aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2009-04-06 10:25:27 +0000
committerMax Horn2009-04-06 10:25:27 +0000
commit52c5b7547c064ec43490f801ec15ab5edf4746ff (patch)
tree3bb9ab5c6c0a4bd62b85cd9bcb51b6273af10778
parentf5fb20680f6524b6e317ba487efdc370e1f1f9ce (diff)
downloadscummvm-rg350-52c5b7547c064ec43490f801ec15ab5edf4746ff.tar.gz
scummvm-rg350-52c5b7547c064ec43490f801ec15ab5edf4746ff.tar.bz2
scummvm-rg350-52c5b7547c064ec43490f801ec15ab5edf4746ff.zip
SCI: Made said_parse_spec static, regenerated said.cpp from said.y
svn-id: r39870
-rw-r--r--engines/sci/engine/said.cpp18
-rw-r--r--engines/sci/engine/said.y2
2 files changed, 15 insertions, 5 deletions
diff --git a/engines/sci/engine/said.cpp b/engines/sci/engine/said.cpp
index f209851d59..1681160247 100644
--- a/engines/sci/engine/said.cpp
+++ b/engines/sci/engine/said.cpp
@@ -811,6 +811,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
# else
YYUSE (yyoutput);
# endif
+ switch (yytype)
+ {
+ default:
+ break;
+ }
}
@@ -894,7 +899,7 @@ yy_reduce_print (yyvsp, yyrule)
fprintf (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
- );
+ );
fprintf (stderr, "\n");
}
}
@@ -1167,6 +1172,13 @@ yydestruct (yymsg, yytype, yyvaluep)
if (!yymsg)
yymsg = "Deleting";
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) {
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,
said_branch_node(SAID_NEXT_NODE,
said_leaf_node(SAID_NEXT_NODE, n1),
@@ -1987,7 +1997,7 @@ static said_spec_t said_top_branch(tree_t first) {
return 0;
}
-int said_parse_spec(EngineState *s, byte *spec) {
+static int said_parse_spec(EngineState *s, byte *spec) {
int nextitem;
said_parse_error = NULL;
diff --git a/engines/sci/engine/said.y b/engines/sci/engine/said.y
index 82f51f4f2a..839c00d19e 100644
--- a/engines/sci/engine/said.y
+++ b/engines/sci/engine/said.y
@@ -353,7 +353,7 @@ static said_spec_t said_top_branch(tree_t first) {
return 0;
}
-int said_parse_spec(EngineState *s, byte *spec) {
+static int said_parse_spec(EngineState *s, byte *spec) {
int nextitem;
said_parse_error = NULL;