warnings: use the regular interface for s/r and r/r conflicts

[bison.git] / tests / existing.at

diff --git a/tests/existing.at b/tests/existing.at
index 5a89732457ad36456027fc66520f2d0bc7d00213..d5cb39d16c0bd189d6a1a866a7956c166b8087ee 100644 (file)
--- a/tests/existing.at
+++ b/tests/existing.at
@@ -1,7 +1,7 @@
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 

-# Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2012 Free Software
+# Foundation, Inc.

 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -42,18 +42,18 @@ AT_CHECK([[diff -u input-lalr.output input.output \
          [[0]], [$1])])
 
 AT_TEST_TABLES_AND_PARSE([$2[: LALR(1)]], [[LALR]], [[last-state]],
          [[0]], [$1])])
 
 AT_TEST_TABLES_AND_PARSE([$2[: LALR(1)]], [[LALR]], [[last-state]],

-                         [[%define lr.type "lalr"
+                         [[%define lr.type lalr

 ]$3],
                          [$4], [$5], [$6], [$7],
                          [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
 AT_TEST_TABLES_AND_PARSE([$2[: IELR(1)]], [[IELR]], [[last-state]],
 ]$3],
                          [$4], [$5], [$6], [$7],
                          [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
 AT_TEST_TABLES_AND_PARSE([$2[: IELR(1)]], [[IELR]], [[last-state]],

-                         [[%define lr.type "ielr"
+                         [[%define lr.type ielr

 ]$3],
                          [$4], [$5], [$6], [$7],
                          [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
 AT_TEST_TABLES_AND_PARSE([$2[: Canonical LR(1)]], [[canonical LR]],
                          [[last-state,no-xml]],
 ]$3],
                          [$4], [$5], [$6], [$7],
                          [AT_LALR1_DIFF_CHECK([$8])$9], [$10], [$11], [$12])
 AT_TEST_TABLES_AND_PARSE([$2[: Canonical LR(1)]], [[canonical LR]],
                          [[last-state,no-xml]],

-                         [[%define lr.type "canonical-lr"
+                         [[%define lr.type canonical-lr

 ]$3],
                          [$4], [$5], [$6], [$7],
                          [$9], [$10], [$11], [$12])
 ]$3],
                          [$4], [$5], [$6], [$7],
                          [$9], [$10], [$11], [$12])


@@ -112,281 +112,281 @@ AT_TEST_EXISTING_GRAMMAR([[GNU AWK 3.1.0 Grammar]],
 ]],
 [[
 start
 ]],
 [[
 start

-       : opt_nls program opt_nls
-       ;
+        : opt_nls program opt_nls
+        ;

 
 program
 
 program

-       : rule
-       | program rule
-       | error
-       | program error
-       | /* empty */
-       ;
+        : rule
+        | program rule
+        | error
+        | program error
+        | /* empty */
+        ;

 
 rule
 
 rule

-       : LEX_BEGIN {} action
-       | LEX_END {}   action
-       | LEX_BEGIN statement_term
-       | LEX_END statement_term
-       | pattern action
-       | action
-       | pattern statement_term
-       | function_prologue function_body
-       ;
+        : LEX_BEGIN {} action
+        | LEX_END {}   action
+        | LEX_BEGIN statement_term
+        | LEX_END statement_term
+        | pattern action
+        | action
+        | pattern statement_term
+        | function_prologue function_body
+        ;

 
 func_name
 
 func_name

-       : NAME
-       | FUNC_CALL
-       | lex_builtin
-       ;
+        : NAME
+        | FUNC_CALL
+        | lex_builtin
+        ;

 
 lex_builtin
 
 lex_builtin

-       : LEX_BUILTIN
-       | LEX_LENGTH
-       ;
+        : LEX_BUILTIN
+        | LEX_LENGTH
+        ;

 
 function_prologue
 
 function_prologue

-       : LEX_FUNCTION {} func_name '(' opt_param_list r_paren opt_nls
-       ;
+        : LEX_FUNCTION {} func_name '(' opt_param_list r_paren opt_nls
+        ;

 
 function_body
 
 function_body

-       : l_brace statements r_brace opt_semi opt_nls
-       | l_brace r_brace opt_semi opt_nls
-       ;
+        : l_brace statements r_brace opt_semi opt_nls
+        | l_brace r_brace opt_semi opt_nls
+        ;

 
 pattern
 
 pattern

-       : exp
-       | exp ',' exp
-       ;
+        : exp
+        | exp ',' exp
+        ;

 
 regexp
 
 regexp

-       /*
-        * In this rule, want_regexp tells yylex that the next thing
-        * is a regexp so it should read up to the closing slash.
-        */
-       : '/' {} REGEXP '/'
-       ;
+        /*
+         * In this rule, want_regexp tells yylex that the next thing
+         * is a regexp so it should read up to the closing slash.
+         */
+        : '/' {} REGEXP '/'
+        ;

 
 action
 
 action

-       : l_brace statements r_brace opt_semi opt_nls
-       | l_brace r_brace opt_semi opt_nls
-       ;
+        : l_brace statements r_brace opt_semi opt_nls
+        | l_brace r_brace opt_semi opt_nls
+        ;

 
 statements
 
 statements

-       : statement
-       | statements statement
-       | error
-       | statements error
-       ;
+        : statement
+        | statements statement
+        | error
+        | statements error
+        ;

 
 statement_term
 
 statement_term

-       : nls
-       | semi opt_nls
-       ;
+        : nls
+        | semi opt_nls
+        ;

 
 statement
 
 statement

-       : semi opt_nls
-       | l_brace r_brace
-       | l_brace statements r_brace
-       | if_statement
-       | LEX_WHILE '(' exp r_paren opt_nls statement
-       | LEX_DO opt_nls statement LEX_WHILE '(' exp r_paren opt_nls
-       | LEX_FOR '(' NAME LEX_IN NAME r_paren opt_nls statement
-       | LEX_FOR '(' opt_exp semi opt_nls exp semi opt_nls opt_exp r_paren opt_nls statement
-       | LEX_FOR '(' opt_exp semi opt_nls semi opt_nls opt_exp r_paren opt_nls statement
-       | LEX_BREAK statement_term
-       | LEX_CONTINUE statement_term
-       | print '(' expression_list r_paren output_redir statement_term
-       | print opt_rexpression_list output_redir statement_term
-       | LEX_NEXT statement_term
-       | LEX_NEXTFILE statement_term
-       | LEX_EXIT opt_exp statement_term
-       | LEX_RETURN {} opt_exp statement_term
-       | LEX_DELETE NAME '[' expression_list ']' statement_term
-       | LEX_DELETE NAME  statement_term
-       | exp statement_term
-       ;
+        : semi opt_nls
+        | l_brace r_brace
+        | l_brace statements r_brace
+        | if_statement
+        | LEX_WHILE '(' exp r_paren opt_nls statement
+        | LEX_DO opt_nls statement LEX_WHILE '(' exp r_paren opt_nls
+        | LEX_FOR '(' NAME LEX_IN NAME r_paren opt_nls statement
+        | LEX_FOR '(' opt_exp semi opt_nls exp semi opt_nls opt_exp r_paren opt_nls statement
+        | LEX_FOR '(' opt_exp semi opt_nls semi opt_nls opt_exp r_paren opt_nls statement
+        | LEX_BREAK statement_term
+        | LEX_CONTINUE statement_term
+        | print '(' expression_list r_paren output_redir statement_term
+        | print opt_rexpression_list output_redir statement_term
+        | LEX_NEXT statement_term
+        | LEX_NEXTFILE statement_term
+        | LEX_EXIT opt_exp statement_term
+        | LEX_RETURN {} opt_exp statement_term
+        | LEX_DELETE NAME '[' expression_list ']' statement_term
+        | LEX_DELETE NAME  statement_term
+        | exp statement_term
+        ;

 
 print
 
 print

-       : LEX_PRINT
-       | LEX_PRINTF
-       ;
+        : LEX_PRINT
+        | LEX_PRINTF
+        ;

 
 if_statement
 
 if_statement

-       : LEX_IF '(' exp r_paren opt_nls statement
-       | LEX_IF '(' exp r_paren opt_nls statement
-            LEX_ELSE opt_nls statement
-       ;
+        : LEX_IF '(' exp r_paren opt_nls statement
+        | LEX_IF '(' exp r_paren opt_nls statement
+             LEX_ELSE opt_nls statement
+        ;

 
 nls
 
 nls

-       : NEWLINE
-       | nls NEWLINE
-       ;
+        : NEWLINE
+        | nls NEWLINE
+        ;

 
 opt_nls
 
 opt_nls

-       : /* empty */
-       | nls
-       ;
+        : /* empty */
+        | nls
+        ;

 
 input_redir
 
 input_redir

-       : /* empty */
-       | '<' simp_exp
-       ;
+        : /* empty */
+        | '<' simp_exp
+        ;

 
 output_redir
 
 output_redir

-       : /* empty */
-       | '>' exp
-       | APPEND_OP exp
-       | '|' exp
-       | TWOWAYIO exp
-       ;
+        : /* empty */
+        | '>' exp
+        | APPEND_OP exp
+        | '|' exp
+        | TWOWAYIO exp
+        ;

 
 opt_param_list
 
 opt_param_list

-       : /* empty */
-       | param_list
-       ;
+        : /* empty */
+        | param_list
+        ;

 
 param_list
 
 param_list

-       : NAME
-       | param_list comma NAME
-       | error
-       | param_list error
-       | param_list comma error
-       ;
+        : NAME
+        | param_list comma NAME
+        | error
+        | param_list error
+        | param_list comma error
+        ;

 
 /* optional expression, as in for loop */
 opt_exp
 
 /* optional expression, as in for loop */
 opt_exp

-       : /* empty */
-       | exp
-       ;
+        : /* empty */
+        | exp
+        ;

 
 opt_rexpression_list
 
 opt_rexpression_list

-       : /* empty */
-       | rexpression_list
-       ;
+        : /* empty */
+        | rexpression_list
+        ;

 
 rexpression_list
 
 rexpression_list

-       : rexp
-       | rexpression_list comma rexp
-       | error
-       | rexpression_list error
-       | rexpression_list error rexp
-       | rexpression_list comma error
-       ;
+        : rexp
+        | rexpression_list comma rexp
+        | error
+        | rexpression_list error
+        | rexpression_list error rexp
+        | rexpression_list comma error
+        ;

 
 opt_expression_list
 
 opt_expression_list

-       : /* empty */
-       | expression_list
-       ;
+        : /* empty */
+        | expression_list
+        ;

 
 expression_list
 
 expression_list

-       : exp
-       | expression_list comma exp
-       | error
-       | expression_list error
-       | expression_list error exp
-       | expression_list comma error
-       ;
+        : exp
+        | expression_list comma exp
+        | error
+        | expression_list error
+        | expression_list error exp
+        | expression_list comma error
+        ;

 
 /* Expressions, not including the comma operator.  */
 
 /* Expressions, not including the comma operator.  */

-exp    : variable ASSIGNOP {} exp
-       | '(' expression_list r_paren LEX_IN NAME
-       | exp '|' LEX_GETLINE opt_variable
-       | exp TWOWAYIO LEX_GETLINE opt_variable
-       | LEX_GETLINE opt_variable input_redir
-       | exp LEX_AND exp
-       | exp LEX_OR exp
-       | exp MATCHOP exp
-       | regexp
-       | '!' regexp %prec UNARY
-       | exp LEX_IN NAME
-       | exp RELOP exp
-       | exp '<' exp
-       | exp '>' exp
-       | exp '?' exp ':' exp
-       | simp_exp
-       | exp simp_exp %prec CONCAT_OP
-       ;
+exp     : variable ASSIGNOP {} exp
+        | '(' expression_list r_paren LEX_IN NAME
+        | exp '|' LEX_GETLINE opt_variable
+        | exp TWOWAYIO LEX_GETLINE opt_variable
+        | LEX_GETLINE opt_variable input_redir
+        | exp LEX_AND exp
+        | exp LEX_OR exp
+        | exp MATCHOP exp
+        | regexp
+        | '!' regexp %prec UNARY
+        | exp LEX_IN NAME
+        | exp RELOP exp
+        | exp '<' exp
+        | exp '>' exp
+        | exp '?' exp ':' exp
+        | simp_exp
+        | exp simp_exp %prec CONCAT_OP
+        ;

 
 rexp
 
 rexp

-       : variable ASSIGNOP {} rexp
-       | rexp LEX_AND rexp
-       | rexp LEX_OR rexp
-       | LEX_GETLINE opt_variable input_redir
-       | regexp
-       | '!' regexp %prec UNARY
-       | rexp MATCHOP rexp
-       | rexp LEX_IN NAME
-       | rexp RELOP rexp
-       | rexp '?' rexp ':' rexp
-       | simp_exp
-       | rexp simp_exp %prec CONCAT_OP
-       ;
+        : variable ASSIGNOP {} rexp
+        | rexp LEX_AND rexp
+        | rexp LEX_OR rexp
+        | LEX_GETLINE opt_variable input_redir
+        | regexp
+        | '!' regexp %prec UNARY
+        | rexp MATCHOP rexp
+        | rexp LEX_IN NAME
+        | rexp RELOP rexp
+        | rexp '?' rexp ':' rexp
+        | simp_exp
+        | rexp simp_exp %prec CONCAT_OP
+        ;

 
 simp_exp
 
 simp_exp

-       : non_post_simp_exp
-       /* Binary operators in order of decreasing precedence.  */
-       | simp_exp '^' simp_exp
-       | simp_exp '*' simp_exp
-       | simp_exp '/' simp_exp
-       | simp_exp '%' simp_exp
-       | simp_exp '+' simp_exp
-       | simp_exp '-' simp_exp
-       | variable INCREMENT
-       | variable DECREMENT
-       ;
+        : non_post_simp_exp
+        /* Binary operators in order of decreasing precedence.  */
+        | simp_exp '^' simp_exp
+        | simp_exp '*' simp_exp
+        | simp_exp '/' simp_exp
+        | simp_exp '%' simp_exp
+        | simp_exp '+' simp_exp
+        | simp_exp '-' simp_exp
+        | variable INCREMENT
+        | variable DECREMENT
+        ;

 
 non_post_simp_exp
 
 non_post_simp_exp

-       : '!' simp_exp %prec UNARY
-       | '(' exp r_paren
-       | LEX_BUILTIN
-         '(' opt_expression_list r_paren
-       | LEX_LENGTH '(' opt_expression_list r_paren
-       | LEX_LENGTH
-       | FUNC_CALL '(' opt_expression_list r_paren
-       | variable
-       | INCREMENT variable
-       | DECREMENT variable
-       | YNUMBER
-       | YSTRING
-       | '-' simp_exp    %prec UNARY
-       | '+' simp_exp    %prec UNARY
-       ;
+        : '!' simp_exp %prec UNARY
+        | '(' exp r_paren
+        | LEX_BUILTIN
+          '(' opt_expression_list r_paren
+        | LEX_LENGTH '(' opt_expression_list r_paren
+        | LEX_LENGTH
+        | FUNC_CALL '(' opt_expression_list r_paren
+        | variable
+        | INCREMENT variable
+        | DECREMENT variable
+        | YNUMBER
+        | YSTRING
+        | '-' simp_exp    %prec UNARY
+        | '+' simp_exp    %prec UNARY
+        ;

 
 opt_variable
 
 opt_variable

-       : /* empty */
-       | variable
-       ;
+        : /* empty */
+        | variable
+        ;

 
 variable
 
 variable

-       : NAME
-       | NAME '[' expression_list ']'
-       | '$' non_post_simp_exp
-       ;
+        : NAME
+        | NAME '[' expression_list ']'
+        | '$' non_post_simp_exp
+        ;

 
 l_brace
 
 l_brace

-       : '{' opt_nls
-       ;
+        : '{' opt_nls
+        ;

 
 r_brace
 
 r_brace

-       : '}' opt_nls
-       ;
+        : '}' opt_nls
+        ;

 
 r_paren
 
 r_paren

-       : ')'
-       ;
+        : ')'
+        ;

 
 opt_semi
 
 opt_semi

-       : /* empty */
-       | semi
-       ;
+        : /* empty */
+        | semi
+        ;

 
 semi
 
 semi

-       : ';'
-       ;
+        : ';'
+        ;

 
 

-comma  : ',' opt_nls
-       ;
+comma   : ',' opt_nls
+        ;

 ]],
 
 dnl INPUT
 ]],
 
 dnl INPUT


@@ -424,8 +424,8 @@ dnl don't like even `print $!4;'.
 
 dnl BISON-STDERR
 [AT_COND_CASE([[canonical LR]],
 
 dnl BISON-STDERR
 [AT_COND_CASE([[canonical LR]],

-[[input.y: conflicts: 265 shift/reduce]],
-[[input.y: conflicts: 65 shift/reduce]])[
+[[input.y: warning: 265 shift/reduce conflicts [-Wconflicts-sr]]],
+[[input.y: warning: 65 shift/reduce conflicts [-Wconflicts-sr]]])[

 ]],
 
 dnl LAST-STATE
 ]],
 
 dnl LAST-STATE


@@ -778,36 +778,35 @@ dnl In the case of the syntax error, the parser recovers, so it returns 0.
 # It reported 80 SR && 99 RR conflicts instead of 78/10!!!
 
 AT_TEST_EXISTING_GRAMMAR([[GNU Cim Grammar]],
 # It reported 80 SR && 99 RR conflicts instead of 78/10!!!
 
 AT_TEST_EXISTING_GRAMMAR([[GNU Cim Grammar]],

-[[%union {}
-
+[[

 %token
 %token

-       HACTIVATE HAFTER /*HAND*/ HARRAY HAT
-       HBEFORE HBEGIN HBOOLEAN
-       HCHARACTER HCLASS /*HCOMMENT*/ HCONC
-       HDELAY HDO
-       HELSE HEND HEQ /*HEQV*/ HEXTERNAL
-       HFOR
-       HGE HGO HGOTO HGT
-       HHIDDEN
-       HIF /*HIMP*/ HIN HINNER HINSPECT HINTEGER HIS
-       HLABEL HLE HLONG HLT
-       HNAME HNE HNEW HNONE /*HNOT*/ HNOTEXT
-       /*HOR*/ HOTHERWISE
-       HPRIOR HPROCEDURE HPROTECTED
-       HQUA
-       HREACTIVATE HREAL HREF
-       HSHORT HSTEP HSWITCH
-       HTEXT HTHEN HTHIS HTO
-       HUNTIL
-       HVALUE HVAR HVIRTUAL
-       HWHEN HWHILE
-
-       HASSIGNVALUE HASSIGNREF
-       /*HDOT*/ HPAREXPSEPARATOR HLABELSEPARATOR HSTATEMENTSEPARATOR
-       HBEGPAR HENDPAR
-       HEQR HNER
-       HADD HSUB HMUL HDIV HINTDIV HEXP
-       HDOTDOTDOT
+        HACTIVATE HAFTER /*HAND*/ HARRAY HAT
+        HBEFORE HBEGIN HBOOLEAN
+        HCHARACTER HCLASS /*HCOMMENT*/ HCONC
+        HDELAY HDO
+        HELSE HEND HEQ /*HEQV*/ HEXTERNAL
+        HFOR
+        HGE HGO HGOTO HGT
+        HHIDDEN
+        HIF /*HIMP*/ HIN HINNER HINSPECT HINTEGER HIS
+        HLABEL HLE HLONG HLT
+        HNAME HNE HNEW HNONE /*HNOT*/ HNOTEXT
+        /*HOR*/ HOTHERWISE
+        HPRIOR HPROCEDURE HPROTECTED
+        HQUA
+        HREACTIVATE HREAL HREF
+        HSHORT HSTEP HSWITCH
+        HTEXT HTHEN HTHIS HTO
+        HUNTIL
+        HVALUE HVAR HVIRTUAL
+        HWHEN HWHILE
+
+        HASSIGNVALUE HASSIGNREF
+        /*HDOT*/ HPAREXPSEPARATOR HLABELSEPARATOR HSTATEMENTSEPARATOR
+        HBEGPAR HENDPAR
+        HEQR HNER
+        HADD HSUB HMUL HDIV HINTDIV HEXP
+        HDOTDOTDOT

 
 %token HIDENTIFIER
 %token HBOOLEANKONST HINTEGERKONST HCHARACTERKONST
 
 %token HIDENTIFIER
 %token HBOOLEANKONST HINTEGERKONST HCHARACTERKONST


@@ -827,7 +826,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU Cim Grammar]],
 
 %left HVALRELOPERATOR HREFRELOPERATOR HOBJRELOPERATOR
 
 
 %left HVALRELOPERATOR HREFRELOPERATOR HOBJRELOPERATOR
 

-%left  HCONC
+%left   HCONC

 
 %left HTERMOPERATOR
 %left UNEAR
 
 %left HTERMOPERATOR
 %left UNEAR


@@ -843,522 +842,522 @@ AT_TEST_EXISTING_GRAMMAR([[GNU Cim Grammar]],
 [[
 /* GRAMATIKK FOR PROGRAM MODULES */
 MAIN_MODULE     :       {}
 [[
 /* GRAMATIKK FOR PROGRAM MODULES */
 MAIN_MODULE     :       {}

-                       MODULS
-               |       error HSTATEMENTSEPARATOR MBEE_DECLSTMS
-               ;
-EXT_DECLARATION        :       HEXTERNAL
-                       MBEE_TYPE
-                       HPROCEDURE
-                               {}
-                       EXT_LIST
-               |
-                       HEXTERNAL
-                       HIDENTIFIER
-                       HPROCEDURE
-                               {}
-                       HIDENTIFIER {}
-                       EXTERNAL_KIND_ITEM
-               |       HEXTERNAL
-                       HCLASS
-                               {}
-                       EXT_LIST
-
-               ;
-EXTERNAL_KIND_ITEM:    EXT_IDENT
-                       HOBJRELOPERATOR
-                               {}
-                       MBEE_TYPE HPROCEDURE
-                       HIDENTIFIER
-                               {}
-                       HEADING EMPTY_BLOCK
-                               {}
-/*             |
-                       EXT_IDENT
-                               {}
-                       MBEE_REST_EXT_LIST
-               ;
-MBEE_REST_EXT_LIST:    /* EMPTY
-               |       HPAREXPSEPARATOR EXT_KIND_LIST
-               ;
-EXT_KIND_LIST  :       EXT_KIND_ITEM
-               |       EXT_KIND_LIST HPAREXPSEPARATOR EXT_KIND_ITEM
-               ;
-EXT_KIND_ITEM  :       HIDENTIFIER
-                       EXT_IDENT
-                               {}*/
-               ;
-EMPTY_BLOCK    :       /*EMPT*/
-               |       HBEGIN HEND
-               ;
-EXT_LIST       :       EXT_ITEM
-               |       EXT_LIST HPAREXPSEPARATOR EXT_ITEM
-               ;
-EXT_ITEM       :       HIDENTIFIER
-                       EXT_IDENT
-               ;
-EXT_IDENT      :       /* EMPTY */
-               |       HVALRELOPERATOR {}
-                       HTEXTKONST
-               ;
+                        MODULS
+                |       error HSTATEMENTSEPARATOR MBEE_DECLSTMS
+                ;
+EXT_DECLARATION :       HEXTERNAL
+                        MBEE_TYPE
+                        HPROCEDURE
+                                {}
+                        EXT_LIST
+                |
+                        HEXTERNAL
+                        HIDENTIFIER
+                        HPROCEDURE
+                                {}
+                        HIDENTIFIER {}
+                        EXTERNAL_KIND_ITEM
+                |       HEXTERNAL
+                        HCLASS
+                                {}
+                        EXT_LIST
+
+                ;
+EXTERNAL_KIND_ITEM:     EXT_IDENT
+                        HOBJRELOPERATOR
+                                {}
+                        MBEE_TYPE HPROCEDURE
+                        HIDENTIFIER
+                                {}
+                        HEADING EMPTY_BLOCK
+                                {}
+/*              |
+                        EXT_IDENT
+                                {}
+                        MBEE_REST_EXT_LIST
+                ;
+MBEE_REST_EXT_LIST:     /* EMPTY
+                |       HPAREXPSEPARATOR EXT_KIND_LIST
+                ;
+EXT_KIND_LIST   :       EXT_KIND_ITEM
+                |       EXT_KIND_LIST HPAREXPSEPARATOR EXT_KIND_ITEM
+                ;
+EXT_KIND_ITEM   :       HIDENTIFIER
+                        EXT_IDENT
+                                {}*/
+                ;
+EMPTY_BLOCK     :       /*EMPT*/
+                |       HBEGIN HEND
+                ;
+EXT_LIST        :       EXT_ITEM
+                |       EXT_LIST HPAREXPSEPARATOR EXT_ITEM
+                ;
+EXT_ITEM        :       HIDENTIFIER
+                        EXT_IDENT
+                ;
+EXT_IDENT       :       /* EMPTY */
+                |       HVALRELOPERATOR {}
+                        HTEXTKONST
+                ;

 /* GRAMATIKK FOR TYPER */
 NO_TYPE         :       /*EMPT*/
 /* GRAMATIKK FOR TYPER */
 NO_TYPE         :       /*EMPT*/

-               ;
+                ;

 MBEE_TYPE       :       NO_TYPE
 MBEE_TYPE       :       NO_TYPE

-               |       TYPE
-               ;
+                |       TYPE
+                ;

 TYPE            :       HREF HBEGPAR
 TYPE            :       HREF HBEGPAR

-                       HIDENTIFIER
-                               {}
-                       HENDPAR
-               |       HTEXT
-               |       HBOOLEAN
-               |       HCHARACTER
-               |       HSHORT HINTEGER
-               |       HINTEGER
-               |       HREAL
-               |       HLONG HREAL
-               ;
+                        HIDENTIFIER
+                                {}
+                        HENDPAR
+                |       HTEXT
+                |       HBOOLEAN
+                |       HCHARACTER
+                |       HSHORT HINTEGER
+                |       HINTEGER
+                |       HREAL
+                |       HLONG HREAL
+                ;

 
 /* GRAMATIKK FOR DEL AV SETNINGER */
 MBEE_ELSE_PART  :       /*EMPT*/
 
 /* GRAMATIKK FOR DEL AV SETNINGER */
 MBEE_ELSE_PART  :       /*EMPT*/

-/*             |       HELSE
-                       HIF
-                       EXPRESSION
-                       HTHEN   {}
-                       BLOCK   {}
-                       MBEE_ELSE_PART          {}*/
-               |       HELSE   {}
-                       BLOCK
-               ;
+/*              |       HELSE
+                        HIF
+                        EXPRESSION
+                        HTHEN   {}
+                        BLOCK   {}
+                        MBEE_ELSE_PART          {}*/
+                |       HELSE   {}
+                        BLOCK
+                ;

 FOR_LIST        :       FOR_LIST_ELEMENT
 FOR_LIST        :       FOR_LIST_ELEMENT

-               |       FOR_LIST_ELEMENT
-                       HPAREXPSEPARATOR
-                       FOR_LIST
-               ;
+                |       FOR_LIST_ELEMENT
+                        HPAREXPSEPARATOR
+                        FOR_LIST
+                ;

 FOR_LIST_ELEMENT:       EXPRESSION
 FOR_LIST_ELEMENT:       EXPRESSION

-                       MBEE_F_L_EL_R_PT
-               ;
+                        MBEE_F_L_EL_R_PT
+                ;

 MBEE_F_L_EL_R_PT:       /*EMPT*/
 MBEE_F_L_EL_R_PT:       /*EMPT*/

-               |       HWHILE
-                       EXPRESSION
-               |       HSTEP
-                       EXPRESSION
-                       HUNTIL
-                       EXPRESSION
-               ;
+                |       HWHILE
+                        EXPRESSION
+                |       HSTEP
+                        EXPRESSION
+                        HUNTIL
+                        EXPRESSION
+                ;

 GOTO            :       HGO
 GOTO            :       HGO

-                       HTO
-               |       HGOTO
-               ;
+                        HTO
+                |       HGOTO
+                ;

 CONN_STATE_R_PT :       WHEN_CLAUSE_LIST
 CONN_STATE_R_PT :       WHEN_CLAUSE_LIST

-               |       HDO   {}
-                       BLOCK
-               ;
+                |       HDO   {}
+                        BLOCK
+                ;

 WHEN_CLAUSE_LIST:       HWHEN
 WHEN_CLAUSE_LIST:       HWHEN

-                       HIDENTIFIER
-                       HDO    {}
-                       BLOCK
-               |       WHEN_CLAUSE_LIST
-                       HWHEN
-                       HIDENTIFIER
-                       HDO    {}
-                       BLOCK
-               ;
+                        HIDENTIFIER
+                        HDO    {}
+                        BLOCK
+                |       WHEN_CLAUSE_LIST
+                        HWHEN
+                        HIDENTIFIER
+                        HDO    {}
+                        BLOCK
+                ;

 MBEE_OTWI_CLAUS :       /*EMPT*/
 MBEE_OTWI_CLAUS :       /*EMPT*/

-               |       HOTHERWISE {}
-
-                       BLOCK
-               ;
-ACTIVATOR      :       HACTIVATE
-               |       HREACTIVATE
-               ;
-SCHEDULE       :       /*EMPT*/
-               |       ATDELAY EXPRESSION      {}
-                       PRIOR
-               |       BEFOREAFTER             {}
-                       EXPRESSION
-               ;
-ATDELAY                :       HAT
-               |       HDELAY
-               ;
-BEFOREAFTER    :       HBEFORE
-               |       HAFTER
-               ;
-PRIOR          :       /*EMPT*/
-               |       HPRIOR
-               ;
+                |       HOTHERWISE {}
+
+                        BLOCK
+                ;
+ACTIVATOR       :       HACTIVATE
+                |       HREACTIVATE
+                ;
+SCHEDULE        :       /*EMPT*/
+                |       ATDELAY EXPRESSION      {}
+                        PRIOR
+                |       BEFOREAFTER             {}
+                        EXPRESSION
+                ;
+ATDELAY         :       HAT
+                |       HDELAY
+                ;
+BEFOREAFTER     :       HBEFORE
+                |       HAFTER
+                ;
+PRIOR           :       /*EMPT*/
+                |       HPRIOR
+                ;

 /* GRAMATIKK FOR SETNINGER OG DEKLARASJONER */
 MODULSTATEMENT  :       HWHILE
 /* GRAMATIKK FOR SETNINGER OG DEKLARASJONER */
 MODULSTATEMENT  :       HWHILE

-                       EXPRESSION
-                       HDO     {}
-                       BLOCK
-               |       HIF
-                       EXPRESSION
-                       HTHEN   {}
-                       BLOCK   {}
-                       MBEE_ELSE_PART
-               |       HFOR
-                       HIDENTIFIER
-                       HASSIGN {}
-                       FOR_LIST
-                       HDO     {}
-                       BLOCK
-               |       GOTO
-                       EXPRESSION
-               |       HINSPECT
-                       EXPRESSION              {}
-                       CONN_STATE_R_PT
-                               {}
-                       MBEE_OTWI_CLAUS
-               |       HINNER
-               |       HIDENTIFIER
-                       HLABELSEPARATOR
-                               {}
-                       DECLSTATEMENT
-               |       EXPRESSION_SIMP
-                       HBEGIN
-                               {}
-                       IMPORT_SPEC_MODULE
-                               {}
-                       MBEE_DECLSTMS
-                       HEND
-               |       EXPRESSION_SIMP HBEGIN error HSTATEMENTSEPARATOR
-                       MBEE_DECLSTMS HEND
-               |       EXPRESSION_SIMP HBEGIN error HEND
-               |       EXPRESSION_SIMP
-               |       ACTIVATOR EXPRESSION SCHEDULE
-               |       HBEGIN
-                               {}
-                       MBEE_DECLSTMS
-                       HEND
-               |       MBEE_TYPE HPROCEDURE
-                       HIDENTIFIER
-                               {}
-                       HEADING BLOCK
-               |       HIDENTIFIER
-                       HCLASS
-                       NO_TYPE
-                               {}
-                       IMPORT_SPEC_MODULE
-                       HIDENTIFIER
-                               {}
-                       HEADING
-                       BLOCK
-               |       HCLASS
-                       NO_TYPE
-                       HIDENTIFIER
-                               {}
-                       HEADING
-                       BLOCK
-               |       EXT_DECLARATION
-               |       /*EMPT*/
-               ;
+                        EXPRESSION
+                        HDO     {}
+                        BLOCK
+                |       HIF
+                        EXPRESSION
+                        HTHEN   {}
+                        BLOCK   {}
+                        MBEE_ELSE_PART
+                |       HFOR
+                        HIDENTIFIER
+                        HASSIGN {}
+                        FOR_LIST
+                        HDO     {}
+                        BLOCK
+                |       GOTO
+                        EXPRESSION
+                |       HINSPECT
+                        EXPRESSION              {}
+                        CONN_STATE_R_PT
+                                {}
+                        MBEE_OTWI_CLAUS
+                |       HINNER
+                |       HIDENTIFIER
+                        HLABELSEPARATOR
+                                {}
+                        DECLSTATEMENT
+                |       EXPRESSION_SIMP
+                        HBEGIN
+                                {}
+                        IMPORT_SPEC_MODULE
+                                {}
+                        MBEE_DECLSTMS
+                        HEND
+                |       EXPRESSION_SIMP HBEGIN error HSTATEMENTSEPARATOR
+                        MBEE_DECLSTMS HEND
+                |       EXPRESSION_SIMP HBEGIN error HEND
+                |       EXPRESSION_SIMP
+                |       ACTIVATOR EXPRESSION SCHEDULE
+                |       HBEGIN
+                                {}
+                        MBEE_DECLSTMS
+                        HEND
+                |       MBEE_TYPE HPROCEDURE
+                        HIDENTIFIER
+                                {}
+                        HEADING BLOCK
+                |       HIDENTIFIER
+                        HCLASS
+                        NO_TYPE
+                                {}
+                        IMPORT_SPEC_MODULE
+                        HIDENTIFIER
+                                {}
+                        HEADING
+                        BLOCK
+                |       HCLASS
+                        NO_TYPE
+                        HIDENTIFIER
+                                {}
+                        HEADING
+                        BLOCK
+                |       EXT_DECLARATION
+                |       /*EMPT*/
+                ;

 IMPORT_SPEC_MODULE:
 IMPORT_SPEC_MODULE:

-               ;
-DECLSTATEMENT  :       MODULSTATEMENT
-               |       TYPE
-                       HIDENTIFIER
-                       MBEE_CONSTANT
-                       HPAREXPSEPARATOR
-                               {}
-                       IDENTIFIER_LISTC
-               |       TYPE
-                       HIDENTIFIER
-                       MBEE_CONSTANT
-               |       MBEE_TYPE
-                       HARRAY  {}
-                       ARR_SEGMENT_LIST
-               |       HSWITCH
-                       HIDENTIFIER
-                       HASSIGN {}
-                       SWITCH_LIST
-               ;
+                ;
+DECLSTATEMENT   :       MODULSTATEMENT
+                |       TYPE
+                        HIDENTIFIER
+                        MBEE_CONSTANT
+                        HPAREXPSEPARATOR
+                                {}
+                        IDENTIFIER_LISTC
+                |       TYPE
+                        HIDENTIFIER
+                        MBEE_CONSTANT
+                |       MBEE_TYPE
+                        HARRAY  {}
+                        ARR_SEGMENT_LIST
+                |       HSWITCH
+                        HIDENTIFIER
+                        HASSIGN {}
+                        SWITCH_LIST
+                ;

 BLOCK           :       DECLSTATEMENT
 BLOCK           :       DECLSTATEMENT

-               |       HBEGIN MBEE_DECLSTMS HEND
-               |       HBEGIN error HSTATEMENTSEPARATOR MBEE_DECLSTMS HEND
-               |       HBEGIN error HEND
-               ;
+                |       HBEGIN MBEE_DECLSTMS HEND
+                |       HBEGIN error HSTATEMENTSEPARATOR MBEE_DECLSTMS HEND
+                |       HBEGIN error HEND
+                ;

 MBEE_DECLSTMS   :       MBEE_DECLSTMSU
 MBEE_DECLSTMS   :       MBEE_DECLSTMSU

-               ;
+                ;

 MBEE_DECLSTMSU  :       DECLSTATEMENT
 MBEE_DECLSTMSU  :       DECLSTATEMENT

-               |       MBEE_DECLSTMSU
-                       HSTATEMENTSEPARATOR
-                       DECLSTATEMENT
-               ;
-MODULS         :       MODULSTATEMENT
-               |       MODULS HSTATEMENTSEPARATOR MODULSTATEMENT
-               ;
+                |       MBEE_DECLSTMSU
+                        HSTATEMENTSEPARATOR
+                        DECLSTATEMENT
+                ;
+MODULS          :       MODULSTATEMENT
+                |       MODULS HSTATEMENTSEPARATOR MODULSTATEMENT
+                ;

 /* GRAMATIKK FOR DEL AV DEKLARASJONER */
 ARR_SEGMENT_LIST:       ARR_SEGMENT
 /* GRAMATIKK FOR DEL AV DEKLARASJONER */
 ARR_SEGMENT_LIST:       ARR_SEGMENT

-               |       ARR_SEGMENT_LIST
-                       HPAREXPSEPARATOR
-                       ARR_SEGMENT
-               ;
-ARR_SEGMENT    :       ARRAY_SEGMENT
-                       HBEGPAR
-                       BAUND_PAIR_LIST HENDPAR
-               ;
+                |       ARR_SEGMENT_LIST
+                        HPAREXPSEPARATOR
+                        ARR_SEGMENT
+                ;
+ARR_SEGMENT     :       ARRAY_SEGMENT
+                        HBEGPAR
+                        BAUND_PAIR_LIST HENDPAR
+                ;

 ARRAY_SEGMENT   :       ARRAY_SEGMENT_EL        {}
 
 ARRAY_SEGMENT   :       ARRAY_SEGMENT_EL        {}
 

-               |       ARRAY_SEGMENT_EL
-                       HPAREXPSEPARATOR
-                       ARRAY_SEGMENT
-               ;
+                |       ARRAY_SEGMENT_EL
+                        HPAREXPSEPARATOR
+                        ARRAY_SEGMENT
+                ;

 ARRAY_SEGMENT_EL:       HIDENTIFIER
 ARRAY_SEGMENT_EL:       HIDENTIFIER

-               ;
+                ;

 BAUND_PAIR_LIST :       BAUND_PAIR
 BAUND_PAIR_LIST :       BAUND_PAIR

-               |       BAUND_PAIR
-                       HPAREXPSEPARATOR
-                       BAUND_PAIR_LIST
-               ;
+                |       BAUND_PAIR
+                        HPAREXPSEPARATOR
+                        BAUND_PAIR_LIST
+                ;

 BAUND_PAIR      :       EXPRESSION
 BAUND_PAIR      :       EXPRESSION

-                       HLABELSEPARATOR
-                       EXPRESSION
-               ;
+                        HLABELSEPARATOR
+                        EXPRESSION
+                ;

 SWITCH_LIST     :       EXPRESSION
 SWITCH_LIST     :       EXPRESSION

-               |       EXPRESSION
-                       HPAREXPSEPARATOR
-                       SWITCH_LIST
-               ;
+                |       EXPRESSION
+                        HPAREXPSEPARATOR
+                        SWITCH_LIST
+                ;

 HEADING         :       MBEE_FMAL_PAR_P HSTATEMENTSEPARATOR {}
 HEADING         :       MBEE_FMAL_PAR_P HSTATEMENTSEPARATOR {}

-                       MBEE_MODE_PART  {}
-                       MBEE_SPEC_PART  {}
-                       MBEE_PROT_PART  {}
-                       MBEE_VIRT_PART
-               ;
+                        MBEE_MODE_PART  {}
+                        MBEE_SPEC_PART  {}
+                        MBEE_PROT_PART  {}
+                        MBEE_VIRT_PART
+                ;

 MBEE_FMAL_PAR_P :       /*EMPT*/
 MBEE_FMAL_PAR_P :       /*EMPT*/

-               |       FMAL_PAR_PART
-               ;
+                |       FMAL_PAR_PART
+                ;

 FMAL_PAR_PART   :       HBEGPAR NO_TYPE
 FMAL_PAR_PART   :       HBEGPAR NO_TYPE

-                       MBEE_LISTV HENDPAR
-               ;
+                        MBEE_LISTV HENDPAR
+                ;

 MBEE_LISTV      :       /*EMPT*/
 MBEE_LISTV      :       /*EMPT*/

-               |       LISTV
-               ;
+                |       LISTV
+                ;

 LISTV           :       HIDENTIFIER
 LISTV           :       HIDENTIFIER

-               |       FPP_CATEG HDOTDOTDOT
-               |       HIDENTIFIER     {}
-                       HPAREXPSEPARATOR LISTV
-               |       FPP_SPEC
-               |       FPP_SPEC
-                       HPAREXPSEPARATOR LISTV
-               ;
+                |       FPP_CATEG HDOTDOTDOT
+                |       HIDENTIFIER     {}
+                        HPAREXPSEPARATOR LISTV
+                |       FPP_SPEC
+                |       FPP_SPEC
+                        HPAREXPSEPARATOR LISTV
+                ;

 FPP_HEADING     :       HBEGPAR NO_TYPE
 FPP_HEADING     :       HBEGPAR NO_TYPE

-                       FPP_MBEE_LISTV HENDPAR
-               ;
+                        FPP_MBEE_LISTV HENDPAR
+                ;

 FPP_MBEE_LISTV  :       /*EMPT*/
 FPP_MBEE_LISTV  :       /*EMPT*/

-               |       FPP_LISTV
-               ;
-FPP_LISTV       :      FPP_CATEG HDOTDOTDOT
-               |       FPP_SPEC
-               |       FPP_SPEC
-                       HPAREXPSEPARATOR LISTV
-               ;
+                |       FPP_LISTV
+                ;
+FPP_LISTV       :       FPP_CATEG HDOTDOTDOT
+                |       FPP_SPEC
+                |       FPP_SPEC
+                        HPAREXPSEPARATOR LISTV
+                ;

 FPP_SPEC        :       FPP_CATEG SPECIFIER HIDENTIFIER
 FPP_SPEC        :       FPP_CATEG SPECIFIER HIDENTIFIER

-               |       FPP_CATEG FPP_PROC_DECL_IN_SPEC
-               ;
+                |       FPP_CATEG FPP_PROC_DECL_IN_SPEC
+                ;

 FPP_CATEG       :       HNAME HLABELSEPARATOR
 FPP_CATEG       :       HNAME HLABELSEPARATOR

-               |       HVALUE HLABELSEPARATOR
-               |       HVAR HLABELSEPARATOR
-               |       /*EMPT*/
-               ;
-FPP_PROC_DECL_IN_SPEC: MBEE_TYPE HPROCEDURE
-                       HIDENTIFIER
-                                       {}
-                       FPP_HEADING {} { /* Yes, two "final" actions. */ }
-               ;
+                |       HVALUE HLABELSEPARATOR
+                |       HVAR HLABELSEPARATOR
+                |       /*EMPT*/
+                ;
+FPP_PROC_DECL_IN_SPEC:  MBEE_TYPE HPROCEDURE
+                        HIDENTIFIER
+                                        {}
+                        FPP_HEADING {} { /* Yes, two "final" actions. */ }
+                ;

 IDENTIFIER_LISTV:       HIDENTIFIER
 IDENTIFIER_LISTV:       HIDENTIFIER

-               |       HDOTDOTDOT
-               |       HIDENTIFIER     {}
-                       HPAREXPSEPARATOR IDENTIFIER_LISTV
-               ;
+                |       HDOTDOTDOT
+                |       HIDENTIFIER     {}
+                        HPAREXPSEPARATOR IDENTIFIER_LISTV
+                ;

 MBEE_MODE_PART  :       /*EMPT*/
 MBEE_MODE_PART  :       /*EMPT*/

-               |       MODE_PART
-               ;
+                |       MODE_PART
+                ;

 MODE_PART       :       NAME_PART
 MODE_PART       :       NAME_PART

-               |       VALUE_PART
-               |       VAR_PART
-               |       NAME_PART VALUE_PART
-               |       VALUE_PART NAME_PART
-               |       NAME_PART VAR_PART
-               |       VAR_PART NAME_PART
-               |       VALUE_PART VAR_PART
-               |       VAR_PART VALUE_PART
-               |       VAR_PART NAME_PART VALUE_PART
-               |       NAME_PART VAR_PART VALUE_PART
-               |       NAME_PART VALUE_PART VAR_PART
-               |       VAR_PART VALUE_PART NAME_PART
-               |       VALUE_PART VAR_PART NAME_PART
-               |       VALUE_PART NAME_PART VAR_PART
-               ;
+                |       VALUE_PART
+                |       VAR_PART
+                |       NAME_PART VALUE_PART
+                |       VALUE_PART NAME_PART
+                |       NAME_PART VAR_PART
+                |       VAR_PART NAME_PART
+                |       VALUE_PART VAR_PART
+                |       VAR_PART VALUE_PART
+                |       VAR_PART NAME_PART VALUE_PART
+                |       NAME_PART VAR_PART VALUE_PART
+                |       NAME_PART VALUE_PART VAR_PART
+                |       VAR_PART VALUE_PART NAME_PART
+                |       VALUE_PART VAR_PART NAME_PART
+                |       VALUE_PART NAME_PART VAR_PART
+                ;

 NAME_PART       :       HNAME           {}
 NAME_PART       :       HNAME           {}

-                       IDENTIFIER_LISTV
-                       HSTATEMENTSEPARATOR
-               ;
+                        IDENTIFIER_LISTV
+                        HSTATEMENTSEPARATOR
+                ;

 VAR_PART        :       HVAR            {}
 VAR_PART        :       HVAR            {}

-                       IDENTIFIER_LISTV
-                       HSTATEMENTSEPARATOR
-               ;
+                        IDENTIFIER_LISTV
+                        HSTATEMENTSEPARATOR
+                ;

 VALUE_PART      :       HVALUE          {}
 VALUE_PART      :       HVALUE          {}

-                       IDENTIFIER_LISTV HSTATEMENTSEPARATOR
-               ;
+                        IDENTIFIER_LISTV HSTATEMENTSEPARATOR
+                ;

 MBEE_SPEC_PART  :       /*EMPT*/
 MBEE_SPEC_PART  :       /*EMPT*/

-               |       SPEC_PART
-               ;
+                |       SPEC_PART
+                ;

 SPEC_PART       :       ONE_SPEC
 SPEC_PART       :       ONE_SPEC

-               |       SPEC_PART ONE_SPEC
-               ;
-ONE_SPEC       :       SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR
-               |       NO_TYPE HPROCEDURE HIDENTIFIER HOBJRELOPERATOR
-                         {}
-                       PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
-               |       FPP_PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
-               |       MBEE_TYPE HPROCEDURE HIDENTIFIER HSTATEMENTSEPARATOR
-               |       MBEE_TYPE HPROCEDURE HIDENTIFIER HPAREXPSEPARATOR
-                       IDENTIFIER_LIST HSTATEMENTSEPARATOR
-               ;
+                |       SPEC_PART ONE_SPEC
+                ;
+ONE_SPEC        :       SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR
+                |       NO_TYPE HPROCEDURE HIDENTIFIER HOBJRELOPERATOR
+                          {}
+                        PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
+                |       FPP_PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
+                |       MBEE_TYPE HPROCEDURE HIDENTIFIER HSTATEMENTSEPARATOR
+                |       MBEE_TYPE HPROCEDURE HIDENTIFIER HPAREXPSEPARATOR
+                        IDENTIFIER_LIST HSTATEMENTSEPARATOR
+                ;

 SPECIFIER       :       TYPE
 SPECIFIER       :       TYPE

-               |       MBEE_TYPE
-                       HARRAY
-               |       HLABEL
-               |       HSWITCH
-               ;
-PROC_DECL_IN_SPEC:     MBEE_TYPE HPROCEDURE
-                       HIDENTIFIER
-                                       {}
-                       HEADING
-                                       {}
-                       MBEE_BEGIN_END
-               ;
-MBEE_BEGIN_END :       /* EMPTY */
-               |       HBEGIN HEND
-               ;
+                |       MBEE_TYPE
+                        HARRAY
+                |       HLABEL
+                |       HSWITCH
+                ;
+PROC_DECL_IN_SPEC:      MBEE_TYPE HPROCEDURE
+                        HIDENTIFIER
+                                        {}
+                        HEADING
+                                        {}
+                        MBEE_BEGIN_END
+                ;
+MBEE_BEGIN_END  :       /* EMPTY */
+                |       HBEGIN HEND
+                ;

 MBEE_PROT_PART  :       /*EMPT*/
 MBEE_PROT_PART  :       /*EMPT*/

-               |       PROTECTION_PART
-               ;
+                |       PROTECTION_PART
+                ;

 PROTECTION_PART :       PROT_SPECIFIER IDENTIFIER_LIST
 PROTECTION_PART :       PROT_SPECIFIER IDENTIFIER_LIST

-                       HSTATEMENTSEPARATOR
-               |       PROTECTION_PART  PROT_SPECIFIER
-                       IDENTIFIER_LIST HSTATEMENTSEPARATOR
-               ;
+                        HSTATEMENTSEPARATOR
+                |       PROTECTION_PART  PROT_SPECIFIER
+                        IDENTIFIER_LIST HSTATEMENTSEPARATOR
+                ;

 PROT_SPECIFIER  :       HHIDDEN
 PROT_SPECIFIER  :       HHIDDEN

-               |       HPROTECTED
-               |       HHIDDEN
-                       HPROTECTED
-               |       HPROTECTED
-                       HHIDDEN
-               ;
+                |       HPROTECTED
+                |       HHIDDEN
+                        HPROTECTED
+                |       HPROTECTED
+                        HHIDDEN
+                ;

 MBEE_VIRT_PART  :       /*EMPT*/
 MBEE_VIRT_PART  :       /*EMPT*/

-               |       VIRTUAL_PART
-               ;
+                |       VIRTUAL_PART
+                ;

 VIRTUAL_PART    :       HVIRTUAL
 VIRTUAL_PART    :       HVIRTUAL

-                       HLABELSEPARATOR
-                       MBEE_SPEC_PART
-               ;
+                        HLABELSEPARATOR
+                        MBEE_SPEC_PART
+                ;

 IDENTIFIER_LIST :       HIDENTIFIER
 IDENTIFIER_LIST :       HIDENTIFIER

-               |       IDENTIFIER_LIST HPAREXPSEPARATOR
-                       HIDENTIFIER
-               ;
+                |       IDENTIFIER_LIST HPAREXPSEPARATOR
+                        HIDENTIFIER
+                ;

 IDENTIFIER_LISTC:       HIDENTIFIER
 IDENTIFIER_LISTC:       HIDENTIFIER

-                       MBEE_CONSTANT
-               |       IDENTIFIER_LISTC HPAREXPSEPARATOR
-                       HIDENTIFIER
-                       MBEE_CONSTANT
-               ;
-MBEE_CONSTANT  :       /* EMPTY */
-               |       HVALRELOPERATOR
-                               {}
-                       EXPRESSION
-               ;
+                        MBEE_CONSTANT
+                |       IDENTIFIER_LISTC HPAREXPSEPARATOR
+                        HIDENTIFIER
+                        MBEE_CONSTANT
+                ;
+MBEE_CONSTANT   :       /* EMPTY */
+                |       HVALRELOPERATOR
+                                {}
+                        EXPRESSION
+                ;

 
 /* GRAMATIKK FOR UTTRYKK */
 EXPRESSION      :       EXPRESSION_SIMP
 
 /* GRAMATIKK FOR UTTRYKK */
 EXPRESSION      :       EXPRESSION_SIMP

-               |       HIF
-                       EXPRESSION
-                       HTHEN
-                       EXPRESSION
-                       HELSE
-                       EXPRESSION
-               ;
-EXPRESSION_SIMP :      EXPRESSION_SIMP
-                       HASSIGN
-                       EXPRESSION
-               |
-
-                       EXPRESSION_SIMP
-                       HCONC
-                       EXPRESSION_SIMP
-               |       EXPRESSION_SIMP HOR
-                       HELSE
-                       EXPRESSION_SIMP
-                       %prec HORELSE
-               |       EXPRESSION_SIMP HAND
-                       HTHEN
-                       EXPRESSION_SIMP
-                       %prec HANDTHEN
-               |       EXPRESSION_SIMP
-                       HEQV EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HIMP EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HOR EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HAND EXPRESSION_SIMP
-               |       HNOT EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HVALRELOPERATOR
-                       EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HREFRELOPERATOR
-                       EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HOBJRELOPERATOR
-                       EXPRESSION_SIMP
-               |       HTERMOPERATOR
-                       EXPRESSION_SIMP %prec UNEAR
-               |       EXPRESSION_SIMP
-                       HTERMOPERATOR
-                       EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HFACTOROPERATOR
-                       EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HPRIMARYOPERATOR
-                       EXPRESSION_SIMP
-               |       HBEGPAR
-                       EXPRESSION HENDPAR
-               |       HTEXTKONST
-               |       HCHARACTERKONST
-               |       HREALKONST
-               |       HINTEGERKONST
-               |       HBOOLEANKONST
-               |       HNONE
-               |       HIDENTIFIER
-                               {}
-                       MBEE_ARG_R_PT
-               |       HTHIS HIDENTIFIER
-               |       HNEW
-                       HIDENTIFIER
-                       ARG_R_PT
-               |       EXPRESSION_SIMP
-                       HDOT
-                       EXPRESSION_SIMP
-               |       EXPRESSION_SIMP
-                       HQUA HIDENTIFIER
-               ;
+                |       HIF
+                        EXPRESSION
+                        HTHEN
+                        EXPRESSION
+                        HELSE
+                        EXPRESSION
+                ;
+EXPRESSION_SIMP :       EXPRESSION_SIMP
+                        HASSIGN
+                        EXPRESSION
+                |
+
+                        EXPRESSION_SIMP
+                        HCONC
+                        EXPRESSION_SIMP
+                |       EXPRESSION_SIMP HOR
+                        HELSE
+                        EXPRESSION_SIMP
+                        %prec HORELSE
+                |       EXPRESSION_SIMP HAND
+                        HTHEN
+                        EXPRESSION_SIMP
+                        %prec HANDTHEN
+                |       EXPRESSION_SIMP
+                        HEQV EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HIMP EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HOR EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HAND EXPRESSION_SIMP
+                |       HNOT EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HVALRELOPERATOR
+                        EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HREFRELOPERATOR
+                        EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HOBJRELOPERATOR
+                        EXPRESSION_SIMP
+                |       HTERMOPERATOR
+                        EXPRESSION_SIMP %prec UNEAR
+                |       EXPRESSION_SIMP
+                        HTERMOPERATOR
+                        EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HFACTOROPERATOR
+                        EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HPRIMARYOPERATOR
+                        EXPRESSION_SIMP
+                |       HBEGPAR
+                        EXPRESSION HENDPAR
+                |       HTEXTKONST
+                |       HCHARACTERKONST
+                |       HREALKONST
+                |       HINTEGERKONST
+                |       HBOOLEANKONST
+                |       HNONE
+                |       HIDENTIFIER
+                                {}
+                        MBEE_ARG_R_PT
+                |       HTHIS HIDENTIFIER
+                |       HNEW
+                        HIDENTIFIER
+                        ARG_R_PT
+                |       EXPRESSION_SIMP
+                        HDOT
+                        EXPRESSION_SIMP
+                |       EXPRESSION_SIMP
+                        HQUA HIDENTIFIER
+                ;

 ARG_R_PT        :       /*EMPTY*/
 ARG_R_PT        :       /*EMPTY*/

-               |       HBEGPAR
-                       ARGUMENT_LIST HENDPAR
-               ;
+                |       HBEGPAR
+                        ARGUMENT_LIST HENDPAR
+                ;

 MBEE_ARG_R_PT   :       /*EMPTY*/
 MBEE_ARG_R_PT   :       /*EMPTY*/

-               |       HBEGPAR
-                       ARGUMENT_LIST HENDPAR
-               ;
+                |       HBEGPAR
+                        ARGUMENT_LIST HENDPAR
+                ;

 ARGUMENT_LIST   :       EXPRESSION
 ARGUMENT_LIST   :       EXPRESSION

-               |       EXPRESSION
-                       HPAREXPSEPARATOR
-                       ARGUMENT_LIST
-               ;
+                |       EXPRESSION
+                        HPAREXPSEPARATOR
+                        ARGUMENT_LIST
+                ;

 ]],
 
 dnl INPUT
 ]],
 
 dnl INPUT


@@ -1366,8 +1365,10 @@ dnl INPUT
 
 dnl BISON-STDERR
 [AT_COND_CASE([[canonical LR]],
 
 dnl BISON-STDERR
 [AT_COND_CASE([[canonical LR]],

-[[input.y: conflicts: 1876 shift/reduce, 144 reduce/reduce]],
-[[input.y: conflicts: 78 shift/reduce, 10 reduce/reduce]])[
+[[input.y: warning: 1876 shift/reduce conflicts [-Wconflicts-sr]
+input.y: warning: 144 reduce/reduce conflicts [-Wconflicts-rr]]],
+[[input.y: warning: 78 shift/reduce conflicts [-Wconflicts-sr]
+input.y: warning: 10 reduce/reduce conflicts [-Wconflicts-rr]]])[

 ]],
 
 dnl LAST-STATE
 ]],
 
 dnl LAST-STATE


@@ -1400,7 +1401,6 @@ State 427 conflicts: 9 shift/reduce, 2 reduce/reduce
 
 AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 [[%error-verbose
 
 AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 [[%error-verbose

-%union {}

 
 %token LABEL
 %token VARIABLE
 
 %token LABEL
 %token VARIABLE


@@ -1480,7 +1480,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 %token RAND
 %token SRAND
 %token COPY
 %token RAND
 %token SRAND
 %token COPY

-%token THRU
+%token THROUGH

 %token TOP
 %token BOTTOM
 %token UPPER
 %token TOP
 %token BOTTOM
 %token UPPER


@@ -1569,367 +1569,367 @@ works */
 ]],
 [[
 top:
 ]],
 [[
 top:

-       optional_separator
-       | element_list
-       ;
+        optional_separator
+        | element_list
+        ;

 
 element_list:
 
 element_list:

-       optional_separator middle_element_list optional_separator
-       ;
+        optional_separator middle_element_list optional_separator
+        ;

 
 middle_element_list:
 
 middle_element_list:

-       element
-       | middle_element_list separator element
-       ;
+        element
+        | middle_element_list separator element
+        ;

 
 optional_separator:
 
 optional_separator:

-       /* empty */
-       | separator
-       ;
+        /* empty */
+        | separator
+        ;

 
 separator:
 
 separator:

-       ';'
-       | separator ';'
-       ;
+        ';'
+        | separator ';'
+        ;

 
 placeless_element:
 
 placeless_element:

-       VARIABLE '=' any_expr
-       | VARIABLE ':' '=' any_expr
-       | UP
-       | DOWN
-       | LEFT
-       | RIGHT
-       | COMMAND_LINE
-       | COMMAND print_args
-       | PRINT print_args
-       | SH
-               {}
-         DELIMITED
-       | COPY TEXT
-       | COPY TEXT THRU
-               {}
-         DELIMITED
-               {}
-         until
-       | COPY THRU
-               {}
-         DELIMITED
-               {}
-         until
-       | FOR VARIABLE '=' expr TO expr optional_by DO
-               {}
-         DELIMITED
-       | simple_if
-       | simple_if ELSE
-               {}
-         DELIMITED
-       | reset_variables
-       | RESET
-       ;
+        VARIABLE '=' any_expr
+        | VARIABLE ':' '=' any_expr
+        | UP
+        | DOWN
+        | LEFT
+        | RIGHT
+        | COMMAND_LINE
+        | COMMAND print_args
+        | PRINT print_args
+        | SH
+                {}
+          DELIMITED
+        | COPY TEXT
+        | COPY TEXT THROUGH
+                {}
+          DELIMITED
+                {}
+          until
+        | COPY THROUGH
+                {}
+          DELIMITED
+                {}
+          until
+        | FOR VARIABLE '=' expr TO expr optional_by DO
+                {}
+          DELIMITED
+        | simple_if
+        | simple_if ELSE
+                {}
+          DELIMITED
+        | reset_variables
+        | RESET
+        ;

 
 reset_variables:
 
 reset_variables:

-       RESET VARIABLE
-       | reset_variables VARIABLE
-       | reset_variables ',' VARIABLE
-       ;
+        RESET VARIABLE
+        | reset_variables VARIABLE
+        | reset_variables ',' VARIABLE
+        ;

 
 print_args:
 
 print_args:

-       print_arg
-       | print_args print_arg
-       ;
+        print_arg
+        | print_args print_arg
+        ;

 
 print_arg:
 
 print_arg:

-       expr                                                    %prec ','
-       | text
-       | position                                              %prec ','
-       ;
+        expr                                                    %prec ','
+        | text
+        | position                                              %prec ','
+        ;

 
 simple_if:
 
 simple_if:

-       IF any_expr THEN
-               {}
-       DELIMITED
-       ;
+        IF any_expr THEN
+                {}
+        DELIMITED
+        ;

 
 until:
 
 until:

-       /* empty */
-       | UNTIL TEXT
-       ;
+        /* empty */
+        | UNTIL TEXT
+        ;

 
 any_expr:
 
 any_expr:

-       expr
-       | text_expr
-       ;
+        expr
+        | text_expr
+        ;

 
 text_expr:
 
 text_expr:

-       text EQUALEQUAL text
-       | text NOTEQUAL text
-       | text_expr ANDAND text_expr
-       | text_expr ANDAND expr
-       | expr ANDAND text_expr
-       | text_expr OROR text_expr
-       | text_expr OROR expr
-       | expr OROR text_expr
-       | '!' text_expr
-       ;
+        text EQUALEQUAL text
+        | text NOTEQUAL text
+        | text_expr ANDAND text_expr
+        | text_expr ANDAND expr
+        | expr ANDAND text_expr
+        | text_expr OROR text_expr
+        | text_expr OROR expr
+        | expr OROR text_expr
+        | '!' text_expr
+        ;

 
 optional_by:
 
 optional_by:

-       /* empty */
-       | BY expr
-       | BY '*' expr
-       ;
+        /* empty */
+        | BY expr
+        | BY '*' expr
+        ;

 
 element:
 
 element:

-       object_spec
-       | LABEL ':' optional_separator element
-       | LABEL ':' optional_separator position_not_place
-       | LABEL ':' optional_separator place
-       | '{' {} element_list '}'
-               {}
-         optional_element
-       | placeless_element
-       ;
+        object_spec
+        | LABEL ':' optional_separator element
+        | LABEL ':' optional_separator position_not_place
+        | LABEL ':' optional_separator place
+        | '{' {} element_list '}'
+                {}
+          optional_element
+        | placeless_element
+        ;

 
 optional_element:
 
 optional_element:

-       /* empty */
-       | element
-       ;
+        /* empty */
+        | element
+        ;

 
 object_spec:
 
 object_spec:

-       BOX
-       | CIRCLE
-       | ELLIPSE
-       | ARC
-       | LINE
-       | ARROW
-       | MOVE
-       | SPLINE
-       | text                                                  %prec TEXT
-       | PLOT expr
-       | PLOT expr text
-       | '['
-               {}
-         element_list ']'
-       | object_spec HEIGHT expr
-       | object_spec RADIUS expr
-       | object_spec WIDTH expr
-       | object_spec DIAMETER expr
-       | object_spec expr                                      %prec HEIGHT
-       | object_spec UP
-       | object_spec UP expr
-       | object_spec DOWN
-       | object_spec DOWN expr
-       | object_spec RIGHT
-       | object_spec RIGHT expr
-       | object_spec LEFT
-       | object_spec LEFT expr
-       | object_spec FROM position
-       | object_spec TO position
-       | object_spec AT position
-       | object_spec WITH path
-       | object_spec WITH position                             %prec ','
-       | object_spec BY expr_pair
-       | object_spec THEN
-       | object_spec SOLID
-       | object_spec DOTTED
-       | object_spec DOTTED expr
-       | object_spec DASHED
-       | object_spec DASHED expr
-       | object_spec FILL
-       | object_spec FILL expr
-       | object_spec SHADED text
-       | object_spec COLORED text
-       | object_spec OUTLINED text
-       | object_spec CHOP
-       | object_spec CHOP expr
-       | object_spec SAME
-       | object_spec INVISIBLE
-       | object_spec LEFT_ARROW_HEAD
-       | object_spec RIGHT_ARROW_HEAD
-       | object_spec DOUBLE_ARROW_HEAD
-       | object_spec CW
-       | object_spec CCW
-       | object_spec text                                      %prec TEXT
-       | object_spec LJUST
-       | object_spec RJUST
-       | object_spec ABOVE
-       | object_spec BELOW
-       | object_spec THICKNESS expr
-       | object_spec ALIGNED
-       ;
+        BOX
+        | CIRCLE
+        | ELLIPSE
+        | ARC
+        | LINE
+        | ARROW
+        | MOVE
+        | SPLINE
+        | text                                                  %prec TEXT
+        | PLOT expr
+        | PLOT expr text
+        | '['
+                {}
+          element_list ']'
+        | object_spec HEIGHT expr
+        | object_spec RADIUS expr
+        | object_spec WIDTH expr
+        | object_spec DIAMETER expr
+        | object_spec expr                                      %prec HEIGHT
+        | object_spec UP
+        | object_spec UP expr
+        | object_spec DOWN
+        | object_spec DOWN expr
+        | object_spec RIGHT
+        | object_spec RIGHT expr
+        | object_spec LEFT
+        | object_spec LEFT expr
+        | object_spec FROM position
+        | object_spec TO position
+        | object_spec AT position
+        | object_spec WITH path
+        | object_spec WITH position                             %prec ','
+        | object_spec BY expr_pair
+        | object_spec THEN
+        | object_spec SOLID
+        | object_spec DOTTED
+        | object_spec DOTTED expr
+        | object_spec DASHED
+        | object_spec DASHED expr
+        | object_spec FILL
+        | object_spec FILL expr
+        | object_spec SHADED text
+        | object_spec COLORED text
+        | object_spec OUTLINED text
+        | object_spec CHOP
+        | object_spec CHOP expr
+        | object_spec SAME
+        | object_spec INVISIBLE
+        | object_spec LEFT_ARROW_HEAD
+        | object_spec RIGHT_ARROW_HEAD
+        | object_spec DOUBLE_ARROW_HEAD
+        | object_spec CW
+        | object_spec CCW
+        | object_spec text                                      %prec TEXT
+        | object_spec LJUST
+        | object_spec RJUST
+        | object_spec ABOVE
+        | object_spec BELOW
+        | object_spec THICKNESS expr
+        | object_spec ALIGNED
+        ;

 
 text:
 
 text:

-       TEXT
-       | SPRINTF '(' TEXT sprintf_args ')'
-       ;
+        TEXT
+        | SPRINTF '(' TEXT sprintf_args ')'
+        ;

 
 sprintf_args:
 
 sprintf_args:

-       /* empty */
-       | sprintf_args ',' expr
-       ;
+        /* empty */
+        | sprintf_args ',' expr
+        ;

 
 position:
 
 position:

-       position_not_place
-       | place
-       ;
+        position_not_place
+        | place
+        ;

 
 position_not_place:
 
 position_not_place:

-       expr_pair
-       | position '+' expr_pair
-       | position '-' expr_pair
-       | '(' position ',' position ')'
-       | expr between position AND position
-       | expr '<' position ',' position '>'
-       ;
+        expr_pair
+        | position '+' expr_pair
+        | position '-' expr_pair
+        | '(' position ',' position ')'
+        | expr between position AND position
+        | expr '<' position ',' position '>'
+        ;

 
 between:
 
 between:

-       BETWEEN
-       | OF THE WAY BETWEEN
-       ;
+        BETWEEN
+        | OF THE WAY BETWEEN
+        ;

 
 expr_pair:
 
 expr_pair:

-       expr ',' expr
-       | '(' expr_pair ')'
-       ;
+        expr ',' expr
+        | '(' expr_pair ')'
+        ;

 
 place:
 
 place:

-       /* line at A left == line (at A) left */
-       label                                                   %prec CHOP
-       | label corner
-       | corner label
-       | corner OF label
-       | HERE
-       ;
+        /* line at A left == line (at A) left */
+        label                                                   %prec CHOP
+        | label corner
+        | corner label
+        | corner OF label
+        | HERE
+        ;

 
 label:
 
 label:

-       LABEL
-       | nth_primitive
-       | label '.' LABEL
-       ;
+        LABEL
+        | nth_primitive
+        | label '.' LABEL
+        ;

 
 ordinal:
 
 ordinal:

-       ORDINAL
-       | '`' any_expr TH
-       ;
+        ORDINAL
+        | '`' any_expr TH
+        ;

 
 optional_ordinal_last:
 
 optional_ordinal_last:

-       LAST
-       | ordinal LAST
-       ;
+        LAST
+        | ordinal LAST
+        ;

 
 nth_primitive:
 
 nth_primitive:

-       ordinal object_type
-       | optional_ordinal_last object_type
-       ;
+        ordinal object_type
+        | optional_ordinal_last object_type
+        ;

 
 object_type:
 
 object_type:

-       BOX
-       | CIRCLE
-       | ELLIPSE
-       | ARC
-       | LINE
-       | ARROW
-       | SPLINE
-       | '[' ']'
-       | TEXT
-       ;
+        BOX
+        | CIRCLE
+        | ELLIPSE
+        | ARC
+        | LINE
+        | ARROW
+        | SPLINE
+        | '[' ']'
+        | TEXT
+        ;

 
 label_path:
 
 label_path:

-       '.' LABEL
-       | label_path '.' LABEL
-       ;
+        '.' LABEL
+        | label_path '.' LABEL
+        ;

 
 relative_path:
 
 relative_path:

-       corner                                                  %prec CHOP
-       /* give this a lower precedence than LEFT and RIGHT so that
-          [A: box] with .A left == [A: box] with (.A left) */
-       | label_path                                            %prec TEXT
-       | label_path corner
-       ;
+        corner                                                  %prec CHOP
+        /* give this a lower precedence than LEFT and RIGHT so that
+           [A: box] with .A left == [A: box] with (.A left) */
+        | label_path                                            %prec TEXT
+        | label_path corner
+        ;

 
 path:
 
 path:

-       relative_path
-       | '(' relative_path ',' relative_path ')'
-               {}
-       /* The rest of these rules are a compatibility sop. */
-       | ORDINAL LAST object_type relative_path
-       | LAST object_type relative_path
-       | ORDINAL object_type relative_path
-       | LABEL relative_path
-       ;
+        relative_path
+        | '(' relative_path ',' relative_path ')'
+                {}
+        /* The rest of these rules are a compatibility sop. */
+        | ORDINAL LAST object_type relative_path
+        | LAST object_type relative_path
+        | ORDINAL object_type relative_path
+        | LABEL relative_path
+        ;

 
 corner:
 
 corner:

-       DOT_N
-       | DOT_E
-       | DOT_W
-       | DOT_S
-       | DOT_NE
-       | DOT_SE
-       | DOT_NW
-       | DOT_SW
-       | DOT_C
-       | DOT_START
-       | DOT_END
-       | TOP
-       | BOTTOM
-       | LEFT
-       | RIGHT
-       | UPPER LEFT
-       | LOWER LEFT
-       | UPPER RIGHT
-       | LOWER RIGHT
-       | LEFT_CORNER
-       | RIGHT_CORNER
-       | UPPER LEFT_CORNER
-       | LOWER LEFT_CORNER
-       | UPPER RIGHT_CORNER
-       | LOWER RIGHT_CORNER
-       | NORTH
-       | SOUTH
-       | EAST
-       | WEST
-       | CENTER
-       | START
-       | END
-       ;
+        DOT_N
+        | DOT_E
+        | DOT_W
+        | DOT_S
+        | DOT_NE
+        | DOT_SE
+        | DOT_NW
+        | DOT_SW
+        | DOT_C
+        | DOT_START
+        | DOT_END
+        | TOP
+        | BOTTOM
+        | LEFT
+        | RIGHT
+        | UPPER LEFT
+        | LOWER LEFT
+        | UPPER RIGHT
+        | LOWER RIGHT
+        | LEFT_CORNER
+        | RIGHT_CORNER
+        | UPPER LEFT_CORNER
+        | LOWER LEFT_CORNER
+        | UPPER RIGHT_CORNER
+        | LOWER RIGHT_CORNER
+        | NORTH
+        | SOUTH
+        | EAST
+        | WEST
+        | CENTER
+        | START
+        | END
+        ;

 
 expr:
 
 expr:

-       VARIABLE
-       | NUMBER
-       | place DOT_X
-       | place DOT_Y
-       | place DOT_HT
-       | place DOT_WID
-       | place DOT_RAD
-       | expr '+' expr
-       | expr '-' expr
-       | expr '*' expr
-       | expr '/' expr
-       | expr '%' expr
-       | expr '^' expr
-       | '-' expr                                              %prec '!'
-       | '(' any_expr ')'
-       | SIN '(' any_expr ')'
-       | COS '(' any_expr ')'
-       | ATAN2 '(' any_expr ',' any_expr ')'
-       | LOG '(' any_expr ')'
-       | EXP '(' any_expr ')'
-       | SQRT '(' any_expr ')'
-       | K_MAX '(' any_expr ',' any_expr ')'
-       | K_MIN '(' any_expr ',' any_expr ')'
-       | INT '(' any_expr ')'
-       | RAND '(' any_expr ')'
-       | RAND '(' ')'
-       | SRAND '(' any_expr ')'
-       | expr '<' expr
-       | expr LESSEQUAL expr
-       | expr '>' expr
-       | expr GREATEREQUAL expr
-       | expr EQUALEQUAL expr
-       | expr NOTEQUAL expr
-       | expr ANDAND expr
-       | expr OROR expr
-       | '!' expr
-       ;
+        VARIABLE
+        | NUMBER
+        | place DOT_X
+        | place DOT_Y
+        | place DOT_HT
+        | place DOT_WID
+        | place DOT_RAD
+        | expr '+' expr
+        | expr '-' expr
+        | expr '*' expr
+        | expr '/' expr
+        | expr '%' expr
+        | expr '^' expr
+        | '-' expr                                              %prec '!'
+        | '(' any_expr ')'
+        | SIN '(' any_expr ')'
+        | COS '(' any_expr ')'
+        | ATAN2 '(' any_expr ',' any_expr ')'
+        | LOG '(' any_expr ')'
+        | EXP '(' any_expr ')'
+        | SQRT '(' any_expr ')'
+        | K_MAX '(' any_expr ',' any_expr ')'
+        | K_MIN '(' any_expr ',' any_expr ')'
+        | INT '(' any_expr ')'
+        | RAND '(' any_expr ')'
+        | RAND '(' ')'
+        | SRAND '(' any_expr ')'
+        | expr '<' expr
+        | expr LESSEQUAL expr
+        | expr '>' expr
+        | expr GREATEREQUAL expr
+        | expr EQUALEQUAL expr
+        | expr NOTEQUAL expr
+        | expr ANDAND expr
+        | expr OROR expr
+        | '!' expr
+        ;

 ]],
 
 dnl INPUT
 ]],
 
 dnl INPUT


@@ -1950,7 +1950,7 @@ dnl without being followed by "of".)
 [[VARIABLE, '=', LABEL, LEFT, DOT_X]],
 
 dnl BISON-STDERR
 [[VARIABLE, '=', LABEL, LEFT, DOT_X]],
 
 dnl BISON-STDERR

-[[input.y:471.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path
+[[input.y:470.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path [-Wother]

 ]],
 
 dnl LAST-STATE
 ]],
 
 dnl LAST-STATE