projects
/
henge
/
apc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
default variant
[henge/apc.git]
/
src
/
parser.y
diff --git
a/src/parser.y
b/src/parser.y
index
07cf5b8
..
e1fe896
100644
(file)
--- 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)))
/* 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.error verbose
+%define parse.lac full
%define lr.type ielr
%define api.pure full
%define api.push-pull push
%parse-param {yycstate* cs}
%union {
%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;
int val;
- apc_facing
face;
+ apc_facing face;
uint8_t* str;
ir_class class;
ir_set set;
uint8_t* str;
ir_class class;
ir_set set;
@@
-83,6
+85,7
@@
class:
NAME CLOPEN { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
progn
CLCLOSE { yyclass_pop(cs); }
NAME CLOPEN { yyclass_push(cs,ir_class_addchild(yyclass(cs), $1)); }
progn
CLCLOSE { yyclass_pop(cs); }
+| CLCLOSE { yyclass_pop(cs); }
;
statement_list:
;
statement_list:
@@
-98,7
+101,9
@@
statement:
data_spec:
SS NAME frame_spec { $$ = ir_framesheet($2,$3.d,$3.w,$3.h); }
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 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); }
| AUDIO NAME { $$ = ir_audio($2); }
| LINK set_ld { $$ = ir_link(OLINK, $2, NULL); }
| LINK set_ld MAP { $$ = ir_link(MLINK, $2,NULL); }
@@
-128,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}; }
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}; }
;
%%
;
%%
@@
-137,7
+143,13
@@
void yyerror
( yycstate* cs,
char const *s
)
( 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 )
yycstate* yycstate_new
( void )
@@
-147,24
+159,24
@@
yycstate* yycstate_new
{ yyerror(class_state, "Memory allocation error.");
return NULL;
}
{ 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 class_state;
}
static inline
ir_class yyclass_pop
( yycstate* cs )
-{ return *(cs->csp)--; }
+{ cs->csp--;
+ return *(cs->csp + 1);
+}
static inline
ir_class yyclass_push
( yycstate* cs,
ir_class class
)
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 )
void yycstate_delete
( yycstate* class_state )