Changeset 10a1225 for src/AST/Expr.cpp

Timestamp:

May 17, 2019, 12:09:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

896737b

Parents:

77bfc80

Message:

Many errors and warning fixes.
More visit implementation

File:

• src/AST/Expr.cpp (modified) (8 diffs)

src/AST/Expr.cpp

@@ -95 +95 @@
         Type * addrType( const Type * type ) {
                 if ( const ReferenceType * refType = dynamic_cast< const ReferenceType * >( type ) ) {
-                        CV::Qualifiers quals = refType->qualifiers;
                         return new ReferenceType{ addrType( refType->base ), refType->qualifiers };
                 } else {
@@ -118 +117 @@
                                 result = res;
                         } else {
-                                SemanticError( loc, arg->result,
+                                SemanticError( loc, arg->result.get(),
                                         "Attempt to take address of non-lvalue expression: " );
                         }
@@ -283 +282 @@
 // --- ConstructorExpr
 
-ConstructorExpr::ConstructorExpr( const CodeLocation & loc, const Expr * call ) 
+ConstructorExpr::ConstructorExpr( const CodeLocation & loc, const Expr * call )
 : Expr( loc ), callExpr( call ) {
-        // allow resolver to type a constructor used as an expression if it has the same type as its 
+        // allow resolver to type a constructor used as an expression if it has the same type as its
         // first argument
         assert( callExpr );
@@ -310 +309 @@
 TupleIndexExpr::TupleIndexExpr( const CodeLocation & loc, const Expr * t, unsigned i )
 : Expr( loc ), tuple( t ), index( i ) {
-        const TupleType * type = strict_dynamic_cast< const TupleType * >( tuple->result );
+        const TupleType * type = strict_dynamic_cast< const TupleType * >( tuple->result.get() );
         assertf( type->size() > index, "TupleIndexExpr index out of bounds: tuple size %d, requested "
                 "index %d in expr %s", type->size(), index, toString( tuple ).c_str() );
@@ -319 +318 @@
 // --- TupleAssignExpr
 
-TupleAssignExpr::TupleAssignExpr( 
-        const CodeLocation & loc, std::vector<ptr<Expr>> && assigns, 
+TupleAssignExpr::TupleAssignExpr(
+        const CodeLocation & loc, std::vector<ptr<Expr>> && assigns,
         std::vector<ptr<ObjectDecl>> && tempDecls )
 : Expr( loc, Tuples::makeTupleType( assigns ) ), stmtExpr() {
-        // convert internally into a StmtExpr which contains the declarations and produces the tuple of 
+        // convert internally into a StmtExpr which contains the declarations and produces the tuple of
         // the assignments
         std::list<ptr<Stmt>> stmts;
@@ -337 +336 @@
 // --- StmtExpr
 
-StmtExpr::StmtExpr( const CodeLocation & loc, const CompoundStmt * ss ) 
+StmtExpr::StmtExpr( const CodeLocation & loc, const CompoundStmt * ss )
 : Expr( loc ), stmts( ss ), returnDecls(), dtors() { computeResult(); }
 
@@ -344 +343 @@
         const std::list<ptr<Stmt>> & body = stmts->kids;
         if ( ! returnDecls.empty() ) {
-                // prioritize return decl for result type, since if a return decl exists, then the StmtExpr 
+                // prioritize return decl for result type, since if a return decl exists, then the StmtExpr
                 // is currently in an intermediate state where the body will always give a void result type
                 result = returnDecls.front()->get_type();
@@ -360 +359 @@
 unsigned long long UniqueExpr::nextId = 0;
 
-UniqueExpr::UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i = -1 )
+UniqueExpr::UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i )
 : Expr( loc, e->result ), id( i ) {
         assert( expr );
-        if ( id == -1 ) {
-                assert( nextId != -1 );
+        if ( id == -1ull ) {
+                assert( nextId != -1ull );
                 id = nextId++;
         }
+}
+
 }