Changes in src/Parser/parser.yy [cc22003:5fcba14]

File:

• src/Parser/parser.yy (modified) (95 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  8 17:50:07 2018
-// Update Count     : 3998
+// Last Modified On : Mon Nov 27 17:23:35 2017
+// Update Count     : 2992
 //
 
@@ -115 +115 @@
 } // distExt
 
-void distInl( DeclarationNode * declaration ) {
-        // distribute EXTENSION across all declarations
-        for ( DeclarationNode *iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                iter->set_inLine( true );
-        } // for
-} // distInl
-
-void distQual( DeclarationNode * declaration, DeclarationNode * qualifiers ) {
-        // distribute qualifiers across all non-variable declarations in a distribution statemement
-        for ( DeclarationNode * iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
-                // SKULLDUGGERY: Distributions are parsed inside out, so qualifiers are added to declarations inside out. Since
-                // addQualifiers appends to the back of the list, the forall clauses are in the wrong order (right to left). To
-                // get the qualifiers in the correct order and still use addQualifiers (otherwise, 90% of addQualifiers has to
-                // be copied to add to front), the appropriate forall pointers are interchanged before calling addQualifiers.
-                DeclarationNode * clone = qualifiers->clone();
-                if ( qualifiers->type ) {                                               // forall clause ? (handles SC)
-                        if ( iter->type->kind == TypeData::Aggregate ) { // struct/union ?
-                                swap( clone->type->forall, iter->type->aggregate.params );
-                                iter->addQualifiers( clone );
-                        } else if ( iter->type->kind == TypeData::AggregateInst && iter->type->aggInst.aggregate->aggregate.body ) { // struct/union ?
-                                // Create temporary node to hold aggregate, call addQualifiers as above, then put nodes back together.
-                                DeclarationNode newnode;
-                                swap( newnode.type, iter->type->aggInst.aggregate );
-                                swap( clone->type->forall, newnode.type->aggregate.params );
-                                newnode.addQualifiers( clone );
-                                swap( newnode.type, iter->type->aggInst.aggregate );
-                        } else if ( iter->type->kind == TypeData::Function ) { // routines ?
-                                swap( clone->type->forall, iter->type->forall );
-                                iter->addQualifiers( clone );
-                        } // if
-                } else {                                                                                // just SC qualifiers
-                        iter->addQualifiers( clone );
-                } // if
-        } // for
-        delete qualifiers;
-} // distQual
-
 // There is an ambiguity for inline generic-routine return-types and generic routines.
 //   forall( otype T ) struct S { int i; } bar( T ) {}
 // Does the forall bind to the struct or the routine, and how would it be possible to explicitly specify the binding.
 //   forall( otype T ) struct S { int T; } forall( otype W ) bar( W ) {}
-// Currently, the forall is associated with the routine, and the generic type has to be separately defined:
-//   forall( otype T ) struct S { int T; };
-//   forall( otype W ) bar( W ) {}
 
 void rebindForall( DeclarationNode * declSpec, DeclarationNode * funcDecl ) {
-        if ( declSpec->type->kind == TypeData::Aggregate ) { // ignore aggregate definition
+        if ( declSpec->type->kind == TypeData::Aggregate ) { // return is aggregate definition
                 funcDecl->type->forall = declSpec->type->aggregate.params; // move forall from aggregate to function type
                 declSpec->type->aggregate.params = nullptr;
@@ -167 +127 @@
 } // rebindForall
 
-NameExpr * build_postfix_name( const string * name ) {
-        NameExpr * new_name = build_varref( new string( "?`" + *name ) );
-        delete name;
-        return new_name;
-} // build_postfix_name
-
-DeclarationNode * fieldDecl( DeclarationNode * typeSpec, DeclarationNode * fieldList ) {
-        if ( ! fieldList ) {                                                            // field declarator ?
-                if ( ! ( typeSpec->type && typeSpec->type->kind == TypeData::Aggregate ) ) {
-                        stringstream ss;
-                        typeSpec->type->print( ss );
-                        SemanticWarning( yylloc, Warning::SuperfluousDecl, ss.str().c_str() );
-                        return nullptr;
-                } // if
-                fieldList = DeclarationNode::newName( nullptr );
-        } // if
-        return distAttr( typeSpec, fieldList );                         // mark all fields in list
-} // fieldDecl
-
-ForCtrl * forCtrl( ExpressionNode * type, string * index, ExpressionNode * start, enum OperKinds compop, ExpressionNode * comp, ExpressionNode * inc ) {
-        return new ForCtrl(
-                distAttr( DeclarationNode::newTypeof( type ), DeclarationNode::newName( index )->addInitializer( new InitializerNode( start ) ) ),
-                new ExpressionNode( build_binary_val( compop, new ExpressionNode( build_varref( new string( *index ) ) ), comp ) ),
-                new ExpressionNode( build_binary_val( OperKinds::PlusAssn, new ExpressionNode( build_varref( new string( *index ) ) ), inc ) ) );
-} // forCtrl
-
-
-bool forall = false, yyy = false;                                               // aggregate have one or more forall qualifiers ?
+bool forall = false;                                                                    // aggregate have one or more forall qualifiers ?
 
 // https://www.gnu.org/software/bison/manual/bison.html#Location-Type
@@ -225 +158 @@
         WaitForStmt * wfs;
         Expression * constant;
-        IfCtrl * ifctl;
-        ForCtrl * fctl;
-        enum OperKinds compop;
+        IfCtl * ifctl;
+        ForCtl * fctl;
         LabelNode * label;
         InitializerNode * in;
@@ -234 +166 @@
         bool flag;
         CatchStmt::Kind catch_kind;
-        GenericExpr * genexpr;
 }
 
@@ -256 +187 @@
 %token TYPEOF LABEL                                                                             // GCC
 %token ENUM STRUCT UNION
-%token EXCEPTION                                                                                // CFA
 %token COROUTINE MONITOR THREAD                                                 // CFA
 %token OTYPE FTYPE DTYPE TTYPE TRAIT                                    // CFA
@@ -271 +201 @@
 %token<tok> ATTR_IDENTIFIER             ATTR_TYPEDEFname                ATTR_TYPEGENname
 %token<tok> INTEGERconstant             CHARACTERconstant               STRINGliteral
-%token<tok> DIRECTIVE
 // Floating point constant is broken into three kinds of tokens because of the ambiguity with tuple indexing and
 // overloading constants 0/1, e.g., x.1 is lexed as (x)(.1), where (.1) is a factional constant, but is semantically
@@ -290 +219 @@
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
 
-%token Erange                                                                                   // ~=
 %token ATassign                                                                                 // @=
 
@@ -313 +241 @@
 %type<ifctl> if_control_expression
 %type<fctl> for_control_expression
-%type<compop> inclexcl
 %type<en> subrange
 %type<decl> asm_name_opt
@@ -321 +248 @@
 %type<flag> asm_volatile_opt
 %type<en> handler_predicate_opt
-%type<genexpr> generic_association generic_assoc_list
 
 // statements
 %type<sn> statement                                             labeled_statement                       compound_statement
 %type<sn> statement_decl                                statement_decl_list                     statement_list_nodecl
-%type<sn> selection_statement                   if_statement
-%type<sn> switch_clause_list_opt                switch_clause_list
+%type<sn> selection_statement
+%type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
 %type<en> case_value
 %type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
+%type<sn> fall_through                                  fall_through_opt
 %type<sn> iteration_statement                   jump_statement
 %type<sn> expression_statement                  asm_statement
-%type<sn> with_statement
-%type<en> with_clause_opt
+%type<sn> with_statement                                with_clause_opt
 %type<sn> exception_statement                   handler_clause                          finally_clause
 %type<catch_kind> handler_key
@@ -349 +275 @@
 %type<decl> aggregate_type aggregate_type_nobody
 
-%type<decl> assertion assertion_list assertion_list_opt
+%type<decl> assertion assertion_list_opt
 
 %type<en>   bit_subrange_size_opt bit_subrange_size
@@ -365 +291 @@
 %type<en> enumerator_value_opt
 
-%type<decl> external_definition external_definition_list external_definition_list_opt
-
-%type<decl> exception_declaration
-
-%type<decl> field_declaration_list_opt field_declaration field_declaring_list_opt field_declarator field_abstract_list_opt field_abstract
-%type<en> field field_name_list field_name fraction_constants_opt
+%type<decl> exception_declaration external_definition external_definition_list external_definition_list_opt
+
+%type<decl> field_declaration field_declaration_list field_declarator field_declaring_list
+%type<en> field field_list field_name fraction_constants
 
 %type<decl> external_function_definition function_definition function_array function_declarator function_no_ptr function_ptr
@@ -383 +307 @@
 %type<decl> cfa_array_parameter_1st_dimension
 
-%type<decl> cfa_trait_declaring_list cfa_declaration cfa_field_declaring_list cfa_field_abstract_list
+%type<decl> cfa_trait_declaring_list cfa_declaration cfa_field_declaring_list
 %type<decl> cfa_function_declaration cfa_function_return cfa_function_specifier
 
@@ -389 +313 @@
 %type<decl> cfa_identifier_parameter_declarator_tuple cfa_identifier_parameter_ptr
 
-%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_ellipsis_list_opt
+%type<decl> cfa_parameter_declaration cfa_parameter_list cfa_parameter_type_list cfa_parameter_type_list_opt
 
 %type<decl> cfa_typedef_declaration cfa_variable_declaration cfa_variable_specifier
 
-%type<decl> c_declaration static_assert
+%type<decl> c_declaration
 %type<decl> KR_function_declarator KR_function_no_ptr KR_function_ptr KR_function_array
-%type<decl> KR_parameter_list KR_parameter_list_opt
-
-%type<decl> parameter_declaration parameter_list parameter_type_list_opt
+%type<decl> KR_declaration_list KR_declaration_list_opt
+
+%type<decl> parameter_declaration parameter_list parameter_type_list
+%type<decl> parameter_type_list_opt
 
 %type<decl> paren_identifier paren_type
@@ -418 +343 @@
 %type<decl> type_parameter type_parameter_list type_initializer_opt
 
-%type<en> type_parameters_opt type_list
+%type<en> type_list
 
 %type<decl> type_qualifier type_qualifier_name forall type_qualifier_list_opt type_qualifier_list
@@ -429 +354 @@
 
 // initializers
-%type<in>  initializer initializer_list_opt initializer_opt
+%type<in>  initializer initializer_list initializer_opt
 
 // designators
@@ -453 +378 @@
 //   Foo ( *fp )( int );
 //   `---'                                              matches start of TYPEGENname '('
-// must be:
+// Must be:
 //   Foo( int ) ( *fp )( int );
-// The same problem occurs here:
-//   forall( otype T ) struct Foo { T v; } ( *fp )( int );
-// must be:
-//   forall( otype T ) struct Foo { T v; } ( int ) ( *fp )( int );
 
 // Order of these lines matters (low-to-high precedence).
 %precedence TYPEGENname
-%precedence '}'
 %precedence '('
 
-%locations                                                                                              // support location tracking for error messages
+%locations                      // support location tracking for error messages
 
 %start translation_unit                                                                 // parse-tree root
@@ -472 +392 @@
 //************************* Namespace Management ********************************
 
-// The C grammar is not context free because it relies on the distinct terminal symbols "identifier" and "TYPEDEFname",
-// which are lexically identical.
-//
-//   typedef int foo; // identifier foo must now be scanned as TYPEDEFname
-//   foo f;           // to allow it to appear in this context
-//
-// While it may be possible to write a purely context-free grammar, such a grammar would obscure the relationship
-// between syntactic and semantic constructs.  Cforall compounds this problem by introducing type names local to the
-// scope of a declaration (for instance, those introduced through "forall" qualifiers), and by introducing "type
-// generators" -- parameterized types.  This latter type name creates a third class of identifiers, "TYPEGENname", which
-// must be distinguished by the lexical scanner.
-//
-// Since the scanner cannot distinguish among the different classes of identifiers without some context information,
-// there is a type table (typedefTable), which holds type names and identifiers that override type names, for each named
-// scope. During parsing, semantic actions update the type table by adding new identifiers in the current scope. For
-// each context that introduces a name scope, a new level is created in the type table and that level is popped on
-// exiting the scope.  Since type names can be local to a particular declaration, each declaration is itself a scope.
-// This requires distinguishing between type names that are local to the current declaration scope and those that
-// persist past the end of the declaration (i.e., names defined in "typedef" or "otype" declarations).
-//
-// The non-terminals "push" and "pop" denote the opening and closing of named scopes. Every push has a matching pop in
-// the production rule. There are multiple lists of declarations, where each declaration is a named scope, so pop/push
-// around the list separator.
-//
-//  int f( forall(T) T (*f1) T , forall( S ) S (*f2)( S ) );
-//      push               pop   push                   pop
+// The grammar in the ANSI C standard is not strictly context-free, since it relies upon the distinct terminal symbols
+// "identifier", "TYPEDEFname", and "TYPEGENname" that are lexically identical.  While it is possible to write a purely
+// context-free grammar, such a grammar would obscure the relationship between syntactic and semantic constructs.
+// Hence, this grammar uses the ANSI style.
+//
+// Cforall compounds this problem by introducing type names local to the scope of a declaration (for instance, those
+// introduced through "forall" qualifiers), and by introducing "type generators" -- parameterized types.  This latter
+// type name creates a third class of identifiers that must be distinguished by the scanner.
+//
+// Since the scanner cannot distinguish among the different classes of identifiers without some context information, it
+// accesses a data structure (TypedefTable) to allow classification of an identifier that it has just read.  Semantic
+// actions during the parser update this data structure when the class of identifiers change.
+//
+// Because the Cforall language is block-scoped, there is the possibility that an identifier can change its class in a
+// local scope; it must revert to its original class at the end of the block.  Since type names can be local to a
+// particular declaration, each declaration is itself a scope.  This requires distinguishing between type names that are
+// local to the current declaration scope and those that persist past the end of the declaration (i.e., names defined in
+// "typedef" or "otype" declarations).
+//
+// The non-terminals "push" and "pop" derive the empty string; their only use is to denote the opening and closing of
+// scopes.  Every push must have a matching pop, although it is regrettable the matching pairs do not always occur
+// within the same rule.  These non-terminals may appear in more contexts than strictly necessary from a semantic point
+// of view.  Unfortunately, these extra rules are necessary to prevent parsing conflicts -- the parser may not have
+// enough context and look-ahead information to decide whether a new scope is necessary, so the effect of these extra
+// rules is to open a new scope unconditionally.  As the grammar evolves, it may be neccesary to add or move around
+// "push" and "pop" nonterminals to resolve conflicts of this sort.
 
 push:
@@ -523 +443 @@
         ;
 
+identifier:
+        IDENTIFIER
+        | ATTR_IDENTIFIER                                                                       // CFA
+        | quasi_keyword
+        ;
+
 no_attr_identifier:
         IDENTIFIER
         | quasi_keyword
-        | '@'                                                                                           // CFA
-                { Token tok = { new string( DeclarationNode::anonymous.newName() ), yylval.tok.loc }; $$ = tok; }
-        ;
-
-identifier:
-        no_attr_identifier
-        | ATTR_IDENTIFIER                                                                       // CFA
         ;
 
@@ -561 +480 @@
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
-        | constant '`' IDENTIFIER                                                       // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | string_literal '`' IDENTIFIER                                         // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( $1 ) ) ); }
-        | IDENTIFIER '`' IDENTIFIER                                                     // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( build_varref( $1 ) ) ) ); }
-        | tuple '`' IDENTIFIER                                                          // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | '(' comma_expression ')' '`' IDENTIFIER                       // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
         | type_name '.' no_attr_identifier                                      // CFA, nested type
-                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
-        | type_name '.' '[' field_name_list ']'                         // CFA, nested type / tuple field selector
-                { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
-        | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11
-                {
-                        // add the missing control expression to the GenericExpr and return it
-                        $5->control = maybeMoveBuild<Expression>( $3 );
-                        $$ = new ExpressionNode( $5 );
-                }
-        ;
-
-generic_assoc_list:                                                                             // C11
-        generic_association
-        | generic_assoc_list ',' generic_association
-                {
-                        // steal the association node from the singleton and delete the wrapper
-                        $1->associations.splice($1->associations.end(), $3->associations);
-                        delete $3;
-                        $$ = $1;
-                }
-        ;
-
-generic_association:                                                                    // C11
-        type_no_function ':' assignment_expression
-                {
-                        // create a GenericExpr wrapper with one association pair
-                        $$ = new GenericExpr( nullptr, { { maybeMoveBuildType($1), maybeMoveBuild<Expression>($3) } } );
-                }
-        | DEFAULT ':' assignment_expression
-                { $$ = new GenericExpr( nullptr, { { maybeMoveBuild<Expression>($3) } } ); }
+                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; }                                                          // FIX ME
+        | type_name '.' '[' push field_list pop ']'                     // CFA, nested type / tuple field selector
+                { throw SemanticError("Qualified names are currently unimplemented."); $$ = nullptr; }                                                          // FIX ME
         ;
 
 postfix_expression:
         primary_expression
-        | postfix_expression '[' assignment_expression ']'
+        | postfix_expression '[' push assignment_expression pop ']'
                 // CFA, comma_expression disallowed in this context because it results in a common user error: subscripting a
                 // matrix with x[i,j] instead of x[i][j]. While this change is not backwards compatible, there seems to be
                 // little advantage to this feature and many disadvantages. It is possible to write x[(i,j)] in CFA, which is
                 // equivalent to the old x[i,j].
-                { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, $3 ) ); }
+                { $$ = new ExpressionNode( build_binary_val( OperKinds::Index, $1, $4 ) ); }
         | postfix_expression '{' argument_expression_list '}' // CFA, constructor call
                 {
@@ -622 +504 @@
         | postfix_expression '.' no_attr_identifier
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
-        | postfix_expression '.' INTEGERconstant                        // CFA, tuple index
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_constantInteger( *$3 ) ) ); }
+        | postfix_expression '.' '[' push field_list pop ']' // CFA, tuple field selector
+                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression FLOATING_FRACTIONconstant          // CFA, tuple index
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_field_name_FLOATING_FRACTIONconstant( *$2 ) ) ); }
-        | postfix_expression '.' '[' field_name_list ']'        // CFA, tuple field selector
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
         | postfix_expression ARROW no_attr_identifier
                 {
                         $$ = new ExpressionNode( build_pfieldSel( $1, *$3 == "0" || *$3 == "1" ? build_constantInteger( *$3 ) : build_varref( $3 ) ) );
                 }
