From: jordan@hack_attack Date: Thu, 22 Sep 2016 19:41:54 +0000 (-0700) Subject: changed NUM to val X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=commitdiff_plain;h=ff9ffcb005f2d279e8bbb97f6d6455bb7c38bbf2 changed NUM to val --- diff --git a/src/apc/lexer.c b/src/apc/lexer.c index c092e5e..67aeb23 100644 --- a/src/apc/lexer.c +++ b/src/apc/lexer.c @@ -110,11 +110,11 @@ int lexer { if (TK_EMPTY) { TK_INIT(); if (scanner() == 0) - { yylval.NUM = 0; + { yylval.val = 0; return 0; } } - yylval.NUM = TK_POPI(); + yylval.val = TK_POPI(); return TK_POPI(); } diff --git a/src/apc/parser.y b/src/apc/parser.y index 07bc28b..64bed5a 100644 --- a/src/apc/parser.y +++ b/src/apc/parser.y @@ -21,7 +21,7 @@ %union { uint64_t ref; - int NUM; + int val; char *str; void *voidp; @@ -50,16 +50,16 @@ %type ele_svlink %type set_svlink //terminals -%token NUM +%token NUM %token STR -%token SS +%token SS %token NAME %token REF -%token SSD +%token SSD %token FPTR -%token WIDTH -%token HEIGHT -%token NUM_PTRS +%token WIDTH +%token HEIGHT +%token NUM_PTRS //precedence %precedence LP %precedence MP