Changeset 39f04ec

Timestamp:

Jul 5, 2016, 11:10:14 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9bb81bb8

Parents:

a43e1d7 (diff), d32c4e2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (16 diffs)
• CodeGen/CodeGenerator.h (modified) (3 diffs)
• ControlStruct/CaseRangeMutator.cc (modified) (1 diff)
• GenPoly/Box.cc (modified) (2 diffs)
• GenPoly/GenPoly.cc (modified) (2 diffs)
• InitTweak/FixGlobalInit.cc (modified) (5 diffs)
• InitTweak/FixInit.cc (modified) (1 diff)
• Parser/DeclarationNode.cc (modified) (2 diffs)
• Parser/ExpressionNode.cc (modified) (5 diffs)
• Parser/InitializerNode.cc (modified) (2 diffs)
• Parser/ParseNode.cc (modified) (3 diffs)
• Parser/ParseNode.h (modified) (6 diffs)
• Parser/parser.cc (modified) (457 diffs)
• Parser/parser.yy (modified) (6 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (3 diffs)
• SynTree/Constant.h (modified) (2 diffs)
• SynTree/Declaration.h (modified) (3 diffs)
• SynTree/Expression.h (modified) (2 diffs)
• driver/cfa.cc (modified) (2 diffs)
• libcfa/builtins.cf (modified) (1 diff)
• libcfa/stdlib (modified) (2 diffs)
• libcfa/stdlib.c (modified) (2 diffs)
• tests/.expect/quoted_keyword.txt (added)
• tests/extension.c (added)
• tests/quoted_keyword.c (modified) (2 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  9 13:21:00 2016
-// Update Count     : 256
+// Last Modified On : Mon Jul  4 20:38:32 2016
+// Update Count     : 300
 //
 
@@ -47 +47 @@
                         dynamic_cast< WhileStmt * >( stmt ) || dynamic_cast< ForStmt * > ( stmt ) || dynamic_cast< SwitchStmt *>( stmt );
         }
+
+        void CodeGenerator::extension( Expression *expr ) {
+                if ( expr->get_extension() ) {
+                        output << "__extension__ ";
+                } // if
+        } // extension
+
+        void CodeGenerator::extension( Declaration *decl ) {
+                if ( decl->get_extension() ) {
+                        output << "__extension__ ";
+                } // if
+        } // extension
 
         ostream & CodeGenerator::Indenter::operator()( ostream & output ) const {
@@ -110 +122 @@
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
+                extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
 
@@ -134 +147 @@
 
         void CodeGenerator::visit( ObjectDecl *objectDecl ) {
+                extension( objectDecl );
                 handleStorageClass( objectDecl );
                 output << genType( objectDecl->get_type(), mangleName( objectDecl ) );
@@ -170 +184 @@
 
         void CodeGenerator::visit( StructDecl *structDecl ) {
+                extension( structDecl );
                 output << "struct ";
                 handleAggregate( structDecl );
         }
 
-        void CodeGenerator::visit( UnionDecl *aggregateDecl ) {
+        void CodeGenerator::visit( UnionDecl *unionDecl ) {
+                extension( unionDecl );
                 output << "union ";
-                handleAggregate( aggregateDecl );
-        }
-
-        void CodeGenerator::visit( EnumDecl *aggDecl ) {
+                handleAggregate( unionDecl );
+        }
+
+        void CodeGenerator::visit( EnumDecl *enumDecl ) {
+                extension( enumDecl );
                 output << "enum ";
 
-                if ( aggDecl->get_name() != "" )
-                        output << aggDecl->get_name();
-
-                std::list< Declaration* > &memb = aggDecl->get_members();
+                if ( enumDecl->get_name() != "" )
+                        output << enumDecl->get_name();
+
+                std::list< Declaration* > &memb = enumDecl->get_members();
 
                 if ( ! memb.empty() ) {
@@ -208 +225 @@
         }
 
-        void CodeGenerator::visit( TraitDecl *aggregateDecl ) {}
+        void CodeGenerator::visit( TraitDecl *traitDecl ) {}
 
         void CodeGenerator::visit( TypedefDecl *typeDecl ) {
-                output << "typedef ";
-                output << genType( typeDecl->get_base(), typeDecl->get_name() );
+                assert( false && "Typedefs are removed and substituted in earlier passes." );
+                //output << "typedef ";
+                //output << genType( typeDecl->get_base(), typeDecl->get_name() );
         }
 
@@ -218 +236 @@
                 // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
                 // still to be done
+                extension( typeDecl );
                 output << "extern unsigned long " << typeDecl->get_name();
                 if ( typeDecl->get_base() ) {
@@ -251 +270 @@
                 output << "{ ";
                 if ( init->begin_initializers() == init->end_initializers() ) {
-                        // illegal to leave initializer list empty for scalar initializers,
-                        // but always legal to have 0
+                        // illegal to leave initializer list empty for scalar initializers, but always legal to have 0
                         output << "0";
                 } else {
@@ -317 +335 @@
                                   case OT_DTOR:
                                         if ( applicationExpr->get_args().size() == 1 ) {
-                                                // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects, so must still output this expression
+                                                // the expression fed into a single parameter constructor or destructor may contain side
+                                                // effects, so must still output this expression
                                                 output << "(";
                                                 (*arg++)->accept( *this );
@@ -403 +421 @@
                                   case OT_DTOR:
                                         if ( untypedExpr->get_args().size() == 1 ) {
-                                                // the expression fed into a single parameter constructor or destructor
-                                                // may contain side effects, so must still output this expression
+                                                // the expression fed into a single parameter constructor or destructor may contain side
+                                                // effects, so must still output this expression
                                                 output << "(";
                                                 (*arg++)->accept( *this );
@@ -500 +518 @@
                         output << ")";
                 } else {
-                        // otherwise, the cast is to an lvalue type, so the cast
-                        // should be dropped, since the result of a cast is
+                        // otherwise, the cast is to an lvalue type, so the cast should be dropped, since the result of a cast is
                         // never an lvalue in C
                 }
@@ -546 +563 @@
 
         void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
+                // use GCC extension to avoid bumping std to C11
                 extension( alignofExpr );
-                // use GCC extension to avoid bumping std to C11
                 output << "__alignof__(";
                 if ( alignofExpr->get_isType() ) {
@@ -558 +575 @@
 
         void CodeGenerator::visit( UntypedOffsetofExpr *offsetofExpr ) {
-                assert( false && "UntypedOffsetofExpr should not reach code generation" );
+                assert( false && "UntypedOffsetofExpr should not reach code generation." );
         }
 
         void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
-                extension( offsetofExpr );
                 // use GCC builtin
                 output << "__builtin_offsetof(";
@@ -571 +587 @@
 
         void CodeGenerator::visit( OffsetPackExpr *offsetPackExpr ) {
-                assert( false && "OffsetPackExpr should not reach code generation" );
+                assert( false && "OffsetPackExpr should not reach code generation." );
         }
 
@@ -612 +628 @@
 
         void CodeGenerator::visit( AsmExpr *asmExpr ) {
-                extension( asmExpr );
                 if ( asmExpr->get_inout() ) {
                         output << "[ ";
@@ -777 +792 @@
 
         void CodeGenerator::visit( ForStmt *forStmt ) {
-                // initialization is always hoisted, so don't
-                // bother doing anything with that
+                // initialization is always hoisted, so don't bother doing anything with that
                 output << "for (;";
 

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  9 13:15:58 2016
-// Update Count     : 29
+// Last Modified On : Mon Jul  4 17:12:40 2016
+// Update Count     : 34
 //
 
@@ -104 +104 @@
                 };
 
-                void extension( Expression *expr ) {
-                        if ( expr->get_extension() ) {
-                                output << "__extension__ ";
-                        } // if
-                } // extension
+                void extension( Expression *expr );
+                void extension( Declaration *decl );
           private:
 
@@ -121 +118 @@
                 void handleAggregate( AggregateDecl *aggDecl );
                 void handleTypedef( NamedTypeDecl *namedType );
-
         };
 

src/ControlStruct/CaseRangeMutator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 25 21:22:40 2016
-// Update Count     : 4
+// Last Modified On : Thu Jun 30 13:28:55 2016
+// Update Count     : 8
 //
 

src/GenPoly/Box.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 14:51:21 2016
-// Update Count     : 295
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 29 21:43:03 2016
+// Update Count     : 296
 //
 
@@ -2294 +2294 @@
                                 // all union members are at offset zero
                                 delete offsetofExpr;
-                                return new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::string("0") ) );
+                                return new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), "0" ) );
                         } else return offsetofExpr;
                 }

src/GenPoly/GenPoly.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed May 25 13:39:21 2016
-// Update Count     : 13
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 29 21:45:53 2016
+// Update Count     : 14
 //
 
@@ -78 +78 @@
                 type = replaceTypeInst( type, env );
 
-                if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( type ) ) {
+                if ( dynamic_cast< TypeInstType * >( type ) ) {
                         return type;
                 } else if ( StructInstType *structType = dynamic_cast< StructInstType* >( type ) ) {

src/InitTweak/FixGlobalInit.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Mon May 04 15:14:56 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 13 11:37:30 2016
-// Update Count     : 2
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun 29 22:33:15 2016
+// Update Count     : 4
 //
 
@@ -85 +85 @@
                         init->accept( checker );
                         return checker.isConstExpr;
-                }
+                } // if
                 // for all intents and purposes, no initializer means const expr
                 return true;
@@ -98 +98 @@
                 } else {
                         translationUnit.push_back( fixer.initFunction );
-                }
+                } // if
+
                 if ( fixer.destroyFunction->get_statements()->get_kids().empty() ) {
                         delete fixer.destroyFunction;
                 } else {
                         translationUnit.push_back( fixer.destroyFunction );
-                }
+                } // if
         }
 
@@ -146 +147 @@
                 // if ( isConstExpr( objDecl->get_init() ) ) return;
 
-                if ( ArrayType * at = dynamic_cast< ArrayType * > ( objDecl->get_type() ) ) {
+                if ( dynamic_cast< ArrayType * > ( objDecl->get_type() ) ) {
                         // xxx - initialize each element of the array
                 } else {
@@ -164 +165 @@
                         destroy->get_args().push_back( new AddressExpr( new VariableExpr( objDecl ) ) );
                         destroyStatements.push_front( new ImplicitCtorDtorStmt( new ExprStmt( noLabels, destroy ) ) );
-                }
+                } // if
         }
 

src/InitTweak/FixInit.cc

@@ -449 +449 @@
                                                 FunctionDecl * dtorCaller = new FunctionDecl( objDecl->get_mangleName() + "_dtor_atexit", DeclarationNode::NoStorageClass, LinkageSpec::C, new FunctionType( Type::Qualifiers(), false ), new CompoundStmt( noLabels ), false, false );
                                                 dtorCaller->fixUniqueId();
-                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor() );
+                                                dtorCaller->get_statements()->get_kids().push_back( ctorInit->get_dtor()->clone() );
 
                                                 // on_exit(dtor_atexit);

src/Parser/DeclarationNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 12:34:05 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:38:09 2016
-// Update Count     : 161
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 30 14:39:51 2016
+// Update Count     : 163
 //
 
@@ -855 +855 @@
 Declaration *DeclarationNode::build() const {
         if ( type ) {
-                Declaration *newDecl = type->buildDecl( name, buildStorageClass(), maybeBuild< Expression >( bitfieldWidth ), buildFuncSpecifier( Inline ), buildFuncSpecifier( Noreturn ), linkage, maybeBuild< Initializer >(initializer) );
-                return newDecl;
+                return type->buildDecl( name, buildStorageClass(), maybeBuild< Expression >( bitfieldWidth ), buildFuncSpecifier( Inline ), buildFuncSpecifier( Noreturn ), linkage, maybeBuild< Initializer >(initializer) )->set_extension( extension );
         } // if
         if ( ! buildFuncSpecifier( Inline ) && ! buildFuncSpecifier( Noreturn ) ) {
-                return new ObjectDecl( name, buildStorageClass(), linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) );
+                return (new ObjectDecl( name, buildStorageClass(), linkage, maybeBuild< Expression >( bitfieldWidth ), 0, maybeBuild< Initializer >( initializer ) ))->set_extension( extension );
         } // if
         throw SemanticError( "invalid function specifier in declaration of ", this );

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 13 14:46:17 2016
-// Update Count     : 307
+// Last Modified On : Thu Jun 30 13:33:16 2016
+// Update Count     : 319
 //
 
@@ -19 +19 @@
 #include <sstream>
 #include <cstdio>
-#include <climits>
 
 #include "ParseNode.h"
@@ -90 +89 @@
 //##############################################################################
 
