Merge branch 'maint'

* maint:
  warnings: introduce -Wdeprecated in the usage info
  errors: prefix the output with "error: "
  errors: indent "invalid value for %define" context
  errors: indent "%define var" redefinition context
  errors: indent "symbol redeclaration" context
  errors: indent "result type clash" error context

Conflicts:
	src/complain.c
	src/muscle-tab.c
	src/reader.c
	src/symtab.c
	tests/conflicts.at
	tests/input.at
	tests/named-refs.at
	tests/output.at
	tests/skeletons.at
This commit is contained in:
Akim Demaille
2012-09-26 14:35:47 +02:00
16 changed files with 288 additions and 240 deletions

View File

@@ -157,7 +157,7 @@ start: ;
]])
AT_BISON_CHECK([[input.y]], [[1]], [[]],
[[<skeleton default value>: invalid value for %define Boolean variable 'foo'
[[<skeleton default value>: error: invalid value for %define Boolean variable 'foo'
]])
AT_CLEANUP
@@ -193,8 +193,8 @@ start: ;
AT_BISON_CHECK([[input1.y]], [[1]], [[]],
[[input1.y: warning: foow fubar [-Wother]
foow.y:2.3-5.3: warning: foowat fubar [-Wother]
input1.y: fooc fubar
fooc.y:1.1-10.5: foocat fubar
input1.y: error: fooc fubar
fooc.y:1.1-10.5: error: foocat fubar
input1.y: fatal error: foof fubar
]])
@@ -264,7 +264,7 @@ start: ;
]])
AT_BISON_CHECK([[input1.y]], [[1]], [[]],
[[input1.y: non-fatal error
[[input1.y: error: non-fatal error
input1.y: fatal error: M4 should exit immediately here
]])