40 lines
968 B
Diff
40 lines
968 B
Diff
--- a/giscanner/meson.build
|
|
+++ b/giscanner/meson.build
|
|
@@ -55,12 +55,12 @@
|
|
subdir('doctemplates/mallard')
|
|
|
|
flex = find_program('flex', 'win_flex')
|
|
-bison = find_program('bison', 'win_bison')
|
|
+yacc = find_program('yacc', 'bison', 'win_bison')
|
|
|
|
scannerparser = custom_target('scannerparser',
|
|
input: 'scannerparser.y',
|
|
output: ['scannerparser.c', 'scannerparser.h'],
|
|
- command: [bison, '@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
|
|
+ command: [yacc, '-d', '-o', '@OUTPUT0@', '@INPUT@']
|
|
|
|
)
|
|
|
|
--- a/giscanner/scannerparser.y
|
|
+++ b/giscanner/scannerparser.y
|
|
@@ -250,7 +250,7 @@
|
|
|
|
%}
|
|
|
|
-%define parse.error verbose
|
|
+%error-verbose
|
|
%union {
|
|
char *str;
|
|
GList *list;
|
|
@@ -266,8 +266,8 @@
|
|
%lex-param { GISourceScanner* scanner }
|
|
|
|
%token <str> BASIC_TYPE
|
|
-%token <str> IDENTIFIER "identifier"
|
|
-%token <str> TYPEDEF_NAME "typedef-name"
|
|
+%token <str> IDENTIFIER
|
|
+%token <str> TYPEDEF_NAME
|
|
|
|
%token INTEGER FLOATING BOOLEAN CHARACTER STRING
|
|
|