+        | postfix_expression ARROW '[' push field_list pop ']' // CFA, tuple field selector
+                        { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
         | postfix_expression ARROW INTEGERconstant                      // CFA, tuple index
                 { $$ = new ExpressionNode( build_pfieldSel( $1, build_constantInteger( *$3 ) ) ); }
-        | postfix_expression ARROW '[' field_name_list ']'      // CFA, tuple field selector
-                { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); }
         | postfix_expression ICR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::IncrPost, $1 ) ); }
         | postfix_expression DECR
                 { $$ = new ExpressionNode( build_unary_ptr( OperKinds::DecrPost, $1 ) ); }
-        | '(' type_no_function ')' '{' initializer_list_opt comma_opt '}' // C99, compound-literal
+        | '(' type_no_function ')' '{' initializer_list comma_opt '}' // C99, compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, new InitializerNode( $5, true ) ) ); }
-        | '(' type_no_function ')' '@' '{' initializer_list_opt comma_opt '}' // CFA, explicit C compound-literal
-                { $$ = new ExpressionNode( build_compoundLiteral( $2, (new InitializerNode( $6, true ))->set_maybeConstructed( false ) ) ); }
         | '^' primary_expression '{' argument_expression_list '}' // CFA
                 {
@@ -661 +539 @@
         // empty
                 { $$ = nullptr; }
-        | '?'                                                                                           // CFA, default parameter
-                { SemanticError( yylloc, "Default parameter for argument is currently unimplemented." ); $$ = nullptr; }
-                // { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
+        // | '@'                                                                                                // use default argument
+        //      { $$ = new ExpressionNode( build_constantInteger( *new string( "2" ) ) ); }
         | assignment_expression
         ;
 
-field_name_list:                                                                                // CFA, tuple field selector
+field_list:                                                                                             // CFA, tuple field selector
         field
-        | field_name_list ',' field                                     { $$ = (ExpressionNode *)$1->set_last( $3 ); }
+        | field_list ',' field                                          { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
@@ -676 +553 @@
         | FLOATING_DECIMALconstant field
                 { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), maybeMoveBuild<Expression>( $2 ) ) ); }
-        | FLOATING_DECIMALconstant '[' field_name_list ']'
-                { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), build_tuple( $3 ) ) ); }
+        | FLOATING_DECIMALconstant '[' push field_list pop ']'
+                { $$ = new ExpressionNode( build_fieldSel( new ExpressionNode( build_field_name_FLOATING_DECIMALconstant( *$1 ) ), build_tuple( $4 ) ) ); }
         | field_name '.' field
                 { $$ = new ExpressionNode( build_fieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
-        | field_name '.' '[' field_name_list ']'
-                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $4 ) ) ); }
+        | field_name '.' '[' push field_list pop ']'
+                { $$ = new ExpressionNode( build_fieldSel( $1, build_tuple( $5 ) ) ); }
         | field_name ARROW field
                 { $$ = new ExpressionNode( build_pfieldSel( $1, maybeMoveBuild<Expression>( $3 ) ) ); }
