X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fparser.y;h=e1fe89651eb15c4f9f1878f5f5351b602ffe4e86;hp=ff2d25715cd485b99183e1323a6a0e91b0e1e0d2;hb=fc6b15eee27f77e01ed4a24bc11e7bfa5a812342;hpb=7896cfff4745b3999850dd301a296de71f7356eb

diff --git a/src/parser.y b/src/parser.y
index ff2d257..e1fe896 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -31,6 +31,7 @@
   /* Stack-based class handler */
   #define yyclass(CS)   (*(CS->csp))
   #define yyclassld(CS) (ir_classld_from_class(yyclass(CS)))
+  #define DEFAULT_VARIANT "default"
 }
 %define parse.error verbose
 %define parse.lac full
@@ -39,9 +40,9 @@
 %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;
@@ -84,6 +85,7 @@ class:
   NAME CLOPEN   { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
   progn
   CLCLOSE       { yyclass_pop(cs); }
+| CLCLOSE       { yyclass_pop(cs); }
 ;
 
 statement_list:
@@ -99,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); }
@@ -129,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}; }
 ;
 
 %%
@@ -139,9 +144,10 @@ void yyerror
   char const *s
 )
 { ir_class* iter;
+  fprintf(stderr, "[class->");
   for (iter = cs->class_stack; iter < cs->csp; iter++)
     fprintf(stderr, "%s/", ir_class_name(*iter));
-  fprintf(stderr, "\n\t");
+  fprintf(stderr, "]\n\t");
   fprintf(stderr, "%s\n", s);
 }