mirror of https://github.com/MidnightCommander/mc
* syntax.c (syntax_text): Remove, it's a separate file now.
(upgrade_syntax_file): Remove. (edit_read_syntax_file): Use check_for_default().
This commit is contained in:
Pavel Roskin
parent
fad8bcf073
commit
6d8020ff3d
|
|
@ -1,3 +1,9 @@
|
|||
2001-09-11 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* syntax.c (syntax_text): Remove, it's a separate file now.
|
||||
(upgrade_syntax_file): Remove.
|
||||
(edit_read_syntax_file): Use check_for_default().
|
||||
|
||||
2001-09-08 Pavel Roskin <proski@gnu.org>
|
||||
|
||||
* edit.h: Remove some useless definitions.
|
||||
|
|
|
|||
230
edit/syntax.c
230
edit/syntax.c
|
|
@ -854,228 +854,6 @@ void edit_free_syntax_rules (WEdit * edit)
|
|||
syntax_free (edit->rules);
|
||||
}
|
||||
|
||||
#define CURRENT_SYNTAX_RULES_VERSION "62"
|
||||
|
||||
static const char * const syntax_text[] = {
|
||||
"# syntax rules version " CURRENT_SYNTAX_RULES_VERSION,
|
||||
"# (after the slash is a Cooledit color, 0-26 or any of the X colors in rgb.txt)",
|
||||
"# black",
|
||||
"# red",
|
||||
"# green",
|
||||
"# brown",
|
||||
"# blue",
|
||||
"# magenta",
|
||||
"# cyan",
|
||||
"# lightgray",
|
||||
"# gray",
|
||||
"# brightred",
|
||||
"# brightgreen",
|
||||
"# yellow",
|
||||
"# brightblue",
|
||||
"# brightmagenta",
|
||||
"# brightcyan",
|
||||
"# white",
|
||||
"",
|
||||
"file gobledy_gook #\\sHelp\\ssupport\\sother\\sfile\\stypes",
|
||||
"context default",
|
||||
"file gobledy_gook #\\sby\\scoding\\srules\\sin\\s~/.cedit/syntax.",
|
||||
"context default",
|
||||
"file gobledy_gook #\\sSee\\sman/syntax\\sin\\sthe\\ssource\\sdistribution",
|
||||
"context default",
|
||||
"file gobledy_gook #\\sand\\sconsult\\sthe\\sman\\spage.",
|
||||
"context default",
|
||||
"",
|
||||
"",
|
||||
"file ..\\*\\\\.(diff|rej|patch)$ Diff\\sOutput ^diff",
|
||||
"include diff.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.lsm$ LSM\\sFile",
|
||||
"include lsm.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.sh$ Shell\\sScript ^#!\\s\\*/.\\*/([a-z]?|ba|pdk)sh",
|
||||
"include sh.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(pl|PL|pm|PM)$ Perl\\sProgram ^#!\\s\\*/.\\*/perl",
|
||||
"include perl.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(py|PY)$ Python\\sProgram ^#!\\s\\*/.\\*/python",
|
||||
"include python.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(man|[0-9n]|[0-9]x)$ NROFF\\sSource",
|
||||
"include nroff.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(htm|html|HTM|HTML)$ HTML\\sFile",
|
||||
"include html.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(pp|PP|pas|PAS)$ Pascal\\sProgram",
|
||||
"include pascal.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(ada|adb|ads|ADA|ADB|ADS)$ Ada\\sProgram",
|
||||
"include ada95.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(sl|SL)$ S-Lang\\sProgram",
|
||||
"include slang.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.tex$ LaTeX\\s2.09\\sDocument",
|
||||
"include latex.syntax",
|
||||
"",
|
||||
"file ..\\*\\.(texi|texinfo|TEXI|TEXINFO)$ Texinfo\\sDocument",
|
||||
"include texinfo.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.([chC]|CC|cxx|cc|cpp|CPP|CXX)$ C/C\\+\\+\\sProgram",
|
||||
"include c.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.[fF]$ Fortran\\sProgram",
|
||||
"include fortran.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.i$ SWIG\\sSource",
|
||||
"include swig.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(php|PHP)[0-9]?$ PHP\\sProgram",
|
||||
"include php.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(java|JAVA|Java|jav)$ Java\\sProgram",
|
||||
"include java.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(st)$ SmallTalk\\sProgram",
|
||||
"include smalltalk.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(ml|mli|mly|mll|mlp)$ ML\\sProgram",
|
||||
"include ml.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.m$ Matlab\\sor\\sOctave\\sFile",
|
||||
"include octave.syntax",
|
||||
"",
|
||||
"file .\\*ChangeLog$ GNU\\sDistribution\\sChangeLog\\sFile",
|
||||
"include changelog.syntax",
|
||||
"",
|
||||
"file .\\*[Mm]akefile[\\\\\\.a-z]\\*$ Makefile",
|
||||
"include makefile.syntax",
|
||||
"",
|
||||
"file ..\\*\\\\.(po|pot|pox)$ PO\\sFile",
|
||||
"include po.syntax",
|
||||
"",
|
||||
"file Don_t_match_me Mail\\sfolder ^From\\s",
|
||||
"include mail.syntax",
|
||||
"",
|
||||
"file .\\*syntax$ Syntax\\sHighlighting\\sdefinitions",
|
||||
"",
|
||||
"context default",
|
||||
" keyword whole spellch\\eck yellow/24",
|
||||
" keyword whole keyw\\ord yellow/24",
|
||||
" keyword whole whole\\[\\t\\s\\]l\\inestart brightcyan/17",
|
||||
" keyword whole whole\\[\\t\\s\\]l\\inestart brightcyan/17",
|
||||
" keyword whole wh\\oleleft\\[\\t\\s\\]l\\inestart brightcyan/17",
|
||||
" keyword whole wh\\oleright\\[\\t\\s\\]l\\inestart brightcyan/17",
|
||||
" keyword whole l\\inestart\\[\\t\\s\\]wh\\ole",
|
||||
" keyword whole l\\inestart\\[\\t\\s\\]wh\\ole",
|
||||
" keyword whole l\\inestart\\[\\t\\s\\]wh\\oleleft",
|
||||
" keyword whole l\\inestart\\[\\t\\s\\]wh\\oleright",
|
||||
" keyword wholeleft whole\\s brightcyan/17",
|
||||
" keyword wholeleft whole\\t brightcyan/17",
|
||||
" keyword whole wh\\oleleft brightcyan/17",
|
||||
" keyword whole wh\\oleright brightcyan/17",
|
||||
" keyword whole lin\\[e\\]start brightcyan/17",
|
||||
" keyword whole c\\ontext\\[\\t\\s\\]exclusive brightred/18",
|
||||
" keyword whole c\\ontext\\[\\t\\s\\]default brightred/18",
|
||||
" keyword whole c\\ontext brightred/18",
|
||||
" keyword whole wh\\olechars\\[\\t\\s\\]left brightcyan/17",
|
||||
" keyword whole wh\\olechars\\[\\t\\s\\]right brightcyan/17",
|
||||
" keyword whole wh\\olechars brightcyan/17",
|
||||
" keyword whole f\\ile brightgreen/6",
|
||||
" keyword whole in\\clude brightred/18",
|
||||
"",
|
||||
" keyword whole 0 lightgray/0 blue/26",
|
||||
" keyword whole 1 lightgray/1 blue/26",
|
||||
" keyword whole 2 lightgray/2 blue/26",
|
||||
" keyword whole 3 lightgray/3 blue/26",
|
||||
" keyword whole 4 lightgray/4 blue/26",
|
||||
" keyword whole 5 lightgray/5 blue/26",
|
||||
" keyword whole 6 lightgray/6",
|
||||
" keyword whole 7 lightgray/7",
|
||||
" keyword whole 8 lightgray/8",
|
||||
" keyword whole 9 lightgray/9",
|
||||
" keyword whole 10 lightgray/10",
|
||||
" keyword whole 11 lightgray/11",
|
||||
" keyword whole 12 lightgray/12",
|
||||
" keyword whole 13 lightgray/13",
|
||||
" keyword whole 14 lightgray/14",
|
||||
" keyword whole 15 lightgray/15",
|
||||
" keyword whole 16 lightgray/16",
|
||||
" keyword whole 17 lightgray/17",
|
||||
" keyword whole 18 lightgray/18",
|
||||
" keyword whole 19 lightgray/19",
|
||||
" keyword whole 20 lightgray/20",
|
||||
" keyword whole 21 lightgray/21",
|
||||
" keyword whole 22 lightgray/22",
|
||||
" keyword whole 23 lightgray/23",
|
||||
" keyword whole 24 lightgray/24",
|
||||
" keyword whole 25 lightgray/25",
|
||||
" keyword whole 26 lightgray/26",
|
||||
"",
|
||||
" keyword wholeleft black\\/ black/0",
|
||||
" keyword wholeleft red\\/ red/DarkRed",
|
||||
" keyword wholeleft green\\/ green/green3",
|
||||
" keyword wholeleft brown\\/ brown/saddlebrown",
|
||||
" keyword wholeleft blue\\/ blue/blue3",
|
||||
" keyword wholeleft magenta\\/ magenta/magenta3",
|
||||
" keyword wholeleft cyan\\/ cyan/cyan3",
|
||||
" keyword wholeleft lightgray\\/ lightgray/lightgray",
|
||||
" keyword wholeleft gray\\/ gray/gray",
|
||||
" keyword wholeleft brightred\\/ brightred/red",
|
||||
" keyword wholeleft brightgreen\\/ brightgreen/green1",
|
||||
" keyword wholeleft yellow\\/ yellow/yellow",
|
||||
" keyword wholeleft brightblue\\/ brightblue/blue1",
|
||||
" keyword wholeleft brightmagenta\\/ brightmagenta/magenta",
|
||||
" keyword wholeleft brightcyan\\/ brightcyan/cyan1",
|
||||
" keyword wholeleft white\\/ white/26",
|
||||
"",
|
||||
"context linestart # \\n brown/22",
|
||||
"",
|
||||
"file .\\* " UNKNOWN_FORMAT,
|
||||
"include unknown.syntax",
|
||||
"",
|
||||
0};
|
||||
|
||||
|
||||
FILE *upgrade_syntax_file (char *syntax_file)
|
||||
{
|
||||
FILE *f;
|
||||
char *p;
|
||||
char line[80];
|
||||
f = fopen (syntax_file, "r");
|
||||
if (!f) {
|
||||
const char * const *syntax_line;
|
||||
rewrite_rule_file:
|
||||
f = fopen (syntax_file, "w");
|
||||
if (!f)
|
||||
return 0;
|
||||
for (syntax_line = syntax_text; *syntax_line; syntax_line++)
|
||||
fprintf (f, "%s\n", *syntax_line);
|
||||
fclose (f);
|
||||
return fopen (syntax_file, "r");
|
||||
}
|
||||
memset (line, 0, sizeof (line));
|
||||
fread (line, sizeof (line) - 1, 1, f);
|
||||
if (!strstr (line, "syntax rules version"))
|
||||
goto rename_rule_file;
|
||||
p = strstr (line, "version") + strlen ("version") + 1;
|
||||
if (atoi (p) < atoi (CURRENT_SYNTAX_RULES_VERSION)) {
|
||||
char s[1024];
|
||||
rename_rule_file:
|
||||
fclose (f);
|
||||
strcpy (s, syntax_file);
|
||||
strcat (s, ".OLD");
|
||||
unlink (s);
|
||||
rename (syntax_file, s);
|
||||
unlink (syntax_file); /* might rename() fail ? */
|
||||
edit_message_dialog (_(" Load Syntax Rules "), _(" Your syntax rule file is outdated \n A new rule file is being installed. \n Your old rule file has been saved with a .OLD extension. "));
|
||||
goto rewrite_rule_file;
|
||||
}
|
||||
rewind (f);
|
||||
return f;
|
||||
}
|
||||
|
||||
/* returns -1 on file error, line number on error in file syntax */
|
||||
static int edit_read_syntax_file (WEdit * edit, char **names, char *syntax_file, char *editor_file, char *first_line, char *type)
|
||||
{
|
||||
|
|
@ -1087,7 +865,13 @@ static int edit_read_syntax_file (WEdit * edit, char **names, char *syntax_file,
|
|||
int argc;
|
||||
int result = 0;
|
||||
int count = 0;
|
||||
f = upgrade_syntax_file (syntax_file);
|
||||
char *lib_file;
|
||||
|
||||
lib_file = concat_dir_and_file (mc_home, "syntax/Syntax");
|
||||
check_for_default (lib_file, syntax_file);
|
||||
g_free (lib_file);
|
||||
|
||||
f = fopen (syntax_file, "r");
|
||||
if (!f)
|
||||
return -1;
|
||||
args[0] = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue