experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "optimized string lex parsing"

Browse source 
This reverts commit 5b6bdbfd3a.
This commit is contained in:
Olof hagsand 2019-02-20 16:26:01 +01:00
parent 83edd29678
commit 8279c015d8
2 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/src/clixon_yang_parse.l
View file

@ -191,14 +191,14 @@ identifier [A-Za-z_][A-Za-z0-9_\-\.]*
<KEYWORD>\} { return *yytext; }
<KEYWORD>; { return *yytext; }
<KEYWORD>. { clixon_yang_parselval.string = strdup(yytext);
BEGIN(UNKNOWN); return CHARS; }
BEGIN(UNKNOWN); return CHAR; }
<UNKNOWN>: { return *yytext; }
<UNKNOWN>; { BEGIN(KEYWORD); return *yytext; }
<UNKNOWN>\" { _YY->yy_lex_string_state =UNKNOWN; BEGIN(STRINGDQ); return *yytext; }
<UNKNOWN>\{ { BEGIN(KEYWORD); return *yytext; }
<UNKNOWN>. { clixon_yang_parselval.string = strdup(yytext);
return CHARS; }
return CHAR; }
<BOOLEAN>true { clixon_yang_parselval.string = strdup(yytext);
return BOOL; }
@ -226,27 +226,22 @@ identifier [A-Za-z_][A-Za-z0-9_\-\.]*
<STRING>\' { _YY->yy_lex_string_state =STRING; BEGIN(STRINGSQ); return SQ; }
<STRING>\+ { return *yytext; }
<STRING>. { clixon_yang_parselval.string = strdup(yytext);
return CHARS;}
return CHAR;}
<STRINGDQ>\\ { _YY->yy_lex_state = STRINGDQ; BEGIN(ESCAPE); }
<STRINGDQ>\" { BEGIN(_YY->yy_lex_string_state); return *yytext; }
<STRINGDQ>\n { _YY->yy_linenum++;
clixon_yang_parselval.string = strdup(yytext);
return CHARS;}
<STRINGDQ>[^\\"\n]+ { clixon_yang_parselval.string = strdup(yytext);
return CHARS;}
<STRINGDQ>\n { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;}
<STRINGDQ>. { clixon_yang_parselval.string = strdup(yytext);
return CHAR;}
<STRINGSQ>\\ { _YY->yy_lex_state = STRINGSQ; BEGIN(ESCAPE); }
<STRINGSQ>\' { BEGIN(_YY->yy_lex_string_state); return SQ; }
<STRINGSQ>\n { _YY->yy_linenum++;
clixon_yang_parselval.string = strdup(yytext);
return CHARS;}
<STRINGSQ>[^\\'\n]+ { clixon_yang_parselval.string = strdup(yytext);
return CHARS;}
<STRINGSQ>\n { _YY->yy_linenum++; clixon_yang_parselval.string = strdup(yytext); return CHAR;}
<STRINGSQ>. { clixon_yang_parselval.string = strdup(yytext);
return CHAR;}
<ESCAPE>. { BEGIN(_YY->yy_lex_state);
clixon_yang_parselval.string = strdup(yytext);
return CHARS; }
return CHAR; }
<COMMENT1>[^*\n]* /* eat anything that's not a '*' */
<COMMENT1>"*"+[^*/\n]* /* eat up '*'s not followed by '/'s */
<COMMENT1>"*"+"/" BEGIN(_YY->yy_lex_state);

6
lib/src/clixon_yang_parse.y
View file

@ -57,7 +57,7 @@
%token MY_EOF
%token SQ /* Single quote: ' */
%token <string> CHARS
%token <string> CHAR
%token <string> IDENTIFIER
%token <string> BOOL
%token <string> INT
@ -1726,14 +1726,14 @@ qstring : '"' ustring '"' { $$=$2; clicon_debug(2,"string-> \" ustring \
;
/* unquoted string */
ustring : ustring CHARS
ustring : ustring CHAR
{
int len = strlen($1);
$$ = realloc($1, len+strlen($2) + 1);
sprintf($$+len, "%s", $2);
free($2);
}
| CHARS
| CHAR
{$$=$1; }
;