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

diff --git a/src/parser.y b/src/parser.y
index 959890d..db8e30b 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -80,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); }
 ;
@@ -100,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:
@@ -147,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 )