kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Do not include farsi.c in main.c

Browse Source 
- Change CMakeLists.txt to compile farsi.c normally
 - Add const to global variables in farsi.h and define them in farsi.c (no need
   to include farsi.h with DO_INIT defined in globals.h)
 - Include farsi.h where necessary
 - Include all necessary headers in farsi.c
 - Move farsi function declarations from main.h to farsi.h
This commit is contained in:
Felipe Oliveira Carvalho 2014-03-22 12:25:01 -03:00 committed by Thiago de Arruda
parent b7f953b9e4
commit 68bc6bce29
16 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -4,7 +4,7 @@ file( GLOB NEOVIM_SOURCES *.c )
foreach(sfile ${NEOVIM_SOURCES})
get_filename_component(f ${sfile} NAME)
if(${f} MATCHES "^(regexp_nfa.c|farsi.c)$")
if(${f} MATCHES "^(regexp_nfa.c)$")
list(APPEND to_remove ${sfile})
endif()
endforeach()

1
src/charset.c
View File

@ -4,6 +4,7 @@
#include "vim.h"
#include "charset.h"
#include "farsi.h"
#include "main.h"
#include "mbyte.h"
#include "memline.h"

1
src/edit.c
View File

@ -19,6 +19,7 @@
#include "eval.h"
#include "ex_docmd.h"
#include "ex_getln.h"
#include "farsi.h"
#include "fileio.h"
#include "fold.h"
#include "getchar.h"

2
src/edit.h
View File

@ -1,6 +1,8 @@
#ifndef NEOVIM_EDIT_H
#define NEOVIM_EDIT_H
#include "vim.h"
/*
* Array indexes used for cptext argument of ins_compl_add().
*/

1
src/ex_cmds.c
View File

@ -24,6 +24,7 @@
#include "ex_docmd.h"
#include "ex_eval.h"
#include "ex_getln.h"
#include "farsi.h"
#include "fileio.h"
#include "fold.h"
#include "getchar.h"

1
src/ex_getln.c
View File

@ -23,6 +23,7 @@
#include "ex_cmds2.h"
#include "ex_docmd.h"
#include "ex_eval.h"
#include "farsi.h"
#include "fileio.h"
#include "getchar.h"
#include "if_cscope.h"

42
src/farsi.c
View File

@ -2,11 +2,20 @@
///
/// Functions for Farsi language
///
/// Included by main.c, when FEAT_FKMAP is defined.
#include "farsi.h"
#include "edit.h"
#include "ex_docmd.h"
#include "ex_eval.h"
#include "ex_getln.h"
#include "farsi.h"
#include "getchar.h"
#include "memline.h"
#include "message.h"
#include "misc1.h"
#include "misc2.h"
#include "screen.h"
#include "vim.h"
#define SRC_EDT 0
@ -14,6 +23,35 @@
#define AT_CURSOR 0
// special Farsi text messages
const char_u farsi_text_1[] = {
YE_, _SIN, RE, ALEF_, _FE, ' ', 'V', 'I', 'M',
' ', F_HE, _BE, ' ', SHIN, RE, _GAF, DAL, ' ', NOON,
ALEF_, _YE, ALEF_, _PE, '\0'
};
const char_u farsi_text_2[] = {
YE_, _SIN, RE, ALEF_, _FE, ' ', FARSI_3, FARSI_3,
FARSI_4, FARSI_2, ' ', DAL, RE, ALEF, DAL, _NOON,
ALEF_, _TE, _SIN, ALEF, ' ', F_HE, _BE, ' ', SHIN,
RE, _GAF, DAL, ' ', NOON, ALEF_, _YE, ALEF_, _PE, '\0'
};
const char_u farsi_text_3[] = {
DAL, WAW, _SHIN, _YE, _MIM, _NOON, ' ', YE_, _NOON,
ALEF_, _BE, _YE, _TE, _SHIN, _PE, ' ', 'R', 'E', 'P', 'L',
'A', 'C', 'E', ' ', NOON, ALEF_, _MIM, RE, _FE, ZE, ALEF,
' ', 'R', 'E', 'V', 'E', 'R', 'S', 'E', ' ', 'I', 'N',
'S', 'E', 'R', 'T', ' ', SHIN, WAW, RE, ' ', ALEF_, _BE,
' ', YE_, _SIN, RE, ALEF_, _FE, ' ', RE, DAL, ' ', RE,
ALEF_, _KAF, ' ', MIM, ALEF_, _GAF, _NOON, _HE, '\0'
};
const char_u farsi_text_5[] = {
' ', YE_, _SIN, RE, ALEF_, _FE, '\0'
};
static int toF_Xor_X_(int c);
static int F_is_TyE(int c);
static int F_is_TyC_TyD(int c);

61
src/farsi.h
View File