-        | field_name ARROW '[' field_name_list ']'
-                { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $4 ) ) ); }
+        | field_name ARROW '[' push field_list pop ']'
+                { $$ = new ExpressionNode( build_pfieldSel( $1, build_tuple( $5 ) ) ); }
         ;
 
 field_name:
-        INTEGERconstant fraction_constants_opt
+        INTEGERconstant fraction_constants
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_constantInteger( *$1 ), $2 ) ); }
-        | FLOATINGconstant fraction_constants_opt
+        | FLOATINGconstant fraction_constants
                 { $$ = new ExpressionNode( build_field_name_fraction_constants( build_field_name_FLOATINGconstant( *$1 ), $2 ) ); }
-        | no_attr_identifier fraction_constants_opt
+        | no_attr_identifier fraction_constants
                 {
                         $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) );
@@ -699 +576 @@
         ;
 
-fraction_constants_opt:
+fraction_constants:
         // empty
                 { $$ = nullptr; }
-        | fraction_constants_opt FLOATING_FRACTIONconstant
+        | fraction_constants FLOATING_FRACTIONconstant
                 {
                         Expression * constant = build_field_name_FLOATING_FRACTIONconstant( *$2 );
@@ -714 +591 @@
                 // semantics checks, e.g., ++3, 3--, *3, &&3
         | constant
+                { $$ = $1; }
         | string_literal
                 { $$ = new ExpressionNode( $1 ); }
@@ -779 +657 @@
         | '(' type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
-        | '(' COROUTINE '&' ')' cast_expression                         // CFA
-                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Coroutine, $5 ) ); }
-        | '(' THREAD '&' ')' cast_expression                            // CFA
-                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Thread, $5 ) ); }
-        | '(' MONITOR '&' ')' cast_expression                           // CFA
-                { $$ = new ExpressionNode( build_keyword_cast( KeywordCastExpr::Monitor, $5 ) ); }
                 // VIRTUAL cannot be opt because of look ahead issues
-        | '(' VIRTUAL ')' cast_expression                                       // CFA
+        | '(' VIRTUAL ')' cast_expression
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $4 ), maybeMoveBuildType( nullptr ) ) ); }
-        | '(' VIRTUAL type_no_function ')' cast_expression      // CFA
+        | '(' VIRTUAL type_no_function ')' cast_expression
                 { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); }
 //      | '(' type_no_function ')' tuple
@@ -880 +752 @@
         | logical_OR_expression '?' comma_expression ':' conditional_expression
                 { $$ = new ExpressionNode( build_cond( $1, $3, $5 ) ); }
-                // FIX ME: computes $1 twice
+                // FIX ME: this hack computes $1 twice
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
                 { $$ = new ExpressionNode( build_cond( $1, $1, $4 ) ); }
@@ -894 +766 @@
         | unary_expression assignment_operator assignment_expression
                 { $$ = new ExpressionNode( build_binary_val( $2, $1, $3 ) ); }
-        | unary_expression '=' '{' initializer_list_opt comma_opt '}'
-                { SemanticError( yylloc, "Initializer assignment is currently unimplemented." ); $$ = nullptr; }
         ;
 
@@ -925 +795 @@
 //      '[' ']'
 //              { $$ = new ExpressionNode( build_tuple() ); }
-//      | '[' push assignment_expression pop ']'
+//      '[' push assignment_expression pop ']'
 //              { $$ = new ExpressionNode( build_tuple( $3 ) ); }
-        '[' ',' tuple_expression_list ']'
-                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $3 ) ) ); }
-        | '[' push assignment_expression pop ',' tuple_expression_list ']'
-                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)$3->set_last( $6 ) ) ); }
+        '[' push ',' tuple_expression_list pop ']'
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $4 ) ) ); }
+        | '[' push assignment_expression ',' tuple_expression_list pop ']'
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)$3->set_last( $5 ) ) ); }
         ;
 
@@ -956 +826 @@
         labeled_statement
         | compound_statement
-        | expression_statement
+        | expression_statement                                          { $$ = $1; }
         | selection_statement
         | iteration_statement
@@ -964 +834 @@
         | waitfor_statement
         | exception_statement
-        | enable_disable_statement
-                { SemanticError( yylloc, "enable/disable statement is currently unimplemented." ); $$ = nullptr; }
         | asm_statement
-        | DIRECTIVE
-                { $$ = new StatementNode( build_directive( $1 ) ); }
-        ;
 
 labeled_statement:
@@ -982 +847 @@
         '{' '}'
                 { $$ = new StatementNode( build_compound( (StatementNode *)0 ) ); }
-        | '{' push
+        | '{'
+                // Two scopes are necessary because the block itself has a scope, but every declaration within the block also
+                // requires its own scope.
+          push push
           local_label_declaration_opt                                           // GCC, local labels
           statement_decl_list                                                           // C99, intermix declarations and statements
           pop '}'
-                { $$ = new StatementNode( build_compound( $4 ) ); }
+                { $$ = new StatementNode( build_compound( $5 ) ); }
         ;
 
 statement_decl_list:                                                                    // C99
         statement_decl
-        | statement_decl_list statement_decl
-                { if ( $1 != 0 ) { $1->set_last( $2 ); $$ = $1; } }
+        | statement_decl_list push statement_decl
+                { if ( $1 != 0 ) { $1->set_last( $3 ); $$ = $1; } }
         ;
 
@@ -1010 +878 @@
                         $$ = new StatementNode( $2 );
                 }
-        | statement
+        | statement pop
         ;
 
@@ -1025 +893 @@
 
 selection_statement:
-                        // pop causes a S/R conflict without separating the IF statement into a non-terminal even after resolving
-                        // the inherent S/R conflict with THEN/ELSE.
-        push if_statement pop
-                { $$ = $2; }
+        IF '(' push if_control_expression ')' statement         %prec THEN
+                // explicitly deal with the shift/reduce conflict on if/else
+                { $$ = new StatementNode( build_if( $4, $6, nullptr ) ); }
+        | IF '(' push if_control_expression ')' statement ELSE statement
+                { $$ = new StatementNode( build_if( $4, $6, $8 ) ); }
         | SWITCH '(' comma_expression ')' case_clause
-                { $$ = new StatementNode( build_switch( true, $3, $5 ) ); }
-        | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt pop '}' // CFA
-                {
-                        StatementNode *sw = new StatementNode( build_switch( true, $3, $8 ) );
+                { $$ = new StatementNode( build_switch( $3, $5 ) ); }
+        | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
+                {
+                        StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
                         // The semantics of the declaration list is changed to include associated initialization, which is performed
                         // *before* the transfer to the appropriate case clause by hoisting the declarations into a compound
@@ -1042 +911 @@
                 }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
-                { $$ = new StatementNode( build_switch( false, $3, $5 ) ); }
-        | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt pop '}' // CFA
-                {
-                        StatementNode *sw = new StatementNode( build_switch( false, $3, $8 ) );
+                { $$ = new StatementNode( build_switch( $3, $5 ) ); }
+        | CHOOSE '(' comma_expression ')' '{' push declaration_list_opt choose_clause_list_opt '}' // CFA
+                {
+                        StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
                         $$ = $7 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
         ;
 
-if_statement:
-        IF '(' if_control_expression ')' statement                      %prec THEN
-                // explicitly deal with the shift/reduce conflict on if/else
-                { $$ = new StatementNode( build_if( $3, $5, nullptr ) ); }
-        | IF '(' if_control_expression ')' statement ELSE statement
-                { $$ = new StatementNode( build_if( $3, $5, $7 ) ); }
-        ;
-
 if_control_expression:
-        comma_expression
-                { $$ = new IfCtrl( nullptr, $1 ); }
-        | c_declaration                                                                         // no semi-colon
-                { $$ = new IfCtrl( $1, nullptr ); }
-        | cfa_declaration                                                                       // no semi-colon
-                { $$ = new IfCtrl( $1, nullptr ); }
+        comma_expression pop
+                { $$ = new IfCtl( nullptr, $1 ); }
+        | c_declaration pop                                                                     // no semi-colon
+                { $$ = new IfCtl( $1, nullptr ); }
+        | cfa_declaration pop                                                           // no semi-colon
+                { $$ = new IfCtl( $1, nullptr ); }
         | declaration comma_expression                                          // semi-colon separated
-                { $$ = new IfCtrl( $1, $2 ); }
+                { $$ = new IfCtl( $1, $2 ); }
         ;
 
@@ -1091 +952 @@
         ;
 
-//label_list_opt:
-//      // empty
-//      | identifier_or_type_name ':'
-//      | label_list_opt identifier_or_type_name ':'
-//      ;
-
 case_label_list:                                                                                // CFA
         case_label
@@ -1119 +974 @@
         ;
 
+choose_clause_list_opt:                                                                 // CFA
+        // empty
+                { $$ = nullptr; }
+        | choose_clause_list
+        ;
+
+choose_clause_list:                                                                             // CFA
+        case_label_list fall_through
+                { $$ = $1->append_last_case( $2 ); }
+        | case_label_list statement_list_nodecl fall_through_opt
+                { $$ = $1->append_last_case( new StatementNode( build_compound( (StatementNode *)$2->set_last( $3 ) ) ) ); }
+        | choose_clause_list case_label_list fall_through
+                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( $3 ))); }
+        | choose_clause_list case_label_list statement_list_nodecl fall_through_opt
+                { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( (StatementNode *)$3->set_last( $4 ) ) ) ) ) ); }
+        ;
+
+fall_through_opt:                                                                               // CFA
+        // empty
+                { $$ = new StatementNode( build_branch( BranchStmt::Break ) ); } // insert implicit break
+        | fall_through
+        ;
+
+fall_through_name:                                                                              // CFA
+        FALLTHRU
+        | FALLTHROUGH
+        ;
+
+fall_through:                                                                                   // CFA
+        fall_through_name
+                { $$ = nullptr; }
+        | fall_through_name ';'
+                { $$ = nullptr; }
+        ;
+
 iteration_statement:
-        WHILE '(' push if_control_expression ')' statement pop
-                { $$ = new StatementNode( build_while( $4, $6 ) ); }
-        | WHILE '(' ')' statement                                                       // CFA => while ( 1 )
-                { $$ = new StatementNode( build_while( new IfCtrl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), $4 ) ); }
+        WHILE '(' comma_expression ')' statement
+                { $$ = new StatementNode( build_while( $3, $5 ) ); }
         | DO statement WHILE '(' comma_expression ')' ';'
-                { $$ = new StatementNode( build_do_while( $5, $2 ) ); }
-        | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
-                { $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), $2 ) ); }
-        | FOR '(' push for_control_expression ')' statement pop
+                { $$ = new StatementNode( build_while( $5, $2, true ) ); }
+        | FOR '(' push for_control_expression ')' statement
                 { $$ = new StatementNode( build_for( $4, $6 ) ); }
         ;
 
 for_control_expression:
-        comma_expression_opt                                                            // CFA
-                {
-                        if ( ! $1 ) {                                                           // => for ( ;; )
-                                $$ = new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr );
-                        } else {
-                                $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $1->clone(),
-                                                         new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
-                        } // if
-                }
-        | constant_expression inclexcl constant_expression      // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ); }
-        | constant_expression inclexcl constant_expression '~' constant_expression // CFA
-                { $$ = forCtrl( $1, new string( DeclarationNode::anonymous.newName() ), $1->clone(), $2, $3, $5 ); }
-        | comma_expression_opt ';' comma_expression                     // CFA
-                {
-                        if ( ! $1 ) {
-                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
-                        } else if ( ! $3 ) {
-                                SemanticError( yylloc, "Missing loop range." ); $$ = nullptr;
-                        } else {
-                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), new ExpressionNode( build_constantInteger( *new string( "0" ) ) ), OperKinds::LThan, $3->clone(),
-                                                                 new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
-                                } else {
-                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
-                                } // if
-                        } // if
-                }
-        | comma_expression_opt ';' constant_expression inclexcl constant_expression // CFA
-                {
-                        if ( ! $1 ) {
-                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
-                        } else {
-                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) );
-                                } else {
-                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
-                                } // if
-                        } // if
-                }
-        | comma_expression_opt ';' constant_expression inclexcl constant_expression '~' constant_expression // CFA
-                {
-                        if ( ! $1 ) {
-                                SemanticError( yylloc, "Missing loop index." ); $$ = nullptr;
-                        } else {
-                                if ( NameExpr *identifier = dynamic_cast<NameExpr *>($1->get_expr()) ) {
-                                        $$ = forCtrl( $3, new string( identifier->name ), $3->clone(), $4, $5, $7 );
-                                } else {
-                                        SemanticError( yylloc, "Expression disallowed. Only loop-index name allowed" ); $$ = nullptr;
-                                } // if
-                        } // if
-                }
-        | comma_expression_opt ';' comma_expression_opt ';' comma_expression_opt
-                { $$ = new ForCtrl( $1, $3, $5 ); }
-        | declaration comma_expression_opt ';' comma_expression_opt // C99, declaration has ';'
-                { $$ = new ForCtrl( $1, $2, $4 ); }
-        ;
-
-inclexcl:
-        '~'
-                { $$ = OperKinds::LThan; }
-        | Erange
-                { $$ = OperKinds::LEThan; }
+        comma_expression_opt pop ';' comma_expression_opt ';' comma_expression_opt
+                { $$ = new ForCtl( $1, $4, $6 ); }
+        | declaration comma_expression_opt ';' comma_expression_opt // C99
+                { $$ = new ForCtl( $1, $2, $4 ); }
         ;
 
@@ -1205 +1032 @@
                 // whereas normal operator precedence yields goto (*i)+3;
                 { $$ = new StatementNode( build_computedgoto( $3 ) ); }
-                // A semantic check is required to ensure fallthru appears only in the body of a choose statement.
-    | fall_through_name ';'                                                             // CFA
-                { $$ = new StatementNode( build_branch( BranchStmt::FallThrough ) ); }
-    | fall_through_name identifier_or_type_name ';'             // CFA
-                { $$ = new StatementNode( build_branch( $2, BranchStmt::FallThrough ) ); }
-        | fall_through_name DEFAULT ';'                                         // CFA
-                { $$ = new StatementNode( build_branch( BranchStmt::FallThroughDefault ) ); }
         | CONTINUE ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
@@ -1228 +1048 @@
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
-        | RETURN '{' initializer_list_opt comma_opt '}'
-                { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
@@ -1238 +1056 @@
         ;
 
-fall_through_name:                                                                              // CFA
-        FALLTHRU
-        | FALLTHROUGH
-        ;
-
 with_statement:
         WITH '(' tuple_expression_list ')' statement
@@ -1253 +1066 @@
 mutex_statement:
         MUTEX '(' argument_expression_list ')' statement
-                { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; }
+                { throw SemanticError("Mutex statement is currently unimplemented."); $$ = nullptr; } // FIX ME
         ;
 
 when_clause:
-        WHEN '(' comma_expression ')'                           { $$ = $3; }
+        WHEN '(' comma_expression ')'
+                { $$ = $3; }
         ;
 
@@ -1267 +1081 @@
 
 waitfor:
-        WAITFOR '(' cast_expression ')'
-                { $$ = $3; }
-        | WAITFOR '(' cast_expression ',' argument_expression_list ')'
-                { $$ = (ExpressionNode *)$3->set_last( $5 ); }
+        WAITFOR '(' identifier ')'
+                {
+                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
+                        delete $3;
+                }
+        | WAITFOR '(' identifier ',' argument_expression_list ')'
+                {
+                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
+                        $$->set_last( $5 );
+                        delete $3;
+                }
         ;
 
 timeout:
-        TIMEOUT '(' comma_expression ')'                        { $$ = $3; }
+        TIMEOUT '(' comma_expression ')'
+                { $$ = $3; }
         ;
 
@@ -1287 +1109 @@
                 { $$ = build_waitfor_timeout( nullptr, $3, $1 ); }
                 // "else" must be conditional after timeout or timeout is never triggered (i.e., it is meaningless)
-        | when_clause_opt timeout statement WOR ELSE statement
-                { SemanticError( yylloc, "else clause must be conditional after timeout or timeout never triggered." ); $$ = nullptr; }
         | when_clause_opt timeout statement WOR when_clause ELSE statement
                 { $$ = build_waitfor_timeout( $2, $3, $1, $7, $5 ); }
@@ -1310 +1130 @@
 
 handler_clause:
-        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( $1, $4, $6, $8 ) ); }
-        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $5, $7, $9 ) ) ); }
+        handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( $1, $5, $7, $9 ) ); }
+        | handler_clause handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, $8, $10 ) ) ); }
         ;
 
 handler_predicate_opt:
-        // empty
+        //empty
                 { $$ = nullptr; }
-        | ';' conditional_expression                            { $$ = $2; }
+        | ';' conditional_expression
+                { $$ = $2; }
         ;
 
 handler_key:
-        CATCH                                                                           { $$ = CatchStmt::Terminate; }
-        | CATCHRESUME                                                           { $$ = CatchStmt::Resume; }
+        CATCH
+                { $$ = CatchStmt::Terminate; }
+        | CATCHRESUME
+                { $$ = CatchStmt::Resume; }
         ;
 
 finally_clause:
-        FINALLY compound_statement                                      { $$ = new StatementNode( build_finally( $2 ) ); }
+        FINALLY compound_statement
+                {
+                        $$ = new StatementNode( build_finally( $2 ) );
+                }
         ;
 
@@ -1335 +1161 @@
         type_specifier_nobody
         | type_specifier_nobody declarator
