sigmasternchen/macrofuck
1
0
Fork 0
mirror of https://github.com/sigmasternchen/macrofuck synced 2025-03-15 07:08:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: support for carriage return

Browse source
This commit is contained in:
overflowerror 2024-05-18 19:18:15 +02:00
parent c2e60dd25c
commit 9d08afd1a1
5 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
compiler/src/lexer.l
View file

@ -13,7 +13,7 @@ map "map"
rmap "rmap" rmap "rmap"
in "in" in "in"
char "'"([^\\]|[\\]n|[\\]t|[\\]{2})"'" char "'"([^\\]|[\\]n|[\\]t|[\\]r|[\\]{2})"'"
id [a-zA-Z_][a-zA-Z0-9_]* id [a-zA-Z_][a-zA-Z0-9_]*
include "#include" include "#include"
@ -58,6 +58,7 @@ char char_escape(const char* yytext) {
if (yytext[2] == '\\') return '\\'; if (yytext[2] == '\\') return '\\';
else if (yytext[2] == 'n') return '\n'; else if (yytext[2] == 'n') return '\n';
else if (yytext[2] == 't') return '\t'; else if (yytext[2] == 't') return '\t';
else if (yytext[2] == 'r') return '\r';
else lex_panic("unknown escape sequence: %s\n", yytext); else lex_panic("unknown escape sequence: %s\n", yytext);
} else { } else {
return yytext[1]; return yytext[1];
@ -118,6 +119,7 @@ int nested_braces = 0;
<STRING>[^\\"\n]* { strbuf_append(strbuf, yytext); } <STRING>[^\\"\n]* { strbuf_append(strbuf, yytext); }
<STRING>\\n { strbuf_append_c(strbuf, '\n'); } <STRING>\\n { strbuf_append_c(strbuf, '\n'); }
<STRING>\\t { strbuf_append_c(strbuf, '\t'); } <STRING>\\t { strbuf_append_c(strbuf, '\t'); }
<STRING>\\r { strbuf_append_c(strbuf, '\r'); }
<STRING>\\[0-7]* { strbuf_append_c(strbuf, strtol(yytext+1, 0, 8)); } <STRING>\\[0-7]* { strbuf_append_c(strbuf, strtol(yytext+1, 0, 8)); }
<STRING>\\[\\"] { strbuf_append_c(strbuf, yytext[1]); } <STRING>\\[\\"] { strbuf_append_c(strbuf, yytext[1]); }
<STRING>\" { yylval.str = strdup(strbuf); BEGIN INITIAL; return STR; } <STRING>\" { yylval.str = strdup(strbuf); BEGIN INITIAL; return STR; }

1
compiler/test/cases/001b-bug-carriage-return-in-char.in Normal file
View file

@ -0,0 +1 @@
print('a', '\r', 'b', '\n');

1
compiler/test/cases/001b-bug-carriage-return-in-char.out Normal file
View file

@ -0,0 +1 @@
[-]+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>[-]+++++++++++++>[-]++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>[-]++++++++++<<<.>.>.>.

1
compiler/test/cases/002b-bug-carriage-return-in-str.in Normal file
View file

@ -0,0 +1 @@
print("a\rb\n");

1
compiler/test/cases/002b-bug-carriage-return-in-str.out Normal file
View file

@ -0,0 +1 @@
[-]+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>[-]+++++++++++++>[-]++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++>[-]++++++++++<<<.>.>.>.