Changes in src/Parser/DeclarationNode.cc [6ef2d81:3a5131ed]

File:

• src/Parser/DeclarationNode.cc (modified) (6 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb  9 15:54:59 2017
-// Update Count     : 742
+// Last Modified On : Thu Feb 16 13:06:50 2017
+// Update Count     : 753
 //
 
@@ -913 +913 @@
         SemanticError errors;
         std::back_insert_iterator< std::list< Declaration * > > out( outputList );
-        const DeclarationNode * cur = firstNode;
-
-        while ( cur ) {
+
+        for ( const DeclarationNode * cur = firstNode; cur; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
                 try {
                         if ( DeclarationNode * extr = cur->extractAggregate() ) {
@@ -921 +920 @@
                                 Declaration * decl = extr->build();
                                 if ( decl ) {
+                                        decl->location = cur->location;
                                         * out++ = decl;
                                 } // if
@@ -928 +928 @@
                         Declaration * decl = cur->build();
                         if ( decl ) {
+                                decl->location = cur->location;
                                 * out++ = decl;
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
         } // while
 
@@ -944 +945 @@
         SemanticError errors;
         std::back_insert_iterator< std::list< DeclarationWithType * > > out( outputList );
-        const DeclarationNode * cur = firstNode;
-        while ( cur ) {
+        
+        for ( const DeclarationNode * cur = firstNode; cur; cur = dynamic_cast< DeclarationNode * >( cur->get_next() ) ) {
                 try {
                         Declaration * decl = cur->build();
                         if ( decl ) {
                                 if ( DeclarationWithType * dwt = dynamic_cast< DeclarationWithType * >( decl ) ) {
+                                        dwt->location = cur->location;
                                         * out++ = dwt;
                                 } else if ( StructDecl * agg = dynamic_cast< StructDecl * >( decl ) ) {
                                         StructInstType * inst = new StructInstType( Type::Qualifiers(), agg->get_name() );
-                                        * out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, nullptr, inst, nullptr );
+                                        auto obj = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj; 
                                         delete agg;
                                 } else if ( UnionDecl * agg = dynamic_cast< UnionDecl * >( decl ) ) {
                                         UnionInstType * inst = new UnionInstType( Type::Qualifiers(), agg->get_name() );
-                                        * out++ = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, nullptr, inst, nullptr );
+                                        auto obj = new ObjectDecl( "", DeclarationNode::NoStorageClass, linkage, nullptr, inst, nullptr );
+                                        obj->location = cur->location;
+                                        * out++ = obj;
                                 } // if
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
                         errors.append( e );
                 } // try
-                cur = dynamic_cast< DeclarationNode * >( cur->get_next() );
-        } // while
+        } // for
+
         if ( ! errors.isEmpty() ) {
                 throw errors;
@@ -979 +986 @@
                         * out++ = cur->buildType();
                 } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
                         errors.append( e );
                 } // try