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

diff --git a/src/parser.y b/src/parser.y
index 07cf5b8..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); }
 ;
@@ -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 )