From 107029bebe1725eb52a1abb9de1f2fdc282380c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Sat, 4 Nov 2000 18:43:02 +0100
Subject: [PATCH] Fixed 20 shift/reduce conflicts due to a couple of typos.
Rev: src/language.yacc:1.218
---
src/language.yacc | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/language.yacc b/src/language.yacc
index a94e42feb0..d75016dc53 100644
--- a/src/language.yacc
+++ b/src/language.yacc
@@ -110,7 +110,7 @@
/* This is the grammar definition of Pike. */
#include "global.h"
-RCSID("$Id: language.yacc,v 1.217 2000/11/04 16:23:13 grubba Exp $");
+RCSID("$Id: language.yacc,v 1.218 2000/11/04 17:43:02 grubba Exp $");
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
@@ -1592,17 +1592,17 @@ local_constant_name: TOK_IDENTIFIER '=' safe_expr0
;
local_constant_list: local_constant_name
- | local_constant_list ',' local_constant_list
+ | local_constant_list ',' local_constant_name
;
-local_constant: TOK_CONSTANT local_constant_list ;
- | TOK_CONSTANT error ';' { yyerrok; }
- | TOK_CONSTANT error TOK_LEX_EOF
+local_constant: TOK_CONSTANT local_constant_list ';'
+ | TOK_CONSTANT error ';' { yyerrok; }
+ | TOK_CONSTANT error TOK_LEX_EOF
{
yyerror("Missing ';'.");
yyerror("Unexpected end of file.");
}
- | TOK_CONSTANT error '}' { yyerror("Missing ';'."); }
+ | TOK_CONSTANT error '}' { yyerror("Missing ';'."); }
;
--
GitLab