-                { $$ = $2->addType( $1 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addType( $1 );
+                }
         | type_specifier_nobody variable_abstract_declarator
                 { $$ = $2->addType( $1 ); }
         | cfa_abstract_declarator_tuple no_attr_identifier      // CFA
-                { $$ = $1->addName( $2 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->addName( $2 );
+                }
         | cfa_abstract_declarator_tuple                                         // CFA
-        ;
-
-enable_disable_statement:
-        enable_disable_key identifier_list compound_statement
-        ;
-
-enable_disable_key:
-        ENABLE
-        | DISABLE
         ;
 
 asm_statement:
         ASM asm_volatile_opt '(' string_literal ')' ';'
-                { $$ = new StatementNode( build_asm( $2, $4, 0 ) ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, 0 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ')' ';' // remaining GCC
-                { $$ = new StatementNode( build_asm( $2, $4, $6 ) ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, $6 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ')' ';'
-                { $$ = new StatementNode( build_asm( $2, $4, $6, $8 ) ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8 ) ); }
         | ASM asm_volatile_opt '(' string_literal ':' asm_operands_opt ':' asm_operands_opt ':' asm_clobbers_list_opt ')' ';'
-                { $$ = new StatementNode( build_asm( $2, $4, $6, $8, $10 ) ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $4, $6, $8, $10 ) ); }
         | ASM asm_volatile_opt GOTO '(' string_literal ':' ':' asm_operands_opt ':' asm_clobbers_list_opt ':' label_list ')' ';'
-                { $$ = new StatementNode( build_asm( $2, $5, 0, $8, $10, $12 ) ); }
+                { $$ = new StatementNode( build_asmstmt( $2, $5, 0, $8, $10, $12 ) ); }
         ;
 
@@ -1417 +1240 @@
 
 declaration_list_opt:                                                                   // used at beginning of switch statement
+        pop
+                { $$ = nullptr; }
+        | declaration_list
+        ;
+
+declaration_list:
+        declaration
+        | declaration_list push declaration
+                { $$ = $1->appendList( $3 ); }
+        ;
+
+KR_declaration_list_opt:                                                                // used to declare parameter types in K&R style functions
         // empty
                 { $$ = nullptr; }
-        | declaration_list
-        ;
-
-declaration_list:
-        declaration
-        | declaration_list declaration
-                { $$ = $1->appendList( $2 ); }
-        ;
-
-KR_parameter_list_opt:                                                                  // used to declare parameter types in K&R style functions
-        // empty
-                { $$ = nullptr; }
-        | KR_parameter_list
-        ;
-
-KR_parameter_list:
+        | KR_declaration_list
+        ;
+
+KR_declaration_list:
         push c_declaration pop ';'
                 { $$ = $2; }
-        | KR_parameter_list push c_declaration pop ';'
+        | KR_declaration_list push c_declaration pop ';'
                 { $$ = $1->appendList( $3 ); }
         ;
@@ -1452 +1275 @@
 
 local_label_list:                                                                               // GCC, local label
-        no_attr_identifier_or_type_name
-        | local_label_list ',' no_attr_identifier_or_type_name
+        no_attr_identifier_or_type_name                         {}
+        | local_label_list ',' no_attr_identifier_or_type_name {}
         ;
 
 declaration:                                                                                    // old & new style declarations
-        c_declaration ';'
-        | cfa_declaration ';'                                                           // CFA
-        | static_assert                                                                         // C11
-        ;
-
-static_assert:
-        STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
-                { $$ = DeclarationNode::newStaticAssert( $3, $5 ); }
-        | STATICASSERT '(' constant_expression ')' ';'          // CFA
-                { $$ = DeclarationNode::newStaticAssert( $3, build_constantStr( *new string( "\"\"" ) ) ); }
+        c_declaration pop ';'
+        | cfa_declaration pop ';'                                                       // CFA
+        | STATICASSERT '(' constant_expression ',' string_literal ')' ';' // C11
+                { throw SemanticError("Static assert is currently unimplemented."); $$ = nullptr; }     // FIX ME
+        ;
 
 // C declaration syntax is notoriously confusing and error prone. Cforall provides its own type, variable and function
@@ -1489 +1307 @@
 cfa_variable_declaration:                                                               // CFA
         cfa_variable_specifier initializer_opt
-                { $$ = $1->addInitializer( $2 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->addInitializer( $2 );
+                }
         | declaration_qualifier_list cfa_variable_specifier initializer_opt
                 // declaration_qualifier_list also includes type_qualifier_list, so a semantic check is necessary to preclude
                 // them as a type_qualifier cannot appear in that context.
-                { $$ = $2->addQualifiers( $1 )->addInitializer( $3 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addQualifiers( $1 )->addInitializer( $3 );;
+                }
         | cfa_variable_declaration pop ',' push identifier_or_type_name initializer_opt
-                { $$ = $1->appendList( $1->cloneType( $5 )->addInitializer( $6 ) ); }
+                {
+                        typedefTable.addToEnclosingScope( *$5, TypedefTable::ID );
+                        $$ = $1->appendList( $1->cloneType( $5 )->addInitializer( $6 ) );
+                }
         ;
 
@@ -1502 +1329 @@
                 // storage-class
         cfa_abstract_declarator_no_tuple identifier_or_type_name asm_name_opt
-                { $$ = $1->addName( $2 )->addAsmName( $3 ); }
+                {
+                        typedefTable.setNextIdentifier( *$2 );
+                        $$ = $1->addName( $2 )->addAsmName( $3 );
+                }
         | cfa_abstract_tuple identifier_or_type_name asm_name_opt
-                { $$ = $1->addName( $2 )->addAsmName( $3 ); }
+                {
+                        typedefTable.setNextIdentifier( *$2 );
+                        $$ = $1->addName( $2 )->addAsmName( $3 );
+                }
         | type_qualifier_list cfa_abstract_tuple identifier_or_type_name asm_name_opt
-                { $$ = $2->addQualifiers( $1 )->addName( $3 )->addAsmName( $4 ); }
+                {
+                        typedefTable.setNextIdentifier( *$3 );
+                        $$ = $2->addQualifiers( $1 )->addName( $3 )->addAsmName( $4 );
+                }
         ;
 
 cfa_function_declaration:                                                               // CFA
         cfa_function_specifier
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1;
+                }
         | type_qualifier_list cfa_function_specifier
-                { $$ = $2->addQualifiers( $1 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addQualifiers( $1 );
+                }
         | declaration_qualifier_list cfa_function_specifier
-                { $$ = $2->addQualifiers( $1 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addQualifiers( $1 );
+                }
         | declaration_qualifier_list type_qualifier_list cfa_function_specifier
-                { $$ = $3->addQualifiers( $1 )->addQualifiers( $2 ); }
-        | cfa_function_declaration ',' identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $3->addQualifiers( $1 )->addQualifiers( $2 );
+                }
+        | cfa_function_declaration pop ',' push identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
                 {
                         // Append the return type at the start (left-hand-side) to each identifier in the list.
                         DeclarationNode * ret = new DeclarationNode;
                         ret->type = maybeClone( $1->type->base );
-                        $$ = $1->appendList( DeclarationNode::newFunction( $3, ret, $6, nullptr ) );
+                        $$ = $1->appendList( DeclarationNode::newFunction( $5, ret, $8, nullptr, true ) );
                 }
         ;
 
 cfa_function_specifier:                                                                 // CFA
-//      '[' ']' identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')' // S/R conflict
+//      '[' ']' identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')' // S/R conflict
 //              {
 //                      $$ = DeclarationNode::newFunction( $3, DeclarationNode::newTuple( 0 ), $6, 0, true );
 //              }
-//      '[' ']' identifier '(' push cfa_parameter_ellipsis_list_opt pop ')'
+//      '[' ']' identifier '(' push cfa_parameter_type_list_opt pop ')'
 //              {
 //                      typedefTable.setNextIdentifier( *$5 );
 //                      $$ = DeclarationNode::newFunction( $5, DeclarationNode::newTuple( 0 ), $8, 0, true );
 //              }
-//      | '[' ']' TYPEDEFname '(' push cfa_parameter_ellipsis_list_opt pop ')'
+//      | '[' ']' TYPEDEFname '(' push cfa_parameter_type_list_opt pop ')'
 //              {
 //                      typedefTable.setNextIdentifier( *$5 );
@@ -1544 +1393 @@
                 // identifier_or_type_name must be broken apart because of the sequence:
                 //
-                //   '[' ']' identifier_or_type_name '(' cfa_parameter_ellipsis_list_opt ')'
+                //   '[' ']' identifier_or_type_name '(' cfa_parameter_type_list_opt ')'
                 //   '[' ']' type_specifier
                 //
                 // type_specifier can resolve to just TYPEDEFname (e.g., typedef int T; int f( T );). Therefore this must be
                 // flattened to allow lookahead to the '(' without having to reduce identifier_or_type_name.
-        cfa_abstract_tuple identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
+        cfa_abstract_tuple identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
                 // To obtain LR(1 ), this rule must be factored out from function return type (see cfa_abstract_declarator).
-                { $$ = DeclarationNode::newFunction( $2, $1, $5, 0 ); }
-        | cfa_function_return identifier_or_type_name '(' push cfa_parameter_ellipsis_list_opt pop ')'
-                { $$ = DeclarationNode::newFunction( $2, $1, $5, 0 ); }
+                {
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
+                }
+        | cfa_function_return identifier_or_type_name '(' push cfa_parameter_type_list_opt pop ')'
+                {
+                        $$ = DeclarationNode::newFunction( $2, $1, $5, 0, true );
+                }
         ;
 
@@ -1560 +1413 @@
                 { $$ = DeclarationNode::newTuple( $3 ); }
         | '[' push cfa_parameter_list pop ',' push cfa_abstract_parameter_list pop ']'
-                // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the ']'.
+                // To obtain LR(1 ), the last cfa_abstract_parameter_list is added into this flattened rule to lookahead to the
+                // ']'.
                 { $$ = DeclarationNode::newTuple( $3->appendList( $7 ) ); }
         ;
@@ -1567 +1421 @@
         TYPEDEF cfa_variable_specifier
                 {
-                        typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, "1" );
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
                         $$ = $2->addTypedef();
                 }
         | TYPEDEF cfa_function_specifier
                 {
-                        typedefTable.addToEnclosingScope( *$2->name, TYPEDEFname, "2" );
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
                         $$ = $2->addTypedef();
                 }
         | cfa_typedef_declaration pop ',' push no_attr_identifier
                 {
-                        typedefTable.addToEnclosingScope( *$5, TYPEDEFname, "3" );
+                        typedefTable.addToEnclosingScope( *$5, TypedefTable::TD );
                         $$ = $1->appendList( $1->cloneType( $5 ) );
                 }
@@ -1588 +1442 @@
         TYPEDEF type_specifier declarator
                 {
-                        typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "4" );
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
                         $$ = $3->addType( $2 )->addTypedef();
                 }
         | typedef_declaration pop ',' push declarator
                 {
-                        typedefTable.addToEnclosingScope( *$5->name, TYPEDEFname, "5" );
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
                         $$ = $1->appendList( $1->cloneBaseType( $5 )->addTypedef() );
                 }
         | type_qualifier_list TYPEDEF type_specifier declarator // remaining OBSOLESCENT (see 2 )
                 {
-                        typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "6" );
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
                         $$ = $4->addType( $3 )->addQualifiers( $1 )->addTypedef();
                 }
         | type_specifier TYPEDEF declarator
                 {
-                        typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "7" );
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
                         $$ = $3->addType( $1 )->addTypedef();
                 }
         | type_specifier TYPEDEF type_qualifier_list declarator
                 {
-                        typedefTable.addToEnclosingScope( *$4->name, TYPEDEFname, "8" );
+                        typedefTable.addToEnclosingScope( TypedefTable::TD );
                         $$ = $4->addQualifiers( $1 )->addTypedef()->addType( $1 );
                 }
@@ -1617 +1471 @@
         TYPEDEF no_attr_identifier '=' assignment_expression
                 {
-                        // $$ = DeclarationNode::newName( 0 );                  // unimplemented
-                        SemanticError( yylloc, "Typedef expression is currently unimplemented." ); $$ = nullptr;
+                        typedefTable.addToEnclosingScope( *$2, TypedefTable::TD );
+                        $$ = DeclarationNode::newName( 0 );                     // unimplemented
                 }
         | typedef_expression pop ',' push no_attr_identifier '=' assignment_expression
                 {
-                        // $$ = DeclarationNode::newName( 0 );                  // unimplemented
-                        SemanticError( yylloc, "Typedef expression is currently unimplemented." ); $$ = nullptr;
+                        typedefTable.addToEnclosingScope( *$5, TypedefTable::TD );
+                        $$ = DeclarationNode::newName( 0 );                     // unimplemented
                 }
         ;
@@ -1639 +1493 @@
 //       declarator asm_name_opt initializer_opt
 //              {
-//                      typedefTable.addToEnclosingScope( IDENTIFIER );
+//                      typedefTable.addToEnclosingScope( TypedefTable::ID );
 //                      $$ = ( $2->addType( $1 ))->addAsmName( $3 )->addInitializer( $4 );
 //              }
 //      | declaring_list ',' attribute_list_opt declarator asm_name_opt initializer_opt
 //              {
-//                      typedefTable.addToEnclosingScope( IDENTIFIER );
+//                      typedefTable.addToEnclosingScope( TypedefTable::ID );
 //                      $$ = $1->appendList( $1->cloneBaseType( $4->addAsmName( $5 )->addInitializer( $6 ) ) );
 //              }
@@ -1651 +1505 @@
 c_declaration:
         declaration_specifier declaring_list
-                { $$ = distAttr( $1, $2 ); }
+                {
+                        $$ = distAttr( $1, $2 );
+                }
         | typedef_declaration
         | typedef_expression                                                            // GCC, naming expression type
@@ -1661 +1517 @@
                 // storage-class
         declarator asm_name_opt initializer_opt
-                { $$ = $1->addAsmName( $2 )->addInitializer( $3 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->addAsmName( $2 )->addInitializer( $3 );
+                }
         | declaring_list ',' attribute_list_opt declarator asm_name_opt initializer_opt
-                { $$ = $1->appendList( $4->addQualifiers( $3 )->addAsmName( $5 )->addInitializer( $6 ) ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $1->appendList( $4->addQualifiers( $3 )->addAsmName( $5 )->addInitializer( $6 ) );
+                }
         ;
 
@@ -1735 +1597 @@
 
 forall:
-        FORALL '(' type_parameter_list ')'                                      // CFA
-                { $$ = DeclarationNode::newForall( $3 ); }
+        FORALL '('
+                {
+                        typedefTable.enterScope();
+                }
+          type_parameter_list ')'                                                       // CFA
+                {
+                        typedefTable.leaveScope();
+                        $$ = DeclarationNode::newForall( $4 );
+                }
         ;
 
@@ -1809 +1678 @@
         | LONG
                 { $$ = DeclarationNode::newLength( DeclarationNode::Long ); }
+        | ZERO_T
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
+        | ONE_T
+                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
         | VALIST                                                                                        // GCC, __builtin_va_list
                 { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
@@ -1828 +1701 @@
 basic_type_specifier:
         direct_type
-                // Cannot have type modifiers, e.g., short, long, etc.
         | type_qualifier_list_opt indirect_type type_qualifier_list_opt
                 { $$ = $2->addQualifiers( $1 )->addQualifiers( $3 ); }
@@ -1834 +1706 @@
 
 direct_type:
+                // A semantic check is necessary for conflicting type qualifiers.
         basic_type_name
         | type_qualifier_list basic_type_name
@@ -1852 +1725 @@
         | ATTR_TYPEGENname '(' comma_expression ')'                     // CFA: e.g., @type(a+b) y;
                 { $$ = DeclarationNode::newAttr( $1, $3 ); }
-        | ZERO_T                                                                                        // CFA
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::Zero ); }
-        | ONE_T                                                                                         // CFA
-                { $$ = DeclarationNode::newBuiltinType( DeclarationNode::One ); }
         ;
 
@@ -1875 +1744 @@
                 { $$ = $3->addQualifiers( $1 ); }
         | sue_type_specifier type_qualifier
-                {
-                        if ( $2->type != nullptr && $2->type->forall ) forall = true; // remember generic type
-                        $$ = $1->addQualifiers( $2 );
-                }
+                { $$ = $1->addQualifiers( $2 ); }
         ;
 
@@ -1921 +1787 @@
                 { $$ = DeclarationNode::newFromTypedef( $1 ); }
         | '.' TYPEDEFname
-                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), DeclarationNode::newFromTypedef( $2 ) ); }
+                { $$ = DeclarationNode::newFromTypedef( $2 ); } // FIX ME
         | type_name '.' TYPEDEFname
