X-Git-Url: https://git.kengrimes.com/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fapc%2Fparser.y;h=12e88745d39167b80cb68e4a6b5920a2739fba0c;hp=07bc28be16d47e13050d1dd9d1b030d1a7cad2e9;hb=92d574d704e54743631464fac3ce739b1077222c;hpb=f0fe047bf6596784aae8c56310f9dec35a09dbec

diff --git a/src/apc/parser.y b/src/apc/parser.y
index 07bc28b..12e8874 100644
--- a/src/apc/parser.y
+++ b/src/apc/parser.y
@@ -21,45 +21,44 @@
 
 %union {
   uint64_t ref;
-  int NUM;
+  int val;
   char *str;
   void *voidp;
 
 }
 
  //operators
-%token         CLOPEN   // /
-%token         CLCLOSE  // \
-%token         SOPEN
-%token         SCLOSE
-%token         EOPEN
-%token         ECLOSE
-%token         VOPEN
-%token         VCLOSE
-
-%token         QOPEN     //!
-%token         QCLOSE    //#
-%token         RT     //*
-%token         HB
-%token         MOD
-%token         SET
-%token         FS
-%token         ELE
+%token         CLOPEN    // (
+%token         CLCLOSE   // )
+%token         SOPEN     // {
+%token         SCLOSE    // }
+%token         EOPEN     // [
+%token         ECLOSE    // ]
+%token         VOPEN     // /
+%token         VCLOSE    // \
+
+%token         QOPEN     // !
+%token         QCLOSE    // @
+%token         RT        // &
+%token         HB        // #
 //nonterminal types
 %type <ref> olink
 %type <ref> ele_svlink
 %type <ref> set_svlink
 //terminals
-%token <NUM> NUM
+%token <val> NUM
 %token <str> STR
-%token <NUM> SS
+%token <val> SS
 %token <str> NAME
 %token <ref> REF
-%token <NUM> SSD
+%token <val> SSD
 %token <voidp> FPTR
-%token <NUM> WIDTH
-%token <NUM> HEIGHT
-%token <NUM> NUM_PTRS
+// Change width, height, num_ptrs to NUM because
+// when scanning, we can't determine which NUM
+// is which. 
+%token <val> WIDTH
+%token <val> HEIGHT
+%token <val> NUM_PTRS
 //precedence
 %precedence LP
 %precedence MP
@@ -79,7 +78,7 @@ class_list class
 ;
 
 class:
-NAME CLOPEN {push_cdat($1);} class_block CLCLOSE              {pop_cdat();};
+ NAME CLOPEN {push_cdat($1);} class_block CLCLOSE              {pop_cdat();};
 ;
 
 class_block:
@@ -119,10 +118,10 @@ quad_list
 ;
 
 set:
-SOPEN set_label element_list set_map_data vdat SCLOSE                           {insert_set(); insert_vdat();};
-| SOPEN set_label element_list set_map_data set_vlink SCLOSE                    {insert_set();};
-| SOPEN set_label element_list set_map_data set_svlink SCLOSE                   {insert_set_svlink($5); insert_set(); };
-| SOPEN set_label element_list vdat SCLOSE                                      {insert_set(); insert_vdat();};
+SOPEN set_label set_map_data element_list {alloc_vdat();} vdat SCLOSE                           {insert_set(); insert_set_vdatid();};
+| SOPEN set_label set_map_data element_list set_vlink SCLOSE                    {insert_set();};
+| SOPEN set_label set_map_data element_list set_svlink SCLOSE                   {insert_set_svlink($5); insert_set(); };
+| SOPEN set_label element_list {alloc_vdat();} vdat SCLOSE                                      {insert_set(); insert_set_vdatid();};
 | SOPEN set_label element_list set_vlink SCLOSE                                 {insert_set(); }
 | SOPEN set_label element_list set_svlink  SCLOSE                               {insert_set_svlink($4); insert_set();};
 | SOPEN olink SCLOSE                                                            {insert_set_olink($2);};
@@ -130,7 +129,7 @@ SOPEN set_label element_list set_map_data vdat SCLOSE
 
 
 set_label:
-HP NAME REF                                                 {insert_set_label($2,$3);};
+HP NAME REF                                                  {insert_set_label($2,$3);};
 | LP NAME                                                    {insert_set_label($2, -1);};
 ;
 
@@ -166,10 +165,10 @@ REF
 ;
 
 element:
-EOPEN ele_label hitbox root vdat ECLOSE                                        {insert_ele(); insert_vdat();};
+EOPEN ele_label hitbox root {alloc_vdat();} vdat ECLOSE                        {insert_ele(); insert_ele_vdatid();};
 | EOPEN ele_label hitbox root ele_vlink ECLOSE                                 {insert_ele(); };
 | EOPEN ele_label hitbox root ele_svlink ECLOSE                                {insert_ele_svlink($5);insert_ele(); };
-| EOPEN ele_label root vdat ECLOSE                                             {insert_ele(); insert_vdat();};
+| EOPEN ele_label root {alloc_vdat();} vdat ECLOSE                                             {insert_ele(); insert_ele_vdatid();};
 | EOPEN ele_label root ele_vlink ECLOSE                                        {insert_ele(); };
 | EOPEN ele_label root ele_svlink ECLOSE                                       {insert_ele_svlink($4); insert_ele(); };
 | EOPEN olink ECLOSE                                                           {insert_ele_olink($2);};
@@ -181,8 +180,8 @@ VOPEN model_list VCLOSE
 
 model_list:
 model_list model
-| model
-;
+|  model
+ ;
 
 model:
 spritesheet LP