variables: simplify the upgrade of namespace into api.namespace.

[bison.git] / data / java.m4

diff --git a/data/java.m4 b/data/java.m4
index b3dbd3b3cbcf9b2d969242ef8a7679b7d11ae63d..690d88588c64132d9c95fad0aa2055f39958ecaa 100644 (file)
--- a/data/java.m4
+++ b/data/java.m4
@@ -2,7 +2,7 @@
 
 # Java language support for Bison
 
 
 # Java language support for Bison
 

-# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.

 
 # 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
 
 # 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


@@ -29,7 +29,7 @@ m4_define([b4_comment], [/* m4_bpatsubst([$1], [
 # --------------------------
 # Join two lists with a comma if necessary.
 m4_define([b4_list2],
 # --------------------------
 # Join two lists with a comma if necessary.
 m4_define([b4_list2],

-         [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2])
+          [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2])

 
 
 # b4_percent_define_get3(DEF, PRE, POST, NOT)
 
 
 # b4_percent_define_get3(DEF, PRE, POST, NOT)


@@ -37,8 +37,8 @@ m4_define([b4_list2],
 # Expand to the value of DEF surrounded by PRE and POST if it's %define'ed,
 # otherwise NOT.
 m4_define([b4_percent_define_get3],
 # Expand to the value of DEF surrounded by PRE and POST if it's %define'ed,
 # otherwise NOT.
 m4_define([b4_percent_define_get3],

-         [m4_ifval(m4_quote(b4_percent_define_get([$1])),
-               [$2[]b4_percent_define_get([$1])[]$3], [$4])])
+          [m4_ifval(m4_quote(b4_percent_define_get([$1])),
+                [$2[]b4_percent_define_get([$1])[]$3], [$4])])

 
 
 
 
 
 


@@ -103,7 +103,7 @@ m4_define([b4_identification],
 m4_define([b4_int_type],
 [m4_if(b4_ints_in($@,   [-128],   [127]), [1], [byte],
        b4_ints_in($@, [-32768], [32767]), [1], [short],
 m4_define([b4_int_type],
 [m4_if(b4_ints_in($@,   [-128],   [127]), [1], [byte],
        b4_ints_in($@, [-32768], [32767]), [1], [short],

-                                              [int])])
+                                               [int])])

 
 # b4_int_type_for(NAME)
 # ---------------------
 
 # b4_int_type_for(NAME)
 # ---------------------


@@ -117,6 +117,27 @@ m4_define([b4_int_type_for],
 m4_define([b4_null], [null])
 
 
 m4_define([b4_null], [null])
 
 

+# b4_typed_parser_table_define(TYPE, NAME, DATA, COMMENT)
+# -------------------------------------------------------
+m4_define([b4_typed_parser_table_define],
+[m4_ifval([$4], [b4_comment([$4])
+  ])dnl
+[private static final ]$1[ yy$2_[] = yy$2_init();
+  private static final ]$1[[] yy$2_init()
+  {
+    return new ]$1[[]
+    {
+  ]$3[
+    };
+  }]])
+
+
+# b4_integral_parser_table_define(NAME, DATA, COMMENT)
+#-----------------------------------------------------
+m4_define([b4_integral_parser_table_define],
+[b4_typed_parser_table_define([b4_int_type_for([$2])], [$1], [$2], [$3])])
+
+

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


@@ -125,8 +146,8 @@ m4_define([b4_null], [null])
 # ---------------------------------------
 # Output the definition of this token as an enum.
 m4_define([b4_token_enum],
 # ---------------------------------------
 # Output the definition of this token as an enum.
 m4_define([b4_token_enum],

-[  /** Token number, to be returned by the scanner.  */
-  public static final int $1 = $2;
+[    /** Token number, to be returned by the scanner.  */
+    static final int b4_percent_define_get([api.tokens.prefix])$1 = $2;

 ])
 
 
 ])
 
 


@@ -154,24 +175,27 @@ m4_define([b4_case], [  case $1:
 ## ---------------- ##
 
 m4_define([b4_yystype], [b4_percent_define_get([[stype]])])
 ## ---------------- ##
 
 m4_define([b4_yystype], [b4_percent_define_get([[stype]])])

-b4_percent_define_default([[stype]], [[Object]])])
+b4_percent_define_default([[stype]], [[Object]])

 
 # %name-prefix
 m4_define_default([b4_prefix], [[YY]])
 
 
 # %name-prefix
 m4_define_default([b4_prefix], [[YY]])
 

-b4_percent_define_default([[parser_class_name]], [b4_prefix[]Parser])])
+b4_percent_define_default([[parser_class_name]], [b4_prefix[]Parser])

 m4_define([b4_parser_class_name], [b4_percent_define_get([[parser_class_name]])])
 
 m4_define([b4_parser_class_name], [b4_percent_define_get([[parser_class_name]])])
 

-b4_percent_define_default([[lex_throws]], [[java.io.IOException]])])
+b4_percent_define_default([[lex_throws]], [[java.io.IOException]])

 m4_define([b4_lex_throws], [b4_percent_define_get([[lex_throws]])])
 
 m4_define([b4_lex_throws], [b4_percent_define_get([[lex_throws]])])
 

-b4_percent_define_default([[throws]], [])])
+b4_percent_define_default([[throws]], [])

 m4_define([b4_throws], [b4_percent_define_get([[throws]])])
 
 m4_define([b4_throws], [b4_percent_define_get([[throws]])])
 

-b4_percent_define_default([[location_type]], [Location])])
+b4_percent_define_default([[init_throws]], [])
+m4_define([b4_init_throws], [b4_percent_define_get([[init_throws]])])
+
+b4_percent_define_default([[location_type]], [Location])

 m4_define([b4_location_type], [b4_percent_define_get([[location_type]])])
 
 m4_define([b4_location_type], [b4_percent_define_get([[location_type]])])
 