@ -11,6 +11,9 @@
#ifndef NEOVIM_FARSI_H
#define NEOVIM_FARSI_H
#include "normal.h"
#include "types.h"
// Farsi character set definition
// Begin of the non-standard part
@ -159,48 +162,22 @@
#define W_R_L 0x2
// special Farsi text messages
extern const char_u farsi_text_1[];
extern const char_u farsi_text_2[];
extern const char_u farsi_text_3[];
extern const char_u farsi_text_5[];
#ifdef DO_INIT
EXTERN char_u farsi_text_1[] = {
YE_, _SIN, RE, ALEF_, _FE, ' ', 'V', 'I', 'M',
' ', F_HE, _BE, ' ', SHIN, RE, _GAF, DAL, ' ', NOON,
ALEF_, _YE, ALEF_, _PE, '\0'
};
#else
EXTERN char_u farsi_text_1[];
#endif
#ifdef DO_INIT
EXTERN char_u farsi_text_2[] = {
YE_, _SIN, RE, ALEF_, _FE, ' ', FARSI_3, FARSI_3,
FARSI_4, FARSI_2, ' ', DAL, RE, ALEF, DAL, _NOON,
ALEF_, _TE, _SIN, ALEF, ' ', F_HE, _BE, ' ', SHIN,
RE, _GAF, DAL, ' ', NOON, ALEF_, _YE, ALEF_, _PE, '\0'
};
#else
EXTERN char_u farsi_text_2[];
#endif
#ifdef DO_INIT
EXTERN char_u farsi_text_3[] = {
DAL, WAW, _SHIN, _YE, _MIM, _NOON, ' ', YE_, _NOON,
ALEF_, _BE, _YE, _TE, _SHIN, _PE, ' ', 'R', 'E', 'P', 'L',
'A', 'C', 'E', ' ', NOON, ALEF_, _MIM, RE, _FE, ZE, ALEF,
' ', 'R', 'E', 'V', 'E', 'R', 'S', 'E', ' ', 'I', 'N',
'S', 'E', 'R', 'T', ' ', SHIN, WAW, RE, ' ', ALEF_, _BE,
' ', YE_, _SIN, RE, ALEF_, _FE, ' ', RE, DAL, ' ', RE,
ALEF_, _KAF, ' ', MIM, ALEF_, _GAF, _NOON, _HE, '\0'
};
#else
EXTERN char_u farsi_text_3[];
#endif
#ifdef DO_INIT
EXTERN char_u farsi_text_5[] = {
' ', YE_, _SIN, RE, ALEF_, _FE, '\0'
};
#else
EXTERN char_u farsi_text_5[];
#endif
int toF_TyA(int c);
int fkmap(int c);
void conv_to_pvim(void);
void conv_to_pstd(void);
char_u *lrswap(char_u *ibuf);
char_u *lrFswap(char_u *cmdbuf, int len);
char_u *lrF_sub(char_u *ibuf);
int cmdl_fkmap(int c);
int F_isalpha(int c);
int F_isdigit(int c);
int F_ischar(int c);
void farsi_fkey(cmdarg_T *cap);
#endif // NEOVIM_FARSI_H

1
src/getchar.c
View File

@ -23,6 +23,7 @@
#include "eval.h"
#include "ex_docmd.h"
#include "ex_getln.h"
#include "farsi.h"
#include "main.h"
#include "mbyte.h"
#include "memline.h"

5
src/globals.h
View File

@ -1139,9 +1139,4 @@ EXTERN int curr_tmode INIT(= TMODE_COOK); /* contains current terminal mode */
/* volatile because it is used in signal handler deathtrap(). */
EXTERN volatile bool in_mch_delay INIT(= false); /* sleeping in mch_delay() */
/*
* Optional Farsi support. Include it here, so EXTERN and INIT are defined.
*/
# include "farsi.h"
#endif /* NEOVIM_GLOBALS_H */

7
src/main.c
View File

@ -2392,10 +2392,3 @@ time_msg (
}
#endif
/*
* When FEAT_FKMAP is defined, also compile the Farsi source code.
*/
# include "farsi.c"

12
src/main.h
View File

@ -14,17 +14,5 @@ void time_msg(char *mesg, void *tv_start);
void server_to_input_buf(char_u *str);
char_u *eval_client_expr_to_string(char_u *expr);
char_u *serverConvert(char_u *client_enc, char_u *data, char_u **tofree);
int toF_TyA(int c);
int fkmap(int c);
void conv_to_pvim(void);
void conv_to_pstd(void);
char_u *lrswap(char_u *ibuf);
char_u *lrFswap(char_u *cmdbuf, int len);
char_u *lrF_sub(char_u *ibuf);
int cmdl_fkmap(int c);
int F_isalpha(int c);
int F_isdigit(int c);
int F_ischar(int c);
void farsi_fkey(cmdarg_T *cap);
/* vim: set ft=c : */
#endif /* NEOVIM_MAIN_H */

1
src/normal.c
View File

@ -24,6 +24,7 @@
#include "ex_cmds2.h"
#include "ex_docmd.h"
#include "ex_getln.h"
#include "farsi.h"
#include "fileio.h"
#include "fold.h"
#include "getchar.h"

1
src/screen.c
View File

@ -96,6 +96,7 @@
#include "eval.h"
#include "ex_cmds2.h"
#include "ex_getln.h"
#include "farsi.h"
#include "fileio.h"
#include "fold.h"
#include "getchar.h"

1
src/search.c
View File

@ -18,6 +18,7 @@
#include "ex_cmds.h"
#include "ex_cmds2.h"
#include "ex_getln.h"
#include "farsi.h"
#include "fileio.h"
#include "fold.h"
#include "getchar.h"

1
src/window.c
View File

@ -19,6 +19,7 @@
#include "ex_docmd.h"
#include "ex_eval.h"
#include "ex_getln.h"
#include "farsi.h"
#include "fileio.h"
#include "fold.h"
#include "getchar.h"