Emphasize that yylex and yyerror must be declared before being used.

[bison.git] / src / parse-gram.y

diff --git a/src/parse-gram.y b/src/parse-gram.y
index ee82858f54003debe00ef555ac427356fc5fb59b..4b7637e7be3c806c635b54f2a93c055949515116 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -40,7 +40,7 @@
 #include "reader.h"
 #include "conflicts.h"
 
 #include "reader.h"
 #include "conflicts.h"
 

-/* Produce verbose parse errors.  */
+/* Produce verbose syntax errors.  */

 #define YYERROR_VERBOSE 1
 #define YYLLOC_DEFAULT(Current, Rhs, N)                        \
 do {                                                   \
 #define YYERROR_VERBOSE 1
 #define YYLLOC_DEFAULT(Current, Rhs, N)                        \
 do {                                                   \


@@ -57,25 +57,20 @@ do {                                                        \
   }                                                    \
 } while (0)
 
   }                                                    \
 } while (0)
 

-/* Pass the control structure to YYPARSE and YYLEX. */
-#define YYPARSE_PARAM gram_control
-#define YYLEX_PARAM gram_control
-/* YYPARSE receives GRAM_CONTROL as a void *.  Provide a
-   correctly typed access to it.  */
-#define yycontrol ((gram_control_t *) gram_control)
-
-/* Request detailed parse error messages, and pass them to GRAM_ERROR.
-   FIXME: depends on the undocumented availability of YYLLOC.t */
+/* Request detailed syntax error messages, and pass them to GRAM_ERROR.
+   FIXME: depends on the undocumented availability of YYLLOC.  */

 #undef  yyerror
 #define yyerror(Msg) \
         gram_error (&yylloc, Msg)
 
 #define YYPRINT(File, Type, Value) \
 #undef  yyerror
 #define yyerror(Msg) \
         gram_error (&yylloc, Msg)
 
 #define YYPRINT(File, Type, Value) \

-        yyprint (File, Type, &Value)
-static void yyprint (FILE *file, int type, const yystype *value);
+       print_token_value (File, Type, &Value)
+static void print_token_value (FILE *file, int type, YYSTYPE const *value);
+
+static void add_param (char const *, char const *, location_t);

 
 symbol_class current_class = unknown_sym;
 
 symbol_class current_class = unknown_sym;

-char *current_type = 0;
+struniq_t current_type = 0;

 symbol_t *current_lhs;
 location_t current_lhs_location;
 assoc_t current_assoc;
 symbol_t *current_lhs;
 location_t current_lhs_location;
 assoc_t current_assoc;


@@ -92,12 +87,12 @@ braced_code_t current_braced_code = action_braced_code;
   int integer;
   char *string;
   assoc_t assoc;
   int integer;
   char *string;
   assoc_t assoc;

+  struniq_t struniq;

 };
 
 /* Define the tokens together with their human representation.  */
 %token GRAM_EOF 0 "end of file"
 %token STRING     "string"
 };
 
 /* Define the tokens together with their human representation.  */
 %token GRAM_EOF 0 "end of file"
 %token STRING     "string"

-%token CHARACTER  "character"

 %token INT        "integer"
 
 %token PERCENT_TOKEN       "%token"
 %token INT        "integer"
 
 %token PERCENT_TOKEN       "%token"


@@ -148,7 +143,6 @@ braced_code_t current_braced_code = action_braced_code;
 %token EQUAL           "="
 %token SEMICOLON       ";"
 %token COLON           ":"
 %token EQUAL           "="
 %token SEMICOLON       ";"
 %token COLON           ":"

-%token COMMA           ","

 %token PIPE            "|"
 %token ID              "identifier"
 %token PERCENT_PERCENT "%%"
 %token PIPE            "|"
 %token ID              "identifier"
 %token PERCENT_PERCENT "%%"


@@ -157,8 +151,10 @@ braced_code_t current_braced_code = action_braced_code;
 %token BRACED_CODE     "{...}"
 
 
 %token BRACED_CODE     "{...}"
 
 

-%type <string> CHARACTER TYPE STRING string_content
-               BRACED_CODE PROLOGUE EPILOGUE epilogue.opt action
+%type <string> STRING string_content
+               BRACED_CODE code_content action
+               PROLOGUE EPILOGUE
+%type <struniq> TYPE

 %type <integer> INT
 %type <symbol> ID symbol string_as_id
 %type <assoc> precedence_declarator
 %type <integer> INT
 %type <symbol> ID symbol string_as_id
 %type <assoc> precedence_declarator


@@ -167,10 +163,6 @@ braced_code_t current_braced_code = action_braced_code;
 
 input:
   declarations "%%" grammar epilogue.opt
 
 input:
   declarations "%%" grammar epilogue.opt

-    {
-      yycontrol->errcode = 0;
-      epilogue_set ($4, @4);
-    }

 ;
 
 
 ;
 
 


@@ -193,14 +185,12 @@ declaration:
 | "%expect" INT                            { expected_conflicts = $2; }
 | "%file-prefix" "=" string_content        { spec_file_prefix = $3; }
 | "%glr-parser"                           { glr_parser = 1; }
 | "%expect" INT                            { expected_conflicts = $2; }
 | "%file-prefix" "=" string_content        { spec_file_prefix = $3; }
 | "%glr-parser"                           { glr_parser = 1; }

