X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fparser.y;h=db8e30b442b0fc5f561792365851b9150c3f46ac;hp=41c4095c2b7e6a9f1b6fe1f0be282ac033d804d3;hb=25a23e5134b1d9649f0279a4028b887c9deb9987;hpb=423ac0e4bfbee80d7820c04a5355cd964a2ae826

diff --git a/src/parser.y b/src/parser.y
index 41c4095..db8e30b 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -3,8 +3,9 @@
 %code requires {
   #include <unitypes.h>
   #include "ir.h"
+  #include "apc.h"
   typedef struct class_state_t yycstate;
-  struct frame_spec_t { ir_facing d; int w, h; };
+  struct frame_spec_t { apc_facing d; int w, h; };
 }
 %code provides {
   yycstate* yycstate_new(void);
@@ -16,7 +17,7 @@
   #include <dirent.h>
   #include <unitypes.h>
   #include "ir.h"
-
+  
   struct class_state_t {
     ir_class *csp;
     ir_class class_stack[];
@@ -39,7 +40,7 @@
 %union {
   long long  ref;
   int        val;
-  ir_facing  face;
+  apc_facing  face;
   uint8_t*   str;
   ir_class   class;
   ir_set     set;
@@ -79,7 +80,13 @@ class_list:
 ;
 
 class:
-  NAME CLOPEN   { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
+NAME CLOPEN   { printf("new class\n");
+                printf("class name: %s\n", $1);
+		printf("current class head: %s\n", ir_class_name(yyclass(cs)));
+		yyclass_push(cs,ir_class_addchild(yyclass(cs), $1));
+		printf("Pushed class\n");
+		printf("current class head: %s\n", ir_class_name(yyclass(cs)));
+}
   progn
   CLCLOSE       { yyclass_pop(cs); }
 ;
@@ -99,13 +106,13 @@ data_spec:
   SS NAME frame_spec     { $$ = ir_framesheet($2,$3.d,$3.w,$3.h); }
 | MAP NAME frame_spec    { $$ = ir_mapsheet($2,$3.d,$3.w,$3.h); }
 | AUDIO NAME             { $$ = ir_audio($2); }
-| LINK set_ld            { $$ = ir_link_odat($2); }
-| LINK set_ld MAP        { $$ = ir_link_mdat($2,NULL); }
-| LINK set_ld MAP NAME   { $$ = ir_link_mdat($2,$4); }
-| LINK set_ld SS         { $$ = ir_link_vdat($2,NULL); }
-| LINK set_ld SS NAME    { $$ = ir_link_vdat($2,$4); }
-| LINK set_ld AUDIO      { $$ = ir_link_adat($2,NULL); }
-| LINK set_ld AUDIO NAME { $$ = ir_link_adat($2,$4); }
+| LINK set_ld            { $$ = ir_link(OLINK, $2, NULL); }
+| LINK set_ld MAP        { $$ = ir_link(MLINK, $2,NULL); }
+| LINK set_ld MAP NAME   { $$ = ir_link(MLINK, $2,$4); }
+| LINK set_ld SS         { $$ = ir_link(VLINK, $2,NULL); }
+| LINK set_ld SS NAME    { $$ = ir_link(VLINK, $2,$4); }
+| LINK set_ld AUDIO      { $$ = ir_link(ALINK, $2,NULL); }
+| LINK set_ld AUDIO NAME { $$ = ir_link(ALINK, $2,$4); }
 ;
 
 set_spec:
@@ -146,24 +153,22 @@ yycstate* yycstate_new
     { yyerror(class_state, "Memory allocation error.");
       return NULL;
     }
-  class_state->csp = &class_state->class_stack[0];
-  yyclass_push(class_state, ir_class_root());
+  class_state->csp = class_state->class_stack;
+  *(class_state->csp) = ir_class_root();
   return class_state;
 }
 
 static inline
 ir_class yyclass_pop
 ( yycstate* cs )
-{ return *(cs->csp)--; }
+{ return *((cs->csp)--); }
 
 static inline
 ir_class yyclass_push
 ( yycstate* cs,
   ir_class class
 )
-{ *++cs->csp = class;
-  return class;
-}
+{ return *++(cs->csp) = class; }
 
 void yycstate_delete
 ( yycstate* class_state )