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

diff --git a/src/apc/parser.y b/src/apc/parser.y
index ffc672d..12e8874 100644
--- a/src/apc/parser.y
+++ b/src/apc/parser.y
@@ -1,8 +1,10 @@
 /* Asset Package Compiler */
+%code requires{
+  #include <stdint.h>
+}
 %{
   #include <stdio.h>
   #include <string.h>
-  #include <stdint.h>
   #include <dirent.h>
   #include <png.h>
   #include <apc/ir.h>
@@ -16,40 +18,47 @@
 %}
 %define parse.error verbose
 %define lr.type ielr
-%define api.value.type union
-//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
+
+%union {
+  uint64_t ref;
+  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        // #
 //nonterminal types
-%type <uint64_t> olink
-%type <uint64_t> ele_svlink
-%type <uint64_t> set_svlink
+%type <ref> olink
+%type <ref> ele_svlink
+%type <ref> set_svlink
 //terminals
-%token <int> NUM
-%token <char*> STR
-%token <int> SS
-%token <char*> NAME
-%token <uint64_t> REF
-%token <int> SSD
-%token <void*> FPTR
-%token <int> WIDTH
-%token <int> HEIGHT
-%token <int> NUM_PTRS
+%token <val> NUM
+%token <str> STR
+%token <val> SS
+%token <str> NAME
+%token <ref> REF
+%token <val> SSD
+%token <voidp> FPTR
+// 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
@@ -69,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:
@@ -109,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);};
@@ -120,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);};
 ;
 
@@ -156,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);};
@@ -171,8 +180,8 @@ VOPEN model_list VCLOSE
 
 model_list:
 model_list model
-| model
-;
+|  model
+ ;
 
 model:
 spritesheet LP