[Scummvm-cvs-logs] SF.net SVN: scummvm:[39870] scummvm/trunk/engines/sci/engine

[fingolfin at users.sourceforge.net]

Revision: 39870
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39870&view=rev
Author:   fingolfin
Date:     2009-04-06 10:25:27 +0000 (Mon, 06 Apr 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/said.cpp
    scummvm/trunk/engines/sci/engine/said.y

Modified: scummvm/trunk/engines/sci/engine/said.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/said.cpp	2009-04-05 16:05:15 UTC (rev 39869)
+++ scummvm/trunk/engines/sci/engine/said.cpp	2009-04-06 10:25:27 UTC (rev 39870)
@@ -811,6 +811,11 @@
 # else
   YYUSE (yyoutput);
 # endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
 }
 
 
@@ -894,7 +899,7 @@
       fprintf (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		      		       );
+		       		       );
       fprintf (stderr, "\n");
     }
 }
@@ -1167,6 +1172,13 @@
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+	break;
+    }
 }
 
 
@@ -1937,8 +1949,6 @@
 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 @@
 	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;

Modified: scummvm/trunk/engines/sci/engine/said.y
===================================================================
--- scummvm/trunk/engines/sci/engine/said.y	2009-04-05 16:05:15 UTC (rev 39869)
+++ scummvm/trunk/engines/sci/engine/said.y	2009-04-06 10:25:27 UTC (rev 39870)
@@ -353,7 +353,7 @@
 	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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.