josh/propane
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

slight reorganization

Browse Source
This commit is contained in:
Josh Holtrop 2010-04-07 21:03:31 -04:00
parent 1907029d56
commit f4249274bd
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
parse-input.cc
View File

@ -24,7 +24,7 @@ bool parse_input(char * buff, int size)
{&empty, "^\\s*$"}, {&empty, "^\\s*$"},
{&comment, "^\\s*#"}, {&comment, "^\\s*#"},
{&section_name, "^\\s*\\[([^\\]]+?)\\]\\s*$"}, {&section_name, "^\\s*\\[([^\\]]+?)\\]\\s*$"},
{&token, "^\\s*" /* possible leading ws */ {&token, "^\\s*" /* possible leading ws */
"([a-zA-Z_][a-zA-Z_0-9]*)" /* token name */ "([a-zA-Z_][a-zA-Z_0-9]*)" /* token name */
"\\s+" /* required whitespace */ "\\s+" /* required whitespace */
"((?:[^\\\\\\s]|\\\\.)+)" /* token RE */ "((?:[^\\\\\\s]|\\\\.)+)" /* token RE */
@ -32,7 +32,16 @@ bool parse_input(char * buff, int size)
"\\s*$"}, /* possible trailing ws */ "\\s*$"}, /* possible trailing ws */
{&rule, "^\\s*(\\S+)\\s*:=(.*)$"} {&rule, "^\\s*(\\S+)\\s*:=(.*)$"}
}; };
const int ovec_size = 30;
int ovector[ovec_size];
int lineno = 1;
char * newline;
char * input = buff;
string sn;
map<string, Section> sections;
sections["none"] = none;
sections["tokens"] = tokens;
sections["rules"] = rules;
Section section = none; Section section = none;
for (int i = 0; i < sizeof(exprs)/sizeof(exprs[0]); i++) for (int i = 0; i < sizeof(exprs)/sizeof(exprs[0]); i++)
@ -48,16 +57,6 @@ bool parse_input(char * buff, int size)
} }
} }
const int ovec_size = 30;
int ovector[ovec_size];
int lineno = 1;
char * newline;
char * input = buff;
string sn;
map<string, Section> sections;
sections["none"] = none;
sections["tokens"] = tokens;
sections["rules"] = rules;
while ((newline = strstr(input, "\n")) != NULL) while ((newline = strstr(input, "\n")) != NULL)
{ {
int line_length = newline - input; int line_length = newline - input;