Changes in src/GenPoly/Box.cc [bc3127d:2ae171d8]

File:

• src/GenPoly/Box.cc (modified) (7 diffs)

src/GenPoly/Box.cc

@@ -141 +141 @@
                         virtual StructDecl *mutate( StructDecl *structDecl ) override;
                         virtual UnionDecl *mutate( UnionDecl *unionDecl ) override;
-                        virtual TraitDecl *mutate( TraitDecl *unionDecl ) override;
                         virtual TypeDecl *mutate( TypeDecl *typeDecl ) override;
                         virtual TypedefDecl *mutate( TypedefDecl *typedefDecl ) override;
@@ -217 +216 @@
                   private:
                 };
+
         } // anonymous namespace
 
@@ -896 +896 @@
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
                                 bodyStmt = new ExprStmt( noLabels, adapteeApp );
+//                      } else if ( isPolyType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
                         } else if ( isDynType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
                                 // return type T
@@ -1298 +1299 @@
                 }
 
+                /// determines if `pref` is a prefix of `str`
+                bool isPrefix( const std::string & str, const std::string & pref ) {
+                        if ( pref.size() > str.size() ) return false;
+                        auto its = std::mismatch( pref.begin(), pref.end(), str.begin() );
+                        return its.first == pref.end();
+                }
+
                 DeclarationWithType * Pass2::mutate( FunctionDecl *functionDecl ) {
                         functionDecl = safe_dynamic_cast< FunctionDecl * > ( handleDecl( functionDecl ) );
@@ -1344 +1352 @@
                 }
 
-                TraitDecl * Pass2::mutate( TraitDecl *aggDecl ) {
-                        return handleAggDecl( aggDecl );
-                }
-
                 TypeDecl * Pass2::mutate( TypeDecl *typeDecl ) {
                         addToTyVarMap( typeDecl, scopeTyVars );
@@ -1373 +1377 @@
                 Type *Pass2::mutate( FunctionType *funcType ) {
                         scopeTyVars.beginScope();
-
                         makeTyVarMap( funcType, scopeTyVars );
 
@@ -1547 +1550 @@
                                         // (alloca was previously used, but can't be safely used in loops)
                                         Type *declType = objectDecl->get_type();
-                                        ObjectDecl *newBuf = new ObjectDecl( bufNamer.newName(), Type::StorageClasses(), LinkageSpec::C, 0,
+                                        std::string bufName = bufNamer.newName();
+                                        ObjectDecl *newBuf = new ObjectDecl( bufName, Type::StorageClasses(), LinkageSpec::C, 0,
                                                 new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ),
-                                                true, false, std::list<Attribute*>{ new Attribute( "aligned", std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
+                                                true, false, std::list<Attribute*>{ new Attribute( std::string{"aligned"}, std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
                                         stmtsToAdd.push_back( new DeclStmt( noLabels, newBuf ) );
 
                                         delete objectDecl->get_init();
-                                        objectDecl->set_init( new SingleInit( new VariableExpr( newBuf ) ) );
+
+                                        objectDecl->set_init( new SingleInit( new NameExpr( bufName ) ) );
                                 }
                         }