variables: accept dashes.

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

diff --git a/src/parse-gram.y b/src/parse-gram.y
index cf7f7793a5340ec69f2f43a5af40bb6885995c03..2e4168b77ae53e3a6328ce6d57a2ef0f02406381 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -1,13 +1,13 @@
 %{/* Bison Grammar Parser                             -*- C -*-
 
 %{/* Bison Grammar Parser                             -*- C -*-
 

-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
-   Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+   Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 

-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,16 +16,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301  USA
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 
 #include <config.h>
 #include "system.h"
 

-#include <strverscmp.h>
-

 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "files.h"


@@ -82,7 +77,6 @@ static int current_prec = 0;
 %locations
 %pure-parser
 %error-verbose
 %locations
 %pure-parser
 %error-verbose

-%defines

 %name-prefix="gram_"
 %expect 0
 
 %name-prefix="gram_"
 %expect 0
 


@@ -154,9 +148,6 @@ static int current_prec = 0;
   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param"
   PERCENT_PURE_PARSER     "%pure-parser"
   PERCENT_OUTPUT          "%output"
   PERCENT_PARSE_PARAM     "%parse-param"
   PERCENT_PURE_PARSER     "%pure-parser"

-  PERCENT_PUSH_PARSER     "%push-parser"
-  PERCENT_PUSH_PULL_PARSER
-                          "%push-pull-parser"

   PERCENT_REQUIRE        "%require"
   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"
   PERCENT_REQUIRE        "%require"
   PERCENT_SKELETON        "%skeleton"
   PERCENT_START           "%start"


@@ -184,27 +175,27 @@ static int current_prec = 0;
 
 /* braceless is not to be used for rule or symbol actions, as it
    calls code_props_plain_init.  */
 
 /* braceless is not to be used for rule or symbol actions, as it
    calls code_props_plain_init.  */

-%type <chars> STRING "%{...%}" EPILOGUE braceless content content.opt
+%type <chars> STRING "%{...%}" EPILOGUE braceless content.opt

 %type <code> "{...}"
 %printer { fputs (quotearg_style (c_quoting_style, $$), stderr); }
         STRING
 %printer { fprintf (stderr, "{\n%s\n}", $$); }
 %type <code> "{...}"
 %printer { fputs (quotearg_style (c_quoting_style, $$), stderr); }
         STRING
 %printer { fprintf (stderr, "{\n%s\n}", $$); }

-        braceless content content.opt "{...}" "%{...%}" EPILOGUE
+        braceless content.opt "{...}" "%{...%}" EPILOGUE

 
 

-%type <uniqstr> TYPE ID ID_COLON
+%type <uniqstr> TYPE ID ID_COLON variable

 %printer { fprintf (stderr, "<%s>", $$); } TYPE
 %printer { fprintf (stderr, "<%s>", $$); } TYPE

-%printer { fputs ($$, stderr); } ID
+%printer { fputs ($$, stderr); } ID variable

 %printer { fprintf (stderr, "%s:", $$); } ID_COLON
 
 %type <integer> INT
 %printer { fprintf (stderr, "%d", $$); } INT
 
 %printer { fprintf (stderr, "%s:", $$); } ID_COLON
 
 %type <integer> INT
 %printer { fprintf (stderr, "%d", $$); } INT
 

-%type <symbol> id id_colon symbol string_as_id
+%type <symbol> id id_colon symbol symbol.prec string_as_id

 %printer { fprintf (stderr, "%s", $$->tag); } id symbol string_as_id
 %printer { fprintf (stderr, "%s:", $$->tag); } id_colon
 
 %type <assoc> precedence_declarator
 %printer { fprintf (stderr, "%s", $$->tag); } id symbol string_as_id
 %printer { fprintf (stderr, "%s:", $$->tag); } id_colon
 
 %type <assoc> precedence_declarator

-%type <list>  symbols.1 generic_symlist generic_symlist_item
+%type <list>  symbols.1 symbols.prec generic_symlist generic_symlist_item

 %%
 
 input:
 %%
 
 input:


@@ -229,11 +220,15 @@ prologue_declaration:
       code_props_plain_init (&plain_code, $1, @1);
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();
       code_props_plain_init (&plain_code, $1, @1);
       code_props_translate_code (&plain_code);
       gram_scanner_last_string_free ();

-      prologue_augment (plain_code.code, @1, union_seen);
+      muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
+                        plain_code.code, @1);

       code_scanner_last_string_free ();
     }
 | "%debug"                         { debug_flag = true; }
       code_scanner_last_string_free ();
     }
 | "%debug"                         { debug_flag = true; }

