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

diff --git a/src/parser.y b/src/parser.y
index db8e30b..5dc5fdb 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -31,16 +31,18 @@
   /* Stack-based class handler */
   #define yyclass(CS)   (*(CS->csp))
   #define yyclassld(CS) (ir_classld_from_class(yyclass(CS)))
+  #define DEFAULT_VARIANT (uint8_t*)"default"
 }
 %define parse.error verbose
+%define parse.lac full
 %define lr.type ielr
 %define api.pure full
 %define api.push-pull push
 %parse-param {yycstate* cs}
 %union {
-  long long  ref;
+  uint32_t   ref;
   int        val;
-  apc_facing  face;
+  apc_facing face;
   uint8_t*   str;
   ir_class   class;
   ir_set     set;
@@ -71,6 +73,7 @@
 progn:
   class_list 
 | class_list statement_list
+| statement_list class_list
 | statement_list
 ;
 
@@ -80,13 +83,7 @@ class_list:
 ;
 
 class:
-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)));
-}
+  NAME CLOPEN   { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
   progn
   CLCLOSE       { yyclass_pop(cs); }
 ;
@@ -96,7 +93,7 @@ statement_list:
 | statement    
 ;
 
-statement:
+   statement:
   set_spec data_spec REF PATH { ir_data_assign_path($2,$4); ir_set_assign_data($1,$2); ir_set_assign_ref($1,$3); }
 | set_spec data_spec PATH     { ir_data_assign_path($2,$3); ir_set_assign_data($1,$2); }
 | set_spec REF PATH           { ir_set_assign_ref($1,$2); }
@@ -104,7 +101,9 @@ statement:
 
 data_spec:
   SS NAME frame_spec     { $$ = ir_framesheet($2,$3.d,$3.w,$3.h); }
+| SS frame_spec          { $$ = ir_framesheet(DEFAULT_VARIANT,$2.d,$2.w,$2.h); }
 | MAP NAME frame_spec    { $$ = ir_mapsheet($2,$3.d,$3.w,$3.h); }
+| MAP frame_spec         { $$ = ir_mapsheet(DEFAULT_VARIANT,$2.d,$2.w,$2.h); }
 | AUDIO NAME             { $$ = ir_audio($2); }
 | LINK set_ld            { $$ = ir_link(OLINK, $2, NULL); }
 | LINK set_ld MAP        { $$ = ir_link(MLINK, $2,NULL); }
@@ -134,6 +133,7 @@ frame_spec:
   NUM NUM                { $$ = (struct frame_spec_t) {SFACE,$1,$2}; }
 | FACING                 { $$ = (struct frame_spec_t) {$1,0,0}; }
 | FACING NUM NUM         { $$ = (struct frame_spec_t) {$1,$2,$3}; }
+| %empty                 { $$ = (struct frame_spec_t) {SFACE,0,0}; }
 ;
 
 %%
@@ -143,7 +143,15 @@ void yyerror
 ( yycstate* cs,
   char const *s
 )
-{ fprintf(stderr, "%s\n", s); }
+{ ir_class* iter;
+  fprintf(stderr, "[class->");
+  for (iter = cs->class_stack; iter <= cs->csp; iter++)
+    fprintf(stderr, "%s/", ir_class_name(*iter));
+  if (strstr(s,"unexpected CLCLOSE") != NULL)
+    yyclass_pop(cs);
+  fprintf(stderr, "]\n\t");
+  fprintf(stderr, "%s\n", s);
+}
 
 yycstate* yycstate_new
 ( void )
@@ -161,7 +169,7 @@ yycstate* yycstate_new
 static inline
 ir_class yyclass_pop
 ( yycstate* cs )
-{ return *((cs->csp)--); }
+{ return *cs->csp--; }
 
 static inline
 ir_class yyclass_push