Changeset 97f65d5 for src/Parser

Timestamp:

Feb 15, 2017, 8:13:49 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

e6512c8

Parents:

aa9ee19 (diff), 3149e7e (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:/u/cforall/software/cfa/cfa-cc

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (4 diffs)
• ParseNode.h (modified) (3 diffs)

src/Parser/DeclarationNode.cc

@@ -921 +921 @@
                                 Declaration * decl = extr->build();
                                 if ( decl ) {
+                                        decl->location = cur->location;
                                         * out++ = decl;
                                 } // if
@@ -928 +929 @@
                         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
@@ -950 +953 @@
                         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
@@ -979 +988 @@
                         * out++ = cur->buildType();
                 } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
                         errors.append( e );
                 } // try

src/Parser/ParseNode.h

@@ -39 +39 @@
 //##############################################################################
 
+extern char* yyfilename;
+extern int yylineno;
+
 class ParseNode {
   public:
@@ -65 +68 @@
         ParseNode * next = nullptr;
         std::string * name = nullptr;
+        CodeLocation location = { yyfilename, yylineno };
 }; // ParseNode
 
@@ -410 +414 @@
         while ( cur ) {
                 try {
-//                      SynTreeType * result = dynamic_cast< SynTreeType * >( maybeBuild< typename std::result_of< decltype(&NodeType::build)(NodeType)>::type >( cur ) );
                         SynTreeType * result = dynamic_cast< SynTreeType * >( maybeBuild< typename std::pointer_traits< decltype(cur->build())>::element_type >( cur ) );
                         if ( result ) {
+                                result->location = cur->location;
                                 * out++ = result;
                         } // if
                 } catch( SemanticError &e ) {
+                        e.set_location( cur->location );
                         errors.append( e );
                 } // try