Merge branch 'maint'

* origin/maint:
  java: use api.location.type and api.position.type

Conflicts:
	NEWS
	data/java.m4
	doc/bison.texi
	tests/java.at
This commit is contained in:
Akim Demaille
2012-10-16 15:26:55 +02:00
4 changed files with 22 additions and 15 deletions

View File

@@ -200,8 +200,8 @@ m4_define([b4_init_throws], [b4_percent_define_get([[init_throws]])])
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]])])
## ----------------- ##