Changeset 7c782af for src/SynTree

Timestamp:

Feb 16, 2018, 4:22:25 PM (8 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:

5964127

Parents:

c71b256 (diff), 62cd621 (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/SynTree

Files:

• Declaration.h (modified) (1 diff)
• Expression.cc (modified) (1 diff)
• Mutator.h (modified) (1 diff)
• Statement.cc (modified) (3 diffs)
• TypeSubstitution.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Declaration.h

@@ -245 +245 @@
         typedef NamedTypeDecl Parent;
   public:
-        TypedefDecl( const std::string &name, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall ) : Parent( name, scs, type ) { set_linkage( spec ); }
+        TypedefDecl( const std::string &name, CodeLocation location, Type::StorageClasses scs, Type *type, LinkageSpec::Spec spec = LinkageSpec::Cforall )
+                : Parent( name, scs, type ) { set_linkage( spec ); this->location = location; }
+
         TypedefDecl( const TypedefDecl &other ) : Parent( other ) {}
 

src/SynTree/Expression.cc

@@ -93 +93 @@
                 return 0;
         }
-        throw SemanticError( "Constant expression of non-integral type ", this );
+        throw SemanticError( this, "Constant expression of non-integral type " );
 }
 

src/SynTree/Mutator.h

@@ -149 +149 @@
                         } // if
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 } // try

src/SynTree/Statement.cc

@@ -100 +100 @@
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.empty() ) {
-                throw SemanticError("goto without target");
+                throw SemanticError( target.get_statement()->location, "goto without target");
         }
 }
@@ -107 +107 @@
         Statement(), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == nullptr ) {
-                throw SemanticError("Computed target not valid in branch statement");
+                throw SemanticError( computedTarget->location, "Computed target not valid in branch statement");
         }
 }
@@ -203 +203 @@
 CaseStmt::CaseStmt( Expression *condition, const std::list<Statement *> &statements, bool deflt ) throw ( SemanticError ) :
         Statement(), condition( condition ), stmts( statements ), _isDefault( deflt ) {
-        if ( isDefault() && condition != 0 ) throw SemanticError("default case with condition: ", condition);
+        if ( isDefault() && condition != 0 ) throw SemanticError( condition, "default case with condition: " );
 }
 

src/SynTree/TypeSubstitution.h

@@ -98 +98 @@
                                 } // if
                         } else {
-                                throw SemanticError( toString( "Attempt to provide non-type parameter: ", toString( *actualIt ).c_str(), " for type parameter " ), formal );
+                                throw SemanticError( formal, toString( "Attempt to provide non-type parameter: ", toString( *actualIt ).c_str(), " for type parameter " ) );
                         } // if
                 } else {

src/SynTree/Visitor.h

@@ -143 +143 @@
                         }
                 } catch( SemanticError &e ) {
-                        e.set_location( (*i)->location );
                         errors.append( e );
                 }