Changeset 49148d5 for src/SymTab/Autogen.h

Timestamp:

Jul 12, 2017, 4:57:23 PM (8 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:

c5e3208

Parents:

a61ad31

Message:

Update autogen to generate ctor/dtor/assign with references

File:

• src/SymTab/Autogen.h (modified) (2 diffs)

src/SymTab/Autogen.h

@@ -43 +43 @@
         template< typename OutputIterator >
         Statement * genScalarCall( InitTweak::InitExpander & srcParam, Expression *dstParam, const std::string & fname, OutputIterator out, Type * type, bool addCast = false ) {
-        // want to be able to generate assignment, ctor, and dtor generically,
-        // so fname is either ?=?, ?{}, or ^?{}
-        UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
+                // want to be able to generate assignment, ctor, and dtor generically,
+                // so fname is either ?=?, ?{}, or ^?{}
+                UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
 
-        // do something special for unnamed members
-        dstParam = new AddressExpr( dstParam );
-        if ( addCast ) {
-                // cast to T* with qualifiers removed, so that qualified objects can be constructed
-                // and destructed with the same functions as non-qualified objects.
-                // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
-                // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
-                // remove lvalue as a qualifier, this can change to
-                //   type->get_qualifiers() = Type::Qualifiers();
-                assert( type );
-                Type * castType = type->clone();
-                castType->get_qualifiers() -= Type::Qualifiers( Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
-                castType->set_lvalue( true ); // xxx - might not need this
-                dstParam = new CastExpr( dstParam, new PointerType( Type::Qualifiers(), castType ) );
-        }
-        fExpr->get_args().push_back( dstParam );
+                if ( addCast ) {
+                        // cast to T& with qualifiers removed, so that qualified objects can be constructed
+                        // and destructed with the same functions as non-qualified objects.
+                        // unfortunately, lvalue is considered a qualifier. For AddressExpr to resolve, its argument
+                        // must have an lvalue qualified type, so remove all qualifiers except lvalue. If we ever
+                        // remove lvalue as a qualifier, this can change to
+                        //   type->get_qualifiers() = Type::Qualifiers();
+                        assert( type );
+                        Type * castType = type->clone();
+                        castType->get_qualifiers() -= Type::Qualifiers( Type::Lvalue | Type::Const | Type::Volatile | Type::Restrict | Type::Atomic );
+                        // castType->set_lvalue( true ); // xxx - might not need this
+                        dstParam = new CastExpr( dstParam, new ReferenceType( Type::Qualifiers(), castType ) );
+                }
+                fExpr->get_args().push_back( dstParam );
 
-        Statement * listInit = srcParam.buildListInit( fExpr );
+                Statement * listInit = srcParam.buildListInit( fExpr );
 
-        std::list< Expression * > args = *++srcParam;
-        fExpr->get_args().splice( fExpr->get_args().end(), args );
+                std::list< Expression * > args = *++srcParam;
+                fExpr->get_args().splice( fExpr->get_args().end(), args );
 
-        *out++ = new ExprStmt( noLabels, fExpr );
+                *out++ = new ExprStmt( noLabels, fExpr );
 
-        srcParam.clearArrayIndices();
+                srcParam.clearArrayIndices();
 
-        return listInit;
+                return listInit;
         }
 
@@ -109 +107 @@
 
                 UntypedExpr *inc = new UntypedExpr( update );
-                inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
+                inc->get_args().push_back( new VariableExpr( index ) );
 
                 UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?[?]" ) );