-                { $$ = DeclarationNode::newQualifiedType( $1, DeclarationNode::newFromTypedef( $3 ) ); }
+                { $$ = DeclarationNode::newFromTypedef( $3 ); } // FIX ME
         | typegen_name
         | '.' typegen_name
-                { $$ = DeclarationNode::newQualifiedType( DeclarationNode::newFromGlobalScope(), $2 ); }
+                { $$ = $2; }                                                                    // FIX ME
         | type_name '.' typegen_name
-                { $$ = DeclarationNode::newQualifiedType( $1, $3 ); }
+                { $$ = $3; }                                                                    // FIX ME
         ;
 
@@ -1950 +1816 @@
         ;
 
-fred:
-        // empty
-                { yyy = false; }
-        ;
-
 aggregate_type:                                                                                 // struct, union
-        aggregate_key attribute_list_opt
-                { forall = false; }                                                             // reset
-          '{' field_declaration_list_opt '}' type_parameters_opt
-                { $$ = DeclarationNode::newAggregate( $1, nullptr, $7, $5, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt no_attr_identifier fred
-                {
-                        typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
+        aggregate_key attribute_list_opt '{' field_declaration_list '}'
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), nullptr, $4, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt no_attr_identifier_or_type_name
+                {
+                        typedefTable.makeTypedef( *$3 );                        // create typedef
+                        if ( forall ) typedefTable.changeKind( *$3, TypedefTable::TG ); // possibly update
                         forall = false;                                                         // reset
                 }
-          '{' field_declaration_list_opt '}' type_parameters_opt
-                { $$ = DeclarationNode::newAggregate( $1, $3, $9, $7, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt type_name fred
-                {
-                        // for type_name can be a qualified type name S.T, in which case only the last name in the chain needs a typedef (other names in the chain should already have one)
-                        typedefTable.makeTypedef( *$3->type->leafName(), forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
-                        forall = false;                                                         // reset
-                }
-          '{' field_declaration_list_opt '}' type_parameters_opt
-                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, $9, $7, true )->addQualifiers( $2 ); }
+          '{' field_declaration_list '}'
+                { $$ = DeclarationNode::newAggregate( $1, $3, nullptr, $6, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt '(' type_list ')' '{' field_declaration_list '}' // CFA
+                { $$ = DeclarationNode::newAggregate( $1, new string( DeclarationNode::anonymous.newName() ), $4, $7, false )->addQualifiers( $2 ); }
         | aggregate_type_nobody
         ;
 
-type_parameters_opt:
-        // empty
-                { $$ = nullptr; }                                                               %prec '}'
-        | '(' type_list ')'
-                { $$ = $2; }
-        ;
-
 aggregate_type_nobody:                                                                  // struct, union - {...}
-        aggregate_key attribute_list_opt no_attr_identifier fred
-                {
-                        typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );
-                        forall = false;                                                         // reset
+        aggregate_key attribute_list_opt no_attr_identifier
+                {
+                        typedefTable.makeTypedef( *$3 );
                         $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
                 }
-        | aggregate_key attribute_list_opt type_name fred
-                {
-                        forall = false;                                                         // reset
+        | aggregate_key attribute_list_opt TYPEDEFname
+                {
+                        typedefTable.makeTypedef( *$3 );
+                        $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
+                }
+        | aggregate_key attribute_list_opt typegen_name         // CFA
+                {
                         // Create new generic declaration with same name as previous forward declaration, where the IDENTIFIER is
                         // switched to a TYPEGENname. Link any generic arguments from typegen_name to new generic declaration and
@@ -2007 +1857 @@
 aggregate_key:
         STRUCT
-                { yyy = true; $$ = DeclarationNode::Struct; }
+                { $$ = DeclarationNode::Struct; }
         | UNION
-                { yyy = true; $$ = DeclarationNode::Union; }
-        | EXCEPTION
-                { yyy = true; $$ = DeclarationNode::Exception; }
+                { $$ = DeclarationNode::Union; }
         | COROUTINE
-                { yyy = true; $$ = DeclarationNode::Coroutine; }
+                { $$ = DeclarationNode::Coroutine; }
         | MONITOR
-                { yyy = true; $$ = DeclarationNode::Monitor; }
+                { $$ = DeclarationNode::Monitor; }
         | THREAD
-                { yyy = true; $$ = DeclarationNode::Thread; }
-        ;
-
-field_declaration_list_opt:
+                { $$ = DeclarationNode::Thread; }
+        ;
+
+field_declaration_list:
         // empty
                 { $$ = nullptr; }
-        | field_declaration_list_opt field_declaration
+        | field_declaration_list field_declaration
                 { $$ = $1 ? $1->appendList( $2 ) : $2; }
         ;
 
 field_declaration:
-        type_specifier field_declaring_list_opt ';'
-                { $$ = fieldDecl( $1, $2 ); }
-        | EXTENSION type_specifier field_declaring_list_opt ';' // GCC
-                { $$ = fieldDecl( $2, $3 ); distExt( $$ ); }
-        | INLINE type_specifier field_abstract_list_opt ';'     // CFA
-                {
-                        if ( ! $3 ) {                                                           // field declarator ?
-                                $3 = DeclarationNode::newName( nullptr );
-                        } // if
-                        $3->inLine = true;
-                        $$ = distAttr( $2, $3 );                                        // mark all fields in list
-                        distInl( $3 );
-                }
-        | typedef_declaration ';'                                                       // CFA
-        | cfa_field_declaring_list ';'                                          // CFA, new style field declaration
+        cfa_field_declaring_list ';'                                            // CFA, new style field declaration
         | EXTENSION cfa_field_declaring_list ';'                        // GCC
-                { distExt( $2 ); $$ = $2; }                                             // mark all fields in list
-        | INLINE cfa_field_abstract_list ';'                            // CFA, new style field declaration
-                { $$ = $2; }                                                                    // mark all fields in list
-        | cfa_typedef_declaration ';'                                           // CFA
-        | static_assert                                                                         // C11
-        ;
-
-field_declaring_list_opt:
-        // empty
-                { $$ = nullptr; }
-        | field_declarator
-        | field_declaring_list_opt ',' attribute_list_opt field_declarator
-                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
-        ;
-
-field_declarator:
-        bit_subrange_size                                                                       // C special case, no field name
-                { $$ = DeclarationNode::newBitfield( $1 ); }
-        | variable_declarator bit_subrange_size_opt
-                // A semantic check is required to ensure bit_subrange only appears on integral types.
-                { $$ = $1->addBitfield( $2 ); }
-        | variable_type_redeclarator bit_subrange_size_opt
-                // A semantic check is required to ensure bit_subrange only appears on integral types.
-                { $$ = $1->addBitfield( $2 ); }
-        ;
-
-field_abstract_list_opt:
-        // empty
-                { $$ = nullptr; }
-        | field_abstract
-        | field_abstract_list_opt ',' attribute_list_opt field_abstract
-                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
-        ;
-
-field_abstract:
-                //      no bit fields
-        variable_abstract_declarator
+                {
+                        distExt( $2 );                                                          // mark all fields in list
+                        $$ = $2;
+                }
+        | type_specifier field_declaring_list ';'
+                {
+                        $$ = distAttr( $1, $2 ); }
+        | EXTENSION type_specifier field_declaring_list ';'     // GCC
+                {
+                        distExt( $3 );                                                          // mark all fields in list
+                        $$ = distAttr( $2, $3 );
+                }
         ;
 
 cfa_field_declaring_list:                                                               // CFA, new style field declaration
-        // bit-fields are handled by C declarations
-        cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
+        cfa_abstract_declarator_tuple                                           // CFA, no field name
+        | cfa_abstract_declarator_tuple no_attr_identifier_or_type_name
                 { $$ = $1->addName( $2 ); }
         | cfa_field_declaring_list ',' no_attr_identifier_or_type_name
                 { $$ = $1->appendList( $1->cloneType( $3 ) ); }
-        ;
-
-cfa_field_abstract_list:                                                                // CFA, new style field declaration
-        // bit-fields are handled by C declarations
-        cfa_abstract_declarator_tuple
-        | cfa_field_abstract_list ','
+        | cfa_field_declaring_list ','                                          // CFA, no field name
                 { $$ = $1->appendList( $1->cloneType( 0 ) ); }
+        ;
+
+field_declaring_list:
+        field_declarator
+        | field_declaring_list ',' attribute_list_opt field_declarator
+                { $$ = $1->appendList( $4->addQualifiers( $3 ) ); }
+        ;
+
+field_declarator:
+        // empty
+                { $$ = DeclarationNode::newName( 0 ); /* XXX */ } // CFA, no field name
+        // '@'
+        //      { $$ = DeclarationNode::newName( new string( DeclarationNode::anonymous.newName() ) ); } // CFA, no field name
+        | bit_subrange_size                                                                     // no field name
+                { $$ = DeclarationNode::newBitfield( $1 ); }
+        | variable_declarator bit_subrange_size_opt
+                // A semantic check is required to ensure bit_subrange only appears on base type int.
+                { $$ = $1->addBitfield( $2 ); }
+        | variable_type_redeclarator bit_subrange_size_opt
+                // A semantic check is required to ensure bit_subrange only appears on base type int.
+                { $$ = $1->addBitfield( $2 ); }
+        | variable_abstract_declarator                                          // CFA, no field name
         ;
 
@@ -2102 +1928 @@
                 { $$ = nullptr; }
         | bit_subrange_size
+                { $$ = $1; }
         ;
 
@@ -2111 +1938 @@
 enum_type:                                                                                              // enum
         ENUM attribute_list_opt '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( nullptr, $4, true )->addQualifiers( $2 ); }
-        | ENUM attribute_list_opt no_attr_identifier
+                { $$ = DeclarationNode::newEnum( new string( DeclarationNode::anonymous.newName() ), $4, true )->addQualifiers( $2 ); }
+        | ENUM attribute_list_opt no_attr_identifier_or_type_name
                 { typedefTable.makeTypedef( *$3 ); }
           '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( $3, $6, true )->addQualifiers( $2 ); }
-        | ENUM attribute_list_opt type_name
-          '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $3->type->symbolic.name, $5, true )->addQualifiers( $2 ); }
         | enum_type_nobody
         ;
 
 enum_type_nobody:                                                                               // enum - {...}
-        ENUM attribute_list_opt no_attr_identifier
+        ENUM attribute_list_opt no_attr_identifier_or_type_name
                 {
                         typedefTable.makeTypedef( *$3 );
                         $$ = DeclarationNode::newEnum( $3, 0, false )->addQualifiers( $2 );
-                }
-        | ENUM attribute_list_opt type_name
-                {
-                        typedefTable.makeTypedef( *$3->type->symbolic.name );
-                        $$ = DeclarationNode::newEnum( $3->type->symbolic.name, 0, false )->addQualifiers( $2 );
                 }
         ;
@@ -2149 +1968 @@
         ;
 
-cfa_parameter_ellipsis_list_opt:                                                        // CFA, abstract + real
+// Minimum of one parameter after which ellipsis is allowed only at the end.
+
+cfa_parameter_type_list_opt:                                                    // CFA
         // empty
-                { $$ = DeclarationNode::newBasicType( DeclarationNode::Void ); }
-        | ELLIPSIS
                 { $$ = nullptr; }
-        | cfa_abstract_parameter_list
+        | cfa_parameter_type_list
+        ;
+
+cfa_parameter_type_list:                                                                // CFA, abstract + real
+        cfa_abstract_parameter_list
         | cfa_parameter_list
         | cfa_parameter_list pop ',' push cfa_abstract_parameter_list
@@ -2185 +2008 @@
         // empty
                 { $$ = nullptr; }
-        | ELLIPSIS
-                { $$ = nullptr; }
-        | parameter_list
+        | parameter_type_list
+        ;
+
+parameter_type_list:
+        parameter_list
         | parameter_list pop ',' push ELLIPSIS
                 { $$ = $1->addVarArgs(); }
@@ -2229 +2054 @@
                 // No SUE declaration in parameter list.
         declaration_specifier_nobody identifier_parameter_declarator default_initialize_opt
-                { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
+                }
         | declaration_specifier_nobody type_parameter_redeclarator default_initialize_opt
-                { $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
+                }
         ;
 
@@ -2282 +2113 @@
                 { $$ = $2; }
         | '=' VOID
-                { $$ = new InitializerNode( true ); }
+                { $$ = nullptr; }
         | ATassign initializer
                 { $$ = $2->set_maybeConstructed( false ); }
@@ -2289 +2120 @@
 initializer:
         assignment_expression                                           { $$ = new InitializerNode( $1 ); }
-        | '{' initializer_list_opt comma_opt '}'        { $$ = new InitializerNode( $2, true ); }
-        ;
-
-initializer_list_opt:
+        | '{' initializer_list comma_opt '}'            { $$ = new InitializerNode( $2, true ); }
+        ;
+
+initializer_list:
         // empty
                 { $$ = nullptr; }
         | initializer
         | designation initializer                                       { $$ = $2->set_designators( $1 ); }
-        | initializer_list_opt ',' initializer          { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
-        | initializer_list_opt ',' designation initializer
+        | initializer_list ',' initializer                      { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
+        | initializer_list ',' designation initializer
                 { $$ = (InitializerNode *)( $1->set_last( $4->set_designators( $3 ) ) ); }
         ;
@@ -2335 +2166 @@
         | '[' push constant_expression ELLIPSIS constant_expression pop ']' // GCC, multiple array elements
                 { $$ = new ExpressionNode( new RangeExpr( maybeMoveBuild< Expression >( $3 ), maybeMoveBuild< Expression >( $5 ) ) ); }
-        | '.' '[' push field_name_list pop ']'                          // CFA, tuple field selector
+        | '.' '[' push field_list pop ']'                                       // CFA, tuple field selector
                 { $$ = $4; }
         ;
@@ -2359 +2190 @@
 type_parameter_list:                                                                    // CFA
         type_parameter
+                { $$ = $1; }
         | type_parameter_list ',' type_parameter
                 { $$ = $1->appendList( $3 ); }
@@ -2372 +2204 @@
 type_parameter:                                                                                 // CFA
         type_class no_attr_identifier_or_type_name
-                { typedefTable.addToScope( *$2, TYPEDEFname, "9" ); }
+                { typedefTable.addToEnclosingScope( *$2, TypedefTable::TD ); }
           type_initializer_opt assertion_list_opt
                 { $$ = DeclarationNode::newTypeParam( $1, $2 )->addTypeInitializer( $4 )->addAssertions( $5 ); }
         | type_specifier identifier_parameter_declarator
-        | assertion_list
-                { $$ = DeclarationNode::newTypeParam( DeclarationNode::Dtype, new string( DeclarationNode::anonymous.newName() ) )->addAssertions( $1 ); }
         ;
 
@@ -2394 +2224 @@
         // empty
                 { $$ = nullptr; }
-        | assertion_list
-        ;
-
-assertion_list:                                                                                 // CFA
-        assertion
-        | assertion_list assertion
+        | assertion_list_opt assertion
                 { $$ = $1 ? $1->appendList( $2 ) : $2; }
         ;
@@ -2405 +2230 @@
 assertion:                                                                                              // CFA
         '|' no_attr_identifier_or_type_name '(' type_list ')'
-                { $$ = DeclarationNode::newTraitUse( $2, $4 ); }
-        | '|' '{' push trait_declaration_list pop '}'
+                {
+                        typedefTable.openTrait( *$2 );
+                        $$ = DeclarationNode::newTraitUse( $2, $4 );
+                }
+        | '|' '{' push trait_declaration_list '}'
                 { $$ = $4; }
-        // | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list pop '}' '(' type_list ')'
-        //      { SemanticError( yylloc, "Generic data-type assertion is currently unimplemented." ); $$ = nullptr; }
+        | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list '}' '(' type_list ')'
+                { $$ = nullptr; }
         ;
 
@@ -2416 +2244 @@
                 { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
         | assignment_expression
-                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $1->build()) ); $$ = nullptr; }
         | type_list ',' type
                 { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) ) ); }
         | type_list ',' assignment_expression
-                { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $3->build()) ); $$ = nullptr; }
-                // { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;
 
@@ -2443 +2269 @@
         no_attr_identifier_or_type_name
                 {
-                        typedefTable.addToEnclosingScope( *$1, TYPEDEFname, "10" );
+                        typedefTable.addToEnclosingScope( *$1, TypedefTable::TD );
                         $$ = DeclarationNode::newTypeDecl( $1, 0 );
                 }
-        | no_attr_identifier_or_type_name '(' type_parameter_list ')'
-                {
-                        typedefTable.addToEnclosingScope( *$1, TYPEGENname, "11" );
-                        $$ = DeclarationNode::newTypeDecl( $1, $3 );
+        | no_attr_identifier_or_type_name '(' push type_parameter_list pop ')'
+                {
+                        typedefTable.addToEnclosingScope( *$1, TypedefTable::TG );
+                        $$ = DeclarationNode::newTypeDecl( $1, $4 );
                 }
         ;
 
 trait_specifier:                                                                                // CFA
-        TRAIT no_attr_identifier_or_type_name '(' type_parameter_list ')' '{' '}'
-                { $$ = DeclarationNode::newTrait( $2, $4, 0 ); }
-        | TRAIT no_attr_identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
-                { $$ = DeclarationNode::newTrait( $2, $4, $8 ); }
+        TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{' '}'
+                {
+                        typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
+                        $$ = DeclarationNode::newTrait( $2, $5, 0 );
+                }
+        | TRAIT no_attr_identifier_or_type_name '(' push type_parameter_list pop ')' '{'
+                {
+                        typedefTable.enterTrait( *$2 );
+                        typedefTable.enterScope();
+                }
+          trait_declaration_list '}'
+                {
+                        typedefTable.leaveTrait();
+                        typedefTable.addToEnclosingScope( *$2, TypedefTable::ID );
+                        $$ = DeclarationNode::newTrait( $2, $5, $10 );
+                }
         ;
 
 trait_declaration_list:                                                                 // CFA
         trait_declaration
-        | trait_declaration_list pop push trait_declaration
-                { $$ = $1->appendList( $4 ); }
+        | trait_declaration_list push trait_declaration
+                { $$ = $1->appendList( $3 ); }
         ;
 
 trait_declaration:                                                                              // CFA
-        cfa_trait_declaring_list ';'
-        | trait_declaring_list ';'
+        cfa_trait_declaring_list pop ';'
+        | trait_declaring_list pop ';'
         ;
 
 cfa_trait_declaring_list:                                                               // CFA
         cfa_variable_specifier
+                {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        $$ = $1;
+                }
         | cfa_function_specifier
+                {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        $$ = $1;
+                }
         | cfa_trait_declaring_list pop ',' push identifier_or_type_name
-                { $$ = $1->appendList( $1->cloneType( $5 ) ); }
+                {
+                        typedefTable.addToEnclosingScope2( *$5, TypedefTable::ID );
+                        $$ = $1->appendList( $1->cloneType( $5 ) );
+                }
         ;
 
 trait_declaring_list:                                                                   // CFA
         type_specifier declarator
-                { $$ = $2->addType( $1 ); }
+                {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        $$ = $2->addType( $1 );
+                }
         | trait_declaring_list pop ',' push declarator
-                { $$ = $1->appendList( $1->cloneBaseType( $5 ) ); }
+                {
+                        typedefTable.addToEnclosingScope2( TypedefTable::ID );
+                        $$ = $1->appendList( $1->cloneBaseType( $5 ) );
+                }
         ;
 
@@ -2488 +2343 @@
 
 translation_unit:
-        // empty, input file
+        // empty
+                {}                                                                                              // empty input file
         | external_definition_list
                 { parseTree = parseTree ? parseTree->appendList( $1 ) : $1;     }
@@ -2494 +2350 @@
 
 external_definition_list:
-        push external_definition pop
-                { $$ = $2; }
-        | external_definition_list push external_definition pop
+        external_definition
+        | external_definition_list push external_definition
                 { $$ = $1 ? $1->appendList( $3 ) : $3; }
         ;
@@ -2506 +2361 @@
         ;
 
-up:
-                { typedefTable.up( forall ); forall = false; }
-        ;
-
-down:
-                { typedefTable.down(); }
-        ;
-
 external_definition:
         declaration
         | external_function_definition
+        | ASM '(' string_literal ')' ';'                                        // GCC, global assembler statement
+                {
+                        $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asmstmt( false, $3, 0 ) ) );
+                }
+        | EXTERN STRINGliteral                                                          // C++-style linkage specifier
+                {
+                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
+                        linkage = LinkageSpec::linkageUpdate( linkage, $2 );
+                }
+          '{' external_definition_list_opt '}'
+                {
+                        linkage = linkageStack.top();
+                        linkageStack.pop();
+                        $$ = $5;
+                }
         | EXTENSION external_definition                                         // GCC, multiple __extension__ allowed, meaning unknown
                 {
@@ -2522 +2384 @@
                         $$ = $2;
                 }
-        | ASM '(' string_literal ')' ';'                                        // GCC, global assembler statement
-                {
-                        $$ = DeclarationNode::newAsmStmt( new StatementNode( build_asm( false, $3, 0 ) ) );
-                }
-        | EXTERN STRINGliteral                                                          // C++-style linkage specifier
-                {
-                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
-                        linkage = LinkageSpec::linkageUpdate( yylloc, linkage, $2 );
-                }
-          '{' up external_definition_list_opt down '}'
-                {
-                        linkage = linkageStack.top();
-                        linkageStack.pop();
-                        $$ = $6;
-                }
-        | type_qualifier_list
-                {
-                        if ( $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( $1->type->forall ) forall = true;          // remember generic type
-                }
-          '{' up external_definition_list_opt down '}'          // CFA, namespace
-                {
-                        distQual( $5, $1 );
-                        forall = false;
-                        $$ = $5;
-                }
-        | declaration_qualifier_list
-                {
-                        if ( $1->type && $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( $1->type && $1->type->forall ) forall = true; // remember generic type
-                }
-          '{' up external_definition_list_opt down '}'          // CFA, namespace
-                {
-                        distQual( $5, $1 );
-                        forall = false;
-                        $$ = $5;
-                }
-        | declaration_qualifier_list type_qualifier_list
-                {
-                        if ( ($1->type && $1->type->qualifiers.val) || $2->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
-                        if ( ($1->type && $1->type->forall) || $2->type->forall ) forall = true; // remember generic type
-                }
-          '{' up external_definition_list_opt down '}'          // CFA, namespace
-                {
-                        distQual( $6, $1->addQualifiers( $2 ) );
-                        forall = false;
-                        $$ = $6;
-                }
+        | forall '{' external_definition_list '}'                       // CFA, namespace
         ;
 
@@ -2580 +2395 @@
                 // declaration must still have a type_specifier.  OBSOLESCENT (see 1)
         | function_declarator compound_statement
-                { $$ = $1->addFunctionBody( $2 ); }
-        | KR_function_declarator KR_parameter_list_opt compound_statement
-                { $$ = $1->addOldDeclList( $2 )->addFunctionBody( $3 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $1->addFunctionBody( $2 );
+                }
+        | KR_function_declarator KR_declaration_list_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $1->addOldDeclList( $2 )->addFunctionBody( $3 );
+                }
         ;
 
 with_clause_opt:
         // empty
-                { $$ = nullptr; forall = false; }
+                { $$ = nullptr; }
         | WITH '(' tuple_expression_list ')'
-                { $$ = $3; forall = false; }
+                { $$ = new StatementNode( build_with( $3, nullptr ) ); }
         ;
 
@@ -2595 +2418 @@
         cfa_function_declaration with_clause_opt compound_statement     // CFA
                 {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
                         // Add the function body to the last identifier in the function definition list, i.e., foo3:
                         //   [const double] foo1(), foo2( int ), foo3( double ) { return 3.0; }
@@ -2603 +2428 @@
                 {
                         rebindForall( $1, $2 );
-                        $$ = $2->addFunctionBody( $4, $3 )->addType( $1 );
-                }
-        | declaration_specifier variable_type_redeclarator with_clause_opt compound_statement
-                {
-                        rebindForall( $1, $2 );
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
                         $$ = $2->addFunctionBody( $4, $3 )->addType( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
         | type_qualifier_list function_declarator with_clause_opt compound_statement
-                { $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 );
+                }
                 // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list function_declarator with_clause_opt compound_statement
-                { $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addFunctionBody( $4, $3 )->addQualifiers( $1 );
+                }
                 // handles default int return type, OBSOLESCENT (see 1)
         | declaration_qualifier_list type_qualifier_list function_declarator with_clause_opt compound_statement
-                { $$ = $3->addFunctionBody( $5, $4 )->addQualifiers( $2 )->addQualifiers( $1 ); }
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $3->addFunctionBody( $5, $4 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
 
                 // Old-style K&R function definition, OBSOLESCENT (see 4)
-        | declaration_specifier KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
+        | declaration_specifier KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {
                         rebindForall( $1, $2 );
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
                         $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addType( $1 );
                 }
                 // handles default int return type, OBSOLESCENT (see 1)
-        | type_qualifier_list KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
-                { $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 ); }
+        | type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 );
+                }
                 // handles default int return type, OBSOLESCENT (see 1)
-        | declaration_qualifier_list KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
-                { $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 ); }
+        | declaration_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5, $4 )->addQualifiers( $1 );
+                }
                 // handles default int return type, OBSOLESCENT (see 1)
-        | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_parameter_list_opt with_clause_opt compound_statement
-                { $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6, $5 )->addQualifiers( $2 )->addQualifiers( $1 ); }
+        | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
+                {
+                        typedefTable.addToEnclosingScope( TypedefTable::ID );
+                        typedefTable.leaveScope();
+                        $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6, $5 )->addQualifiers( $2 )->addQualifiers( $1 );
+                }
         ;
 
