Changes in src/SymTab/Autogen.h [a4477db:d180746]

File:

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

src/SymTab/Autogen.h

@@ -40 +40 @@
         extern Type * SizeType;
 
-        /// intrinsic dereference operator for unqualified types - set when *? function is seen in FindSpecialDeclarations.
-        /// Useful for creating dereference ApplicationExprs without a full resolver pass.
-        extern FunctionDecl * dereferenceOperator;
-
-        // generate the type of an assignment function for paramType
-        FunctionType * genAssignType( Type * paramType );
-
-        // generate the type of a default constructor or destructor for paramType
-        FunctionType * genDefaultType( Type * paramType );
-
-        // generate the type of a copy constructor for paramType
-        FunctionType * genDefaultType( Type * paramType );
-
         /// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
         template< typename OutputIterator >
@@ -61 +48 @@
         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 ) );
 
-                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 );
+        // 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 );
 
-                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;
         }
 
@@ -125 +114 @@
 
                 UntypedExpr *inc = new UntypedExpr( update );
-                inc->get_args().push_back( new VariableExpr( index ) );
+                inc->get_args().push_back( new AddressExpr( new VariableExpr( index ) ) );
 
                 UntypedExpr *dstIndex = new UntypedExpr( new NameExpr( "?[?]" ) );