conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove stuff rerated to parser_control from scan.l

This commit is contained in:
Yuichi Nishiwaki 2013-10-28 22:55:15 +09:00
parent 94e1e245ea
commit a19c59ba87
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parse.y
View File

@ -195,7 +195,7 @@ yyerror(struct parser_control *p, const char *msg)
int int
yylex(YYSTYPE *yylvalp, struct parser_control *p) yylex(YYSTYPE *yylvalp, struct parser_control *p)
{ {
return yylex_(yylvalp, p->yyscanner, p); return yylex_(yylvalp, p->yyscanner);
} }
bool bool

13
src/scan.l
View File

@ -5,17 +5,7 @@
#include "picrin.h" #include "picrin.h"
#include "y.tab.h" #include "y.tab.h"
struct parser_control { #define YY_DECL int yylex_(YYSTYPE *yylvalp, yyscan_t yyscanner)
pic_state *pic;
void *yyscanner;
pic_value value;
bool incomp;
int yynerrs;
};
void yyerror(struct parser_control *p, const char *msg);
#define YY_DECL int yylex_ (YYSTYPE *yylvalp, yyscan_t yyscanner, struct parser_control *p)
%} %}
%option reentrant %option reentrant
@ -79,7 +69,6 @@ infnan "+inf.0"|"-inf.0"|"+nan.0"|"-nan.0"
"\"" BEGIN(STRING); "\"" BEGIN(STRING);
<STRING>{ <STRING>{
[^\\"]* yymore(); [^\\"]* yymore();
<<EOF>> { yyerror(p, "eof in string"); BEGIN(INITIAL); }
"\"" { "\"" {
yytext[yyleng-1] = '\0'; yytext[yyleng-1] = '\0';
yylvalp->cstr = strdup(yytext); yylvalp->cstr = strdup(yytext);