-static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
-static inline bool checkL( char c ) { return c == 'l' || c == 'L'; }
-static inline bool checkF( char c ) { return c == 'f' || c == 'F'; }
-static inline bool checkD( char c ) { return c == 'd' || c == 'D'; }
-static inline bool checkI( char c ) { return c == 'i' || c == 'I'; }
-static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
-
-// Difficult to separate extra parts of constants during lexing because actions are not allow in the middle of patterns:
-//
-//              prefix action constant action suffix
-//
-// Alternatively, breaking a pattern using BEGIN does not work if the following pattern can be empty:
-//
-//              constant BEGIN CONT ...
-//              <CONT>(...)? BEGIN 0 ... // possible empty suffix
-//
-// because the CONT rule is NOT triggered if the pattern is empty. Hence, constants are reparsed here to determine their
-// type.
-
-ConstantNode::ConstantNode( Type t, string *inVal ) : type( t ), value( *inVal ) {
-        // lexing divides constants into 4 kinds
-        switch ( type ) {
-          case Integer:
-                {
-                        static const BasicType::Kind kind[2][3] = {
-                                { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
-                                { BasicType::UnsignedInt, BasicType::LongUnsignedInt, BasicType::LongLongUnsignedInt },
-                        };
-                        bool dec = true, Unsigned = false;                      // decimal, unsigned constant
-                        int size;                                                                       // 0 => int, 1 => long, 2 => long long
-                        unsigned long long v;                                           // converted integral value
-                        size_t last = value.length() - 1;                       // last character of constant
-
-                        if ( value[0] == '0' ) {                                        // octal constant ?
-                                dec = false;
-                                if ( last != 0 && checkX( value[1] ) ) { // hex constant ?
-                                        sscanf( (char *)value.c_str(), "%llx", &v );
-                                        //printf( "%llx %llu\n", v, v );
-                                } else {
-                                        sscanf( (char *)value.c_str(), "%llo", &v );
-                                        //printf( "%llo %llu\n", v, v );
-                                } // if
-                        } else {                                                                        // decimal constant ?
-                                sscanf( (char *)value.c_str(), "%llu", &v );
-                                //printf( "%llu %llu\n", v, v );
-                        } // if
-
-                        if ( v <= INT_MAX ) {                                           // signed int
-                                size = 0;
-                        } else if ( v <= UINT_MAX && ! dec ) {          // unsigned int
-                                size = 0;
-                                Unsigned = true;                                                // unsigned
-                        } else if ( v <= LONG_MAX ) {                           // signed long int
-                                size = 1;
-                        } else if ( v <= ULONG_MAX && ( ! dec || LONG_MAX == LLONG_MAX ) ) { // signed long int
-                                size = 1;
-                                Unsigned = true;                                                // unsigned long int
-                        } else if ( v <= LLONG_MAX ) {                          // signed long long int
-                                size = 2;
-                        } else {                                                                        // unsigned long long int
-                                size = 2;
-                                Unsigned = true;                                                // unsigned long long int
-                        } // if
-
-                        if ( checkU( value[last] ) ) {                          // suffix 'u' ?
-                                Unsigned = true;
-                                if ( last > 0 && checkL( value[ last - 1 ] ) ) { // suffix 'l' ?
-                                        size = 1;
-                                        if ( last > 1 && checkL( value[ last - 2 ] ) ) { // suffix 'll' ?
-                                                size = 2;
-                                        } // if
-                                } // if
-                        } else if ( checkL( value[ last ] ) ) {         // suffix 'l' ?
-                                size = 1;
-                                if ( last > 0 && checkL( value[ last - 1 ] ) ) { // suffix 'll' ?
-                                        size = 2;
-                                        if ( last > 1 && checkU( value[ last - 2 ] ) ) { // suffix 'u' ?
-                                                Unsigned = true;
-                                        } // if
-                                } else {
-                                        if ( last > 0 && checkU( value[ last - 1 ] ) ) { // suffix 'u' ?
-                                                Unsigned = true;
-                                        } // if
-                                } // if
-                        } // if
-                        btype = kind[Unsigned][size];                           // lookup constant type
-                        break;
-                }
-          case Float:
-                {
-                        static const BasicType::Kind kind[2][3] = {
-                                { BasicType::Float, BasicType::Double, BasicType::LongDouble },
-                                { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex },
-                        };
-                        bool complx = false;                                            // real, complex
-                        int size = 1;                                                           // 0 => float, 1 => double (default), 2 => long double
-                        // floating-point constant has minimum of 2 characters: 1. or .1
-                        size_t last = value.length() - 1;
-
-                        if ( checkI( value[last] ) ) {                          // imaginary ?
-                                complx = true;
-                                last -= 1;                                                              // backup one character
-                        } // if
-                        if ( checkF( value[last] ) ) {                          // float ?
-                                size = 0;
-                        } else if ( checkD( value[last] ) ) {           // double ?
-                                size = 1;
-                        } else if ( checkL( value[last] ) ) {           // long double ?
-                                size = 2;
-                        } // if
-                        if ( ! complx && checkI( value[last - 1] ) ) { // imaginary ?
-                                complx = true;
-                        } // if
-                        btype = kind[complx][size];                                     // lookup constant type
-                        break;
-                }
-          case Character:
-                btype = BasicType::Char;                                                // default
-                if ( string( "LUu" ).find( value[0] ) != string::npos ) {
-                        // ???
-                } // if
-                break;
-          case String:
-                // array of char
-                if ( string( "LUu" ).find( value[0] ) != string::npos ) {
-                        if ( value[0] == 'u' && value[1] == '8' ) {
-                                // ???
-                        } else {
-                                // ???
-                        } // if
-                } // if
-                break;
-        } // switch
+ConstantNode::ConstantNode( ConstantExpr *expr ) : expr( expr ) {
 } // ConstantNode::ConstantNode
 
 ConstantNode *ConstantNode::appendstr( const std::string *newValue ) {
         assert( newValue != 0 );
-        assert( type == String );
+        string value = expr->get_constant()->get_value();
 
         // "abc" "def" "ghi" => "abcdefghi", remove new text from quotes and insert before last quote in old string.
@@ -237 +104 @@
 
 void ConstantNode::printOneLine( std::ostream &os, int indent ) const {
-        os << string( indent, ' ' );
-        printDesignation( os );
-
-        switch ( type ) {
-          case Integer:
-          case Float:
-                os << value ;
-                break;
-          case Character:
-                os << "'" << value << "'";
-                break;
-          case String:
-                os << '"' << value << '"';
-                break;
-        } // switch
-
-        os << ' ';
+        // os << string( indent, ' ' );
+        // printDesignation( os );
+
+        // switch ( type ) {
+        //   case Integer:
+        //   case Float:
+        //      os << value ;
+        //      break;
+        //   case Character:
+        //      os << "'" << value << "'";
+        //      break;
+        //   case String:
+        //      os << '"' << value << '"';
+        //      break;
+        // } // switch
+
+        // os << ' ';
 }
 
@@ -262 +129 @@
 
 Expression *ConstantNode::build() const {
-        ::Type::Qualifiers q;                                                           // no qualifiers on constants
-
-        switch ( get_type() ) {
-          case String:
-                {
-                        // string should probably be a primitive type
-                        ArrayType *at = new ArrayType( q, new BasicType( q, BasicType::Char ),
-                                                                                   new ConstantExpr(
-                                                                                           Constant( new BasicType( q, BasicType::UnsignedInt ),
-                                                                                                                 toString( value.size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'
-                                                                                   false, false );
-                        return new ConstantExpr( Constant( at, value ), maybeBuild< Expression >( get_argName() ) );
-                }
-          default:
-                return new ConstantExpr( Constant( new BasicType( q, btype ), get_value() ), maybeBuild< Expression >( get_argName() ) );
-        }
+        return expr->clone();
 }
 

src/Parser/InitializerNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:20:24 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jan 07 13:32:57 2016
-// Update Count     : 13
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Jul  4 15:37:15 2016
+// Update Count     : 15
 //
 
@@ -99 +99 @@
 
                 if ( get_expression() != 0)
-                        return new SingleInit( get_expression()->build(), designators, maybeConstructed );
+                        return new SingleInit( maybeBuild<Expression>( get_expression() ), designators, maybeConstructed );
         } // if
 

src/Parser/ParseNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:26:29 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Aug 12 13:26:00 2015
-// Update Count     : 36
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 30 21:13:12 2016
+// Update Count     : 52
 // 
 
+#include <climits>
 #include "ParseNode.h"
 using namespace std;
+
+// Difficult to separate extra parts of constants during lexing because actions are not allow in the middle of patterns:
+//
+//              prefix action constant action suffix
+//
+// Alternatively, breaking a pattern using BEGIN does not work if the following pattern can be empty:
+//
+//              constant BEGIN CONT ...
+//              <CONT>(...)? BEGIN 0 ... // possible empty suffix
+//
+// because the CONT rule is NOT triggered if the pattern is empty. Hence, constants are reparsed here to determine their
+// type.
+
+static inline bool checkU( char c ) { return c == 'u' || c == 'U'; }
+static inline bool checkL( char c ) { return c == 'l' || c == 'L'; }
+static inline bool checkF( char c ) { return c == 'f' || c == 'F'; }
+static inline bool checkD( char c ) { return c == 'd' || c == 'D'; }
+static inline bool checkI( char c ) { return c == 'i' || c == 'I'; }
+static inline bool checkX( char c ) { return c == 'x' || c == 'X'; }
+
+BasicType::Kind literalType( ConstantNode::Type type, string &value ) {
+        BasicType::Kind btype;
+
+        // lexing divides constants into 4 kinds
+        switch ( type ) {
+          case ConstantNode::Integer:
+                {
+                        static const BasicType::Kind kind[2][3] = {
+                                { BasicType::SignedInt, BasicType::LongSignedInt, BasicType::LongLongSignedInt },
+                                { BasicType::UnsignedInt, BasicType::LongUnsignedInt, BasicType::LongLongUnsignedInt },
+                        };
+                        bool dec = true, Unsigned = false;                      // decimal, unsigned constant
+                        int size;                                                                       // 0 => int, 1 => long, 2 => long long
+                        unsigned long long v;                                           // converted integral value
+                        size_t last = value.length() - 1;                       // last character of constant
+
+                        if ( value[0] == '0' ) {                                        // octal constant ?
+                                dec = false;
+                                if ( last != 0 && checkX( value[1] ) ) { // hex constant ?
+                                        sscanf( (char *)value.c_str(), "%llx", &v );
+                                        //printf( "%llx %llu\n", v, v );
+                                } else {
+                                        sscanf( (char *)value.c_str(), "%llo", &v );
+                                        //printf( "%llo %llu\n", v, v );
+                                } // if
+                        } else {                                                                        // decimal constant ?
+                                sscanf( (char *)value.c_str(), "%llu", &v );
+                                //printf( "%llu %llu\n", v, v );
+                        } // if
+
+                        if ( v <= INT_MAX ) {                                           // signed int
+                                size = 0;
+                        } else if ( v <= UINT_MAX && ! dec ) {          // unsigned int
+                                size = 0;
+                                Unsigned = true;                                                // unsigned
+                        } else if ( v <= LONG_MAX ) {                           // signed long int
+                                size = 1;
+                        } else if ( v <= ULONG_MAX && ( ! dec || LONG_MAX == LLONG_MAX ) ) { // signed long int
+                                size = 1;
+                                Unsigned = true;                                                // unsigned long int
+                        } else if ( v <= LLONG_MAX ) {                          // signed long long int
+                                size = 2;
+                        } else {                                                                        // unsigned long long int
+                                size = 2;
+                                Unsigned = true;                                                // unsigned long long int
+                        } // if
+
+                        if ( checkU( value[last] ) ) {                          // suffix 'u' ?
+                                Unsigned = true;
+                                if ( last > 0 && checkL( value[ last - 1 ] ) ) { // suffix 'l' ?
+                                        size = 1;
+                                        if ( last > 1 && checkL( value[ last - 2 ] ) ) { // suffix 'll' ?
+                                                size = 2;
+                                        } // if
+                                } // if
+                        } else if ( checkL( value[ last ] ) ) {         // suffix 'l' ?
+                                size = 1;
+                                if ( last > 0 && checkL( value[ last - 1 ] ) ) { // suffix 'll' ?
+                                        size = 2;
+                                        if ( last > 1 && checkU( value[ last - 2 ] ) ) { // suffix 'u' ?
+                                                Unsigned = true;
+                                        } // if
+                                } else {
+                                        if ( last > 0 && checkU( value[ last - 1 ] ) ) { // suffix 'u' ?
+                                                Unsigned = true;
+                                        } // if
+                                } // if
+                        } // if
+                        btype = kind[Unsigned][size];                           // lookup constant type
+                        break;
+                }
+          case ConstantNode::Float:
+                {
+                        static const BasicType::Kind kind[2][3] = {
+                                { BasicType::Float, BasicType::Double, BasicType::LongDouble },
+                                { BasicType::FloatComplex, BasicType::DoubleComplex, BasicType::LongDoubleComplex },
+                        };
+                        bool complx = false;                                            // real, complex
+                        int size = 1;                                                           // 0 => float, 1 => double (default), 2 => long double
+                        // floating-point constant has minimum of 2 characters: 1. or .1
+                        size_t last = value.length() - 1;
+
+                        if ( checkI( value[last] ) ) {                          // imaginary ?
+                                complx = true;
+                                last -= 1;                                                              // backup one character
+                        } // if
+                        if ( checkF( value[last] ) ) {                          // float ?
+                                size = 0;
+                        } else if ( checkD( value[last] ) ) {           // double ?
+                                size = 1;
+                        } else if ( checkL( value[last] ) ) {           // long double ?
+                                size = 2;
+                        } // if
+                        if ( ! complx && checkI( value[last - 1] ) ) { // imaginary ?
+                                complx = true;
+                        } // if
+                        btype = kind[complx][size];                                     // lookup constant type
+                        break;
+                }
+          case ConstantNode::Character:
+                btype = BasicType::Char;                                                // default
+                if ( string( "LUu" ).find( value[0] ) != string::npos ) {
+                        // ???
+                } // if
+                break;
+          case ConstantNode::String:
+                assert( false );
+                // array of char
+                if ( string( "LUu" ).find( value[0] ) != string::npos ) {
+                        if ( value[0] == 'u' && value[1] == '8' ) {
+                                // ???
+                        } else {
+                                // ???
+                        } // if
+                } // if
+                break;
+        } // switch
+        return btype;
+} // literalType
+
+
+ConstantNode *makeConstant( ConstantNode::Type type, std::string *str ) {
+        ::Type::Qualifiers emptyQualifiers;                                     // no qualifiers on constants
+        return new ConstantNode( new ConstantExpr( Constant( new BasicType( emptyQualifiers, literalType( type, *str ) ), *str ), nullptr ) );
+}
+
+ConstantNode *makeConstantStr( ConstantNode::Type type, std::string *str ) {
+        ::Type::Qualifiers emptyQualifiers;                                     // no qualifiers on constants
+        // string should probably be a primitive type
+        ArrayType *at = new ArrayType( emptyQualifiers, new BasicType( emptyQualifiers, BasicType::Char ),
+                                                                   new ConstantExpr(
+                                                                           Constant( new BasicType( emptyQualifiers, BasicType::UnsignedInt ),
+                                                                                                 toString( str->size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'
+                                                                   false, false );
+        return new ConstantNode( new ConstantExpr( Constant( at, *str ), nullptr ) );
+}
+
 
 // Builder
@@ -28 +186 @@
 };
 
-ParseNode *ParseNode::get_link() const {
-        return next;
-}
-
 ParseNode *ParseNode::get_last() {
         ParseNode *current = this;
@@ -43 +197 @@
 ParseNode *ParseNode::set_link( ParseNode *next_ ) {
         if ( next_ == 0 ) return this;
-
         get_last()->next = next_;
-
         return this;
 }

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 27 23:28:10 2016
-// Update Count     : 242
+// Last Modified On : Mon Jul  4 15:35:09 2016
+// Update Count     : 260
 //
 
@@ -43 +43 @@
         ParseNode();
         ParseNode( const std::string * );
-        ParseNode( const std::string & );  // for copy constructing subclasses
+        ParseNode( const std::string & );                                       // for copy constructing subclasses
         virtual ~ParseNode();
 
-        ParseNode *get_link() const;
+        ParseNode *get_link() const { return next; }
         ParseNode *get_last();
         ParseNode *set_link( ParseNode * );
@@ -62 +62 @@
   protected:
         std::string name;
+        static int indent_by;
         ParseNode *next;
-        static int indent_by;
 };
 
@@ -126 +126 @@
         enum Type { Integer, Float, Character, String };
 
-        ConstantNode( Type, std::string * );
-        ConstantNode( const ConstantNode &other ) : type( other.type ), btype( other.btype), value( *new std::string( other.value ) ) {};
-        ~ConstantNode() { delete &value; }
+        ConstantNode( ConstantExpr * );
+        ConstantNode( const ConstantNode &other ) : expr( other.expr->clone() ) {};
+        ~ConstantNode() { delete expr; }
 
         virtual ConstantNode *clone() const { return new ConstantNode( *this ); }
-        Type get_type( void ) const { return type; }
         virtual void print( std::ostream &, int indent = 0) const;
         virtual void printOneLine( std::ostream &, int indent = 0) const;
 
-        const std::string &get_value() const { return value; }
         ConstantNode *appendstr( const std::string *newValue );
 
         Expression *build() const;
   private:
-        Type type;
-        BasicType::Kind btype;
-        std::string &value;
-};
+        ConstantExpr *expr;
+};
+
+ConstantNode *makeConstant( ConstantNode::Type, std::string * );
+ConstantNode *makeConstantStr( ConstantNode::Type type, std::string *str );
 
 class VarRefNode : public ExpressionNode {
@@ -482 +481 @@
         void setCatchRest( bool newVal ) { isCatchRest = newVal; }
 
-        bool get_extension() const { return extension; }
-        StatementNode *set_extension( bool exten ) { extension = exten; return this; }
-
         std::string get_target() const;
 
@@ -503 +499 @@
         DeclarationNode *decl;
         bool isCatchRest;
-        bool extension = false;
 }; // StatementNode
 

src/Parser/parser.cc

@@ -1030 +1030 @@
      613,   614,   615,   616,   617,   618,   619,   620,   624,   625,
      631,   632,   638,   639,   640,   641,   642,   643,   644,   645,
-     646,   656,   663,   665,   675,   676,   681,   683,   685,   687,
-     691,   692,   697,   702,   705,   707,   709,   714,   716,   724,
-     725,   727,   731,   732,   737,   738,   743,   744,   748,   753,
-     754,   758,   760,   766,   767,   771,   773,   775,   777,   783,
-     784,   788,   789,   793,   795,   797,   802,   804,   809,   811,
-     815,   818,   822,   825,   829,   831,   835,   837,   844,   846,
-     848,   857,   859,   861,   863,   865,   870,   872,   874,   876,
-     881,   894,   895,   900,   902,   907,   911,   913,   915,   917,
-     919,   925,   926,   932,   933,   937,   938,   943,   945,   951,
-     952,   954,   959,   961,   968,   970,   974,   975,   980,   982,
-     986,   987,   991,   993,   997,   998,  1002,  1003,  1007,  1008,
-    1023,  1024,  1025,  1026,  1027,  1031,  1036,  1043,  1053,  1058,
-    1063,  1071,  1076,  1081,  1086,  1091,  1099,  1121,  1126,  1133,
-    1135,  1142,  1147,  1152,  1163,  1168,  1173,  1178,  1183,  1192,
-    1197,  1205,  1206,  1207,  1208,  1214,  1219,  1227,  1228,  1229,
-    1230,  1234,  1235,  1236,  1237,  1242,  1243,  1252,  1253,  1258,
-    1259,  1264,  1266,  1268,  1270,  1272,  1275,  1274,  1286,  1287,
-    1289,  1299,  1300,  1305,  1309,  1311,  1313,  1315,  1317,  1319,
-    1321,  1323,  1328,  1330,  1332,  1334,  1336,  1338,  1340,  1342,
-    1344,  1346,  1348,  1350,  1352,  1358,  1359,  1361,  1363,  1365,
-    1370,  1371,  1377,  1378,  1380,  1382,  1387,  1389,  1391,  1393,
-    1398,  1399,  1401,  1403,  1408,  1409,  1411,  1416,  1417,  1419,
-    1421,  1426,  1428,  1430,  1435,  1436,  1440,  1442,  1448,  1447,
-    1451,  1453,  1458,  1460,  1465,  1467,  1472,  1473,  1475,  1476,
-    1481,  1482,  1484,  1486,  1491,  1493,  1499,  1500,  1502,  1505,
-    1508,  1513,  1514,  1519,  1524,  1528,  1530,  1536,  1535,  1542,
-    1544,  1550,  1551,  1559,  1560,  1564,  1565,  1566,  1568,  1570,
-    1577,  1578,  1580,  1582,  1587,  1588,  1594,  1595,  1599,  1600,
-    1605,  1606,  1607,  1609,  1617,  1618,  1620,  1623,  1625,  1629,
-    1630,  1631,  1633,  1635,  1639,  1644,  1652,  1653,  1662,  1664,
-    1669,  1670,  1671,  1675,  1676,  1677,  1681,  1682,  1683,  1687,
-    1688,  1689,  1694,  1695,  1696,  1697,  1703,  1704,  1706,  1711,
-    1712,  1717,  1718,  1719,  1720,  1721,  1736,  1737,  1742,  1743,
-    1751,  1753,  1755,  1758,  1760,  1762,  1785,  1786,  1788,  1790,
-    1795,  1796,  1798,  1803,  1808,  1809,  1815,  1814,  1818,  1822,
-    1824,  1826,  1832,  1833,  1838,  1843,  1845,  1850,  1852,  1853,
-    1855,  1860,  1862,  1864,  1869,  1871,  1876,  1881,  1889,  1895,
-    1894,  1908,  1909,  1914,  1915,  1919,  1924,  1929,  1937,  1942,
-    1953,  1954,  1965,  1966,  1972,  1973,  1977,  1978,  1979,  1982,
-    1981,  1992,  1997,  2003,  2009,  2018,  2024,  2030,  2036,  2042,
-    2050,  2056,  2064,  2070,  2079,  2080,  2081,  2085,  2089,  2091,
-    2096,  2097,  2101,  2102,  2107,  2113,  2114,  2117,  2119,  2120,
-    2124,  2125,  2126,  2127,  2161,  2163,  2164,  2166,  2171,  2176,
-    2181,  2183,  2185,  2190,  2192,  2194,  2196,  2201,  2203,  2212,
-    2214,  2215,  2220,  2222,  2224,  2229,  2231,  2233,  2238,  2240,
-    2242,  2251,  2252,  2253,  2257,  2259,  2261,  2266,  2268,  2270,
-    2275,  2277,  2279,  2294,  2296,  2297,  2299,  2304,  2305,  2310,
-    2312,  2314,  2319,  2321,  2323,  2325,  2330,  2332,  2334,  2344,
-    2346,  2347,  2349,  2354,  2356,  2358,  2363,  2365,  2367,  2369,
-    2374,  2376,  2378,  2409,  2411,  2412,  2414,  2419,  2424,  2432,
-    2434,  2436,  2441,  2443,  2448,  2450,  2464,  2465,  2467,  2472,
-    2474,  2476,  2478,  2480,  2485,  2486,  2488,  2490,  2495,  2497,
-    2499,  2505,  2507,  2509,  2513,  2515,  2517,  2519,  2533,  2534,
-    2536,  2541,  2543,  2545,  2547,  2549,  2554,  2555,  2557,  2559,
-    2564,  2566,  2568,  2574,  2575,  2577,  2586,  2589,  2591,  2594,
-    2596,  2598,  2611,  2612,  2614,  2619,  2621,  2623,  2625,  2627,
-    2632,  2633,  2635,  2637,  2642,  2644,  2652,  2653,  2654,  2659,
-    2660,  2664,  2666,  2668,  2670,  2672,  2674,  2681,  2683,  2685,
-    2687,  2689,  2691,  2693,  2695,  2697,  2699,  2704,  2706,  2708,
-    2713,  2739,  2740,  2742,  2746,  2747,  2751,  2753,  2755,  2757,
-    2759,  2761,  2768,  2770,  2772,  2774,  2776,  2778,  2783,  2788,
-    2790,  2792,  2810,  2812,  2817,  2818
+     646,   656,   663,   665,   675,   676,   681,   683,   689,   691,
+     695,   696,   701,   706,   709,   711,   713,   718,   720,   728,
+     729,   731,   735,   736,   741,   742,   747,   748,   752,   757,
+     758,   762,   764,   770,   771,   775,   777,   779,   781,   787,
+     788,   792,   793,   797,   799,   801,   806,   808,   813,   815,
+     819,   822,   826,   829,   833,   835,   839,   841,   848,   850,
+     852,   861,   863,   865,   867,   869,   874,   876,   878,   880,
+     885,   898,   899,   904,   906,   911,   915,   917,   919,   921,
+     923,   929,   930,   936,   937,   941,   942,   947,   949,   955,
+     956,   958,   963,   965,   972,   974,   978,   979,   984,   986,
+     990,   991,   995,   997,  1001,  1002,  1006,  1007,  1011,  1012,
+    1027,  1028,  1029,  1030,  1031,  1035,  1040,  1047,  1057,  1062,
+    1067,  1075,  1080,  1085,  1090,  1095,  1103,  1125,  1130,  1137,
+    1139,  1146,  1151,  1156,  1167,  1172,  1177,  1182,  1187,  1196,
+    1201,  1209,  1210,  1211,  1212,  1218,  1223,  1231,  1232,  1233,
+    1234,  1238,  1239,  1240,  1241,  1246,  1247,  1256,  1257,  1262,
+    1263,  1268,  1270,  1272,  1274,  1276,  1279,  1278,  1290,  1291,
+    1293,  1303,  1304,  1309,  1313,  1315,  1317,  1319,  1321,  1323,
+    1325,  1327,  1332,  1334,  1336,  1338,  1340,  1342,  1344,  1346,
+    1348,  1350,  1352,  1354,  1356,  1362,  1363,  1365,  1367,  1369,
+    1374,  1375,  1381,  1382,  1384,  1386,  1391,  1393,  1395,  1397,
+    1402,  1403,  1405,  1407,  1412,  1413,  1415,  1420,  1421,  1423,
+    1425,  1430,  1432,  1434,  1439,  1440,  1444,  1446,  1452,  1451,
+    1455,  1457,  1462,  1464,  1469,  1471,  1476,  1477,  1479,  1480,
+    1489,  1490,  1492,  1494,  1499,  1501,  1507,  1508,  1510,  1513,
+    1516,  1521,  1522,  1527,  1532,  1536,  1538,  1544,  1543,  1550,
+    1552,  1558,  1559,  1567,  1568,  1572,  1573,  1574,  1576,  1578,
+    1585,  1586,  1588,  1590,  1595,  1596,  1602,  1603,  1607,  1608,
+    1613,  1614,  1615,  1617,  1625,  1626,  1628,  1631,  1633,  1637,
+    1638,  1639,  1641,  1643,  1647,  1652,  1660,  1661,  1670,  1672,
+    1677,  1678,  1679,  1683,  1684,  1685,  1689,  1690,  1691,  1695,
+    1696,  1697,  1702,  1703,  1704,  1705,  1711,  1712,  1714,  1719,
+    1720,  1725,  1726,  1727,  1728,  1729,  1744,  1745,  1750,  1751,
+    1759,  1761,  1763,  1766,  1768,  1770,  1793,  1794,  1796,  1798,
+    1803,  1804,  1806,  1811,  1816,  1817,  1823,  1822,  1826,  1830,
+    1832,  1834,  1840,  1841,  1846,  1851,  1853,  1858,  1860,  1861,
+    1863,  1868,  1870,  1872,  1877,  1879,  1884,  1889,  1897,  1903,
+    1902,  1916,  1917,  1922,  1923,  1927,  1932,  1937,  1945,  1950,
+    1961,  1962,  1973,  1974,  1980,  1981,  1985,  1986,  1987,  1990,
+    1989,  2000,  2009,  2015,  2021,  2030,  2036,  2042,  2048,  2054,
+    2062,  2068,  2076,  2082,  2091,  2092,  2093,  2097,  2101,  2103,
+    2108,  2109,  2113,  2114,  2119,  2125,  2126,  2129,  2131,  2132,
+    2136,  2137,  2138,  2139,  2173,  2175,  2176,  2178,  2183,  2188,
+    2193,  2195,  2197,  2202,  2204,  2206,  2208,  2213,  2215,  2224,
+    2226,  2227,  2232,  2234,  2236,  2241,  2243,  2245,  2250,  2252,
+    2254,  2263,  2264,  2265,  2269,  2271,  2273,  2278,  2280,  2282,
+    2287,  2289,  2291,  2306,  2308,  2309,  2311,  2316,  2317,  2322,
+    2324,  2326,  2331,  2333,  2335,  2337,  2342,  2344,  2346,  2356,
+    2358,  2359,  2361,  2366,  2368,  2370,  2375,  2377,  2379,  2381,
+    2386,  2388,  2390,  2421,  2423,  2424,  2426,  2431,  2436,  2444,
+    2446,  2448,  2453,  2455,  2460,  2462,  2476,  2477,  2479,  2484,
+    2486,  2488,  2490,  2492,  2497,  2498,  2500,  2502,  2507,  2509,
+    2511,  2517,  2519,  2521,  2525,  2527,  2529,  2531,  2545,  2546,
+    2548,  2553,  2555,  2557,  2559,  2561,  2566,  2567,  2569,  2571,
+    2576,  2578,  2580,  2586,  2587,  2589,  2598,  2601,  2603,  2606,
+    2608,  2610,  2623,  2624,  2626,  2631,  2633,  2635,  2637,  2639,
+    2644,  2645,  2647,  2649,  2654,  2656,  2664,  2665,  2666,  2671,
+    2672,  2676,  2678,  2680,  2682,  2684,  2686,  2693,  2695,  2697,
+    2699,  2701,  2703,  2705,  2707,  2709,  2711,  2716,  2718,  2720,
+    2725,  2751,  2752,  2754,  2758,  2759,  2763,  2765,  2767,  2769,
+    2771,  2773,  2780,  2782,  2784,  2786,  2788,  2790,  2795,  2800,
+    2802,  2804,  2822,  2824,  2829,  2830
 };
 #endif
@@ -5237 +5237 @@
 /* Line 1806 of yacc.c  */
 #line 305 "parser.yy"
-    { (yyval.constant) = new ConstantNode( ConstantNode::Integer, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = makeConstant( ConstantNode::Integer, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5244 +5244 @@
 /* Line 1806 of yacc.c  */
 #line 306 "parser.yy"
-    { (yyval.constant) = new ConstantNode( ConstantNode::Float, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = makeConstant( ConstantNode::Float, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5251 +5251 @@
 /* Line 1806 of yacc.c  */
 #line 307 "parser.yy"
-    { (yyval.constant) = new ConstantNode( ConstantNode::Character, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = makeConstant( ConstantNode::Character, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5258 +5258 @@
 /* Line 1806 of yacc.c  */
 #line 332 "parser.yy"
-    { (yyval.constant) = new ConstantNode( ConstantNode::String, (yyvsp[(1) - (1)].tok) ); }
+    { (yyval.constant) = makeConstantStr( ConstantNode::String, (yyvsp[(1) - (1)].tok) ); }
     break;
 
@@ -5953 +5953 @@
 /* Line 1806 of yacc.c  */
 #line 684 "parser.yy"
-    { (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) )/*->set_extension( true )*/; }
+    {   // mark all fields in list
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                                iter->set_extension( true );
+                        (yyval.sn) = new StatementNode( (yyvsp[(2) - (2)].decl) );
+                }
     break;
 
@@ -5959 +5963 @@
 
 /* Line 1806 of yacc.c  */
-#line 686 "parser.yy"
+#line 690 "parser.yy"
     { (yyval.sn) = new StatementNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -5966 +5970 @@
 
 /* Line 1806 of yacc.c  */
-#line 693 "parser.yy"
+#line 697 "parser.yy"
     { if ( (yyvsp[(1) - (2)].sn) != 0 ) { (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) ); (yyval.sn) = (yyvsp[(1) - (2)].sn); } }
     break;
@@ -5973 +5977 @@
 
 /* Line 1806 of yacc.c  */
-#line 698 "parser.yy"
+#line 702 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Exp, (yyvsp[(1) - (2)].en), 0 ); }
     break;
@@ -5980 +5984 @@
 
 /* Line 1806 of yacc.c  */
-#line 704 "parser.yy"
+#line 708 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -5987 +5991 @@
 
 /* Line 1806 of yacc.c  */
-#line 706 "parser.yy"
+#line 710 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::If, (yyvsp[(3) - (7)].en), (StatementNode *)mkList((*(yyvsp[(5) - (7)].sn), *(yyvsp[(7) - (7)].sn) )) ); }
     break;
@@ -5994 +5998 @@
 
 /* Line 1806 of yacc.c  */
-#line 708 "parser.yy"
+#line 712 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6001 +6005 @@
 
 /* Line 1806 of yacc.c  */
-#line 710 "parser.yy"
+#line 714 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Switch, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); /* xxx */ }
     break;
@@ -6008 +6012 @@
 
 /* Line 1806 of yacc.c  */
-#line 715 "parser.yy"
+#line 719 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6015 +6019 @@
 
 /* Line 1806 of yacc.c  */
-#line 717 "parser.yy"
+#line 721 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Choose, (yyvsp[(3) - (9)].en), (yyvsp[(8) - (9)].sn) ); }
     break;
@@ -6022 +6026 @@
 
 /* Line 1806 of yacc.c  */
-#line 724 "parser.yy"
+#line 728 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -6029 +6033 @@
 
 /* Line 1806 of yacc.c  */
-#line 726 "parser.yy"
+#line 730 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6036 +6040 @@
 
 /* Line 1806 of yacc.c  */
-#line 733 "parser.yy"
+#line 737 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::TupleC ), (ExpressionNode *)(tupleContents( (yyvsp[(1) - (3)].en) ))->set_link( (yyvsp[(3) - (3)].en) ) ); }
     break;
@@ -6043 +6047 @@
 
 /* Line 1806 of yacc.c  */
-#line 737 "parser.yy"
+#line 741 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Case, (yyvsp[(2) - (3)].en), 0 ); }
     break;
@@ -6050 +6054 @@
 
 /* Line 1806 of yacc.c  */
-#line 738 "parser.yy"
+#line 742 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Default ); }
     break;
@@ -6057 +6061 @@
 
 /* Line 1806 of yacc.c  */
-#line 744 "parser.yy"
+#line 748 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (2)].sn)->set_link( (yyvsp[(2) - (2)].sn) )); }
     break;
@@ -6064 +6068 @@
 
 /* Line 1806 of yacc.c  */
-#line 748 "parser.yy"
+#line 752 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -6071 +6075 @@
 
 /* Line 1806 of yacc.c  */
-#line 753 "parser.yy"
+#line 757 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6078 +6082 @@
 
 /* Line 1806 of yacc.c  */
-#line 759 "parser.yy"
+#line 763 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -6085 +6089 @@
 
 /* Line 1806 of yacc.c  */
-#line 761 "parser.yy"
+#line 765 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
     break;
@@ -6092 +6096 @@
 
 /* Line 1806 of yacc.c  */
-#line 766 "parser.yy"
+#line 770 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6099 +6103 @@
 
 /* Line 1806 of yacc.c  */
-#line 772 "parser.yy"
+#line 776 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (2)].sn)->append_last_case( (yyvsp[(2) - (2)].sn) ); }
     break;
@@ -6106 +6110 @@
 
 /* Line 1806 of yacc.c  */
-#line 774 "parser.yy"
+#line 778 "parser.yy"
     { (yyval.sn) = (yyvsp[(1) - (3)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].sn) ))); }
     break;
@@ -6113 +6117 @@
 
 /* Line 1806 of yacc.c  */
-#line 776 "parser.yy"
+#line 780 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (3)].sn)->set_link( (yyvsp[(2) - (3)].sn)->append_last_case( (yyvsp[(3) - (3)].sn) ))); }
     break;
@@ -6120 +6124 @@
 
 /* Line 1806 of yacc.c  */
-#line 778 "parser.yy"
+#line 782 "parser.yy"
     { (yyval.sn) = (StatementNode *)( (yyvsp[(1) - (4)].sn)->set_link( (yyvsp[(2) - (4)].sn)->append_last_case((StatementNode *)mkList((*(yyvsp[(3) - (4)].sn),*(yyvsp[(4) - (4)].sn) ))))); }
     break;
@@ -6127 +6131 @@
 
 /* Line 1806 of yacc.c  */
-#line 783 "parser.yy"
+#line 787 "parser.yy"
     { (yyval.sn) = 0; }
     break;
@@ -6134 +6138 @@
 
 /* Line 1806 of yacc.c  */
-#line 788 "parser.yy"
+#line 792 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Fallthru ); }
     break;
@@ -6141 +6145 @@
 
 /* Line 1806 of yacc.c  */
-#line 789 "parser.yy"
+#line 793 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Fallthru ); }
     break;
@@ -6148 +6152 @@
 
 /* Line 1806 of yacc.c  */
-#line 794 "parser.yy"
+#line 798 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::While, (yyvsp[(3) - (5)].en), (yyvsp[(5) - (5)].sn) ); }
     break;
@@ -6155 +6159 @@
 
 /* Line 1806 of yacc.c  */
-#line 796 "parser.yy"
+#line 800 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Do, (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ); }
     break;
@@ -6162 +6166 @@
 
 /* Line 1806 of yacc.c  */
-#line 798 "parser.yy"
+#line 802 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::For, (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].sn) ); }
     break;
@@ -6169 +6173 @@
 
 /* Line 1806 of yacc.c  */
-#line 803 "parser.yy"
+#line 807 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (6)].en), (yyvsp[(4) - (6)].en), (yyvsp[(6) - (6)].en) ); }
     break;
@@ -6176 +6180 @@
 
 /* Line 1806 of yacc.c  */
-#line 805 "parser.yy"
+#line 809 "parser.yy"
     { (yyval.en) = new ForCtlExprNode( (yyvsp[(1) - (4)].decl), (yyvsp[(2) - (4)].en), (yyvsp[(4) - (4)].en) ); }
     break;
@@ -6183 +6187 @@
 
 /* Line 1806 of yacc.c  */
-#line 810 "parser.yy"
+#line 814 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -6190 +6194 @@
 
 /* Line 1806 of yacc.c  */
-#line 814 "parser.yy"
+#line 818 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Goto, (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6197 +6201 @@
 
 /* Line 1806 of yacc.c  */
-#line 817 "parser.yy"
+#line 821 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue ); }
     break;
@@ -6204 +6208 @@
 
 /* Line 1806 of yacc.c  */
-#line 821 "parser.yy"
+#line 825 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Continue, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -6211 +6215 @@
 
 /* Line 1806 of yacc.c  */
-#line 824 "parser.yy"
+#line 828 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break ); }
     break;
@@ -6218 +6222 @@
 
 /* Line 1806 of yacc.c  */
-#line 828 "parser.yy"
+#line 832 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Break, (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -6225 +6229 @@
 
 /* Line 1806 of yacc.c  */
-#line 830 "parser.yy"
+#line 834 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Return, (yyvsp[(2) - (3)].en), 0 ); }
     break;
 
   case 195:
-
-/* Line 1806 of yacc.c  */
-#line 832 "parser.yy"
-    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
-    break;
-
-  case 196:
 
 /* Line 1806 of yacc.c  */
@@ -6243 +6240 @@
     break;
 
+  case 196:
+
+/* Line 1806 of yacc.c  */
+#line 840 "parser.yy"
+    { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (3)].en), 0 ); }
+    break;
+
   case 197:
 
 /* Line 1806 of yacc.c  */
-#line 838 "parser.yy"
+#line 842 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Throw, (yyvsp[(2) - (5)].en), 0 ); }
     break;
@@ -6253 +6257 @@
 
 /* Line 1806 of yacc.c  */
-#line 845 "parser.yy"
+#line 849 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6260 +6264 @@
 
 /* Line 1806 of yacc.c  */
-#line 847 "parser.yy"
+#line 851 "parser.yy"
     { (yyval.sn) = new StatementNode( StatementNode::Try, 0,(StatementNode *)(mkList((*(yyvsp[(2) - (3)].sn),*(yyvsp[(3) - (3)].pn) )))); }
     break;
@@ -6267 +6271 @@
 
 /* Line 1806 of yacc.c  */
-#line 849 "parser.yy"
+#line 853 "parser.yy"
     {
                         (yyvsp[(3) - (4)].pn)->set_link( (yyvsp[(4) - (4)].pn) );
@@ -6277 +6281 @@
 
 /* Line 1806 of yacc.c  */
-#line 860 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
-    break;
-
-  case 203:
-
-/* Line 1806 of yacc.c  */
-#line 862 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
-    break;
-
-  case 204:
-
-/* Line 1806 of yacc.c  */
 #line 864 "parser.yy"
     { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
     break;
 
-  case 205:
+  case 203:
 
 /* Line 1806 of yacc.c  */
@@ -6302 +6292 @@
     break;
 
+  case 204:
+
+/* Line 1806 of yacc.c  */
+#line 868 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( 0, (yyvsp[(5) - (5)].sn), true ); }
+    break;
+
+  case 205:
+
+/* Line 1806 of yacc.c  */
+#line 870 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (6)].pn)->set_link( StatementNode::newCatchStmt( 0, (yyvsp[(6) - (6)].sn), true ) ); }
+    break;
+
   case 206:
-
-/* Line 1806 of yacc.c  */
-#line 871 "parser.yy"
-    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
-    break;
-
-  case 207:
-
-/* Line 1806 of yacc.c  */
-#line 873 "parser.yy"
-    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
-    break;
-
-  case 208:
 
 /* Line 1806 of yacc.c  */
@@ -6323 +6313 @@
     break;
 
-  case 209:
+  case 207:
 
 /* Line 1806 of yacc.c  */
@@ -6330 +6320 @@
     break;
 
+  case 208:
+
+/* Line 1806 of yacc.c  */
+#line 879 "parser.yy"
+    { (yyval.pn) = StatementNode::newCatchStmt( (yyvsp[(5) - (9)].decl), (yyvsp[(8) - (9)].sn) ); }
+    break;
+
+  case 209:
+
+/* Line 1806 of yacc.c  */
+#line 881 "parser.yy"
+    { (yyval.pn) = (yyvsp[(1) - (10)].pn)->set_link( StatementNode::newCatchStmt( (yyvsp[(6) - (10)].decl), (yyvsp[(9) - (10)].sn) ) ); }
+    break;
+
   case 210:
 
 /* Line 1806 of yacc.c  */
-#line 882 "parser.yy"
+#line 886 "parser.yy"
     {
                         (yyval.pn) = new StatementNode( StatementNode::Finally, 0, (yyvsp[(2) - (2)].sn) );
@@ -6343 +6347 @@
 
 /* Line 1806 of yacc.c  */
-#line 896 "parser.yy"
+#line 900 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6353 +6357 @@
 
 /* Line 1806 of yacc.c  */
-#line 901 "parser.yy"
+#line 905 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -6360 +6364 @@
 
 /* Line 1806 of yacc.c  */
-#line 903 "parser.yy"
+#line 907 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6370 +6374 @@
 
 /* Line 1806 of yacc.c  */
-#line 912 "parser.yy"
+#line 916 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (6)].flag), (yyvsp[(4) - (6)].constant), 0 ); }
     break;
@@ -6377 +6381 @@
 
 /* Line 1806 of yacc.c  */
-#line 914 "parser.yy"
+#line 918 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (8)].flag), (yyvsp[(4) - (8)].constant), (yyvsp[(6) - (8)].en) ); }
     break;
@@ -6384 +6388 @@
 
 /* Line 1806 of yacc.c  */
-#line 916 "parser.yy"
+#line 920 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (10)].flag), (yyvsp[(4) - (10)].constant), (yyvsp[(6) - (10)].en), (yyvsp[(8) - (10)].en) ); }
     break;
@@ -6391 +6395 @@
 
 /* Line 1806 of yacc.c  */
-#line 918 "parser.yy"
+#line 922 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (12)].flag), (yyvsp[(4) - (12)].constant), (yyvsp[(6) - (12)].en), (yyvsp[(8) - (12)].en), (yyvsp[(10) - (12)].constant) ); }
     break;
@@ -6398 +6402 @@
 
 /* Line 1806 of yacc.c  */
-#line 920 "parser.yy"
+#line 924 "parser.yy"
     { (yyval.sn) = new AsmStmtNode( StatementNode::Asm, (yyvsp[(2) - (14)].flag), (yyvsp[(5) - (14)].constant), 0, (yyvsp[(8) - (14)].en), (yyvsp[(10) - (14)].constant), (yyvsp[(12) - (14)].label) ); }
     break;
@@ -6405 +6409 @@
 
 /* Line 1806 of yacc.c  */
-#line 925 "parser.yy"
+#line 929 "parser.yy"
     { (yyval.flag) = false; }
     break;
@@ -6412 +6416 @@
 
 /* Line 1806 of yacc.c  */
-#line 927 "parser.yy"
+#line 931 "parser.yy"
     { (yyval.flag) = true; }
     break;
@@ -6419 +6423 @@
 
 /* Line 1806 of yacc.c  */
-#line 932 "parser.yy"
+#line 936 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -6426 +6430 @@
 
 /* Line 1806 of yacc.c  */
-#line 939 "parser.yy"
+#line 943 "parser.yy"
     { (yyval.en) = (ExpressionNode *)(yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) ); }
     break;
@@ -6433 +6437 @@
 
 /* Line 1806 of yacc.c  */
-#line 944 "parser.yy"
+#line 948 "parser.yy"
     { (yyval.en) = new AsmExprNode( 0, (yyvsp[(1) - (4)].constant), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -6440 +6444 @@
 
 /* Line 1806 of yacc.c  */
-#line 946 "parser.yy"
+#line 950 "parser.yy"
     { (yyval.en) = new AsmExprNode( (yyvsp[(2) - (7)].en), (yyvsp[(4) - (7)].constant), (yyvsp[(6) - (7)].en) ); }
     break;
@@ -6447 +6451 @@
 
 /* Line 1806 of yacc.c  */
-#line 951 "parser.yy"
+#line 955 "parser.yy"
     { (yyval.constant) = 0; }
     break;
@@ -6454 +6458 @@
 
 /* Line 1806 of yacc.c  */
-#line 953 "parser.yy"
+#line 957 "parser.yy"
     { (yyval.constant) = (yyvsp[(1) - (1)].constant); }
     break;
@@ -6461 +6465 @@
 
 /* Line 1806 of yacc.c  */
-#line 955 "parser.yy"
+#line 959 "parser.yy"
     { (yyval.constant) = (ConstantNode *)(yyvsp[(1) - (3)].constant)->set_link( (yyvsp[(3) - (3)].constant) ); }
     break;
@@ -6468 +6472 @@
 
 /* Line 1806 of yacc.c  */
-#line 960 "parser.yy"
+#line 964 "parser.yy"
     { (yyval.label) = new LabelNode(); (yyval.label)->append_label( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -6475 +6479 @@
 
 /* Line 1806 of yacc.c  */
-#line 962 "parser.yy"
+#line 966 "parser.yy"
     { (yyval.label) = (yyvsp[(1) - (3)].label); (yyvsp[(1) - (3)].label)->append_label( (yyvsp[(3) - (3)].tok) ); }
     break;
@@ -6482 +6486 @@
 
 /* Line 1806 of yacc.c  */
-#line 969 "parser.yy"
+#line 973 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6489 +6493 @@
 
 /* Line 1806 of yacc.c  */
-#line 976 "parser.yy"
+#line 980 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6496 +6500 @@
 
 /* Line 1806 of yacc.c  */
-#line 981 "parser.yy"
+#line 985 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6503 +6507 @@
 
 /* Line 1806 of yacc.c  */
-#line 988 "parser.yy"
+#line 992 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6510 +6514 @@
 
 /* Line 1806 of yacc.c  */
-#line 1002 "parser.yy"
+#line 1006 "parser.yy"
     {}
     break;
@@ -6517 +6521 @@
 
 /* Line 1806 of yacc.c  */
-#line 1003 "parser.yy"
+#line 1007 "parser.yy"
     {}
     break;
@@ -6524 +6528 @@
 
 /* Line 1806 of yacc.c  */
-#line 1032 "parser.yy"
+#line 1036 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6534 +6538 @@
 
 /* Line 1806 of yacc.c  */
-#line 1039 "parser.yy"
+#line 1043 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6544 +6548 @@
 
 /* Line 1806 of yacc.c  */
-#line 1044 "parser.yy"
+#line 1048 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (6)].tok), TypedefTable::ID );
@@ -6554 +6558 @@
 
 /* Line 1806 of yacc.c  */
-#line 1054 "parser.yy"
+#line 1058 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6564 +6568 @@
 
 /* Line 1806 of yacc.c  */
-#line 1059 "parser.yy"
+#line 1063 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(2) - (3)].tok) );
@@ -6574 +6578 @@
 
 /* Line 1806 of yacc.c  */
-#line 1064 "parser.yy"
+#line 1068 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(3) - (4)].tok) );
@@ -6584 +6588 @@
 
 /* Line 1806 of yacc.c  */
-#line 1072 "parser.yy"
+#line 1076 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6594 +6598 @@
 
 /* Line 1806 of yacc.c  */
-#line 1077 "parser.yy"
+#line 1081 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6604 +6608 @@
 
 /* Line 1806 of yacc.c  */
-#line 1082 "parser.yy"
+#line 1086 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6614 +6618 @@
 
 /* Line 1806 of yacc.c  */
-#line 1087 "parser.yy"
+#line 1091 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6624 +6628 @@
 
 /* Line 1806 of yacc.c  */
-#line 1092 "parser.yy"
+#line 1096 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -6634 +6638 @@
 
 /* Line 1806 of yacc.c  */
-#line 1100 "parser.yy"
+#line 1104 "parser.yy"
     {
                         (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(3) - (8)].tok), DeclarationNode::newTuple( 0 ), (yyvsp[(6) - (8)].decl), 0, true );
@@ -6641 +6645 @@
 
   case 267:
-
-/* Line 1806 of yacc.c  */
-#line 1123 "parser.yy"
-    {
-                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
-                }
-    break;
-
-  case 268:
 
 /* Line 1806 of yacc.c  */
@@ -6658 +6653 @@
     break;
 
+  case 268:
+
+/* Line 1806 of yacc.c  */
+#line 1131 "parser.yy"
+    {
+                        (yyval.decl) = DeclarationNode::newFunction( (yyvsp[(2) - (7)].tok), (yyvsp[(1) - (7)].decl), (yyvsp[(5) - (7)].decl), 0, true );
+                }
+    break;
+
   case 269:
 
 /* Line 1806 of yacc.c  */
-#line 1134 "parser.yy"
+#line 1138 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -6668 +6672 @@
 
 /* Line 1806 of yacc.c  */
-#line 1138 "parser.yy"
+#line 1142 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (9)].decl)->appendList( (yyvsp[(7) - (9)].decl) ) ); }
     break;
@@ -6675 +6679 @@
 
 /* Line 1806 of yacc.c  */
-#line 1143 "parser.yy"
+#line 1147 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6685 +6689 @@
 
 /* Line 1806 of yacc.c  */
-#line 1148 "parser.yy"
+#line 1152 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6695 +6699 @@
 
 /* Line 1806 of yacc.c  */
-#line 1153 "parser.yy"
+#line 1157 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (5)].tok), TypedefTable::TD );
@@ -6705 +6709 @@
 
 /* Line 1806 of yacc.c  */
-#line 1164 "parser.yy"
+#line 1168 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6715 +6719 @@
 
 /* Line 1806 of yacc.c  */
-#line 1169 "parser.yy"
+#line 1173 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6725 +6729 @@
 
 /* Line 1806 of yacc.c  */
-#line 1174 "parser.yy"
+#line 1178 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6735 +6739 @@
 
 /* Line 1806 of yacc.c  */
-#line 1179 "parser.yy"
+#line 1183 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6745 +6749 @@
 
 /* Line 1806 of yacc.c  */
-#line 1184 "parser.yy"
+#line 1188 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::TD );
@@ -6755 +6759 @@
 
 /* Line 1806 of yacc.c  */
-#line 1193 "parser.yy"
+#line 1197 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (4)].tok), TypedefTable::TD );
@@ -6765 +6769 @@
 
 /* Line 1806 of yacc.c  */
-#line 1198 "parser.yy"
+#line 1202 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(5) - (7)].tok), TypedefTable::TD );
@@ -6775 +6779 @@
 
 /* Line 1806 of yacc.c  */
-#line 1215 "parser.yy"
+#line 1219 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6785 +6789 @@
 
 /* Line 1806 of yacc.c  */
-#line 1220 "parser.yy"
+#line 1224 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -6795 +6799 @@
 
 /* Line 1806 of yacc.c  */
-#line 1242 "parser.yy"
+#line 1246 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -6802 +6806 @@
 
 /* Line 1806 of yacc.c  */
-#line 1254 "parser.yy"
+#line 1258 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6809 +6813 @@
 
 /* Line 1806 of yacc.c  */
-#line 1265 "parser.yy"
+#line 1269 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Const ); }
     break;
@@ -6816 +6820 @@
 
 /* Line 1806 of yacc.c  */
-#line 1267 "parser.yy"
+#line 1271 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Restrict ); }
     break;
@@ -6823 +6827 @@
 
 /* Line 1806 of yacc.c  */
-#line 1269 "parser.yy"
+#line 1273 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Volatile ); }
     break;
@@ -6830 +6834 @@
 
 /* Line 1806 of yacc.c  */
-#line 1271 "parser.yy"
+#line 1275 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Lvalue ); }
     break;
@@ -6837 +6841 @@
 
 /* Line 1806 of yacc.c  */
-#line 1273 "parser.yy"
+#line 1277 "parser.yy"
     { (yyval.decl) = DeclarationNode::newQualifier( DeclarationNode::Atomic ); }
     break;
@@ -6844 +6848 @@
 
 /* Line 1806 of yacc.c  */
-#line 1275 "parser.yy"
+#line 1279 "parser.yy"
     {
                         typedefTable.enterScope();
@@ -6853 +6857 @@
 
 /* Line 1806 of yacc.c  */
-#line 1279 "parser.yy"
+#line 1283 "parser.yy"
     {
                         typedefTable.leaveScope();
@@ -6863 +6867 @@
 
 /* Line 1806 of yacc.c  */
-#line 1288 "parser.yy"
+#line 1292 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6870 +6874 @@
 
 /* Line 1806 of yacc.c  */
-#line 1290 "parser.yy"
+#line 1294 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -6877 +6881 @@
 
 /* Line 1806 of yacc.c  */
-#line 1301 "parser.yy"
+#line 1305 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -6884 +6888 @@
 
 /* Line 1806 of yacc.c  */
-#line 1310 "parser.yy"
+#line 1314 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
     break;
@@ -6891 +6895 @@
 
 /* Line 1806 of yacc.c  */
-#line 1312 "parser.yy"
+#line 1316 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Static ); }
     break;
@@ -6898 +6902 @@
 
 /* Line 1806 of yacc.c  */
-#line 1314 "parser.yy"
+#line 1318 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Auto ); }
     break;
@@ -6905 +6909 @@
 
 /* Line 1806 of yacc.c  */
-#line 1316 "parser.yy"
+#line 1320 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Register ); }
     break;
@@ -6912 +6916 @@
 
 /* Line 1806 of yacc.c  */
-#line 1318 "parser.yy"
+#line 1322 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Inline ); }
     break;
@@ -6919 +6923 @@
 
 /* Line 1806 of yacc.c  */
-#line 1320 "parser.yy"
+#line 1324 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Fortran ); }
     break;
@@ -6926 +6930 @@
 
 /* Line 1806 of yacc.c  */
-#line 1322 "parser.yy"
+#line 1326 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Noreturn ); }
     break;
@@ -6933 +6937 @@
 
 /* Line 1806 of yacc.c  */
-#line 1324 "parser.yy"
+#line 1328 "parser.yy"
     { (yyval.decl) = DeclarationNode::newStorageClass( DeclarationNode::Threadlocal ); }
     break;
@@ -6940 +6944 @@
 
 /* Line 1806 of yacc.c  */
-#line 1329 "parser.yy"
+#line 1333 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Char ); }
     break;
@@ -6947 +6951 @@
 
 /* Line 1806 of yacc.c  */
-#line 1331 "parser.yy"
+#line 1335 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Double ); }
     break;
@@ -6954 +6958 @@
 
 /* Line 1806 of yacc.c  */
-#line 1333 "parser.yy"
+#line 1337 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Float ); }
     break;
@@ -6961 +6965 @@
 
 /* Line 1806 of yacc.c  */
-#line 1335 "parser.yy"
+#line 1339 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Int ); }
     break;
@@ -6968 +6972 @@
 
 /* Line 1806 of yacc.c  */
-#line 1337 "parser.yy"
+#line 1341 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
     break;
@@ -6975 +6979 @@
 
 /* Line 1806 of yacc.c  */
-#line 1339 "parser.yy"
+#line 1343 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
     break;
@@ -6982 +6986 @@
 
 /* Line 1806 of yacc.c  */
-#line 1341 "parser.yy"
+#line 1345 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
     break;
@@ -6989 +6993 @@
 
 /* Line 1806 of yacc.c  */
-#line 1343 "parser.yy"
+#line 1347 "parser.yy"
     { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
     break;
@@ -6996 +7000 @@
 
 /* Line 1806 of yacc.c  */
-#line 1345 "parser.yy"
+#line 1349 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Void ); }
     break;
@@ -7003 +7007 @@
 
 /* Line 1806 of yacc.c  */
-#line 1347 "parser.yy"
+#line 1351 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Bool ); }
     break;
@@ -7010 +7014 @@
 
 /* Line 1806 of yacc.c  */
-#line 1349 "parser.yy"
+#line 1353 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
     break;
@@ -7017 +7021 @@
 
 /* Line 1806 of yacc.c  */
-#line 1351 "parser.yy"
+#line 1355 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
     break;
@@ -7024 +7028 @@
 
 /* Line 1806 of yacc.c  */
-#line 1353 "parser.yy"
+#line 1357 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBuiltinType( DeclarationNode::Valist ); }
     break;
@@ -7031 +7035 @@
 
 /* Line 1806 of yacc.c  */
-#line 1360 "parser.yy"
+#line 1364 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7038 +7042 @@
 
 /* Line 1806 of yacc.c  */
-#line 1362 "parser.yy"
+#line 1366 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7045 +7049 @@
 
 /* Line 1806 of yacc.c  */
-#line 1364 "parser.yy"
+#line 1368 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7052 +7056 @@
 
 /* Line 1806 of yacc.c  */
-#line 1366 "parser.yy"
+#line 1370 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addType( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7059 +7063 @@
 
 /* Line 1806 of yacc.c  */
-#line 1372 "parser.yy"
+#line 1376 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7066 +7070 @@
 
 /* Line 1806 of yacc.c  */
-#line 1379 "parser.yy"
+#line 1383 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7073 +7077 @@
 
 /* Line 1806 of yacc.c  */
-#line 1381 "parser.yy"
+#line 1385 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7080 +7084 @@
 
 /* Line 1806 of yacc.c  */
-#line 1383 "parser.yy"
+#line 1387 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addType( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7087 +7091 @@
 
 /* Line 1806 of yacc.c  */
-#line 1388 "parser.yy"
+#line 1392 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (4)].decl); }
     break;
@@ -7094 +7098 @@
 
 /* Line 1806 of yacc.c  */
-#line 1390 "parser.yy"
+#line 1394 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeof( (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7101 +7105 @@
 
 /* Line 1806 of yacc.c  */
-#line 1392 "parser.yy"
+#line 1396 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7108 +7112 @@
 
 /* Line 1806 of yacc.c  */
-#line 1394 "parser.yy"
+#line 1398 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAttr( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7115 +7119 @@
 
 /* Line 1806 of yacc.c  */
-#line 1400 "parser.yy"
+#line 1404 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7122 +7126 @@
 
 /* Line 1806 of yacc.c  */
-#line 1402 "parser.yy"
+#line 1406 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7129 +7133 @@
 
 /* Line 1806 of yacc.c  */
-#line 1404 "parser.yy"
+#line 1408 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7136 +7140 @@
 
 /* Line 1806 of yacc.c  */
-#line 1410 "parser.yy"
+#line 1414 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7143 +7147 @@
 
 /* Line 1806 of yacc.c  */
-#line 1412 "parser.yy"
+#line 1416 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7150 +7154 @@
 
 /* Line 1806 of yacc.c  */
-#line 1418 "parser.yy"
+#line 1422 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7157 +7161 @@
 
 /* Line 1806 of yacc.c  */
-#line 1420 "parser.yy"
+#line 1424 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7164 +7168 @@
 
 /* Line 1806 of yacc.c  */
-#line 1422 "parser.yy"
+#line 1426 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7171 +7175 @@
 
 /* Line 1806 of yacc.c  */
-#line 1427 "parser.yy"
+#line 1431 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7178 +7182 @@
 
 /* Line 1806 of yacc.c  */
-#line 1429 "parser.yy"
+#line 1433 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypedef( (yyvsp[(2) - (2)].tok) )->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7185 +7189 @@
 
 /* Line 1806 of yacc.c  */
-#line 1431 "parser.yy"
+#line 1435 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7192 +7196 @@
 
 /* Line 1806 of yacc.c  */
-#line 1441 "parser.yy"
+#line 1445 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (4)].aggKey), 0, 0, (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7199 +7203 @@
 
 /* Line 1806 of yacc.c  */
-#line 1443 "parser.yy"
+#line 1447 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7209 +7213 @@
 
 /* Line 1806 of yacc.c  */
-#line 1448 "parser.yy"
+#line 1452 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7216 +7220 @@
 
 /* Line 1806 of yacc.c  */
-#line 1450 "parser.yy"
+#line 1454 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (6)].aggKey), (yyvsp[(2) - (6)].tok), 0, (yyvsp[(5) - (6)].decl)); }
     break;
@@ -7223 +7227 @@
 
 /* Line 1806 of yacc.c  */
-#line 1452 "parser.yy"
+#line 1456 "parser.yy"
     { (yyval.decl) = DeclarationNode::newAggregate( (yyvsp[(1) - (7)].aggKey), 0, (yyvsp[(3) - (7)].en), (yyvsp[(6) - (7)].decl) ); }
     break;
@@ -7230 +7234 @@
 
 /* Line 1806 of yacc.c  */
-#line 1454 "parser.yy"
+#line 1458 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7237 +7241 @@
 
 /* Line 1806 of yacc.c  */
-#line 1459 "parser.yy"
+#line 1463 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Struct; }
     break;
@@ -7244 +7248 @@
 
 /* Line 1806 of yacc.c  */
-#line 1461 "parser.yy"
+#line 1465 "parser.yy"
     { (yyval.aggKey) = DeclarationNode::Union; }
     break;
@@ -7251 +7255 @@
 
 /* Line 1806 of yacc.c  */
-#line 1466 "parser.yy"
+#line 1470 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (1)].decl); }
     break;
@@ -7258 +7262 @@
 
 /* Line 1806 of yacc.c  */
-#line 1468 "parser.yy"
+#line 1472 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7265 +7269 @@
 
 /* Line 1806 of yacc.c  */
-#line 1474 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)/*->set_extension( true )*/; }
+#line 1478 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (3)].decl)->set_extension( true ); }
     break;
 
@@ -7272 +7276 @@
 
 /* Line 1806 of yacc.c  */
-#line 1477 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (3)].decl)/*->set_extension( true )*/; }
+#line 1481 "parser.yy"
+    {   // mark all fields in list
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (3)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                                iter->set_extension( true );
+                        (yyval.decl) = (yyvsp[(2) - (3)].decl);
+                }
     break;
 
@@ -7279 +7287 @@
 
 /* Line 1806 of yacc.c  */
-#line 1483 "parser.yy"
+#line 1491 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addName( (yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7286 +7294 @@
 
 /* Line 1806 of yacc.c  */
-#line 1485 "parser.yy"
+#line 1493 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(1) - (3)].decl)->cloneType( (yyvsp[(3) - (3)].tok) ) ); }
     break;
@@ -7293 +7301 @@
 
 /* Line 1806 of yacc.c  */
-#line 1487 "parser.yy"
+#line 1495 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(1) - (2)].decl)->cloneType( 0 ) ); }
     break;
@@ -7300 +7308 @@
 
 /* Line 1806 of yacc.c  */
-#line 1492 "parser.yy"
+#line 1500 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7307 +7315 @@
 
 /* Line 1806 of yacc.c  */
-#line 1494 "parser.yy"
+#line 1502 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(1) - (4)].decl)->cloneBaseType( (yyvsp[(4) - (4)].decl) ) ); }
     break;
@@ -7314 +7322 @@
 
 /* Line 1806 of yacc.c  */
-#line 1499 "parser.yy"
+#line 1507 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( 0 ); /* XXX */ }
     break;
@@ -7321 +7329 @@
 
 /* Line 1806 of yacc.c  */
-#line 1501 "parser.yy"
+#line 1509 "parser.yy"
     { (yyval.decl) = DeclarationNode::newBitfield( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7328 +7336 @@
 
 /* Line 1806 of yacc.c  */
-#line 1504 "parser.yy"
+#line 1512 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7335 +7343 @@
 
 /* Line 1806 of yacc.c  */
-#line 1507 "parser.yy"
+#line 1515 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addBitfield( (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7342 +7350 @@
 
 /* Line 1806 of yacc.c  */
-#line 1513 "parser.yy"
+#line 1521 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7349 +7357 @@
 
 /* Line 1806 of yacc.c  */
-#line 1515 "parser.yy"
+#line 1523 "parser.yy"
     { (yyval.en) = (yyvsp[(1) - (1)].en); }
     break;
@@ -7356 +7364 @@
 
 /* Line 1806 of yacc.c  */
-#line 1520 "parser.yy"
+#line 1528 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7363 +7371 @@
 
 /* Line 1806 of yacc.c  */
-#line 1529 "parser.yy"
+#line 1537 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( 0, (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -7370 +7378 @@
 
 /* Line 1806 of yacc.c  */
-#line 1531 "parser.yy"
+#line 1539 "parser.yy"
     {
                         typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) );
@@ -7380 +7388 @@
 
 /* Line 1806 of yacc.c  */
-#line 1536 "parser.yy"
+#line 1544 "parser.yy"
     { typedefTable.makeTypedef( *(yyvsp[(2) - (2)].tok) ); }
     break;
@@ -7387 +7395 @@
 
 /* Line 1806 of yacc.c  */
-#line 1538 "parser.yy"
+#line 1546 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnum( (yyvsp[(2) - (7)].tok), (yyvsp[(5) - (7)].decl) ); }
     break;
@@ -7394 +7402 @@
 
 /* Line 1806 of yacc.c  */
-#line 1543 "parser.yy"
+#line 1551 "parser.yy"
     { (yyval.decl) = DeclarationNode::newEnumConstant( (yyvsp[(1) - (2)].tok), (yyvsp[(2) - (2)].en) ); }
     break;
@@ -7401 +7409 @@
 
 /* Line 1806 of yacc.c  */
-#line 1545 "parser.yy"
+#line 1553 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( DeclarationNode::newEnumConstant( (yyvsp[(3) - (4)].tok), (yyvsp[(4) - (4)].en) ) ); }
     break;
@@ -7408 +7416 @@
 
 /* Line 1806 of yacc.c  */
-#line 1550 "parser.yy"
+#line 1558 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -7415 +7423 @@
 
 /* Line 1806 of yacc.c  */
-#line 1552 "parser.yy"
+#line 1560 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -7422 +7430 @@
 
 /* Line 1806 of yacc.c  */
-#line 1559 "parser.yy"
+#line 1567 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7429 +7437 @@
 
 /* Line 1806 of yacc.c  */
-#line 1567 "parser.yy"
+#line 1575 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7436 +7444 @@
 
 /* Line 1806 of yacc.c  */
-#line 1569 "parser.yy"
+#line 1577 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7443 +7451 @@
 
 /* Line 1806 of yacc.c  */
-#line 1571 "parser.yy"
+#line 1579 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7450 +7458 @@
 
 /* Line 1806 of yacc.c  */
-#line 1579 "parser.yy"
+#line 1587 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
 
   case 412:
-
-/* Line 1806 of yacc.c  */
-#line 1581 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
-    break;
-
-  case 413:
-
-/* Line 1806 of yacc.c  */
-#line 1583 "parser.yy"
-    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
-    break;
-
-  case 415:
 
 /* Line 1806 of yacc.c  */
@@ -7475 +7469 @@
     break;
 
+  case 413:
+
+/* Line 1806 of yacc.c  */
+#line 1591 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (9)].decl)->appendList( (yyvsp[(5) - (9)].decl) )->appendList( (yyvsp[(9) - (9)].decl) ); }
+    break;
+
+  case 415:
+
+/* Line 1806 of yacc.c  */
+#line 1597 "parser.yy"
+    { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
+    break;
+
   case 416:
 
 /* Line 1806 of yacc.c  */
-#line 1594 "parser.yy"
+#line 1602 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7485 +7493 @@
 
 /* Line 1806 of yacc.c  */
-#line 1601 "parser.yy"
+#line 1609 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->addVarArgs(); }
     break;
@@ -7492 +7500 @@
 
 /* Line 1806 of yacc.c  */
-#line 1608 "parser.yy"
+#line 1616 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7499 +7507 @@
 
 /* Line 1806 of yacc.c  */
-#line 1610 "parser.yy"
+#line 1618 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (5)].decl)->appendList( (yyvsp[(5) - (5)].decl) ); }
     break;
@@ -7506 +7514 @@
 
 /* Line 1806 of yacc.c  */
-#line 1619 "parser.yy"
+#line 1627 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7513 +7521 @@
 
 /* Line 1806 of yacc.c  */
-#line 1622 "parser.yy"
+#line 1630 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addName( (yyvsp[(2) - (3)].tok) ); }
     break;
@@ -7520 +7528 @@
 
 /* Line 1806 of yacc.c  */
-#line 1624 "parser.yy"
+#line 1632 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addName( (yyvsp[(3) - (4)].tok) )->addQualifiers( (yyvsp[(1) - (4)].decl) ); }
     break;
@@ -7527 +7535 @@
 
 /* Line 1806 of yacc.c  */
-#line 1634 "parser.yy"
+#line 1642 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7534 +7542 @@
 
 /* Line 1806 of yacc.c  */
-#line 1640 "parser.yy"
+#line 1648 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7544 +7552 @@
 
 /* Line 1806 of yacc.c  */
-#line 1645 "parser.yy"
+#line 1653 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -7554 +7562 @@
 
 /* Line 1806 of yacc.c  */
-#line 1654 "parser.yy"
+#line 1662 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7561 +7569 @@
 
 /* Line 1806 of yacc.c  */
-#line 1663 "parser.yy"
+#line 1671 "parser.yy"
     { (yyval.decl) = DeclarationNode::newName( (yyvsp[(1) - (1)].tok) ); }
     break;
@@ -7568 +7576 @@
 
 /* Line 1806 of yacc.c  */
-#line 1665 "parser.yy"
+#line 1673 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( DeclarationNode::newName( (yyvsp[(3) - (3)].tok) ) ); }
     break;
 
   case 451:
-
-/* Line 1806 of yacc.c  */
-#line 1690 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
-    break;
-
-  case 455:
 
 /* Line 1806 of yacc.c  */
@@ -7586 +7587 @@
     break;
 
+  case 455:
+
+/* Line 1806 of yacc.c  */
+#line 1706 "parser.yy"
+    { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addType( (yyvsp[(1) - (2)].decl) ); }
+    break;
+
   case 456:
 
 /* Line 1806 of yacc.c  */
-#line 1703 "parser.yy"
+#line 1711 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7596 +7604 @@
 
 /* Line 1806 of yacc.c  */
-#line 1705 "parser.yy"
+#line 1713 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in); }
     break;
@@ -7603 +7611 @@
 
 /* Line 1806 of yacc.c  */
-#line 1707 "parser.yy"
+#line 1715 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_maybeConstructed( false ); }
     break;
@@ -7610 +7618 @@
 
 /* Line 1806 of yacc.c  */
-#line 1711 "parser.yy"
+#line 1719 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(1) - (1)].en) ); }
     break;
@@ -7617 +7625 @@
 
 /* Line 1806 of yacc.c  */
-#line 1712 "parser.yy"
+#line 1720 "parser.yy"
     { (yyval.in) = new InitializerNode( (yyvsp[(2) - (4)].in), true ); }
     break;
@@ -7624 +7632 @@
 
 /* Line 1806 of yacc.c  */
-#line 1717 "parser.yy"
+#line 1725 "parser.yy"
     { (yyval.in) = 0; }
     break;
@@ -7631 +7639 @@
 
 /* Line 1806 of yacc.c  */
-#line 1719 "parser.yy"
+#line 1727 "parser.yy"
     { (yyval.in) = (yyvsp[(2) - (2)].in)->set_designators( (yyvsp[(1) - (2)].en) ); }
     break;
@@ -7638 +7646 @@
 
 /* Line 1806 of yacc.c  */
-#line 1720 "parser.yy"
+#line 1728 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (3)].in)->set_link( (yyvsp[(3) - (3)].in) ) ); }
     break;
@@ -7645 +7653 @@
 
 /* Line 1806 of yacc.c  */
-#line 1722 "parser.yy"
+#line 1730 "parser.yy"
     { (yyval.in) = (InitializerNode *)( (yyvsp[(1) - (4)].in)->set_link( (yyvsp[(4) - (4)].in)->set_designators( (yyvsp[(3) - (4)].en) ) ) ); }
     break;
@@ -7652 +7660 @@
 
 /* Line 1806 of yacc.c  */
-#line 1738 "parser.yy"
+#line 1746 "parser.yy"
     { (yyval.en) = new VarRefNode( (yyvsp[(1) - (2)].tok) ); }
     break;
@@ -7659 +7667 @@
 
 /* Line 1806 of yacc.c  */
-#line 1744 "parser.yy"
+#line 1752 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (2)].en)->set_link( (yyvsp[(2) - (2)].en) )); }
     break;
@@ -7666 +7674 @@
 
 /* Line 1806 of yacc.c  */
-#line 1752 "parser.yy"
+#line 1760 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(1) - (1)].tok) ) ); }
     break;
@@ -7673 +7681 @@
 
 /* Line 1806 of yacc.c  */
-#line 1754 "parser.yy"
+#line 1762 "parser.yy"
     { (yyval.en) = new DesignatorNode( new VarRefNode( (yyvsp[(2) - (2)].tok) ) ); }
     break;
@@ -7680 +7688 @@
 
 /* Line 1806 of yacc.c  */
-#line 1757 "parser.yy"
+#line 1765 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
@@ -7687 +7695 @@
 
 /* Line 1806 of yacc.c  */
-#line 1759 "parser.yy"
+#line 1767 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(3) - (5)].en), true ); }
     break;
@@ -7694 +7702 @@
 
 /* Line 1806 of yacc.c  */
-#line 1761 "parser.yy"
+#line 1769 "parser.yy"
     { (yyval.en) = new DesignatorNode( new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(3) - (7)].en), (yyvsp[(5) - (7)].en) ), true ); }
     break;
@@ -7701 +7709 @@
 
 /* Line 1806 of yacc.c  */
-#line 1763 "parser.yy"
+#line 1771 "parser.yy"
     { (yyval.en) = new DesignatorNode( (yyvsp[(4) - (6)].en) ); }
     break;
@@ -7708 +7716 @@
 
 /* Line 1806 of yacc.c  */
-#line 1787 "parser.yy"
+#line 1795 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7715 +7723 @@
 
 /* Line 1806 of yacc.c  */
-#line 1789 "parser.yy"
+#line 1797 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7722 +7730 @@
 
 /* Line 1806 of yacc.c  */
-#line 1791 "parser.yy"
+#line 1799 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->addQualifiers( (yyvsp[(2) - (3)].decl) )->addQualifiers( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7729 +7737 @@
 
 /* Line 1806 of yacc.c  */
-#line 1797 "parser.yy"
+#line 1805 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -7736 +7744 @@
 
 /* Line 1806 of yacc.c  */
-#line 1799 "parser.yy"
+#line 1807 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7743 +7751 @@
 
 /* Line 1806 of yacc.c  */
-#line 1804 "parser.yy"
+#line 1812 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFromTypeGen( (yyvsp[(1) - (4)].tok), (yyvsp[(3) - (4)].en) ); }
     break;
@@ -7750 +7758 @@
 
 /* Line 1806 of yacc.c  */
-#line 1810 "parser.yy"
+#line 1818 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->appendList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -7757 +7765 @@
 
 /* Line 1806 of yacc.c  */
-#line 1815 "parser.yy"
+#line 1823 "parser.yy"
     { typedefTable.addToEnclosingScope( *(yyvsp[(2) - (2)].tok), TypedefTable::TD ); }
     break;
@@ -7764 +7772 @@
 
 /* Line 1806 of yacc.c  */
-#line 1817 "parser.yy"
+#line 1825 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTypeParam( (yyvsp[(1) - (4)].tclass), (yyvsp[(2) - (4)].tok) )->addAssertions( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7771 +7779 @@
 
 /* Line 1806 of yacc.c  */
-#line 1823 "parser.yy"
+#line 1831 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Type; }
     break;
@@ -7778 +7786 @@
 
 /* Line 1806 of yacc.c  */
-#line 1825 "parser.yy"
+#line 1833 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Ftype; }
     break;
@@ -7785 +7793 @@
 
 /* Line 1806 of yacc.c  */
-#line 1827 "parser.yy"
+#line 1835 "parser.yy"
     { (yyval.tclass) = DeclarationNode::Dtype; }
     break;
@@ -7792 +7800 @@
 
 /* Line 1806 of yacc.c  */
-#line 1832 "parser.yy"
+#line 1840 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7799 +7807 @@
 
 /* Line 1806 of yacc.c  */
-#line 1834 "parser.yy"
+#line 1842 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl) == 0 ? (yyvsp[(2) - (2)].decl) : (yyvsp[(1) - (2)].decl)->appendList( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7806 +7814 @@
 
 /* Line 1806 of yacc.c  */
-#line 1839 "parser.yy"
+#line 1847 "parser.yy"
     {
                         typedefTable.openTrait( *(yyvsp[(2) - (5)].tok) );
@@ -7816 +7824 @@
 
 /* Line 1806 of yacc.c  */
-#line 1844 "parser.yy"
+#line 1852 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (5)].decl); }
     break;
@@ -7823 +7831 @@
 
 /* Line 1806 of yacc.c  */
-#line 1846 "parser.yy"
+#line 1854 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -7830 +7838 @@
 
 /* Line 1806 of yacc.c  */
-#line 1851 "parser.yy"
+#line 1859 "parser.yy"
     { (yyval.en) = new TypeValueNode( (yyvsp[(1) - (1)].decl) ); }
     break;
@@ -7837 +7845 @@
 
 /* Line 1806 of yacc.c  */
-#line 1854 "parser.yy"
+#line 1862 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( new TypeValueNode( (yyvsp[(3) - (3)].decl) ))); }
     break;
@@ -7844 +7852 @@
 
 /* Line 1806 of yacc.c  */
-#line 1856 "parser.yy"
+#line 1864 "parser.yy"
     { (yyval.en) = (ExpressionNode *)( (yyvsp[(1) - (3)].en)->set_link( (yyvsp[(3) - (3)].en) )); }
     break;
@@ -7851 +7859 @@
 
 /* Line 1806 of yacc.c  */
-#line 1861 "parser.yy"
+#line 1869 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl); }
     break;
@@ -7858 +7866 @@
 
 /* Line 1806 of yacc.c  */
-#line 1863 "parser.yy"
+#line 1871 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addQualifiers( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -7865 +7873 @@
 
 /* Line 1806 of yacc.c  */
-#line 1865 "parser.yy"
+#line 1873 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl)->copyStorageClasses( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -7872 +7880 @@
 
 /* Line 1806 of yacc.c  */
-#line 1870 "parser.yy"
+#line 1878 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addAssertions( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -7879 +7887 @@
 
 /* Line 1806 of yacc.c  */
-#line 1872 "parser.yy"
+#line 1880 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addAssertions( (yyvsp[(2) - (4)].decl) )->addType( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -7886 +7894 @@
 
 /* Line 1806 of yacc.c  */
-#line 1877 "parser.yy"
+#line 1885 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (1)].tok), TypedefTable::TD );
@@ -7896 +7904 @@
 
 /* Line 1806 of yacc.c  */
-#line 1882 "parser.yy"
+#line 1890 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(1) - (6)].tok), TypedefTable::TG );
@@ -7906 +7914 @@
 
 /* Line 1806 of yacc.c  */
-#line 1890 "parser.yy"
+#line 1898 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( *(yyvsp[(2) - (9)].tok), TypedefTable::ID );
@@ -7916 +7924 @@
 
 /* Line 1806 of yacc.c  */
-#line 1895 "parser.yy"
+#line 1903 "parser.yy"
     {
                         typedefTable.enterTrait( *(yyvsp[(2) - (8)].tok) );
@@ -7926 +7934 @@
 
 /* Line 1806 of yacc.c  */
-#line 1900 "parser.yy"
+#line 1908 "parser.yy"
     {
                         typedefTable.leaveTrait();
@@ -7937 +7945 @@
 
 /* Line 1806 of yacc.c  */
-#line 1910 "parser.yy"
+#line 1918 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -7944 +7952 @@
 
 /* Line 1806 of yacc.c  */
-#line 1920 "parser.yy"
+#line 1928 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7954 +7962 @@
 
 /* Line 1806 of yacc.c  */
-#line 1925 "parser.yy"
+#line 1933 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7964 +7972 @@
 
 /* Line 1806 of yacc.c  */
-#line 1930 "parser.yy"
+#line 1938 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( *(yyvsp[(5) - (5)].tok), TypedefTable::ID );
@@ -7974 +7982 @@
 
 /* Line 1806 of yacc.c  */
-#line 1938 "parser.yy"
+#line 1946 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7984 +7992 @@
 
 /* Line 1806 of yacc.c  */
-#line 1943 "parser.yy"
+#line 1951 "parser.yy"
     {
                         typedefTable.addToEnclosingScope2( TypedefTable::ID );
@@ -7994 +8002 @@
 
 /* Line 1806 of yacc.c  */
-#line 1953 "parser.yy"
+#line 1961 "parser.yy"
     {}
     break;
@@ -8001 +8009 @@
 
 /* Line 1806 of yacc.c  */
-#line 1955 "parser.yy"
+#line 1963 "parser.yy"
     {
                         if ( theTree ) {
@@ -8014 +8022 @@
 
 /* Line 1806 of yacc.c  */
-#line 1967 "parser.yy"
+#line 1975 "parser.yy"
     { (yyval.decl) = ( (yyvsp[(1) - (3)].decl) != NULL ) ? (yyvsp[(1) - (3)].decl)->appendList( (yyvsp[(3) - (3)].decl) ) : (yyvsp[(3) - (3)].decl); }
     break;
@@ -8021 +8029 @@
 
 /* Line 1806 of yacc.c  */
-#line 1972 "parser.yy"
+#line 1980 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8028 +8036 @@
 
 /* Line 1806 of yacc.c  */
-#line 1980 "parser.yy"
+#line 1988 "parser.yy"
     {}
     break;
@@ -8035 +8043 @@
 
 /* Line 1806 of yacc.c  */
-#line 1982 "parser.yy"
+#line 1990 "parser.yy"
     {
                         linkageStack.push( linkage );
@@ -8045 +8053 @@
 
 /* Line 1806 of yacc.c  */
-#line 1987 "parser.yy"
+#line 1995 "parser.yy"
     {
                         linkage = linkageStack.top();
@@ -8056 +8064 @@
 
 /* Line 1806 of yacc.c  */
-#line 1993 "parser.yy"
-    { (yyval.decl) = (yyvsp[(2) - (2)].decl)/*->set_extension( true )*/; }
+#line 2001 "parser.yy"
+    {   // mark all fields in list
+                        for ( DeclarationNode *iter = (yyvsp[(2) - (2)].decl); iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                                iter->set_extension( true );
+                        (yyval.decl) = (yyvsp[(2) - (2)].decl);
+                }
     break;
 
@@ -8063 +8075 @@
 
 /* Line 1806 of yacc.c  */
-#line 2004 "parser.yy"
+#line 2016 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8074 +8086 @@
 
 /* Line 1806 of yacc.c  */
-#line 2010 "parser.yy"
+#line 2022 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8085 +8097 @@
 
 /* Line 1806 of yacc.c  */
-#line 2019 "parser.yy"
+#line 2031 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8096 +8108 @@
 
 /* Line 1806 of yacc.c  */
-#line 2025 "parser.yy"
+#line 2037 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8107 +8119 @@
 
 /* Line 1806 of yacc.c  */
-#line 2031 "parser.yy"
+#line 2043 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8118 +8130 @@
 
 /* Line 1806 of yacc.c  */
-#line 2037 "parser.yy"
+#line 2049 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8129 +8141 @@
 
 /* Line 1806 of yacc.c  */
-#line 2043 "parser.yy"
+#line 2055 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8140 +8152 @@
 
 /* Line 1806 of yacc.c  */
-#line 2051 "parser.yy"
+#line 2063 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8151 +8163 @@
 
 /* Line 1806 of yacc.c  */
-#line 2057 "parser.yy"
+#line 2069 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8162 +8174 @@
 
 /* Line 1806 of yacc.c  */
-#line 2065 "parser.yy"
+#line 2077 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8173 +8185 @@
 
 /* Line 1806 of yacc.c  */
-#line 2071 "parser.yy"
+#line 2083 "parser.yy"
     {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
@@ -8184 +8196 @@
 
 /* Line 1806 of yacc.c  */
-#line 2086 "parser.yy"
+#line 2098 "parser.yy"
     { (yyval.en) = new CompositeExprNode( new OperatorNode( OperatorNode::Range ), (yyvsp[(1) - (3)].en), (yyvsp[(3) - (3)].en) ); }
     break;
@@ -8191 +8203 @@
 
 /* Line 1806 of yacc.c  */
-#line 2096 "parser.yy"
+#line 2108 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8198 +8210 @@
 
 /* Line 1806 of yacc.c  */
-#line 2103 "parser.yy"
+#line 2115 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -8205 +8217 @@
 
 /* Line 1806 of yacc.c  */
-#line 2109 "parser.yy"
+#line 2121 "parser.yy"
     { (yyval.decl) = 0; }
     break;
@@ -8212 +8224 @@
 
 /* Line 1806 of yacc.c  */
-#line 2124 "parser.yy"
+#line 2136 "parser.yy"
     {}
     break;
@@ -8219 +8231 @@
 
 /* Line 1806 of yacc.c  */
-#line 2125 "parser.yy"
+#line 2137 "parser.yy"
     {}
     break;
@@ -8226 +8238 @@
 
 /* Line 1806 of yacc.c  */
-#line 2126 "parser.yy"
+#line 2138 "parser.yy"
     {}
     break;
@@ -8233 +8245 @@
 
 /* Line 1806 of yacc.c  */
-#line 2127 "parser.yy"
+#line 2139 "parser.yy"
     {}
     break;
@@ -8240 +8252 @@
 
 /* Line 1806 of yacc.c  */
-#line 2162 "parser.yy"
+#line 2174 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8247 +8259 @@
 
 /* Line 1806 of yacc.c  */
-#line 2165 "parser.yy"
+#line 2177 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8254 +8266 @@
 
 /* Line 1806 of yacc.c  */
-#line 2167 "parser.yy"
+#line 2179 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8261 +8273 @@
 
 /* Line 1806 of yacc.c  */
-#line 2172 "parser.yy"
+#line 2184 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8271 +8283 @@
 
 /* Line 1806 of yacc.c  */
-#line 2177 "parser.yy"
+#line 2189 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8278 +8290 @@
 
 /* Line 1806 of yacc.c  */
-#line 2182 "parser.yy"
+#line 2194 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8285 +8297 @@
 
 /* Line 1806 of yacc.c  */
-#line 2184 "parser.yy"
+#line 2196 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8292 +8304 @@
 
 /* Line 1806 of yacc.c  */
-#line 2186 "parser.yy"
+#line 2198 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8299 +8311 @@
 
 /* Line 1806 of yacc.c  */
-#line 2191 "parser.yy"
+#line 2203 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8306 +8318 @@
 
 /* Line 1806 of yacc.c  */
-#line 2193 "parser.yy"
+#line 2205 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8313 +8325 @@
 
 /* Line 1806 of yacc.c  */
-#line 2195 "parser.yy"
+#line 2207 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8320 +8332 @@
 
 /* Line 1806 of yacc.c  */
-#line 2197 "parser.yy"
+#line 2209 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8327 +8339 @@
 
 /* Line 1806 of yacc.c  */
-#line 2202 "parser.yy"
+#line 2214 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8334 +8346 @@
 
 /* Line 1806 of yacc.c  */
-#line 2204 "parser.yy"
+#line 2216 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8341 +8353 @@
 
 /* Line 1806 of yacc.c  */
-#line 2213 "parser.yy"
+#line 2225 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8348 +8360 @@
 
 /* Line 1806 of yacc.c  */
-#line 2216 "parser.yy"
+#line 2228 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8355 +8367 @@
 
 /* Line 1806 of yacc.c  */
-#line 2221 "parser.yy"
+#line 2233 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8362 +8374 @@
 
 /* Line 1806 of yacc.c  */
-#line 2223 "parser.yy"
+#line 2235 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8369 +8381 @@
 
 /* Line 1806 of yacc.c  */
-#line 2225 "parser.yy"
+#line 2237 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8376 +8388 @@
 
 /* Line 1806 of yacc.c  */
-#line 2230 "parser.yy"
+#line 2242 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8383 +8395 @@
 
 /* Line 1806 of yacc.c  */
-#line 2232 "parser.yy"
+#line 2244 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8390 +8402 @@
 
 /* Line 1806 of yacc.c  */
-#line 2234 "parser.yy"
+#line 2246 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8397 +8409 @@
 
 /* Line 1806 of yacc.c  */
-#line 2239 "parser.yy"
+#line 2251 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8404 +8416 @@
 
 /* Line 1806 of yacc.c  */
-#line 2241 "parser.yy"
+#line 2253 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8411 +8423 @@
 
 /* Line 1806 of yacc.c  */
-#line 2243 "parser.yy"
+#line 2255 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8418 +8430 @@
 
 /* Line 1806 of yacc.c  */
-#line 2258 "parser.yy"
+#line 2270 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (4)].decl)->addIdList( (yyvsp[(3) - (4)].decl) ); }
     break;
@@ -8425 +8437 @@
 
 /* Line 1806 of yacc.c  */
-#line 2260 "parser.yy"
+#line 2272 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (6)].decl)->addIdList( (yyvsp[(5) - (6)].decl) ); }
     break;
@@ -8432 +8444 @@
 
 /* Line 1806 of yacc.c  */
-#line 2262 "parser.yy"
+#line 2274 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8439 +8451 @@
 
 /* Line 1806 of yacc.c  */
-#line 2267 "parser.yy"
+#line 2279 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8446 +8458 @@
 
 /* Line 1806 of yacc.c  */
-#line 2269 "parser.yy"
+#line 2281 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8453 +8465 @@
 
 /* Line 1806 of yacc.c  */
-#line 2271 "parser.yy"
+#line 2283 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8460 +8472 @@
 
 /* Line 1806 of yacc.c  */
-#line 2276 "parser.yy"
+#line 2288 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8467 +8479 @@
 
 /* Line 1806 of yacc.c  */
-#line 2278 "parser.yy"
+#line 2290 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8474 +8486 @@
 
 /* Line 1806 of yacc.c  */
-#line 2280 "parser.yy"
+#line 2292 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8481 +8493 @@
 
 /* Line 1806 of yacc.c  */
-#line 2295 "parser.yy"
+#line 2307 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8488 +8500 @@
 
 /* Line 1806 of yacc.c  */
-#line 2298 "parser.yy"
+#line 2310 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8495 +8507 @@
 
 /* Line 1806 of yacc.c  */
-#line 2300 "parser.yy"
+#line 2312 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8502 +8514 @@
 
 /* Line 1806 of yacc.c  */
-#line 2306 "parser.yy"
+#line 2318 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8509 +8521 @@
 
 /* Line 1806 of yacc.c  */
-#line 2311 "parser.yy"
+#line 2323 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8516 +8528 @@
 
 /* Line 1806 of yacc.c  */
-#line 2313 "parser.yy"
+#line 2325 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8523 +8535 @@
 
 /* Line 1806 of yacc.c  */
-#line 2315 "parser.yy"
+#line 2327 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8530 +8542 @@
 
 /* Line 1806 of yacc.c  */
-#line 2320 "parser.yy"
+#line 2332 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8537 +8549 @@
 
 /* Line 1806 of yacc.c  */
-#line 2322 "parser.yy"
+#line 2334 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8544 +8556 @@
 
 /* Line 1806 of yacc.c  */
-#line 2324 "parser.yy"
+#line 2336 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8551 +8563 @@
 
 /* Line 1806 of yacc.c  */
-#line 2326 "parser.yy"
+#line 2338 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8558 +8570 @@
 
 /* Line 1806 of yacc.c  */
-#line 2331 "parser.yy"
+#line 2343 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8565 +8577 @@
 
 /* Line 1806 of yacc.c  */
-#line 2333 "parser.yy"
+#line 2345 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8572 +8584 @@
 
 /* Line 1806 of yacc.c  */
-#line 2335 "parser.yy"
+#line 2347 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8579 +8591 @@
 
 /* Line 1806 of yacc.c  */
-#line 2345 "parser.yy"
+#line 2357 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8586 +8598 @@
 
 /* Line 1806 of yacc.c  */
-#line 2348 "parser.yy"
+#line 2360 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8593 +8605 @@
 
 /* Line 1806 of yacc.c  */
-#line 2350 "parser.yy"
+#line 2362 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8600 +8612 @@
 
 /* Line 1806 of yacc.c  */
-#line 2355 "parser.yy"
+#line 2367 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8607 +8619 @@
 
 /* Line 1806 of yacc.c  */
-#line 2357 "parser.yy"
+#line 2369 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8614 +8626 @@
 
 /* Line 1806 of yacc.c  */
-#line 2359 "parser.yy"
+#line 2371 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8621 +8633 @@
 
 /* Line 1806 of yacc.c  */
-#line 2364 "parser.yy"
+#line 2376 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8628 +8640 @@
 
 /* Line 1806 of yacc.c  */
-#line 2366 "parser.yy"
+#line 2378 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8635 +8647 @@
 
 /* Line 1806 of yacc.c  */
-#line 2368 "parser.yy"
+#line 2380 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8642 +8654 @@
 
 /* Line 1806 of yacc.c  */
-#line 2370 "parser.yy"
+#line 2382 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8649 +8661 @@
 
 /* Line 1806 of yacc.c  */
-#line 2375 "parser.yy"
+#line 2387 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8656 +8668 @@
 
 /* Line 1806 of yacc.c  */
-#line 2377 "parser.yy"
+#line 2389 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8663 +8675 @@
 
 /* Line 1806 of yacc.c  */
-#line 2379 "parser.yy"
+#line 2391 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8670 +8682 @@
 
 /* Line 1806 of yacc.c  */
-#line 2410 "parser.yy"
+#line 2422 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8677 +8689 @@
 
 /* Line 1806 of yacc.c  */
-#line 2413 "parser.yy"
+#line 2425 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8684 +8696 @@
 
 /* Line 1806 of yacc.c  */
-#line 2415 "parser.yy"
+#line 2427 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8691 +8703 @@
 
 /* Line 1806 of yacc.c  */
-#line 2420 "parser.yy"
+#line 2432 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8701 +8713 @@
 
 /* Line 1806 of yacc.c  */
-#line 2425 "parser.yy"
+#line 2437 "parser.yy"
     {
                         typedefTable.setNextIdentifier( *(yyvsp[(1) - (1)].tok) );
@@ -8711 +8723 @@
 
 /* Line 1806 of yacc.c  */
-#line 2433 "parser.yy"
+#line 2445 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8718 +8730 @@
 
 /* Line 1806 of yacc.c  */
-#line 2435 "parser.yy"
+#line 2447 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8725 +8737 @@
 
 /* Line 1806 of yacc.c  */
-#line 2437 "parser.yy"
+#line 2449 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8732 +8744 @@
 
 /* Line 1806 of yacc.c  */
-#line 2442 "parser.yy"
+#line 2454 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8739 +8751 @@
 
 /* Line 1806 of yacc.c  */
-#line 2444 "parser.yy"
+#line 2456 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8746 +8758 @@
 
 /* Line 1806 of yacc.c  */
-#line 2449 "parser.yy"
+#line 2461 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addParamList( (yyvsp[(4) - (6)].decl) ); }
     break;
@@ -8753 +8765 @@
 
 /* Line 1806 of yacc.c  */
-#line 2451 "parser.yy"
+#line 2463 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8760 +8772 @@
 
 /* Line 1806 of yacc.c  */
-#line 2466 "parser.yy"
+#line 2478 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8767 +8779 @@
 
 /* Line 1806 of yacc.c  */
-#line 2468 "parser.yy"
+#line 2480 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8774 +8786 @@
 
 /* Line 1806 of yacc.c  */
-#line 2473 "parser.yy"
+#line 2485 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8781 +8793 @@
 
 /* Line 1806 of yacc.c  */
-#line 2475 "parser.yy"
+#line 2487 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8788 +8800 @@
 
 /* Line 1806 of yacc.c  */
-#line 2477 "parser.yy"
+#line 2489 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8795 +8807 @@
 
 /* Line 1806 of yacc.c  */
-#line 2479 "parser.yy"
+#line 2491 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8802 +8814 @@
 
 /* Line 1806 of yacc.c  */
-#line 2481 "parser.yy"
+#line 2493 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8809 +8821 @@
 
 /* Line 1806 of yacc.c  */
-#line 2487 "parser.yy"
+#line 2499 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8816 +8828 @@
 
 /* Line 1806 of yacc.c  */
-#line 2489 "parser.yy"
+#line 2501 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8823 +8835 @@
 
 /* Line 1806 of yacc.c  */
-#line 2491 "parser.yy"
+#line 2503 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8830 +8842 @@
 
 /* Line 1806 of yacc.c  */
-#line 2496 "parser.yy"
+#line 2508 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8837 +8849 @@
 
 /* Line 1806 of yacc.c  */
-#line 2498 "parser.yy"
+#line 2510 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8844 +8856 @@
 
 /* Line 1806 of yacc.c  */
-#line 2500 "parser.yy"
+#line 2512 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8851 +8863 @@
 
 /* Line 1806 of yacc.c  */
-#line 2506 "parser.yy"
+#line 2518 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8858 +8870 @@
 
 /* Line 1806 of yacc.c  */
-#line 2508 "parser.yy"
+#line 2520 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false )->addArray( (yyvsp[(3) - (3)].decl) ); }
     break;
@@ -8865 +8877 @@
 
 /* Line 1806 of yacc.c  */
-#line 2514 "parser.yy"
+#line 2526 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(3) - (5)].en), 0, false ); }
     break;
@@ -8872 +8884 @@
 
 /* Line 1806 of yacc.c  */
-#line 2516 "parser.yy"
+#line 2528 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( 0 ); }
     break;
@@ -8879 +8891 @@
 
 /* Line 1806 of yacc.c  */
-#line 2518 "parser.yy"
+#line 2530 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newArray( (yyvsp[(4) - (6)].en), 0, false ) ); }
     break;
@@ -8886 +8898 @@
 
 /* Line 1806 of yacc.c  */
-#line 2520 "parser.yy"
+#line 2532 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (6)].decl)->addArray( DeclarationNode::newVarArray( 0 ) ); }
     break;
@@ -8893 +8905 @@
 
 /* Line 1806 of yacc.c  */
-#line 2535 "parser.yy"
+#line 2547 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8900 +8912 @@
 
 /* Line 1806 of yacc.c  */
-#line 2537 "parser.yy"
+#line 2549 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8907 +8919 @@
 
 /* Line 1806 of yacc.c  */
-#line 2542 "parser.yy"
+#line 2554 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -8914 +8926 @@
 
 /* Line 1806 of yacc.c  */
-#line 2544 "parser.yy"
+#line 2556 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8921 +8933 @@
 
 /* Line 1806 of yacc.c  */
-#line 2546 "parser.yy"
+#line 2558 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -8928 +8940 @@
 
 /* Line 1806 of yacc.c  */
-#line 2548 "parser.yy"
+#line 2560 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -8935 +8947 @@
 
 /* Line 1806 of yacc.c  */
-#line 2550 "parser.yy"
+#line 2562 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8942 +8954 @@
 
 /* Line 1806 of yacc.c  */
-#line 2556 "parser.yy"
+#line 2568 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8949 +8961 @@
 
 /* Line 1806 of yacc.c  */
-#line 2558 "parser.yy"
+#line 2570 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -8956 +8968 @@
 
 /* Line 1806 of yacc.c  */
-#line 2560 "parser.yy"
+#line 2572 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8963 +8975 @@
 
 /* Line 1806 of yacc.c  */
-#line 2565 "parser.yy"
+#line 2577 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, 0, (yyvsp[(3) - (5)].decl), 0 ); }
     break;
@@ -8970 +8982 @@
 
 /* Line 1806 of yacc.c  */
-#line 2567 "parser.yy"
+#line 2579 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -8977 +8989 @@
 
 /* Line 1806 of yacc.c  */
-#line 2569 "parser.yy"
+#line 2581 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -8984 +8996 @@
 
 /* Line 1806 of yacc.c  */
-#line 2576 "parser.yy"
+#line 2588 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addArray( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -8991 +9003 @@
 
 /* Line 1806 of yacc.c  */
-#line 2587 "parser.yy"
+#line 2599 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, 0, false ); }
     break;
@@ -8998 +9010 @@
 
 /* Line 1806 of yacc.c  */
-#line 2590 "parser.yy"
+#line 2602 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -9005 +9017 @@
 
 /* Line 1806 of yacc.c  */
-#line 2592 "parser.yy"
+#line 2604 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( 0, (yyvsp[(3) - (5)].decl), false ); }
     break;
@@ -9012 +9024 @@
 
 /* Line 1806 of yacc.c  */
-#line 2595 "parser.yy"
+#line 2607 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -9019 +9031 @@
 
 /* Line 1806 of yacc.c  */
-#line 2597 "parser.yy"
+#line 2609 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl), true ); }
     break;
@@ -9026 +9038 @@
 
 /* Line 1806 of yacc.c  */
-#line 2599 "parser.yy"
+#line 2611 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(3) - (7)].decl), true ); }
     break;
@@ -9033 +9045 @@
 
 /* Line 1806 of yacc.c  */
-#line 2613 "parser.yy"
+#line 2625 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -9040 +9052 @@
 
 /* Line 1806 of yacc.c  */
-#line 2615 "parser.yy"
+#line 2627 "parser.yy"
     { (yyval.decl) = (yyvsp[(1) - (2)].decl)->addQualifiers( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -9047 +9059 @@
 
 /* Line 1806 of yacc.c  */
-#line 2620 "parser.yy"
+#line 2632 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( 0 ); }
     break;
@@ -9054 +9066 @@
 
 /* Line 1806 of yacc.c  */
-#line 2622 "parser.yy"
+#line 2634 "parser.yy"
     { (yyval.decl) = DeclarationNode::newPointer( (yyvsp[(2) - (2)].decl) ); }
     break;
@@ -9061 +9073 @@
 
 /* Line 1806 of yacc.c  */
-#line 2624 "parser.yy"
+#line 2636 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9068 +9080 @@
 
 /* Line 1806 of yacc.c  */
-#line 2626 "parser.yy"
+#line 2638 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addPointer( DeclarationNode::newPointer( (yyvsp[(2) - (3)].decl) ) ); }
     break;
@@ -9075 +9087 @@
 
 /* Line 1806 of yacc.c  */
-#line 2628 "parser.yy"
+#line 2640 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -9082 +9094 @@
 
 /* Line 1806 of yacc.c  */
-#line 2634 "parser.yy"
+#line 2646 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -9089 +9101 @@
 
 /* Line 1806 of yacc.c  */
-#line 2636 "parser.yy"
+#line 2648 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (4)].decl)->addArray( (yyvsp[(4) - (4)].decl) ); }
     break;
@@ -9096 +9108 @@
 
 /* Line 1806 of yacc.c  */
-#line 2638 "parser.yy"
+#line 2650 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -9103 +9115 @@
 
 /* Line 1806 of yacc.c  */
-#line 2643 "parser.yy"
+#line 2655 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (8)].decl)->addParamList( (yyvsp[(6) - (8)].decl) ); }
     break;
@@ -9110 +9122 @@
 
 /* Line 1806 of yacc.c  */
-#line 2645 "parser.yy"
+#line 2657 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (3)].decl); }
     break;
@@ -9117 +9129 @@
 
 /* Line 1806 of yacc.c  */
-#line 2655 "parser.yy"
+#line 2667 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9124 +9136 @@
 
 /* Line 1806 of yacc.c  */
-#line 2665 "parser.yy"
+#line 2677 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9131 +9143 @@
 
 /* Line 1806 of yacc.c  */
-#line 2667 "parser.yy"
+#line 2679 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9138 +9150 @@
 
 /* Line 1806 of yacc.c  */
-#line 2669 "parser.yy"
+#line 2681 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9145 +9157 @@
 
 /* Line 1806 of yacc.c  */
-#line 2671 "parser.yy"
+#line 2683 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9152 +9164 @@
 
 /* Line 1806 of yacc.c  */
-#line 2673 "parser.yy"
+#line 2685 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9159 +9171 @@
 
 /* Line 1806 of yacc.c  */
-#line 2675 "parser.yy"
+#line 2687 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9166 +9178 @@
 
 /* Line 1806 of yacc.c  */
-#line 2682 "parser.yy"
+#line 2694 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9173 +9185 @@
 
 /* Line 1806 of yacc.c  */
-#line 2684 "parser.yy"
+#line 2696 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9180 +9192 @@
 
 /* Line 1806 of yacc.c  */
-#line 2686 "parser.yy"
+#line 2698 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9187 +9199 @@
 
 /* Line 1806 of yacc.c  */
-#line 2688 "parser.yy"
+#line 2700 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -9194 +9206 @@
 
 /* Line 1806 of yacc.c  */
-#line 2690 "parser.yy"
+#line 2702 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9201 +9213 @@
 
 /* Line 1806 of yacc.c  */
-#line 2692 "parser.yy"
+#line 2704 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9208 +9220 @@
 
 /* Line 1806 of yacc.c  */
-#line 2694 "parser.yy"
+#line 2706 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9215 +9227 @@
 
 /* Line 1806 of yacc.c  */
-#line 2696 "parser.yy"
+#line 2708 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9222 +9234 @@
 
 /* Line 1806 of yacc.c  */
-#line 2698 "parser.yy"
+#line 2710 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( (yyvsp[(2) - (3)].decl) )->addNewArray( (yyvsp[(1) - (3)].decl) ); }
     break;
@@ -9229 +9241 @@
 
 /* Line 1806 of yacc.c  */
-#line 2700 "parser.yy"
+#line 2712 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9236 +9248 @@
 
 /* Line 1806 of yacc.c  */
-#line 2705 "parser.yy"
+#line 2717 "parser.yy"
     { (yyval.decl) = DeclarationNode::newVarArray( (yyvsp[(3) - (6)].decl) ); }
     break;
@@ -9243 +9255 @@
 
 /* Line 1806 of yacc.c  */
-#line 2707 "parser.yy"
+#line 2719 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), false ); }
     break;
@@ -9250 +9262 @@
 
 /* Line 1806 of yacc.c  */
-#line 2712 "parser.yy"
+#line 2724 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(4) - (6)].en), (yyvsp[(3) - (6)].decl), true ); }
     break;
@@ -9257 +9269 @@
 
 /* Line 1806 of yacc.c  */
-#line 2714 "parser.yy"
+#line 2726 "parser.yy"
     { (yyval.decl) = DeclarationNode::newArray( (yyvsp[(5) - (7)].en), (yyvsp[(4) - (7)].decl)->addQualifiers( (yyvsp[(3) - (7)].decl) ), true ); }
     break;
@@ -9264 +9276 @@
 
 /* Line 1806 of yacc.c  */
-#line 2741 "parser.yy"
+#line 2753 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addQualifiers( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9271 +9283 @@
 
 /* Line 1806 of yacc.c  */
-#line 2752 "parser.yy"
+#line 2764 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9278 +9290 @@
 
 /* Line 1806 of yacc.c  */
-#line 2754 "parser.yy"
+#line 2766 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9285 +9297 @@
 
 /* Line 1806 of yacc.c  */
-#line 2756 "parser.yy"
+#line 2768 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9292 +9304 @@
 
 /* Line 1806 of yacc.c  */
-#line 2758 "parser.yy"
+#line 2770 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9299 +9311 @@
 
 /* Line 1806 of yacc.c  */
-#line 2760 "parser.yy"
+#line 2772 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewPointer( DeclarationNode::newPointer( 0 ) ); }
     break;
@@ -9306 +9318 @@
 
 /* Line 1806 of yacc.c  */
-#line 2762 "parser.yy"
+#line 2774 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewPointer( DeclarationNode::newPointer( (yyvsp[(1) - (3)].decl) ) ); }
     break;
@@ -9313 +9325 @@
 
 /* Line 1806 of yacc.c  */
-#line 2769 "parser.yy"
+#line 2781 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9320 +9332 @@
 
 /* Line 1806 of yacc.c  */
-#line 2771 "parser.yy"
+#line 2783 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9327 +9339 @@
 
 /* Line 1806 of yacc.c  */
-#line 2773 "parser.yy"
+#line 2785 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9334 +9346 @@
 
 /* Line 1806 of yacc.c  */
-#line 2775 "parser.yy"
+#line 2787 "parser.yy"
     { (yyval.decl) = (yyvsp[(3) - (3)].decl)->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9341 +9353 @@
 
 /* Line 1806 of yacc.c  */
-#line 2777 "parser.yy"
+#line 2789 "parser.yy"
     { (yyval.decl) = (yyvsp[(4) - (4)].decl)->addNewArray( (yyvsp[(3) - (4)].decl) )->addNewArray( DeclarationNode::newArray( 0, 0, false ) ); }
     break;
@@ -9348 +9360 @@
 
 /* Line 1806 of yacc.c  */
-#line 2779 "parser.yy"
+#line 2791 "parser.yy"
     { (yyval.decl) = (yyvsp[(2) - (2)].decl)->addNewArray( (yyvsp[(1) - (2)].decl) ); }
     break;
@@ -9355 +9367 @@
 
 /* Line 1806 of yacc.c  */
-#line 2784 "parser.yy"
+#line 2796 "parser.yy"
     { (yyval.decl) = DeclarationNode::newTuple( (yyvsp[(3) - (5)].decl) ); }
     break;
@@ -9362 +9374 @@
 
 /* Line 1806 of yacc.c  */
-#line 2789 "parser.yy"
+#line 2801 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), (yyvsp[(4) - (5)].decl), 0 ); }
     break;
@@ -9369 +9381 @@
 
 /* Line 1806 of yacc.c  */
-#line 2791 "parser.yy"
+#line 2803 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9376 +9388 @@
 
 /* Line 1806 of yacc.c  */
-#line 2793 "parser.yy"
+#line 2805 "parser.yy"
     { (yyval.decl) = DeclarationNode::newFunction( 0, (yyvsp[(1) - (6)].decl), (yyvsp[(4) - (6)].decl), 0 ); }
     break;
@@ -9383 +9395 @@
 
 /* Line 1806 of yacc.c  */
-#line 2817 "parser.yy"
+#line 2829 "parser.yy"
     { (yyval.en) = 0; }
     break;
@@ -9390 +9402 @@
 
 /* Line 1806 of yacc.c  */
-#line 2819 "parser.yy"
+#line 2831 "parser.yy"
     { (yyval.en) = (yyvsp[(2) - (2)].en); }
     break;
@@ -9397 +9409 @@
 
 /* Line 1806 of yacc.c  */
-#line 9400 "Parser/parser.cc"
+#line 9412 "Parser/parser.cc"
       default: break;
     }
@@ -9628 +9640 @@
 
 /* Line 2067 of yacc.c  */
-#line 2822 "parser.yy"
+#line 2834 "parser.yy"
 
 // ----end of grammar----

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 27 17:47:56 2016
-// Update Count     : 1627
+// Last Modified On : Thu Jun 30 21:15:54 2016
+// Update Count     : 1657
 //
 
@@ -303 +303 @@
 constant:
                 // ENUMERATIONconstant is not included here; it is treated as a variable with type "enumeration constant".
-        INTEGERconstant                                                         { $$ = new ConstantNode( ConstantNode::Integer, $1 ); }
-        | FLOATINGconstant                                                      { $$ = new ConstantNode( ConstantNode::Float, $1 ); }
-        | CHARACTERconstant                                                     { $$ = new ConstantNode( ConstantNode::Character, $1 ); }
+INTEGERconstant                                                                 { $$ = makeConstant( ConstantNode::Integer, $1 ); }
+        | FLOATINGconstant                                                      { $$ = makeConstant( ConstantNode::Float, $1 ); }
+        | CHARACTERconstant                                                     { $$ = makeConstant( ConstantNode::Character, $1 ); }
         ;
 
@@ -330 +330 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = new ConstantNode( ConstantNode::String, $1 ); }
+        STRINGliteral                                                           { $$ = makeConstantStr( ConstantNode::String, $1 ); }
         | string_literal_list STRINGliteral                     { $$ = $1->appendstr( $2 ); }
         ;
@@ -682 +682 @@
                 { $$ = new StatementNode( $1 ); }
         | EXTENSION declaration                                                         // GCC
-                { $$ = new StatementNode( $2 )/*->set_extension( true )*/; }
+                {       // mark all fields in list
+                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                                iter->set_extension( true );
+                        $$ = new StatementNode( $2 );
+                }
         | function_definition
                 { $$ = new StatementNode( $1 ); }
@@ -1472 +1476 @@
         new_field_declaring_list ';'                                            // CFA, new style field declaration
         | EXTENSION new_field_declaring_list ';'                        // GCC
-                { $$ = $2/*->set_extension( true )*/; }
+                { $$ = $2->set_extension( true ); }
         | field_declaring_list ';'
         | EXTENSION field_declaring_list ';'                            // GCC
-                { $$ = $2/*->set_extension( true )*/; }
+                {       // mark all fields in list
+                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                                iter->set_extension( true );
+                        $$ = $2;
+                }
         ;
 
@@ -1991 +1999 @@
                 }
         | EXTENSION external_definition
-                { $$ = $2/*->set_extension( true )*/; }
+                {       // mark all fields in list
+                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_link() )
+                                iter->set_extension( true );
+                        $$ = $2;
+                }
         ;
 

src/ResolvExpr/AlternativeFinder.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 13 16:13:54 2016
-// Update Count     : 25
+// Last Modified On : Mon Jul  4 17:02:51 2016
+// Update Count     : 29
 //
 
@@ -227 +227 @@
                         std::cerr << "there are " << alternatives.size() << " alternatives after elimination" << std::endl;
                 )
+
+                // Central location to handle gcc extension keyword for all expression types.
+                for ( Alternative &iter: alternatives ) {
+                        iter.expr->set_extension( expr->get_extension() );
+                } // for
         }
 
@@ -772 +777 @@
                 for ( std::list< DeclarationWithType* >::iterator i = declList.begin(); i != declList.end(); ++i ) {
                         VariableExpr newExpr( *i, nameExpr->get_argName() );
-                        newExpr.set_extension( nameExpr->get_extension() );
                         alternatives.push_back( Alternative( newExpr.clone(), env, Cost() ) );
                         PRINT(

src/SynTree/Constant.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 15:19:16 2015
-// Update Count     : 5
+// Last Modified On : Thu Jun 30 13:33:17 2016
+// Update Count     : 6
 //
 
@@ -29 +29 @@
         Type *get_type() { return type; }
         void set_type( Type *newValue ) { type = newValue; }
-        std::string get_value() { return value; }
+        std::string &get_value() { return value; }
         void set_value( std::string newValue ) { value = newValue; }
 

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri May 06 16:26:12 2016
-// Update Count     : 33
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 30 21:17:24 2016
+// Update Count     : 38
 //
 
@@ -41 +41 @@
         void set_isNoreturn( bool newValue ) { isNoreturn = newValue; }
         UniqueId get_uniqueId() const { return uniqueId; }
+        bool get_extension() const { return extension; }
+        Declaration *set_extension( bool exten ) { extension = exten; return this; }
 
         void fixUniqueId( void );
@@ -57 +59 @@
         bool isInline, isNoreturn;
         UniqueId uniqueId;
+        bool extension = false;
 };
 

src/SynTree/Expression.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jun  8 17:05:30 2016
-// Update Count     : 22
+// Last Modified On : Mon Jul  4 14:45:32 2016
+// Update Count     : 23
 //
 
@@ -39 +39 @@
         void set_argName( Expression *name ) { argName = name; }
         bool get_extension() const { return extension; }
-        void set_extension( bool exten ) { extension = exten; }
+        Expression * set_extension( bool exten ) { extension = exten; return this; }
 
         virtual Expression *clone() const = 0;

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jun 10 09:26:19 2016
-// Update Count     : 138
+// Last Modified On : Mon Jul  4 11:33:15 2016
+// Update Count     : 139
 //
 
@@ -246 +246 @@
         args[nargs] = "-I" CFA_INCDIR;
         nargs += 1;
+        args[nargs] = "-I" CFA_INCDIR "/containers";
+        nargs += 1;
 
         args[nargs] = "-I" CFA_INCDIR "/containers";

src/libcfa/builtins.cf

@@ -584 +584 @@
 int __builtin_LINE();
 extern const char *__PRETTY_FUNCTION__;
+typedef int wchar_t;
+int atexit( void (*)(void) );

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 27 22:03:29 2016
-// Update Count     : 96
+// Last Modified On : Thu Jun 30 15:04:18 2016
+// Update Count     : 97
 //
 
@@ -129 +129 @@
 T max( const T t1, const T t2 );
 
+forall( otype T | { T min( T, T ); T max( T, T ); } )
+T clamp( const T value, const T min_val, const T max_val );
+
 forall( otype T )
 void swap( T * t1, T * t2 );

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 28 07:54:21 2016
-// Update Count     : 166
+// Last Modified On : Thu Jun 30 15:04:25 2016
+// Update Count     : 168
 //
 
@@ -254 +254 @@
 } // max
 
+forall( otype T | { T min( T, T ); T max( T, T ); } )
+T clamp( const T value, const T min_val, const T max_val ) {
+        return max( min_val, min( value, max_val ) );
+} // clamp
+
 forall( otype T )
 void swap( T * t1, T * t2 ) {

src/tests/quoted_keyword.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun 25 08:02:58 2016
-// Update Count     : 16
+// Last Modified On : Thu Jun 30 14:03:59 2016
+// Update Count     : 19
 //
 
@@ -37 +37 @@
 int main() {
         int `if` = 0;
+        `catch` = 1;
+        st.`otype` = 2;
+        st.`struct` = 3;
+        `throw` = 4;
         sout | `catch` + st.`otype` + st.`struct` + `throw` | endl;
 }