Various Java skeleton improvements.

[bison.git] / data / java.m4

diff --git a/data/java.m4 b/data/java.m4
index b3dbd3b3cbcf9b2d969242ef8a7679b7d11ae63d..9c2835d86c59a8e5b06c7e18b6f5e691ad880409 100644 (file)
--- a/data/java.m4
+++ b/data/java.m4
@@ -125,8 +125,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 $1 = $2;

 ])
 
 
 ])
 
 


@@ -154,24 +154,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,9 +221,9 @@ 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
 # -------------------