-| "%lex-param" string_content "," string_content
-                           { muscle_pair_list_grow ("lex_param", $2, $4); }
+| "%lex-param" code_content               { add_param ("lex_param", $2, @2); }

 | "%locations"                             { locations_flag = 1; }
 | "%name-prefix" "=" string_content        { spec_name_prefix = $3; }
 | "%no-lines"                              { no_lines_flag = 1; }
 | "%output" "=" string_content             { spec_outfile = $3; }
 | "%locations"                             { locations_flag = 1; }
 | "%name-prefix" "=" string_content        { spec_name_prefix = $3; }
 | "%no-lines"                              { no_lines_flag = 1; }
 | "%output" "=" string_content             { spec_outfile = $3; }

-| "%parse-param" string_content "," string_content
-                           { muscle_pair_list_grow ("parse_param", $2, $4); }
+| "%parse-param" code_content          { add_param ("parse_param", $2, @2); }

 | "%pure-parser"                           { pure_parser = 1; }
 | "%skeleton" string_content               { skeleton = $2; }
 | "%token-table"                           { token_table_flag = 1; }
 | "%pure-parser"                           { pure_parser = 1; }
 | "%skeleton" string_content               { skeleton = $2; }
 | "%token-table"                           { token_table_flag = 1; }


@@ -285,7 +275,7 @@ precedence_declarator:
 ;
 
 type.opt:
 ;
 
 type.opt:

-  /* Nothing. */ { current_type = NULL;}
+  /* Nothing. */ { current_type = NULL; }

 | TYPE           { current_type = $1; }
 ;
 
 | TYPE           { current_type = $1; }
 ;
 


@@ -390,7 +380,6 @@ rhs:
 symbol:
   ID              { $$ = $1; }
 | string_as_id    { $$ = $1; }
 symbol:
   ID              { $$ = $1; }
 | string_as_id    { $$ = $1; }

-| CHARACTER       { $$ = symbol_get ($1, @1); }

 ;
 
 action:
 ;
 
 action:


@@ -416,14 +405,21 @@ string_content:
     };
 
 
     };
 
 

+/* A BRACED_CODE used for its contents.  Strip the braces. */
+code_content:
+  BRACED_CODE
+    {
+      $$ = $1 + 1;
+      $$[strlen ($$) - 1] = '\0';
+    };
+
+

 epilogue.opt:
   /* Nothing.  */
 epilogue.opt:
   /* Nothing.  */

-    {
-      $$ = xstrdup ("");
-    }

 | "%%" EPILOGUE
     {
 | "%%" EPILOGUE
     {

-      $$ = $2;
+      epilogue_augment ($2, @2);
+      scanner_last_string_free ();

     }
 ;
 
     }
 ;
 


@@ -432,21 +428,54 @@ semi_colon.opt:
 | ";"
 ;
 %%
 | ";"
 ;
 %%

+static void
+add_param (char const *type, char const *decl, location_t loc)
+{
+  static char const alphanum[] =
+    "0123456789"
+    "abcdefghijklmnopqrstuvwxyz"
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "_";
+  char const *alpha = alphanum + 10;
+  char const *name_start = NULL;
+  char const *p;
+
+  for (p = decl; *p; p++)
+    if ((p == decl || ! strchr (alphanum, p[-1])) && strchr (alpha, p[0]))
+      name_start = p;
+
+  if (! name_start)
+    complain_at (loc, _("missing identifier in parameter declaration"));
+  else
+    {
+      char *name;
+      size_t name_len;
+
+      for (name_len = 1;
+          name_start[name_len] && strchr (alphanum, name_start[name_len]);
+          name_len++)
+       continue;
+
+      name = xmalloc (name_len + 1);
+      memcpy (name, name_start, name_len);
+      name[name_len] = '\0';
+      muscle_pair_list_grow (type, decl, name);
+      free (name);
+    }
+
+  scanner_last_string_free ();
+}
+

 /*------------------------------------------------------------------.
 | When debugging the parser, display tokens' locations and values.  |
 `------------------------------------------------------------------*/
 
 static void
 /*------------------------------------------------------------------.
 | When debugging the parser, display tokens' locations and values.  |
 `------------------------------------------------------------------*/
 
 static void

-yyprint (FILE *file,
-         int type, const yystype *value)
+print_token_value (FILE *file, int type, YYSTYPE const *value)

 {
   fputc (' ', file);
   switch (type)
     {
 {
   fputc (' ', file);
   switch (type)
     {

-    case CHARACTER:
-      fprintf (file, " = '%s'", value->string);
-      break;
-

     case ID:
       fprintf (file, " = %s", value->symbol->tag);
       break;
     case ID:
       fprintf (file, " = %s", value->symbol->tag);
       break;


@@ -460,7 +489,7 @@ yyprint (FILE *file,
       break;
 
     case TYPE:
       break;
 
     case TYPE:

-      fprintf (file, " = <%s>", value->string);
+      fprintf (file, " = <%s>", value->struniq);

       break;
 
     case BRACED_CODE:
       break;
 
     case BRACED_CODE:


@@ -468,11 +497,15 @@ yyprint (FILE *file,
     case EPILOGUE:
       fprintf (file, " = {{ %s }}", value->string);
       break;
     case EPILOGUE:
       fprintf (file, " = {{ %s }}", value->string);
       break;

+
+    default:
+      fprintf (file, "unknown token type");
+      break;

     }
 }
 
 void
     }
 }
 
 void

-gram_error (location_t *yylloc, const char *msg)
+gram_error (location_t const *loc, char const *msg)

 {
 {

-  complain_at (*yylloc, "%s", msg);
+  complain_at (*loc, "%s", msg);

 }
 }