Changeset b5fed34

Timestamp:

May 23, 2019, 12:07:20 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:

effe5b0

Parents:

d7aa12c

Message:

Implemented the last stubbed function.
ALL warnings should be gone

File:

• src/InitTweak/InitTweak.cc (modified) (3 diffs)

src/InitTweak/InitTweak.cc

@@ -474 +474 @@
                 }
 
-                // template<typename CallExpr>
-                // const ast::Expr * callArg( const CallExpr * call, unsigned int pos ) {
-                //      if( pos >= call->args.size() ) {
-                //              assertf( false, "getCallArg for argument that doesn't exist: (%u); %s.",
-                //                      pos, toString( call ).c_str() );
-                //      }
-                //      for ( const ast::Expr * arg : call->args ) {
-                //              if ( pos == 0 ) return arg;
-                //              --pos;
-                //      }
-                //      assert( false );
-                // }
+                template<typename CallExpr>
+                const ast::Expr * callArg( const CallExpr * call, unsigned int pos ) {
+                        if( pos >= call->args.size() ) {
+                                assertf( false, "getCallArg for argument that doesn't exist: (%u); %s.",
+                                        pos, toString( call ).c_str() );
+                        }
+                        for ( const ast::Expr * arg : call->args ) {
+                                if ( pos == 0 ) return arg;
+                                --pos;
+                        }
+                        assert( false );
+                }
         }
 
@@ -506 +506 @@
                 }
         }
+
         const ast::Expr * getCallArg( const ast::Expr * call, unsigned pos ) {
-                (void)call;
-                (void)pos;
-                #warning unimplemented; needs to build AST/Expr.cpp
-                assertf(false, "unimplemented; needs to build AST/Expr.cpp");
-                // if ( auto app = dynamic_cast< const ast::ApplicationExpr * >( call ) ) {
-                //      return callArg( app, pos );
-                // } else if ( auto untyped = dynamic_cast< const ast::UntypedExpr * >( call ) ) {
-                //      return callArg( untyped, pos );
-                // } else if ( auto tupleAssn = dynamic_cast< const ast::TupleAssignExpr * >( call ) ) {
-                //      const std::list<ast::ptr<ast::Stmt>>& stmts = tupleAssn->stmtExpr->stmts->kids;
-                //      assertf( ! stmts.empty(), "TupleAssignExpr missing statements." );
-                //      const ExprStmt * stmt = strict_dynamic_cast< const ast::ExprStmt * >( stmts.back() );
-                //      const TupleExpr * tuple = strict_dynamic_cast< const ast::TupleExpr * >( stmt->expr );
-                //      assertf( ! tuple->exprs.empty(), "TupleAssignExpr has empty tuple expr.");
-                //      return getCallArg( tuple->exprs.front(), pos );
-                // } else if ( auto ctor = dynamic_cast< const ast::ImplicitCopyCtorExpr * >( call ) ) {
-                //      return getCallArg( ctor->callExpr, pos );
-                // } else {
-                //      assertf( false, "Unexpected expression type passed to getCallArg: %s",
-                //              toString( call ).c_str() );
-                // }
+                if ( auto app = dynamic_cast< const ast::ApplicationExpr * >( call ) ) {
+                        return callArg( app, pos );
+                } else if ( auto untyped = dynamic_cast< const ast::UntypedExpr * >( call ) ) {
+                        return callArg( untyped, pos );
+                } else if ( auto tupleAssn = dynamic_cast< const ast::TupleAssignExpr * >( call ) ) {
+                        const std::list<ast::ptr<ast::Stmt>>& stmts = tupleAssn->stmtExpr->stmts->kids;
+                        assertf( ! stmts.empty(), "TupleAssignExpr missing statements." );
+                        auto stmt  = strict_dynamic_cast< const ast::ExprStmt * >( stmts.back().get() );
+                        auto tuple = strict_dynamic_cast< const ast::TupleExpr * >( stmt->expr.get() );
+                        assertf( ! tuple->exprs.empty(), "TupleAssignExpr has empty tuple expr.");
+                        return getCallArg( tuple->exprs.front(), pos );
+                } else if ( auto ctor = dynamic_cast< const ast::ImplicitCopyCtorExpr * >( call ) ) {
+                        return getCallArg( ctor->callExpr, pos );
+                } else {
+                        assertf( false, "Unexpected expression type passed to getCallArg: %s",
+                                toString( call ).c_str() );
+                }
         }
 
@@ -637 +634 @@
         }
         const ast::Type* getPointerBase( const ast::Type* t ) {
-                (void)t;
-                #warning needs to build Type.cpp before inclusion
-                assertf(false, "needs to build Type.cpp before inclusion");
-                // if ( const auto * p = dynamic_cast< const ast::PointerType * >( t ) ) {
-                //      return p->base;
-                // } else if ( const auto * a = dynamic_cast< const ast::ArrayType * >( t ) ) {
-                //      return a->base;
-                // } else if ( const auto * r = dynamic_cast< const ast::ReferenceType * >( t ) ) {
-                //      return r->base;
-                // } else return nullptr;
+                if ( const auto * p = dynamic_cast< const ast::PointerType * >( t ) ) {
+                        return p->base;
+                } else if ( const auto * a = dynamic_cast< const ast::ArrayType * >( t ) ) {
+                        return a->base;
+                } else if ( const auto * r = dynamic_cast< const ast::ReferenceType * >( t ) ) {
+                        return r->base;
+                } else return nullptr;
         }