Forgot the old yylval global variable usage completely.

9 files changed, 16 insertions, 16 deletions

diff --git a/tools/d2c/Makefile.am b/tools/d2c/Makefile.am
index dc4fdf8..d876ab1 100644
--- a/tools/d2c/Makefile.am
+++ b/tools/d2c/Makefile.am
@@ -9,7 +9,7 @@ BUILT_SOURCES = grammar.h
 AM_YFLAGS = -v -d -p d2c_
 
 AM_LFLAGS = -P d2c_ -o lex.yy.c --header-file=tokens.h			\
-			-Dyylval=d2c_lval -Dyyget_lineno=d2c_get_lineno 	\
+			-Dyyget_lineno=d2c_get_lineno 						\
 			-Dyy_scan_bytes=d2c__scan_bytes						\
 			-Dyy_delete_buffer=d2c__delete_buffer
 
diff --git a/tools/d2c/args/Makefile.am b/tools/d2c/args/Makefile.am
index 2a4cb4d..c26dea4 100644
--- a/tools/d2c/args/Makefile.am
+++ b/tools/d2c/args/Makefile.am
@@ -9,7 +9,7 @@ BUILT_SOURCES = grammar.h
 AM_YFLAGS = -v -d -p args_
 
 AM_LFLAGS = -P args_ -o lex.yy.c --header-file=tokens.h			\
-			-Dyylval=args_lval -Dyyget_lineno=args_get_lineno 	\
+			-Dyyget_lineno=args_get_lineno 						\
 			-Dyy_scan_string=args__scan_string					\
 			-Dyy_delete_buffer=args__delete_buffer
 
diff --git a/tools/d2c/bits/Makefile.am b/tools/d2c/bits/Makefile.am
index 415e2a6..8459770 100644
--- a/tools/d2c/bits/Makefile.am
+++ b/tools/d2c/bits/Makefile.am
@@ -9,7 +9,7 @@ BUILT_SOURCES = grammar.h
 AM_YFLAGS = -v -d -p bits_
 
 AM_LFLAGS = -P bits_ -o lex.yy.c --header-file=tokens.h			\
-			-Dyylval=bits_lval -Dyyget_lineno=bits_get_lineno 	\
+			-Dyyget_lineno=bits_get_lineno 						\
 			-Dyy_scan_string=bits__scan_string					\
 			-Dyy_delete_buffer=bits__delete_buffer
 
diff --git a/tools/d2c/conv/Makefile.am b/tools/d2c/conv/Makefile.am
index 7744bc0..0a49e97 100644
--- a/tools/d2c/conv/Makefile.am
+++ b/tools/d2c/conv/Makefile.am
@@ -9,7 +9,7 @@ BUILT_SOURCES = grammar.h
 AM_YFLAGS = -v -d -p conv_
 
 AM_LFLAGS = -P conv_ -o lex.yy.c --header-file=tokens.h			\
-			-Dyylval=conv_lval -Dyyget_lineno=conv_get_lineno 	\
+			-Dyyget_lineno=conv_get_lineno 						\
 			-Dyy_scan_string=conv__scan_string					\
 			-Dyy_delete_buffer=conv__delete_buffer
 
diff --git a/tools/d2c/format/Makefile.am b/tools/d2c/format/Makefile.am
index 7afd98d..5b1dcee 100644
--- a/tools/d2c/format/Makefile.am
+++ b/tools/d2c/format/Makefile.am
@@ -8,9 +8,9 @@ BUILT_SOURCES = grammar.h
 
 AM_YFLAGS = -v -d -p format_
 
