Changeset dd0c97b for src

Timestamp:

Jan 11, 2017, 3:29:33 PM (7 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:

d3a85240

Parents:

627f585

Message:

prevent generic parameters from polluting the outer scope in Box Pass2

Location:

src

Files:

• GenPoly/Box.cc (modified) (5 diffs)
• tests/.expect/tupleVariadic.txt (modified) (1 diff)
• tests/tupleVariadic.c (modified) (2 diffs)

src/GenPoly/Box.cc

@@ -136 +136 @@
                         template< typename DeclClass >
                         DeclClass *handleDecl( DeclClass *decl, Type *type );
-
-                        using PolyMutator::mutate;
+                        template< typename AggDecl >
+                        AggDecl * handleAggDecl( AggDecl * aggDecl );
+
+                        typedef PolyMutator Parent;
+                        using Parent::mutate;
                         virtual DeclarationWithType *mutate( FunctionDecl *functionDecl ) override;
                         virtual ObjectDecl *mutate( ObjectDecl *objectDecl ) override;
+                        virtual StructDecl *mutate( StructDecl *structDecl ) override;
+                        virtual UnionDecl *mutate( UnionDecl *unionDecl ) override;
                         virtual TypeDecl *mutate( TypeDecl *typeDecl ) override;
                         virtual TypedefDecl *mutate( TypedefDecl *typedefDecl ) override;
@@ -1275 +1280 @@
                 template< typename DeclClass >
                 DeclClass * Pass2::handleDecl( DeclClass *decl, Type *type ) {
-                        DeclClass *ret = static_cast< DeclClass *>( Mutator::mutate( decl ) );
+                        DeclClass *ret = static_cast< DeclClass *>( Parent::mutate( decl ) );
 
                         return ret;
@@ -1309 +1314 @@
                 }
 
+                template< typename AggDecl >
+                AggDecl * Pass2::handleAggDecl( AggDecl * aggDecl ) {
+                        // prevent tyVars from leaking into containing scope
+                        scopeTyVars.beginScope();
+                        Parent::mutate( aggDecl );
+                        scopeTyVars.endScope();
+                        return aggDecl;
+                }
+
+                StructDecl * Pass2::mutate( StructDecl *aggDecl ) {
+                        return handleAggDecl( aggDecl );
+                }
+
+                UnionDecl * Pass2::mutate( UnionDecl *aggDecl ) {
+                        return handleAggDecl( aggDecl );
+                }
+
                 TypeDecl * Pass2::mutate( TypeDecl *typeDecl ) {
                         addToTyVarMap( typeDecl, scopeTyVars );
@@ -1314 +1336 @@
                                 return handleDecl( typeDecl, typeDecl->get_base() );
                         } else {
-                                return Mutator::mutate( typeDecl );
+                                return Parent::mutate( typeDecl );
                         }
                 }
@@ -1326 +1348 @@
                         makeTyVarMap( pointerType, scopeTyVars );
 
-                        Type *ret = Mutator::mutate( pointerType );
+                        Type *ret = Parent::mutate( pointerType );
 
                         scopeTyVars.endScope();

src/tests/.expect/tupleVariadic.txt

@@ -9 +9 @@
 called ?{} with a: 10 2 3 4
 array = { 10, 2, 3, 4, }
+copy=111111
 calling func
 called process(int) 3

src/tests/tupleVariadic.c

@@ -89 +89 @@
 }
 
+forall(otype T)
+T * copy(T x) {
+        // test calling new inside a polymorphic function
+        return new(x);
+}
+
 int main() {
         array * x0 = new();
@@ -104 +110 @@
         array * x4 = new(10, 2, 3, 4);
         print(x4);
+
+        int * ptr = copy(111111);
+        printf("copy=%d\n", *ptr);
+
         printf("calling func\n");
         func(3, 2.0, 111, 4.145);