-b4_percent_define_default([[position_type]], [Position])])
+b4_percent_define_default([[position_type]], [Position])

 m4_define([b4_position_type], [b4_percent_define_get([[position_type]])])
 
 
 m4_define([b4_position_type], [b4_percent_define_get([[position_type]])])
 
 


@@ -218,21 +242,21 @@ m4_define([b4_rhs_location],
 # it to be single quoted.  Same for b4_parse_param.
 
 # TODO: should be in bison.m4
 # it to be single quoted.  Same for b4_parse_param.
 
 # TODO: should be in bison.m4

-m4_define_default([b4_lex_param], [[]]))
-m4_define([b4_lex_param], b4_lex_param))
-m4_define([b4_parse_param], b4_parse_param))
+m4_define_default([b4_lex_param], [[]])
+m4_define([b4_lex_param], b4_lex_param)
+m4_define([b4_parse_param], b4_parse_param)

 
 # b4_lex_param_decl
 
 # b4_lex_param_decl

-# -------------------
+# -----------------

 # Extra formal arguments of the constructor.
 m4_define([b4_lex_param_decl],
 [m4_ifset([b4_lex_param],
           [b4_remove_comma([$1],
 # Extra formal arguments of the constructor.
 m4_define([b4_lex_param_decl],
 [m4_ifset([b4_lex_param],
           [b4_remove_comma([$1],

-                          b4_param_decls(b4_lex_param))],
-         [$1])])
+                           b4_param_decls(b4_lex_param))],
+          [$1])])

 
 m4_define([b4_param_decls],
 
 m4_define([b4_param_decls],

-         [m4_map([b4_param_decl], [$@])])
+          [m4_map([b4_param_decl], [$@])])

 m4_define([b4_param_decl], [, $1])
 
 m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1, ], [])m4_shift2($@)])
 m4_define([b4_param_decl], [, $1])
 
 m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1, ], [])m4_shift2($@)])


@@ -245,21 +269,21 @@ m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1, ], [])m4_shift2($@)])
 m4_define([b4_parse_param_decl],
 [m4_ifset([b4_parse_param],
           [b4_remove_comma([$1],
 m4_define([b4_parse_param_decl],
 [m4_ifset([b4_parse_param],
           [b4_remove_comma([$1],

-                          b4_param_decls(b4_parse_param))],
-         [$1])])
+                           b4_param_decls(b4_parse_param))],
+          [$1])])

 
 
 
 # b4_lex_param_call
 
 
 
 # b4_lex_param_call

-# -------------------
+# -----------------

 # Delegating the lexer parameters to the lexer constructor.
 m4_define([b4_lex_param_call],
           [m4_ifset([b4_lex_param],
 # Delegating the lexer parameters to the lexer constructor.
 m4_define([b4_lex_param_call],
           [m4_ifset([b4_lex_param],

-                   [b4_remove_comma([$1],
-                                    b4_param_calls(b4_lex_param))],
-                   [$1])])
+                    [b4_remove_comma([$1],
+                                     b4_param_calls(b4_lex_param))],
+                    [$1])])

 m4_define([b4_param_calls],
 m4_define([b4_param_calls],

-         [m4_map([b4_param_call], [$@])])
+          [m4_map([b4_param_call], [$@])])

 m4_define([b4_param_call], [, $2])
 
 
 m4_define([b4_param_call], [, $2])
 
 


@@ -269,13 +293,13 @@ m4_define([b4_param_call], [, $2])
 # Extra initialisations of the constructor.
 m4_define([b4_parse_param_cons],
           [m4_ifset([b4_parse_param],
 # Extra initialisations of the constructor.
 m4_define([b4_parse_param_cons],
           [m4_ifset([b4_parse_param],

-                   [b4_constructor_calls(b4_parse_param)])])
+                    [b4_constructor_calls(b4_parse_param)])])

 
 m4_define([b4_constructor_calls],
 
 m4_define([b4_constructor_calls],

-         [m4_map([b4_constructor_call], [$@])])
+          [m4_map([b4_constructor_call], [$@])])

 m4_define([b4_constructor_call],
 m4_define([b4_constructor_call],

-         [this.$2 = $2;
-         ])
+          [this.$2 = $2;
+          ])

 
 
 
 
 
 


@@ -284,15 +308,15 @@ m4_define([b4_constructor_call],
 # Extra instance variables.
 m4_define([b4_parse_param_vars],
           [m4_ifset([b4_parse_param],
 # Extra instance variables.
 m4_define([b4_parse_param_vars],
           [m4_ifset([b4_parse_param],

-                   [
+                    [

     /* User arguments.  */
 b4_var_decls(b4_parse_param)])])
 
 m4_define([b4_var_decls],
     /* User arguments.  */
 b4_var_decls(b4_parse_param)])])
 
 m4_define([b4_var_decls],

-         [m4_map_sep([b4_var_decl], [
+          [m4_map_sep([b4_var_decl], [

 ], [$@])])
 m4_define([b4_var_decl],
 ], [$@])])
 m4_define([b4_var_decl],

-         [    protected final $1;])
+          [    protected final $1;])

 
 
 
 
 
 


@@ -300,4 +324,4 @@ m4_define([b4_var_decl],
 # -----------------------
 # Expand to either an empty string or "throws THROWS".
 m4_define([b4_maybe_throws],
 # -----------------------
 # Expand to either an empty string or "throws THROWS".
 m4_define([b4_maybe_throws],

-         [m4_ifval($1, [throws $1])])
+          [m4_ifval($1, [throws $1])])