* data/yacc.c (m4_int_type): New.

* data/c.m4 (m4_int_type): Don't use yysigned_char, but `signed
char' as only yacc.c wants K&R portability.
* data/glr.c (yysigned_char): Remove.
* data/lalr1.cc: Rename the trailing b4_name as b4_parser_class_name.
Reported by Quoc Peyrot.

diff --git a/ChangeLog b/ChangeLog
index ee4cec217966a4f0fcdd409fc358c25235dd83d2..cc9da645f6325732a75f07ab95c19d72dc29f68b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-24  Akim Demaille  <akim@epita.fr>
+
+       * data/yacc.c (m4_int_type): New.
+       * data/c.m4 (m4_int_type): Don't use yysigned_char, but `signed
+       char' as only yacc.c wants K&R portability.
+       * data/glr.c (yysigned_char): Remove.
+       * data/lalr1.cc: Rename the trailing b4_name as b4_parser_class_name.
+       Reported by Quoc Peyrot.
+
 2002-10-23  Paul Eggert  <eggert@twinsun.com>
 
        * src/main.c (main): With --trace=time, report times even if a

diff --git a/THANKS b/THANKS
index 20cff397a0885824219b2ddc0cb45c1ec298672d..2c59995e8ee50e87c907c74019425dfe244a6e16 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -48,6 +48,7 @@ Paul Hilfinger            Hilfinger@CS.Berkeley.EDU
 Per Allansson             per@appgate.com
 Peter Hámorský            hamo@upjs.sk
 Piotr Gackiewicz          gacek@intertel.com.pl
+Quoc Peyrot               chojin@lrde.epita.fr
 R Blake                   blakers@mac.com
 Raja R Harinath           harinath@cs.umn.edu
 Richard Stallman          rms@gnu.org

diff --git a/data/c.m4 b/data/c.m4
index b513df56189e9f556333d56a55851795bba6df12..785f9e113462ee971068abc0f0c0470029eda82a 100644 (file)
--- a/data/c.m4
+++ b/data/c.m4
@@ -65,7 +65,7 @@ m4_define([b4_ints_in],
 # MIN to MAX (included).
 m4_define([b4_int_type],
 [m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
-       b4_ints_in($@,   [-128],   [127]), [1], [yysigned_char],
+       b4_ints_in($@,   [-128],   [127]), [1], [signed char],
 
        b4_ints_in($@,      [0], [65535]), [1], [unsigned short],
        b4_ints_in($@, [-32768], [32767]), [1], [short],
@@ -74,6 +74,7 @@ m4_define([b4_int_type],
 
                                               [int])])
 
+
 # b4_int_type_for(NAME)
 # ---------------------
 # Return the smallest int type able to handle numbers ranging from

diff --git a/data/glr.c b/data/glr.c
index eb4954482015ef8d58559c7e0701bc61cfc6ed7d..77a35afc713450c23f5e5b0a11dd4649488d2d34 100644 (file)
--- a/data/glr.c
+++ b/data/glr.c
@@ -207,12 +207,6 @@ static YYLTYPE yyloc_default;
 #  define yyfalse 0
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short yysigned_char;
-#endif
-
 /*-----------------.
 | GCC extensions.  |
 `-----------------*/

diff --git a/data/lalr1.cc b/data/lalr1.cc
index 96325b0bd014a2e831089f336f493d715d527c0c..b7b64c3ca7f190b4ee7416b0b439284f72832b1f 100644 (file)
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -775,7 +775,7 @@ const int yy::b4_parser_class_name::ntokens_ = b4_tokens_number;
 const int yy::b4_parser_class_name::initdepth_ = b4_stack_depth_init;
 
 const unsigned yy::b4_parser_class_name::user_token_number_max_ = b4_user_token_number_max;
-const yy::b4_parser_class_name::TokenNumberType yy::b4_name::undef_token_ = b4_undef_token_number;
+const yy::b4_parser_class_name::TokenNumberType yy::b4_parser_class_name::undef_token_ = b4_undef_token_number;
 
 b4_epilogue
 dnl

diff --git a/data/yacc.c b/data/yacc.c
index 29e13e9feb12d67f619140279a5212da2863e095..11edba30403940eb1080a422682adaf7efc815c6 100644 (file)
--- a/data/yacc.c
+++ b/data/yacc.c
@@ -47,6 +47,28 @@ m4_ifdef([b4_parse_param],
           b4_parse_param)])
 
 
+
+## ------------ ##
+## Data Types.  ##
+## ------------ ##
+
+# b4_int_type(MIN, MAX)
+# ---------------------
+# Return the smallest int type able to handle numbers ranging from
+# MIN to MAX (included).  We overwrite the version from c.m4 which relies
+# on `signed char' which is not portable to old K&R compilers.
+m4_define([b4_int_type],
+[m4_if(b4_ints_in($@,      [0],   [255]), [1], [unsigned char],
+       b4_ints_in($@,   [-128],   [127]), [1], [yysigned_char],
+
+       b4_ints_in($@,      [0], [65535]), [1], [unsigned short],
+       b4_ints_in($@, [-32768], [32767]), [1], [short],
+
+       m4_eval([0 <= $1]),                [1], [unsigned int],
+
+                                              [int])])
+
+
 ## ----------------- ##
 ## Semantic Values.  ##
 ## ----------------- ##