Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-06-07 11:29:29 +00:00
Code Issues Projects Releases Wiki Activity

fix lexer bugs with bad input.

Browse Source
This commit is contained in:
Kelvin Sherlock 2014-12-31 16:49:42 -05:00
parent cbe66b6798
commit b707e02295
2 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
bin/lexer.rl
View File

@ -215,6 +215,7 @@ namespace {
Parse(parser, tkINTEGER, value, command);
};
# todo -- (\['\]|[^'\]){1,4} ?
['] [^']{1,4} ['] {
// 4 cc code
@ -375,28 +376,41 @@ bool ParseLine(const char *iter, Command *command)
const char *te;
int cs, act;
for(;;)
%% write init;
%% write exec;
if (cs < lexer_first_final /* == lexer_error */)
{
putchar(' '); putchar(' '); // 2 leading spaces.
for (size_t i = 0, l = p - iter; i < l; ++i) putchar(' '); puts("^");
if (*p == 0) fprintf(stderr, "Unexpected end of line\n");
else fprintf(stderr, "unexpected character: `%c'\n", *p);
ParseFree(parser, free);
return false;
}
%% write init;
%% write exec;
/*
if (cs == lexer_en_error)
{
ParseFree(parser, free);
return false;
}
if (cs == lexer_error)
{
fprintf(stderr, "illegal character: `%c'\n", *p);
ParseFree(parser, free);
return false;
}
if (cs == lexer_en_error)
{
ParseFree(parser, free);
return false;
}
if (p == pe)
{
Parse(parser, tkEOL, 0, command);
break;
}
if (cs < lexer_first_final)
{
fprintf(stderr, "Incomplete command\n");
ParseFree(parser, free);
return false;
}
*/
if (p == pe)
{
// always true?
Parse(parser, tkEOL, 0, command);
}
Parse(parser, 0, 0, command);

6
bin/parser.lemon
View File

@ -222,6 +222,12 @@ stmt ::= expr(a) SEMI SEMIT IDENTIFIER(b) EOL.
}
stmt ::= expr SEMI SEMIT error EOL.
{
fprintf(stderr, "usage: expression ; t TemplateName\n");
}
stmt ::= DREGISTER(a) EQ expr(b) EOL.
{
Debug::SetDRegister(a.intValue, b.intValue);