Changeset 70f89d00 for src/InitTweak

Timestamp:

May 30, 2016, 12:51:22 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f1b1e4c

Parents:

677c1be

Message:

function scoped const objects can be constructed, add missing copy constructors to Initializer.cc

Location:

src/InitTweak

Files:

• GenInit.cc (modified) (3 diffs)
• InitTweak.cc (modified) (1 diff)
• InitTweak.h (modified) (1 diff)

src/InitTweak/GenInit.cc

@@ -143 +143 @@
                 if ( tryConstruct( objDecl ) ) {
                         if ( inFunction ) {
+                                // remove qualifiers so that const objects can be initialized, and attach the
+                                // qualifiers to ConstructorInit so that they can be replaced after resolving
+                                Type * type = objDecl->get_type();
+                                Type::Qualifiers qualifiers = type->get_qualifiers();
+                                type->get_qualifiers() = Type::Qualifiers();
+
                                 if ( ArrayType * at = dynamic_cast< ArrayType * >( objDecl->get_type() ) ) {
                                         // call into makeArrayFunction from validate.cc to generate calls to ctor/dtor for each element of array
@@ -165 +171 @@
                                                 assert( dtor.size() == 1 );
 
-                                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init() ) );
+                                                objDecl->set_init( new ConstructorInit( ctor.front(), dtor.front(), objDecl->get_init(), objDecl, qualifiers ) );
                                         } else {
                                                 // array came with an initializer list: initialize each element
@@ -185 +191 @@
                                         ExprStmt * ctorStmt = new ExprStmt( noLabels, ctor );
                                         ExprStmt * dtorStmt = new ExprStmt( noLabels, dtor );
-                                        objDecl->set_init( new ConstructorInit( ctorStmt, dtorStmt, objDecl->get_init() ) );
+                                        objDecl->set_init( new ConstructorInit( ctorStmt, dtorStmt, objDecl->get_init(), objDecl, qualifiers ) );
                                 }
                         }

src/InitTweak/InitTweak.cc

@@ -83 +83 @@
     }
   }
+
+  namespace {
+    template<typename CallExpr>
+    std::string funcName( CallExpr * expr ) {
+      Expression * func = expr->get_function();
+      if ( NameExpr * nameExpr = dynamic_cast< NameExpr * >( func ) ) {
+        return nameExpr->get_name();
+      } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( func ) ) {
+        return varExpr->get_var()->get_name();
+      } else {
+        assert( false && "Unexpected expression type being called as a function in call expression" );
+      }
+    }
+  }
+
+  std::string getFunctionName( Expression * expr ) {
+    if ( ApplicationExpr * appExpr = dynamic_cast< ApplicationExpr * >( expr ) ) {
+      return funcName( appExpr );
+    } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * > ( expr ) ) {
+      return funcName( untypedExpr );
+    } else {
+      assert( false && "Unexpected expression type passed to getFunctionName" );
+    }
+  }
 }

src/InitTweak/InitTweak.h

@@ -39 +39 @@
   /// Currently has assertions that make it less than fully general.
   bool isInstrinsicSingleArgCallStmt( Statement * expr );
+
+  /// returns the name of the function being called
+  std::string getFunctionName(Expression * expr);
 } // namespace