java: stype is obsoleted by api.value.type

[bison.git] / data / java.m4

diff --git a/data/java.m4 b/data/java.m4
index 988ac39ac670e16cf9ca0d15edb4f391d23035c7..97e9548fdb580c86ad4654e06c85feb91dbf99a1 100644 (file)
--- a/data/java.m4
+++ b/data/java.m4
@@ -19,15 +19,9 @@
 
 m4_include(b4_pkgdatadir/[c-like.m4])
 
 
 m4_include(b4_pkgdatadir/[c-like.m4])
 

-# b4_comment(TEXT)
-# ----------------
-m4_define([b4_comment], [/* m4_bpatsubst([$1], [
-], [
-   ])  */])
-

 
 # b4_list2(LIST1, LIST2)
 
 # b4_list2(LIST1, 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])
 # Join two lists with a comma if necessary.
 m4_define([b4_list2],
           [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2])


@@ -179,8 +173,8 @@ m4_define([b4_predicate_case], [  case $1:
 ## Default values.  ##
 ## ---------------- ##
 
 ## Default values.  ##
 ## ---------------- ##
 

-m4_define([b4_yystype], [b4_percent_define_get([[stype]])])
-b4_percent_define_default([[stype]], [[Object]])
+m4_define([b4_yystype], [b4_percent_define_get([[api.value.type]])])
+b4_percent_define_default([[api.value.type]], [[Object]])

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


@@ -197,11 +191,11 @@ m4_define([b4_throws], [b4_percent_define_get([[throws]])])
 b4_percent_define_default([[init_throws]], [])
 m4_define([b4_init_throws], [b4_percent_define_get([[init_throws]])])
 
 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]])])
+b4_percent_define_default([[api.location.type]], [Location])
+m4_define([b4_location_type], [b4_percent_define_get([[api.location.type]])])

 
 

-b4_percent_define_default([[position_type]], [Position])
-m4_define([b4_position_type], [b4_percent_define_get([[position_type]])])
+b4_percent_define_default([[api.position.type]], [Position])
+m4_define([b4_position_type], [b4_percent_define_get([[api.position.type]])])

 
 
 ## ----------------- ##
 
 
 ## ----------------- ##