[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
more %define/%code work
|
From: |
Joel E. Denny |
|
Subject: |
more %define/%code work |
|
Date: |
Wed, 28 Feb 2007 23:50:38 -0500 (EST) |
I'm thinking of committing this. Any comments?
Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1689
diff -p -u -r1.1689 ChangeLog
--- ChangeLog 1 Mar 2007 03:40:18 -0000 1.1689
+++ ChangeLog 1 Mar 2007 04:39:05 -0000
@@ -1,5 +1,59 @@
2007-02-28 Joel E. Denny <address@hidden>
+ Miscellaneous %define and %code cleanup.
+ * data/bison.m4 (b4_percent_define_flag_if): Correct comments on how
+ values are interpreted.
+ * doc/bison.texinfo (Decl Summary): Clean up and extend %define
+ documentation a little more.
+ * src/muscle_tab.c (MUSCLE_USER_NAME_CONVERT,
+ muscle_percent_define_insert, muscle_percent_code_grow): New
+ functions/macros.
+ * src/muscle_tab.h (muscle_percent_define_insert,
+ muscle_percent_code_grow): Prototype.
+ * src/parse-gram.y (prologue_declaration): Use
+ muscle_percent_define_insert and muscle_percent_code_grow when parsing
+ %define and %code directives.
+
+ Make it easy to share %define boolean variables between the front-end
+ and back-end. Though not used yet, this will be useful in the future.
+ * data/bison.m4 (b4_check_user_names): Rewrite comments to talk about
+ Bison uses of names rather than just skeleton uses of names.
+ (b4_percent_define_get, b4_percent_define_ifdef): Rename
+ b4_percent_define_skeleton_variables(VARIABLE) to
+ b4_percent_define_bison_variables(VARIABLE).
+ (b4_percent_code_get, b4_percent_code_ifdef): Rename
+ b4_percent_code_skeleton_qualifiers(QUALIFIER) to
+ b4_percent_code_bison_qualifiers(QUALIFIER).
+ (b4_check_user_names_wrap): Update for renames.
+ * src/muscle_tab.c, src/muscle_tab.h (muscle_percent_define_flag_if,
+ muscle_percent_define_default): New functions mimicking
+ b4_percent_define_flag_if and b4_percent_define_default.
+
+ For %define variables, report locations for invalid values and
+ redefinitions.
+ * data/bison.m4 (b4_percent_define_flag_if): Read
+ b4_percent_define_loc(VARIABLE) to report the location of an invalid
+ value for VARIABLE.
+ (b4_percent_define_default): Save a special location in
+ b4_percent_define_loc(VARIABLE) in case the default value for VARIABLE
+ must later be reported as invalid.
+ * src/muscle_tab.c (muscle_location_grow, muscle_location_decode): New
+ functions.
+ (muscle_percent_define_insert): Record the location of VARIABLE in
+ muscle percent_define_loc(VARIABLE), and use it to report the previous
+ location for a redefinition.
+ (muscle_percent_define_flag_if): Update like b4_percent_define_flag_if.
+ (muscle_percent_define_default): Update like b4_percent_define_default.
+ (muscle_grow_user_name_list): Rename to...
+ (muscle_user_name_list_grow): ... this for consistency and use
+ muscle_location_grow.
+ * src/muscle_tab.h (muscle_location_grow): Prototype.
+ * tests/input.at (%define errors): Update expected output.
+ * tests/skeletons.at (%define boolean variables: invalid skeleton
+ defaults): New test case.
+
+2007-02-28 Joel E. Denny <address@hidden>
+
* src/print.c (lookahead_set, state_default_rule): Remove.
(print_reductions): Replace state_default_rule invocation with
equivalent use of yydefact, which was computed in token_actions in
Index: data/bison.m4
===================================================================
RCS file: /sources/bison/bison/data/bison.m4,v
retrieving revision 1.16
diff -p -u -r1.16 bison.m4
--- data/bison.m4 30 Jan 2007 08:01:29 -0000 1.16
+++ data/bison.m4 1 Mar 2007 04:39:06 -0000
@@ -285,11 +285,11 @@ b4_define_user_code([pre_prologue])
b4_define_user_code([stype])
-# b4_check_user_names(WHAT, USER-LIST, SKELETON-NAMESPACE)
+# b4_check_user_names(WHAT, USER-LIST, BISON-NAMESPACE)
# --------------------------------------------------------
# Warn if any name of type WHAT is used by the user (as recorded in USER-LIST)
-# but is not used by the skeleton (as recorded by macros in the namespace
-# SKELETON-NAMESPACE).
+# but is not used by Bison (as recorded by macros in the namespace
+# BISON-NAMESPACE).
#
# USER-LIST must expand to a list specifying all grammar occurrences of all
# names of type WHAT. Each item in the list must be a triplet specifying one
@@ -304,22 +304,22 @@ b4_define_user_code([stype])
# [[[[bar]], [[parser.y:5.7]], [[parser.y:5.16]]]],
# [[[[baz]], [[parser.y:8.7]], [[parser.y:8.16]]]]]])
#
-# The macro SKELETON-NAMESPACE(bar) must be defined iff the name bar of type
-# WHAT is used in the skeleton. Empty string names are fine, but it would be
-# ugly for a Bison skeleton to actually use one.
+# The macro BISON-NAMESPACE(bar) must be defined iff the name bar of type WHAT
+# is used by Bison (in the front-end or in the skeleton). Empty string names
+# are fine, but it would be ugly for Bison to actually use one.
#
-# For example, to use b4_foo_skeleton_names for SKELETON-NAMESPACE and define
-# that the names bar and baz are used in the skeleton:
+# For example, to use b4_foo_bison_names for BISON-NAMESPACE and define that
+# the names bar and baz are used by Bison:
#
-# m4_define([b4_foo_skeleton_names(bar)])
-# m4_define([b4_foo_skeleton_names(baz)])
+# m4_define([b4_foo_bison_names(bar)])
+# m4_define([b4_foo_bison_names(baz)])
#
# To invoke b4_check_user_names with TYPE foo, with USER-LIST
-# b4_foo_user_names, with SKELETON-NAMESPACE b4_foo_skeleton_names, and with
-# correct quoting:
+# b4_foo_user_names, with BISON-NAMESPACE b4_foo_bison_names, and with correct
+# quoting:
#
# b4_check_user_names([[foo]], [b4_foo_user_names],
-# [[b4_foo_skeleton_names]])
+# [[b4_foo_bison_names]])
m4_define([b4_check_user_names],
[m4_foreach([b4_occurrence], $2,
[m4_pushdef([b4_occurrence], b4_occurrence)dnl
@@ -339,60 +339,79 @@ m4_popdef([b4_end])dnl
# b4_percent_define_get(VARIABLE)
# -------------------------------
# If the %define variable VARIABLE is defined, emit its value. Also, record
-# the skeleton's usage of VARIABLE by defining
-# b4_percent_define_skeleton_variables(VARIABLE).
+# Bison's usage of VARIABLE by defining
+# b4_percent_define_bison_variables(VARIABLE).
#
# For example:
#
# b4_percent_define_get([[foo]])
m4_define([b4_percent_define_get],
-[m4_define([b4_percent_define_skeleton_variables(]$1[)])dnl
+[m4_define([b4_percent_define_bison_variables(]$1[)])dnl
m4_ifdef([b4_percent_define(]$1[)], [m4_indir([b4_percent_define(]$1[)])])])
# b4_percent_define_ifdef(VARIABLE, IF-TRUE, [IF-FALSE])
# ------------------------------------------------------
# If the %define variable VARIABLE is defined, expand IF-TRUE, else expand
-# IF-FALSE. Also, record the skeleton's usage of VARIABLE by defining
-# b4_percent_define_skeleton_variables(VARIABLE).
+# IF-FALSE. Also, record Bison's usage of VARIABLE by defining
+# b4_percent_define_bison_variables(VARIABLE).
+#
+# For example:
+#
+# b4_percent_define_ifdef([[foo]], [[it's defined]], [[it's undefined]])
m4_define([b4_percent_define_ifdef],
[m4_ifdef([b4_percent_define(]$1[)],
- [m4_define([b4_percent_define_skeleton_variables(]$1[)])$2],
+ [m4_define([b4_percent_define_bison_variables(]$1[)])$2],
[$3])])
# b4_percent_define_flag_if(VARIABLE, IF-TRUE, [IF-FALSE])
# --------------------------------------------------------
-# If the %define variable VARIABLE is defined to anything but "0" or "false",
-# expand IF-TRUE. If it is defined to "0" or "false", expand IF-FALSE. If
-# it is undefined, raise an error (this macro should be preceded by
-# b4_percent_define_default). Also, record the skeleton's usage of VARIABLE by
-# defining b4_percent_define_skeleton_variables(VARIABLE).
+# Mimic muscle_percent_define_flag_if in ../src/muscle_tab.h exactly. That is,
+# if the %define variable VARIABLE is defined to "" or "true", expand IF-TRUE.
+# If it is defined to "false", expand IF-FALSE. Complain if it is undefined
+# (a Bison or skeleton error since the default value should have been set
+# already) or defined to any other value (possibly a user error). Also, record
+# Bison's usage of VARIABLE by defining
+# b4_percent_define_bison_variables(VARIABLE).
+#
+# For example:
+#
+# b4_percent_define_flag_if([[foo]], [[it's true]], [[it's false]])
m4_define([b4_percent_define_flag_if],
[b4_percent_define_ifdef([$1],
- [m4_case(b4_percent_define_get([$1]),
- [], [$2], [true], [$2], [false], [$3],
- [m4_expand_once(
- [b4_complain([[invalid value for %%define
variable `%s']], [$1])],
- [[b4_percent_define_flag_if($1)]])])],
- [b4_fatal([[invalid %%define variable `%s' passed to
b4_percent_define_flag_if]], [$1])])])
+ [m4_case(b4_percent_define_get([$1]),
+ [], [$2], [true], [$2], [false], [$3],
+ [m4_expand_once([dnl
+ m4_pushdef([b4_loc], m4_indir([b4_percent_define_loc(]$1[)]))dnl
+ b4_complain_at(b4_loc,
+ [[invalid value for %%define boolean variable
`%s']],
+ [$1])dnl
+ m4_popdef([b4_loc])],
+ [[b4_percent_define_flag_if($1)]])])],
+ [b4_fatal([[undefined %%define variable `%s' passed to
b4_percent_define_flag_if]], [$1])])])
# b4_percent_define_default(VARIABLE, DEFAULT)
# --------------------------------------------
-# If the %define variable VARIABLE is undefined, set its value to DEFAULT.
+# Mimic muscle_percent_define_default in ../src/muscle_tab.h exactly. That is,
+# if the %define variable VARIABLE is undefined, set its value to DEFAULT.
+# Don't record this as a Bison usage of VARIABLE as there's no reason to
+# suspect that the value has yet influenced the output.
#
# For example:
#
# b4_percent_define_default([[foo]], [[default value]])
m4_define([b4_percent_define_default],
[m4_ifndef([b4_percent_define(]$1[)],
- [m4_define([b4_percent_define(]$1[)], [$2])])])
+ [m4_define([b4_percent_define(]$1[)], [$2])dnl
+ m4_define([b4_percent_define_loc(]$1[)],
+ [[[[[Bison:b4_percent_define_default]:0.0]],
[[[Bison:b4_percent_define_default]:0.0]]]])])])
# b4_percent_code_get([QUALIFIER])
# --------------------------------
# If any %code blocks for QUALIFIER are defined, emit them beginning with a
# comment and ending with synclines and a newline. If QUALIFIER is not
# specified or empty, do this for the unqualified %code blocks. Also, record
-# the skeleton's usage of QUALIFIER (if specified) by defining
-# b4_percent_code_skeleton_qualifiers(QUALIFIER).
+# Bison's usage of QUALIFIER (if specified) by defining
+# b4_percent_code_bison_qualifiers(QUALIFIER).
#
# For example, to emit any unqualified %code blocks followed by any %code
# blocks for the qualifier foo:
@@ -401,7 +420,7 @@ m4_define([b4_percent_define_default],
# b4_percent_code_get([[foo]])
m4_define([b4_percent_code_get],
[m4_pushdef([b4_macro_name], [[b4_percent_code(]$1[)]])dnl
-m4_ifval([$1], [m4_define([b4_percent_code_skeleton_qualifiers(]$1[)])])dnl
+m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])dnl
m4_ifdef(b4_macro_name,
[b4_comment([m4_if([$#], [0], [[Unqualified %code]],
[[%code "]$1["]])[ blocks.]])
@@ -413,24 +432,24 @@ m4_popdef([b4_macro_name])])
# -----------------------------------------------------
# If any %code blocks for QUALIFIER (or unqualified %code blocks if
# QUALIFIER is empty) are defined, expand IF-TRUE, else expand IF-FALSE.
-# Also, record the skeleton's usage of QUALIFIER (if specified) by defining
-# b4_percent_code_skeleton_qualifiers(QUALIFIER).
+# Also, record Bison's usage of QUALIFIER (if specified) by defining
+# b4_percent_code_bison_qualifiers(QUALIFIER).
m4_define([b4_percent_code_ifdef],
[m4_ifdef([b4_percent_code(]$1[)],
- [m4_ifval([$1],
[m4_define([b4_percent_code_skeleton_qualifiers(]$1[)])])$2],
+ [m4_ifval([$1],
[m4_define([b4_percent_code_bison_qualifiers(]$1[)])])$2],
[$3])])
-## --------------------------------------------------------- ##
-## After processing the skeletons, check that all the user's ##
-## %define variables and %code qualifiers were used. ##
-## --------------------------------------------------------- ##
+## ----------------------------------------------------------- ##
+## After processing the skeletons, check that all the user's ##
+## %define variables and %code qualifiers were used by Bison. ##
+## ----------------------------------------------------------- ##
m4_define([b4_check_user_names_wrap],
[m4_ifdef([b4_percent_]$1[_user_]$2[s],
[b4_check_user_names([[%]$1 $2],
[b4_percent_]$1[_user_]$2[s],
- [[b4_percent_]$1[_skeleton_]$2[s]])])])
+ [[b4_percent_]$1[_bison_]$2[s]])])])
m4_wrap([
b4_check_user_names_wrap([[define]], [[variable]])
Index: doc/bison.texinfo
===================================================================
RCS file: /sources/bison/bison/doc/bison.texinfo,v
retrieving revision 1.228
diff -p -u -r1.228 bison.texinfo
--- doc/bison.texinfo 24 Feb 2007 05:43:35 -0000 1.228
+++ doc/bison.texinfo 1 Mar 2007 04:39:10 -0000
@@ -4693,14 +4693,32 @@ already defined, so that the debugging f
@deffn {Directive} %define @var{variable}
@deffnx {Directive} %define @var{variable} "@var{value}"
-Define a variable to adjust Bison's behavior. The possible choices for
address@hidden, as well as their meanings, depend on the selected target
-language and/or the parser skeleton (@pxref{Decl Summary,,%language}).
-
-Some @var{variable}s may be used as boolean values: in this case, the
-skeleton will conventionally treat a @var{value} of @samp{false} as the
-boolean variable being false; a @var{value} of @samp{true}, or @var{value}
-being omitted altogether, will conversely define the variable as true.
+Define a variable to adjust Bison's behavior.
+The possible choices for @var{variable}, as well as their meanings, depend on
+the selected target language and/or the parser skeleton (@pxref{Decl
+Summary,,%language}).
+
+Bison will warn if a @var{variable} is defined multiple times.
+
+Omitting @code{"@var{value}"} is always equivalent to specifying it as
address@hidden""}.
+
+Some @var{variable}s may be used as booleans.
+In this case, Bison will complain if the variable definition does not meet one
+of the following four conditions:
+
address@hidden
address@hidden @code{"@var{value}"} is @code{"true"}
+
address@hidden @code{"@var{value}"} is omitted (or is @code{""}).
+This is equivalent to @code{"true"}.
+
address@hidden @code{"@var{value}"} is @code{"false"}.
+
address@hidden @var{variable} is never defined.
+In this case, Bison selects a default value, which may depend on the selected
+target language and/or parser skeleton.
address@hidden enumerate
@end deffn
@deffn {Directive} %defines
Index: src/muscle_tab.c
===================================================================
RCS file: /sources/bison/bison/src/muscle_tab.c,v
retrieving revision 1.46
diff -p -u -r1.46 muscle_tab.c
--- src/muscle_tab.c 17 Jan 2007 08:36:07 -0000 1.46
+++ src/muscle_tab.c 1 Mar 2007 04:39:10 -0000
@@ -26,6 +26,7 @@
#include <hash.h>
#include <quotearg.h>
+#include "complain.h"
#include "files.h"
#include "muscle_tab.h"
#include "getargs.h"
@@ -249,6 +250,207 @@ muscle_find (char const *key)
}
+void
+muscle_boundary_grow (char const *key, boundary bound)
+{
+ char *extension;
+ MUSCLE_OBSTACK_SGROW (&muscle_obstack, bound.file);
+ obstack_1grow (&muscle_obstack, ':');
+ obstack_fgrow1 (&muscle_obstack, "%d", bound.line);
+ obstack_1grow (&muscle_obstack, '.');
+ obstack_fgrow1 (&muscle_obstack, "%d", bound.column);
+ obstack_1grow (&muscle_obstack, '\0');
+ extension = obstack_finish (&muscle_obstack);
+ muscle_grow (key, extension, "");
+ obstack_free (&muscle_obstack, extension);
+}
+
+void
+muscle_location_grow (char const *key, location loc)
+{
+ muscle_grow (key, "[[", "");
+ muscle_boundary_grow (key, loc.start);
+ muscle_grow (key, "]], [[", "");
+ muscle_boundary_grow (key, loc.end);
+ muscle_grow (key, "]]", "");
+}
+
+/* Reverse of muscle_location_grow. */
+static location
+muscle_location_decode (char const *key)
+{
+ location loc;
+ char const *value = muscle_find_const (key);
+ aver (value);
+ aver (*value == '[');
+ aver (*++value == '[');
+ while (*++value)
+ switch (*value)
+ {
+ case '$':
+ aver (*++value == ']');
+ aver (*++value == '[');
+ obstack_sgrow (&muscle_obstack, "$");
+ break;
+ case '@':
+ switch (*++value)
+ {
+ case '@': obstack_sgrow (&muscle_obstack, "@" ); break;
+ case '{': obstack_sgrow (&muscle_obstack, "[" ); break;
+ case '}': obstack_sgrow (&muscle_obstack, "]" ); break;
+ default: aver (false); break;
+ }
+ break;
+ case '[':
+ aver (false);
+ break;
+ case ']':
+ {
+ char *boundary_str;
+ aver (*++value == ']');
+ obstack_1grow (&muscle_obstack, '\0');
+ boundary_str = obstack_finish (&muscle_obstack);
+ switch (*++value)
+ {
+ case ',':
+ boundary_set_from_string (&loc.start, boundary_str);
+ obstack_free (&muscle_obstack, boundary_str);
+ aver (*++value == ' ');
+ aver (*++value == '[');
+ aver (*++value == '[');
+ break;
+ case '\0':
+ boundary_set_from_string (&loc.end, boundary_str);
+ obstack_free (&muscle_obstack, boundary_str);
+ return loc;
+ break;
+ default:
+ aver (false);
+ break;
+ }
+ }
+ break;
+ default:
+ obstack_1grow (&muscle_obstack, *value);
+ break;
+ }
+ aver (false);
+ return loc;
+}
+
+void
+muscle_user_name_list_grow (char const *key, char const *user_name,
+ location loc)
+{
+ muscle_grow (key, "[[[[", ",");
+ muscle_grow (key, user_name, "");
+ muscle_grow (key, "]], ", "");
+ muscle_location_grow (key, loc);
+ muscle_grow (key, "]]", "");
+}
+
+#define MUSCLE_USER_NAME_CONVERT(NAME, PREFIX, USER_NAME, SUFFIX) \
+do { \
+ char *tmp; \
+ size_t length = strlen ((USER_NAME)); \
+ tmp = xmalloc (sizeof (PREFIX) - 1 + length + sizeof (SUFFIX)); \
+ strcpy (tmp, (PREFIX)); \
+ strcpy (tmp + sizeof (PREFIX) - 1, (USER_NAME)); \
+ strcpy (tmp + sizeof (PREFIX) - 1 + length, (SUFFIX)); \
+ (NAME) = uniqstr_new (tmp); \
+ free (tmp); \
+} while (0)
+
+void
+muscle_percent_define_insert (char const *variable, location variable_loc,
+ char const *value)
+{
+ char const *name;
+ char const *loc_name;
+
+ MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
+ MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
+
+ if (muscle_find_const (name))
+ {
+ warn_at (variable_loc, _("%s `%s' redefined"),
+ "%define variable", variable);
+ warn_at (muscle_location_decode (loc_name), _("previous definition"));
+ }
+ MUSCLE_INSERT_STRING (name, value);
+
+ muscle_insert (loc_name, "");
+ muscle_location_grow (loc_name, variable_loc);
+ muscle_user_name_list_grow ("percent_define_user_variables", variable,
+ variable_loc);
+}
+
+bool
+muscle_percent_define_flag_if (char const *variable)
+{
+ char const *name;
+ char const *loc_name;
+ char const *usage_name;
+ char const *value;
+ bool result = false;
+
+ MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
+ MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
+ MUSCLE_USER_NAME_CONVERT (usage_name, "percent_define_bison_variables(",
+ variable, ")");
+
+ value = muscle_find_const (name);
+ if (value)
+ {
+ if (value[0] == '\0' || 0 == strcmp (value, "true"))
+ result = true;
+ else if (0 == strcmp (value, "false"))
+ result = false;
+ else if (!muscle_find_const (usage_name))
+ complain_at(muscle_location_decode (loc_name),
+ _("invalid value for %%define boolean variable `%s'"),
+ variable);
+ }
+ else
+ fatal(_("undefined %%define variable `%s' passed to
muscle_percent_define_flag_if"),
+ variable);
+
+ muscle_insert (usage_name, "");
+
+ return result;
+}
+
+void
+muscle_percent_define_default (char const *variable, char const *value)
+{
+ char const *name;
+ char const *loc_name;
+ MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
+ MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
+ if (!muscle_find_const (name))
+ {
+ location loc;
+ MUSCLE_INSERT_STRING (name, value);
+ loc.start.file = loc.end.file = "[Bison:muscle_percent_define_default]";
+ loc.start.line = loc.start.column = 0;
+ loc.end.line = loc.end.column = 0;
+ muscle_insert (loc_name, "");
+ muscle_location_grow (loc_name, loc);
+ }
+}
+
+void
+muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
+ char const *code, location code_loc)
+{
+ char const *name;
+ MUSCLE_USER_NAME_CONVERT (name, "percent_code(", qualifier, ")");
+ muscle_code_grow (name, code, code_loc);
+ muscle_user_name_list_grow ("percent_code_user_qualifiers", qualifier,
+ qualifier_loc);
+}
+
+
/*------------------------------------------------.
| Output the definition of ENTRY as a m4_define. |
`------------------------------------------------*/
@@ -278,31 +480,3 @@ muscles_m4_output (FILE *out)
{
hash_do_for_each (muscle_table, muscle_m4_output_processor, out);
}
-
-void
-muscle_boundary_grow (char const *key, boundary bound)
-{
- char *extension;
- MUSCLE_OBSTACK_SGROW (&muscle_obstack, bound.file);
- obstack_1grow (&muscle_obstack, ':');
- obstack_fgrow1 (&muscle_obstack, "%d", bound.line);
- obstack_1grow (&muscle_obstack, '.');
- obstack_fgrow1 (&muscle_obstack, "%d", bound.column);
- obstack_1grow (&muscle_obstack, '\0');
- extension = obstack_finish (&muscle_obstack);
- muscle_grow (key, extension, "");
- obstack_free (&muscle_obstack, extension);
-}
-
-void
-muscle_grow_user_name_list (char const *key, char const *user_name,
- location loc)
-{
- muscle_grow (key, "[[[[", ",");
- muscle_grow (key, user_name, "");
- muscle_grow (key, "]], [[", "");
- muscle_boundary_grow (key, loc.start);
- muscle_grow (key, "]], [[", "");
- muscle_boundary_grow (key, loc.end);
- muscle_grow (key, "]]]]", "");
-}
Index: src/muscle_tab.h
===================================================================
RCS file: /sources/bison/bison/src/muscle_tab.h,v
retrieving revision 1.24
diff -p -u -r1.24 muscle_tab.h
--- src/muscle_tab.h 17 Jan 2007 08:36:07 -0000 1.24
+++ src/muscle_tab.h 1 Mar 2007 04:39:10 -0000
@@ -25,8 +25,8 @@
void muscle_init (void);
void muscle_insert (char const *key, char const *value);
-char *muscle_find (char const *key);
char const *muscle_find_const (char const *key);
+char *muscle_find (char const *key);
void muscle_free (void);
@@ -110,7 +110,9 @@ void muscle_code_grow (const char *key,
void muscle_pair_list_grow (const char *muscle,
const char *a1, const char *a2);
-void muscles_m4_output (FILE *out);
+/* In the format `[[file_name:line.column]], [[file_name:line.column]]', append
+ LOC to MUSCLE. Use digraphs for special characters in each file name. */
+void muscle_location_grow (char const *key, location loc);
/* In the format `file_name:line.column', append BOUND to MUSCLE. Use digraphs
for special characters in the file name. */
@@ -119,7 +121,36 @@ void muscle_boundary_grow (char const *k
/* Grow KEY for the occurrence of the name USER_NAME at LOC appropriately for
use with b4_check_user_names in ../data/bison.m4. USER_NAME is not escaped
with digraphs, so it must not contain `[' or `]'. */
-void muscle_grow_user_name_list (char const *key, char const *user_name,
+void muscle_user_name_list_grow (char const *key, char const *user_name,
location loc);
+/* Define the muscle for the %define variable VARIABLE appearing at
+ VARIABLE_LOC in the grammar file with value VALUE. Warn if VARIABLE is
+ already defined. Record this as a grammar occurrence of VARIABLE by
+ invoking muscle_user_name_list_grow. */
+void muscle_percent_define_insert (char const *variable, location variable_loc,
+ char const *value);
+
+/* Mimic b4_percent_define_flag_if in ../data/bison.m4 exactly. That is, if
+ the %define variable VARIABLE is defined to "" or "true", return true. If
+ it is defined to "false", return false. Complain if it is undefined (a
+ Bison error since the default value should have been set already) or defined
+ to any other value (possibly a user error). Also, record Bison's usage of
+ VARIABLE by defining b4_percent_define_bison_variables(VARIABLE). */
+bool muscle_percent_define_flag_if (char const *variable);
+
+/* Mimic b4_percent_define_default in ../data/bison.m4 exactly. That is, if
+ the %define variable VARIABLE is undefined, set its value to VALUE.
+ Don't record this as a Bison usage of VARIABLE as there's no reason to
+ suspect that the value has yet influenced the output. */
+void muscle_percent_define_default (char const *variable, char const *value);
+
+/* Grow the muscle for the %code qualifier QUALIFIER appearing at QUALIFIER_LOC
+ in the grammar file with code CODE appearing at CODE_LOC. Record this as a
+ grammar occurrence of VARIABLE by invoking muscle_user_name_list_grow. */
+void muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
+ char const *code, location code_loc);
+
+void muscles_m4_output (FILE *out);
+
#endif /* not MUSCLE_TAB_H_ */
Index: src/parse-gram.y
===================================================================
RCS file: /sources/bison/bison/src/parse-gram.y,v
retrieving revision 1.118
diff -p -u -r1.118 parse-gram.y
--- src/parse-gram.y 23 Jan 2007 12:24:27 -0000 1.118
+++ src/parse-gram.y 1 Mar 2007 04:39:10 -0000
@@ -235,17 +235,7 @@ prologue_declaration:
| "%debug" { debug_flag = true; }
| "%define" variable content.opt
{
- char const name_prefix[] = "percent_define(";
- size_t length = strlen ($2);
- char *name = xmalloc (sizeof name_prefix + length + 1);
- strcpy (name, name_prefix);
- strcpy (name + sizeof name_prefix - 1, $2);
- strcpy (name + sizeof name_prefix - 1 + length, ")");
- if (muscle_find_const (name))
- warn_at (@2, _("%s `%s' redefined"), "%define variable", $2);
- MUSCLE_INSERT_STRING (uniqstr_new (name), $3);
- free (name);
- muscle_grow_user_name_list ("percent_define_user_variables", $2, @2);
+ muscle_percent_define_insert ($2, @2, $3);
}
| "%defines" { defines_flag = true; }
| "%defines" STRING
@@ -347,21 +337,15 @@ grammar_declaration:
}
| "%code" braceless
{
+ /* 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" ID braceless
{
- char const name_prefix[] = "percent_code(";
- size_t length = strlen ($2);
- char *name = xmalloc (sizeof name_prefix + length + 1);
- strcpy (name, name_prefix);
- strcpy (name + sizeof name_prefix - 1, $2);
- strcpy (name + sizeof name_prefix - 1 + length, ")");
- muscle_code_grow (uniqstr_new (name), $3, @3);
- free (name);
+ muscle_percent_code_grow ($2, @2, $3, @3);
code_scanner_last_string_free ();
- muscle_grow_user_name_list ("percent_code_user_qualifiers", $2, @2);
}
;
Index: tests/input.at
===================================================================
RCS file: /sources/bison/bison/tests/input.at,v
retrieving revision 1.77
diff -p -u -r1.77 input.at
--- tests/input.at 30 Jan 2007 08:01:29 -0000 1.77
+++ tests/input.at 1 Mar 2007 04:39:10 -0000
@@ -811,7 +811,9 @@ start: ;
AT_CHECK([[bison input.y]], [0], [],
[[input.y:2.9-11: warning: %define variable `var' redefined
+input.y:1.9-11: warning: previous definition
input.y:3.10-12: warning: %define variable `var' redefined
+input.y:2.9-11: warning: previous definition
input.y:1.9-11: warning: %define variable `var' is not used
input.y:2.9-11: warning: %define variable `var' is not used
input.y:3.10-12: warning: %define variable `var' is not used
@@ -836,7 +838,7 @@ start: ;
]])
AT_CHECK([[bison Input.y]], [1], [],
-[[Input.y: invalid value for %define variable `public'
+[[Input.y:2.9-14: invalid value for %define boolean variable `public'
]])
AT_CLEANUP
Index: tests/skeletons.at
===================================================================
RCS file: /sources/bison/bison/tests/skeletons.at,v
retrieving revision 1.4
diff -p -u -r1.4 skeletons.at
--- tests/skeletons.at 28 Jan 2007 14:31:56 -0000 1.4
+++ tests/skeletons.at 1 Mar 2007 04:39:10 -0000
@@ -19,10 +19,10 @@
AT_BANNER([[Skeleton Support.]])
## ------------------------------ ##
-## relative skeleton file names. ##
+## Relative skeleton file names. ##
## ------------------------------ ##
-AT_SETUP([[relative skeleton file names]])
+AT_SETUP([[Relative skeleton file names]])
AT_CHECK([[mkdir tmp]])
@@ -79,10 +79,10 @@ AT_CLEANUP
## ------------------------------- ##
-## installed skeleton file names. ##
+## Installed skeleton file names. ##
## ------------------------------- ##
-AT_SETUP([[installed skeleton file names]])
+AT_SETUP([[Installed skeleton file names]])
m4_pushdef([AT_GRAM],
[[%{
@@ -141,3 +141,31 @@ AT_PARSER_CHECK([[./input-gram]], [[1]],
m4_popdef([AT_GRAM])
AT_CLEANUP
+
+
+## ------------------------------------------------------ ##
+## %define boolean variables: invalid skeleton defaults. ##
+## ------------------------------------------------------ ##
+
+AT_SETUP([[%define boolean variables: invalid skeleton defaults]])
+
+AT_CHECK([[mkdir tmp]])
+
+AT_DATA([[skel.c]],
+[[b4_percent_define_default([[foo]], [[bogus value]])
+b4_percent_define_flag_if([[foo]])
+]])
+
+AT_DATA([[input.y]],
+[[%skeleton "./skel.c"
+%%
+start: ;
+]])
+
+AT_CHECK([[bison input.y]], [[1]], [[]],
+[[[Bison:b4_percent_define_default]:0.0: invalid value for %define boolean
variable `foo'
+]])
+
+AT_CLEANUP
+
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- more %define/%code work,
Joel E. Denny <=