@@ -2744 +2592 @@
 paren_identifier:
         identifier
-                { $$ = DeclarationNode::newName( $1 ); }
+                {
+                        typedefTable.setNextIdentifier( *$1 );
+                        $$ = DeclarationNode::newName( $1 );
+                }
         | '(' paren_identifier ')'                                                      // redundant parenthesis
                 { $$ = $2; }
@@ -2877 +2728 @@
 paren_type:
         typedef
-                // hide type name in enclosing scope by variable name
-                {
-                        // if ( ! typedefTable.existsCurr( *$1->name ) ) {
-                                typedefTable.addToEnclosingScope( *$1->name, IDENTIFIER, "ID" );
-                        // } else {
-                        //      SemanticError( yylloc, string("'") + *$1->name + "' redeclared as different kind of symbol." ); $$ = nullptr;
-                        // } // if
-                }
         | '(' paren_type ')'
                 { $$ = $2; }
@@ -2895 +2738 @@
                 { $$ = $3->addPointer( DeclarationNode::newPointer( $2, $1 ) ); }
         | '(' type_ptr ')' attribute_list_opt
-                { $$ = $2->addQualifiers( $4 ); }                               // redundant parenthesis
+                { $$ = $2->addQualifiers( $4 ); }
         ;
 
@@ -2987 +2830 @@
 typedef:
         TYPEDEFname