-AM_LFLAGS = -P format_ -o lex.yy.c --header-file=tokens.h			\
-			-Dyylval=format_lval -Dyyget_lineno=format_get_lineno 	\
-			-Dyy_scan_string=format__scan_string					\
+AM_LFLAGS = -P format_ -o lex.yy.c --header-file=tokens.h		\
+			-Dyyget_lineno=format_get_lineno 					\
+			-Dyy_scan_string=format__scan_string				\
 			-Dyy_delete_buffer=format__delete_buffer
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS)
diff --git a/tools/d2c/grammar.y b/tools/d2c/grammar.y
index f0c1779..ec7da60 100644
--- a/tools/d2c/grammar.y
+++ b/tools/d2c/grammar.y
@@ -12,7 +12,7 @@
 
 
 /* Affiche un message d'erreur suite à l'analyse en échec. */
-static int d2c_error(rented_coder *, char *, char *);
+static int yyerror(rented_coder *, char *, char *);
 
 /* Affiche des indications sur l'utilisation du programme. */
 static void show_usage(const char *);
@@ -233,9 +233,9 @@ rules : RULES RAW_BLOCK { handle_coder_rules(coder, $2); }
 *                                                                             *
 ******************************************************************************/
 
-static int d2c_error(rented_coder *coder, char *temp, char *msg)
+static int yyerror(rented_coder *coder, char *temp, char *msg)
 {
-	printf("yyerror line %d: %s\n", d2c_get_lineno(), msg);
+	printf("yyerror line %d: %s\n", yyget_lineno(), msg);
 
 	return 0;
 
diff --git a/tools/d2c/hooks/Makefile.am b/tools/d2c/hooks/Makefile.am
index 1eb00a8..4dc34e4 100644
--- a/tools/d2c/hooks/Makefile.am
+++ b/tools/d2c/hooks/Makefile.am
@@ -8,8 +8,8 @@ BUILT_SOURCES = grammar.h
 
 AM_YFLAGS = -v -d -p hooks_
 
-AM_LFLAGS = -P hooks_ -o lex.yy.c --header-file=tokens.h			\
-			-Dyylval=hooks_lval -Dyyget_lineno=hooks_get_lineno 	\
+AM_LFLAGS = -P hooks_ -o lex.yy.c --header-file=tokens.h		\
+			-Dyyget_lineno=hooks_get_lineno 					\
 			-Dyy_scan_string=hooks__scan_string					\
 			-Dyy_delete_buffer=hooks__delete_buffer
 
diff --git a/tools/d2c/rules/Makefile.am b/tools/d2c/rules/Makefile.am
index c2d9d96..9db9905 100644
--- a/tools/d2c/rules/Makefile.am
+++ b/tools/d2c/rules/Makefile.am
@@ -9,7 +9,7 @@ BUILT_SOURCES = grammar.h
 AM_YFLAGS = -v -d -p rules_
 
 AM_LFLAGS = -P rules_ -o lex.yy.c --header-file=tokens.h		\
-			-Dyylval=rules_lval -Dyyget_lineno=rules_get_lineno \
+			-Dyyget_lineno=rules_get_lineno 					\
 			-Dyy_scan_string=rules__scan_string					\
 			-Dyy_delete_buffer=rules__delete_buffer
 
diff --git a/tools/d2c/syntax/Makefile.am b/tools/d2c/syntax/Makefile.am
index 716f5da..95da241 100644
--- a/tools/d2c/syntax/Makefile.am
+++ b/tools/d2c/syntax/Makefile.am
@@ -8,9 +8,9 @@ BUILT_SOURCES = grammar.h
 
 AM_YFLAGS = -v -d -p syntax_
 
-AM_LFLAGS = -P syntax_ -o lex.yy.c --header-file=tokens.h			\
-			-Dyylval=syntax_lval -Dyyget_lineno=syntax_get_lineno 	\
-			-Dyy_scan_string=syntax__scan_string					\
+AM_LFLAGS = -P syntax_ -o lex.yy.c --header-file=tokens.h		\
+			-Dyyget_lineno=syntax_get_lineno 					\
+			-Dyy_scan_string=syntax__scan_string				\
 			-Dyy_delete_buffer=syntax__delete_buffer
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS)