thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Made said_parse_spec static, regenerated said.cpp from said.y

Browse source 
svn-id: r39870
This commit is contained in:
Max Horn 2009-04-06 10:25:27 +00:00
parent f5fb20680f
commit 52c5b7547c
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/sci/engine/said.cpp
View file

@ -811,6 +811,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
# else # else
YYUSE (yyoutput); YYUSE (yyoutput);
# endif # endif
switch (yytype)
{
default:
break;
}
} }
@ -1167,6 +1172,13 @@ yydestruct (yymsg, yytype, yyvaluep)
if (!yymsg) if (!yymsg)
yymsg = "Deleting"; yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
switch (yytype)
{
default:
break;
}
} }
@ -1937,8 +1949,6 @@ static tree_t said_terminal(int val) {
static tree_t said_aug_branch(int n1, int n2, tree_t t1, tree_t t2) { static tree_t said_aug_branch(int n1, int n2, tree_t t1, tree_t t2) {
int retval; int retval;
// FIXME: The following code is ambiguous and *not* safely portable,
// due to the way the SAID_NEXT_NODE macro is implemented
retval = said_branch_node(SAID_NEXT_NODE, retval = said_branch_node(SAID_NEXT_NODE,
said_branch_node(SAID_NEXT_NODE, said_branch_node(SAID_NEXT_NODE,
said_leaf_node(SAID_NEXT_NODE, n1), said_leaf_node(SAID_NEXT_NODE, n1),
@ -1987,7 +1997,7 @@ static said_spec_t said_top_branch(tree_t first) {
return 0; return 0;
} }
int said_parse_spec(EngineState *s, byte *spec) { static int said_parse_spec(EngineState *s, byte *spec) {
int nextitem; int nextitem;
said_parse_error = NULL; said_parse_error = NULL;

2
engines/sci/engine/said.y
View file

@ -353,7 +353,7 @@ static said_spec_t said_top_branch(tree_t first) {
return 0; return 0;
} }
int said_parse_spec(EngineState *s, byte *spec) { static int said_parse_spec(EngineState *s, byte *spec) {
int nextitem; int nextitem;
said_parse_error = NULL; said_parse_error = NULL;