-| "%define" STRING content.opt     { muscle_insert ($2, $3); }
+| "%define" variable content.opt
+    {
+      muscle_percent_define_insert ($2, @2, $3);
+    }

 | "%defines"                       { defines_flag = true; }
 | "%defines" STRING
     {
 | "%defines"                       { defines_flag = true; }
 | "%defines" STRING
     {


@@ -259,7 +254,7 @@ prologue_declaration:
       muscle_code_grow ("initial_action", action.code, @2);
       code_scanner_last_string_free ();
     }
       muscle_code_grow ("initial_action", action.code, @2);
       code_scanner_last_string_free ();
     }

-| "%language" STRING           { language_argmatch ($2, 1, &@1); }
+| "%language" STRING           { language_argmatch ($2, grammar_prio, @1); }

 | "%lex-param" "{...}"         { add_param ("lex_param", $2, @2); }
 | "%locations"                  { locations_flag = true; }
 | "%name-prefix" STRING         { spec_name_prefix = $2; }
 | "%lex-param" "{...}"         { add_param ("lex_param", $2, @2); }
 | "%locations"                  { locations_flag = true; }
 | "%name-prefix" STRING         { spec_name_prefix = $2; }


@@ -269,13 +264,46 @@ prologue_declaration:
 | "%output" STRING              { spec_outfile = $2; }
 | "%output" "=" STRING          { spec_outfile = $3; }  /* deprecated */
 | "%parse-param" "{...}"       { add_param ("parse_param", $2, @2); }
 | "%output" STRING              { spec_outfile = $2; }
 | "%output" "=" STRING          { spec_outfile = $3; }  /* deprecated */
 | "%parse-param" "{...}"       { add_param ("parse_param", $2, @2); }

-| "%pure-parser"                { pure_parser = true; }
-| "%push-parser"                { push_parser = true; pull_parser = false; }
-| "%push-pull-parser"           { push_parser = true; pull_parser = true; }
+| "%pure-parser"
+    {
+      /* %pure-parser is deprecated in favor of `%define api.pure', so use
+         `%define api.pure' in a backward-compatible manner here.  First, don't
+         complain if %pure-parser is specified multiple times.  */
+      if (!muscle_find_const ("percent_define(api.pure)"))
+        muscle_percent_define_insert ("api.pure", @1, "");
+      /* In all cases, use api.pure now so that the backend doesn't complain if
+         the skeleton ignores api.pure, but do warn now if there's a previous
+         conflicting definition from an actual %define.  */
+      if (!muscle_percent_define_flag_if ("api.pure"))
+        muscle_percent_define_insert ("api.pure", @1, "");
+    }

 | "%require" STRING             { version_check (&@2, $2); }
 | "%require" STRING             { version_check (&@2, $2); }

-| "%skeleton" STRING            { skeleton_arg ($2, 1, &@1); }
+| "%skeleton" STRING
+    {
+      char const *skeleton_user = $2;
+      if (strchr (skeleton_user, '/'))
+        {
+          size_t dir_length = strlen (current_file);
+          char *skeleton_build;
+          while (dir_length && current_file[dir_length - 1] != '/')
+            --dir_length;
+          while (dir_length && current_file[dir_length - 1] == '/')
+            --dir_length;
+          skeleton_build =
+            xmalloc (dir_length + 1 + strlen (skeleton_user) + 1);
+          if (dir_length > 0)
+            {
+              strncpy (skeleton_build, current_file, dir_length);
+              skeleton_build[dir_length++] = '/';
+            }
+          strcpy (skeleton_build + dir_length, skeleton_user);
+          skeleton_user = uniqstr_new (skeleton_build);
+          free (skeleton_build);
+        }
+      skeleton_arg (skeleton_user, grammar_prio, @1);
+    }

 | "%token-table"                { token_table_flag = true; }
 | "%token-table"                { token_table_flag = true; }

-| "%verbose"                    { report_flag = report_states; }
+| "%verbose"                    { report_flag |= report_states; }

 | "%yacc"                       { yacc_flag = true; }
 | /*FIXME: Err?  What is this horror doing here? */ ";"
 ;
 | "%yacc"                       { yacc_flag = true; }
 | /*FIXME: Err?  What is this horror doing here? */ ";"
 ;


