Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2025-01-10 05:29:48 +00:00
Code Issues Projects Releases Wiki Activity

fix integer tokens.

Browse Source
This commit is contained in:
Kelvin Sherlock 2014-12-29 15:51:57 -05:00
parent 1cd59d36f3
commit d400bfb4da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/template_loader.rl
View File

@ -50,7 +50,7 @@ void TemplateParse(void *yyp, int yymajor, void *yyminor, Debug::TemplateParseIn
void TemplateParse(void *yyp, int yymajor, int yyminor, Debug::TemplateParseInfo *info) void TemplateParse(void *yyp, int yymajor, int yyminor, Debug::TemplateParseInfo *info)
{ {
TemplateParse(yyp, yymajor, &yyminor, info); TemplateParse(yyp, yymajor, (void *)yyminor, info);
} }
void TemplateParse(void *yyp, int yymajor, const std::string *yyminor, Debug::TemplateParseInfo *info) void TemplateParse(void *yyp, int yymajor, const std::string *yyminor, Debug::TemplateParseInfo *info)

4
bin/template_parser.lemon
View File

@ -67,7 +67,7 @@ struct_field(rhs) ::= opt_volatile TEMPLATE(a) opt_star(star) IDENTIFIER(b) arra
%type array_count { int } %type array_count { int }
array_count(rhs) ::= . { rhs = 0; } array_count(rhs) ::= . { rhs = 0; }
array_count(rhs) ::= LBRACKET INTEGER(a) RBRACKET. { array_count(rhs) ::= LBRACKET INTEGER(a) RBRACKET. {
int i = *(int *)a; int i = (int)(ptrdiff_t)a;
if (i == 0) { if (i == 0) {
fprintf(stderr, "Template error: line %u: 0-sized arrays are not allowed.\n", fprintf(stderr, "Template error: line %u: 0-sized arrays are not allowed.\n",
info->LineNumber); info->LineNumber);
@ -110,7 +110,7 @@ typecode(rhs) ::= UNSIGNED LONG opt_int. { rhs = kUInt32; }
typecode(rhs) ::= opt_signed LONG LONG. { rhs = kSInt64; } typecode(rhs) ::= opt_signed LONG LONG. { rhs = kSInt64; }
typecode(rhs) ::= UNSIGNED LONG LONG. { rhs = kUInt64; } typecode(rhs) ::= UNSIGNED LONG LONG. { rhs = kUInt64; }
typecode(rhs) ::= TYPECODE(a). { rhs = *(int *)a; } typecode(rhs) ::= TYPECODE(a). { rhs = (int)(ptrdiff_t)a; }
/* pointers are not fully supported yet */ /* pointers are not fully supported yet */
typecode(rhs) ::= VOID STAR. { rhs = kVoidPtr; } typecode(rhs) ::= VOID STAR. { rhs = kVoidPtr; }