Branch: Tag:

2000-11-04

2000-11-04 17:43:02 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Fixed 20 shift/reduce conflicts due to a couple of typos.

Rev: src/language.yacc:1.218

110:   /* 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:    ;      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 ';'."); }    ;