/* 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
%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;
;
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); }
+| CLCLOSE { yyclass_pop(cs); }
;
statement_list:
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); }
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}; }
;
%%
( 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));
+ fprintf(stderr, "]\n\t");
+ fprintf(stderr, "%s\n", s);
+}
yycstate* yycstate_new
( void )
static inline
ir_class yyclass_pop
( yycstate* cs )
-{ return *((cs->csp)--); }
+{ cs->csp--;
+ return *(cs->csp + 1);
+}
static inline
ir_class yyclass_push