Use b4_parser_tables_define in Java.

* data/java.m4 (b4_typed_parser_table): Rename as...
	(b4_typed_parser_table_define): this, for consistency.
	Accept a comment as $4.
	Move $2 into yy*_.
	(b4_integral_parser_table): Rename as...
	(b4_integral_parser_table_define): this.
	* data/lalr1.java: Adjust all uses.
	Use b4_parser_tables_define instead of generation by hand.
This commit is contained in:
Akim Demaille
2008-11-25 21:58:06 +01:00
parent ba206cf40a
commit 2c1bf9bd68
3 changed files with 31 additions and 48 deletions

View File

@@ -117,11 +117,13 @@ m4_define([b4_int_type_for],
m4_define([b4_null], [null])
# b4_typed_parser_table(TYPE, NAME, DATA)
# ---------------------------------------
m4_define([b4_typed_parser_table],
[[private static final ]$1[ $2[] = $2init();
private static final ]$1[[] $2init()
# 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[[]
{
@@ -130,10 +132,10 @@ m4_define([b4_typed_parser_table],
}]])
# b4_integral_parser_table(NAME, DATA)
#-------------------------------------
m4_define([b4_integral_parser_table],
[b4_typed_parser_table([b4_int_type_for([$2])], [$1], [$2])])
# 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])])
## ------------------------- ##