@@ -311,19 +339,15 @@ grammar_declaration:
     }
 | "%code" braceless
     {
     }
 | "%code" braceless
     {

-      muscle_code_grow ("percent_code", $2, @2);
+      /* Do not invoke muscle_percent_code_grow here since it invokes
+         muscle_user_name_list_grow.  */
+      muscle_code_grow ("percent_code()", $2, @2);

       code_scanner_last_string_free ();
     }
       code_scanner_last_string_free ();
     }

-| "%code" STRING braceless
+| "%code" ID braceless

     {
     {

-      char const name_prefix[] = "percent_code_";
-      char *name = xmalloc (sizeof name_prefix + strlen ($2));
-      strcpy (name, name_prefix);
-      strcpy (name + sizeof name_prefix - 1, $2);
-      muscle_code_grow (uniqstr_new (name), $3, @3);
-      free (name);
+      muscle_percent_code_grow ($2, @2, $3, @3);

       code_scanner_last_string_free ();
       code_scanner_last_string_free ();

-      muscle_grow ("used_percent_code_qualifiers", $2, ",");

     }
 ;
 
     }
 ;
 


@@ -340,28 +364,11 @@ union_name:
 ;
 
 grammar_declaration:
 ;
 
 grammar_declaration:

-  "%union" union_name "{...}"
+  "%union" union_name braceless

     {
     {

-      char const *body = $3;
-
-      /* Concatenate the %union bodies.  If this is the first %union, make sure
-        the synchronization line appears after the opening '{' so as not to
-        confuse Doxygen.  Otherwise, turn the previous %union's trailing '}'
-        into '\n', and omit the new %union's leading '{'.  */
-      if (!union_seen)
-       {
-         muscle_grow ("stype", "{", "");
-       }
-      else
-       {
-         char *code = muscle_find ("stype");
-         code[strlen (code) - 1] = '\n';
-       }
-      body++;
-

       union_seen = true;
       union_seen = true;

-      muscle_code_grow ("stype", body, @3);
-      gram_scanner_last_string_free ();
+      muscle_code_grow ("stype", $3, @3);
+      code_scanner_last_string_free ();

     }
 ;
 
     }
 ;
 


@@ -390,7 +397,7 @@ symbol_declaration:
 ;
 
 precedence_declaration:
 ;
 
 precedence_declaration:

-  precedence_declarator type.opt symbols.1
+  precedence_declarator type.opt symbols.prec

     {
       symbol_list *list;
       ++current_prec;
     {
       symbol_list *list;
       ++current_prec;


@@ -415,6 +422,19 @@ type.opt:
 | TYPE           { current_type = $1; tag_seen = true; }
 ;
 
 | TYPE           { current_type = $1; tag_seen = true; }
 ;
 

+/* Just like symbols.1 but accept INT for the sake of POSIX.  */
+symbols.prec:
+  symbol.prec
+    { $$ = symbol_list_sym_new ($1, @1); }
+| symbols.prec symbol.prec
+    { $$ = symbol_list_prepend ($1, symbol_list_sym_new ($2, @2)); }
+;
+
+symbol.prec:
+    symbol { $$ = $1; }
+  | symbol INT { $$ = $1; symbol_user_token_number_set ($1, $2, @2); }
+  ;
+

 /* One or more symbols to be %typed. */
 symbols.1:
   symbol
 /* One or more symbols to be %typed. */
 symbols.1:
   symbol


@@ -521,26 +541,26 @@ rhs:
 ;
 
 
 ;
 
 

-/*-----------*
- | content.  |
- *-----------*/
+/*----------------------------*
+ | variable and content.opt.  |
+ *---------------------------*/

 
 

-content:
-  STRING
-| braceless
+variable:
+  ID
+| STRING { $$ = uniqstr_new ($1); }

 ;
 
 ;
 

-/* Some content or "1" by default. */
+/* Some content or empty by default. */

 content.opt:
 content.opt:

-  /* Nothing. */
-    {
-      static char one[] = "1";
-      $$ = one;
-    }
-| content
+  /* Nothing. */   { $$ = ""; }
+| STRING

 ;
 
 
 ;
 
 

+/*-------------*
+ | braceless.  |
+ *-------------*/
+

 braceless:
   "{...}"
     {
 braceless:
   "{...}"
     {