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

diff --cc NEWS
Simple merge

diff --cc data/java.m4
index c16ab0b,4e80968..2bbd09a
--- 1/data/java.m4
--- 2/data/java.m4
+++ b/data/java.m4
@@@ -185,23 -160,20 +185,23 @@@ b4_percent_define_default([[stype]], [[
  # %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]])])
  
 -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]])])
  
 -b4_percent_define_default([[throws]], [])])
 +b4_percent_define_default([[throws]], [])
  m4_define([b4_throws], [b4_percent_define_get([[throws]])])
  
 -b4_percent_define_default([[api.location.type]], [Location])])
 +b4_percent_define_default([[init_throws]], [])
 +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]])])
  
  
  ## ----------------- ##

diff --cc doc/bison.texi
Simple merge

diff --cc tests/java.at
Simple merge