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

fix #63. process escape sequences in string

This commit is contained in:
Yuichi Nishiwaki 2014-03-04 23:44:27 +09:00
parent f8b3f5f1fd
commit 818fb41f77
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/read.c
View File

@ -91,9 +91,6 @@ read_datum(int tok, yyscan_t scanner)
case tSYMBOL: case tSYMBOL:
return pic_symbol_value(pic_intern(pic, yylval.str.buf, yylval.str.len)); return pic_symbol_value(pic_intern(pic, yylval.str.buf, yylval.str.len));
case tSTRING:
return pic_obj_value(pic_str_new(pic, yylval.str.buf, yylval.str.len));
case tINT: case tINT:
return pic_int_value(yylval.i); return pic_int_value(yylval.i);
@ -106,6 +103,11 @@ read_datum(int tok, yyscan_t scanner)
case tCHAR: case tCHAR:
return pic_char_value(yylval.c); return pic_char_value(yylval.c);
case tSTRING:
val = pic_obj_value(pic_str_new(pic, yylval.str.buf, yylval.str.len));
pic_free(pic, yylval.str.buf);
return val;
case tBYTEVECTOR: case tBYTEVECTOR:
val = pic_obj_value(pic_blob_new(pic, yylval.blob.dat, yylval.blob.len)); val = pic_obj_value(pic_blob_new(pic, yylval.blob.dat, yylval.blob.len));
pic_free(pic, yylval.blob.dat); pic_free(pic, yylval.blob.dat);

30
src/scan.l
View File

@ -118,13 +118,33 @@ infnan "+inf.0"|"-inf.0"|"+nan.0"|"-nan.0"
"\"" { "\"" {
BEGIN(STRING); BEGIN(STRING);
yylval.str.len = 0;
yylval.str.buf = yyalloc(yylval.str.len + 1, yyscanner);
strcpy(yylval.str.buf, "");
} }
<STRING>[^\\"]* { <STRING>[^\\"]+ {
yymore(); yylval.str.len += yyleng;
yylval.str.buf = yyrealloc(yylval.str.buf, yylval.str.len + 1, yyscanner);
strcpy(yylval.str.buf + yylval.str.len - yyleng, yytext);
} }
<STRING>"\"" { <STRING>\\. {
yylval.str.buf = yytext; yylval.str.len += 1;
yylval.str.len = yyleng - 1; yylval.str.buf = yyrealloc(yylval.str.buf, yylval.str.len + 1, yyscanner);
yylval.str.buf[yylval.str.len] = '\0';
switch (yytext[yyleng - 1]) {
case 'a': yylval.str.buf[yylval.str.len - 1] = '\a'; break;
case 'b': yylval.str.buf[yylval.str.len - 1] = '\b'; break;
case 't': yylval.str.buf[yylval.str.len - 1] = '\t'; break;
case 'n': yylval.str.buf[yylval.str.len - 1] = '\n'; break;
case 'r': yylval.str.buf[yylval.str.len - 1] = '\r'; break;
default: yylval.str.buf[yylval.str.len - 1] = yytext[yyleng - 1]; break;
}
}
<STRING>\\[:blank:]*\n[:blank:]* {
/* skip intraline whitespaces */
}
<STRING>\" {
BEGIN(INITIAL); BEGIN(INITIAL);
return tSTRING; return tSTRING;
} }