Use b4_subtract where possible.

	* data/lalr1.cc (b4_subtract): Move to...
	* data/bison.m4: here.
	* data/glr.c (b4_rhs_data): Use it.
	* data/yacc.c (b4_rhs_value, b4_rhs_location): Use it.

diff --git a/ChangeLog b/ChangeLog
index 608c2cea4af992c2c24d2a9f445642463eae84e4..3531117d7a9d45f9f89bcd06f3cc4d9ac54bf228 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-18  Akim Demaille  <demaille@gostai.com>
+
+       Use b4_subtract where possible.
+       * data/lalr1.cc (b4_subtract): Move to...
+       * data/bison.m4: here.
+       * data/glr.c (b4_rhs_data): Use it.
+       * data/yacc.c (b4_rhs_value, b4_rhs_location): Use it.
+

 2008-11-18  Akim Demaille  <demaille@gostai.com>
 
        Remove incorrect mode specification.
 2008-11-18  Akim Demaille  <demaille@gostai.com>
 
        Remove incorrect mode specification.

diff --git a/data/bison.m4 b/data/bison.m4
index 7cb43b800ea4ec07bdccfc4297579abf5ddc7b11..c7392b3891beef03a10aed804d718479f149126a 100644 (file)
--- a/data/bison.m4
+++ b/data/bison.m4
@@ -212,6 +212,15 @@ m4_define([b4_ints_in],
 [m4_eval([$3 <= $1 && $1 <= $4 && $3 <= $2 && $2 <= $4])])
 
 
 [m4_eval([$3 <= $1 && $1 <= $4 && $3 <= $2 && $2 <= $4])])
 
 

+# b4_subtract(LHS, RHS)
+# ---------------------
+# Evaluate LHS - RHS if they are integer literals, otherwise expand
+# to (LHS) - (RHS).
+m4_define([b4_subtract],
+[m4_bmatch([$1$2], [^[0123456789]*$],
+           [m4_eval([$1 - $2])],
+           [($1) - ($2)])])
+

 
 ## ------------------ ##
 ## Decoding options.  ##
 
 ## ------------------ ##
 ## Decoding options.  ##


@@ -257,11 +266,6 @@ b4_define_flag_if([nondeterministic])      # Whether conflicts should be handled.
 b4_define_flag_if([yacc])              # Whether POSIX Yacc is emulated.
 
 
 b4_define_flag_if([yacc])              # Whether POSIX Yacc is emulated.
 
 

-## ------------------------- ##
-## Assigning token numbers.  ##
-## ------------------------- ##
-
-

 ## ----------- ##
 ## Synclines.  ##
 ## ----------- ##
 ## ----------- ##
 ## Synclines.  ##
 ## ----------- ##

diff --git a/data/glr.c b/data/glr.c
index f8a32a82293deb3063ee60c18a4352e0ff3c56e8..910a8ee1e91a7b9847a4c39154d89ec152746def 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -117,7 +117,7 @@ m4_define([b4_lhs_value],
 # Expand to the semantic stack place that contains value and location
 # of symbol number NUM in a rule of length RULE-LENGTH.
 m4_define([b4_rhs_data],
 # Expand to the semantic stack place that contains value and location
 # of symbol number NUM in a rule of length RULE-LENGTH.
 m4_define([b4_rhs_data],

-[((yyGLRStackItem const *)yyvsp)@{YYFILL (($2) - ($1))@}.yystate])
+[((yyGLRStackItem const *)yyvsp)@{YYFILL (b4_subtract([$2], [$1]))@}.yystate])

 
 
 # b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
 
 
 # b4_rhs_value(RULE-LENGTH, NUM, [TYPE])

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 6e5042d410c04b1ed3f63d52651b3b7c982219e0..58ebe94c4e278d8f9e9fcae9993b8add37fcbf76 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -18,16 +18,6 @@
 
 m4_include(b4_pkgdatadir/[c++.m4])
 
 
 m4_include(b4_pkgdatadir/[c++.m4])
 

-# b4_subtract(LHS, RHS)
-# ---------------------
-# Evaluate LHS - RHS if they are integer literals, otherwise expand
-# to (LHS) - (RHS).
-m4_define([b4_subtract],
-[m4_bmatch([$1$2], [^[0123456789]*$],
-           [m4_eval([$1 - $2])],
-           [($1) - ($2)])])
-
-

 # b4_args(ARG1, ...)
 # _b4_args(ARG1, ...)
 # -------------------
 # b4_args(ARG1, ...)
 # _b4_args(ARG1, ...)
 # -------------------

diff --git a/data/yacc.c b/data/yacc.c
index 36028e27ca8c7ee5461598e96046906bdbe25d0a..872e63f1c20737bcecaa26722c1d9c274e46dac8 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -124,7 +124,7 @@ m4_define([b4_lhs_value],
 # Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
 # symbols on RHS.
 m4_define([b4_rhs_value],
 # Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
 # symbols on RHS.
 m4_define([b4_rhs_value],

-[b4_symbol_value([yyvsp@{($2) - ($1)@}], [$3])])
+          [b4_symbol_value([yyvsp@{b4_subtract([$2], [$1])@}], [$3])])

 
 
 
 
 
 


@@ -144,7 +144,7 @@ m4_define([b4_lhs_location],
 # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
 # on RHS.
 m4_define([b4_rhs_location],
 # Expansion of @NUM, where the current rule has RULE-LENGTH symbols
 # on RHS.
 m4_define([b4_rhs_location],

-[(yylsp@{($2) - ($1)@})])
+          [(yylsp@{b4_subtract([$2], [$1])@})])