Changeset 9b4f329 for src/InitTweak

Timestamp:

May 16, 2019, 6:46:51 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

246c245

Parents:

f3cc5b6

Message:

Finished porting AST::Expr subclasses

Location:

src/InitTweak

Files:

• InitTweak.cc (modified) (5 diffs)
• InitTweak.h (modified) (1 diff)

src/InitTweak/InitTweak.cc

@@ -5 +5 @@
 #include <memory>                  // for __shared_ptr
 
+#include "AST/Expr.hpp"
+#include "AST/Stmt.hpp"
 #include "AST/Type.hpp"
 #include "Common/PassVisitor.h"
@@ -27 +29 @@
 #include "Tuples/Tuples.h"         // for Tuples::isTtype
 
-class UntypedValofExpr;
-
 namespace InitTweak {
         namespace {
@@ -433 +433 @@
                         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 );
+                // }
         }
 
@@ -452 +465 @@
                         assertf( false, "Unexpected expression type passed to getCallArg: %s", toString( callExpr ).c_str() );
                 }
+        }
+        const ast::Expr * getCallArg( const ast::Expr * call, unsigned pos ) {
+                assert(!"implemented; 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() );
+                // }
         }
 
@@ -516 +549 @@
         const ast::Type* getPointerBase( const ast::Type* t ) {
                 assert(!"needs to build Type.cpp before inclusion");
-                // if ( const ast::PointerType* p = dynamic_cast< const ast::PointerType* >( t ) ) {
+                // if ( const auto * p = dynamic_cast< const ast::PointerType * >( t ) ) {
                 //      return p->base;
-                // } else if ( const ast::ArrayType* a = dynamic_cast< const ast::ArrayType* >( t ) ) {
+                // } else if ( const auto * a = dynamic_cast< const ast::ArrayType * >( t ) ) {
                 //      return a->base;
-                // } else if ( const ast::ReferenceType* r = dynamic_cast< const ast::ReferenceType* >( t ) ) {
+                // } else if ( const auto * r = dynamic_cast< const ast::ReferenceType * >( t ) ) {
                 //      return r->base;
                 // } else return nullptr;

src/InitTweak/InitTweak.h

@@ -81 +81 @@
         /// returns the argument to a call expression in position N indexed from 0
         Expression *& getCallArg( Expression * callExpr, unsigned int pos );
+        const ast::Expr * getCallArg( const ast::Expr * call, unsigned pos );
 
         /// returns the base type of a PointerType or ArrayType, else returns NULL