-                { $$ = DeclarationNode::newName( $1 ); }
+                {
+                        typedefTable.setNextIdentifier( *$1 );
+                        $$ = DeclarationNode::newName( $1 );
+                }
         | TYPEGENname
-                { $$ = DeclarationNode::newName( $1 ); }
+                {
+                        typedefTable.setNextIdentifier( *$1 );
+                        $$ = DeclarationNode::newName( $1 );
+                }
         ;
 
@@ -3174 +3023 @@
         '[' ']'
                 { $$ = DeclarationNode::newArray( 0, 0, false ); }
-                // multi_array_dimension handles the '[' '*' ']' case
+        // multi_array_dimension handles the '[' '*' ']' case
         | '[' push type_qualifier_list '*' pop ']'                      // remaining C99
                 { $$ = DeclarationNode::newVarArray( $3 ); }
         | '[' push type_qualifier_list pop ']'
                 { $$ = DeclarationNode::newArray( 0, $3, false ); }
-                // multi_array_dimension handles the '[' assignment_expression ']' case
+        // multi_array_dimension handles the '[' assignment_expression ']' case
         | '[' push type_qualifier_list assignment_expression pop ']'
                 { $$ = DeclarationNode::newArray( $4, $3, false ); }
@@ -3315 +3164 @@
 //
 //              cfa_abstract_tuple identifier_or_type_name
-//              '[' cfa_parameter_list ']' identifier_or_type_name '(' cfa_parameter_ellipsis_list_opt ')'
+//              '[' cfa_parameter_list ']' identifier_or_type_name '(' cfa_parameter_type_list_opt ')'
 //
 // since a function return type can be syntactically identical to a tuple type:
@@ -3374 +3223 @@
         '[' push cfa_abstract_parameter_list pop ']'
                 { $$ = DeclarationNode::newTuple( $3 ); }
-        | '[' push type_specifier_nobody ELLIPSIS pop ']'
-                { SemanticError( yylloc, "Tuple array currently unimplemented." ); $$ = nullptr; }
-        | '[' push type_specifier_nobody ELLIPSIS constant_expression pop ']'
-                { SemanticError( yylloc, "Tuple array currently unimplemented." ); $$ = nullptr; }
         ;
 
 cfa_abstract_function:                                                                  // CFA
-//      '[' ']' '(' cfa_parameter_ellipsis_list_opt ')'
+//      '[' ']' '(' cfa_parameter_type_list_opt ')'
 //              { $$ = DeclarationNode::newFunction( nullptr, DeclarationNode::newTuple( nullptr ), $4, nullptr ); }
-        cfa_abstract_tuple '(' push cfa_parameter_ellipsis_list_opt pop ')'
+        cfa_abstract_tuple '(' push cfa_parameter_type_list_opt pop ')'
                 { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
-        | cfa_function_return '(' push cfa_parameter_ellipsis_list_opt pop ')'
+        | cfa_function_return '(' push cfa_parameter_type_list_opt pop ')'
                 { $$ = DeclarationNode::newFunction( nullptr, $1, $4, nullptr ); }
         ;
@@ -3416 +3261 @@
 
 %%
-
 // ----end of grammar----