Changes in src/SymTab/Autogen.cc [39f84a4:4e06c1e]

File:

• src/SymTab/Autogen.cc (modified) (4 diffs)

src/SymTab/Autogen.cc

@@ -26 +26 @@
 
 namespace SymTab {
-        Type * SizeType = 0;
-
         class AutogenerateRoutines : public Visitor {
                 public:
@@ -61 +59 @@
         bool isUnnamedBitfield( ObjectDecl * obj ) {
                 return obj != NULL && obj->get_name() == "" && obj->get_bitfieldWidth() != NULL;
+        }
+
+        template< typename OutputIterator >
+        void makeScalarFunction( Expression *src, ObjectDecl *dstParam, DeclarationWithType *member, std::string fname, OutputIterator out ) {
+                ObjectDecl *obj = dynamic_cast<ObjectDecl *>( member );
+                // unnamed bit fields are not copied as they cannot be accessed
+                if ( isUnnamedBitfield( obj ) ) return;
+
+                // want to be able to generate assignment, ctor, and dtor generically,
+                // so fname is either ?=?, ?{}, or ^?{}
+                UntypedExpr *fExpr = new UntypedExpr( new NameExpr( fname ) );
+
+                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
+
+                // do something special for unnamed members
+                Expression *dstselect = new AddressExpr( new MemberExpr( member, derefExpr ) );
+                fExpr->get_args().push_back( dstselect );
+
+                if ( src ) {
+                        fExpr->get_args().push_back( src );
+                }
+
+                *out++ = new ExprStmt( noLabels, fExpr );
         }
 
@@ -189 +211 @@
                 }
 
-                InitTweak::InitExpander srcParam( src );
-
                 // assign to destination (and return value if generic)
-                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
-                Expression *dstselect = new MemberExpr( field, derefExpr );
-                genImplicitCall( srcParam, dstselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
-
-                if ( isGeneric && returnVal ) {
-                        UntypedExpr *derefRet = new UntypedExpr( new NameExpr( "*?" ) );
-                        derefRet->get_args().push_back( new VariableExpr( returnVal ) );
-                        Expression *retselect = new MemberExpr( field, derefRet );
-                        genImplicitCall( srcParam, retselect, func->get_name(), back_inserter( func->get_statements()->get_kids() ), field, forward );
+                if ( ArrayType *array = dynamic_cast< ArrayType * >( field->get_type() ) ) {
+                        UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
+                        derefExpr->get_args().push_back( new VariableExpr( dstParam ) );
+                        Expression *dstselect = new MemberExpr( field, derefExpr );
+
+                        makeArrayFunction( src, dstselect, array, func->get_name(), back_inserter( func->get_statements()->get_kids() ), forward );
+                        if ( isGeneric && returnVal ) {
+                                UntypedExpr *derefRet = new UntypedExpr( new NameExpr( "*?" ) );
+                                derefRet->get_args().push_back( new VariableExpr( returnVal ) );
+                                Expression *retselect = new MemberExpr( field, derefRet );
+
+                                makeArrayFunction( src, retselect, array, func->get_name(), back_inserter( func->get_statements()->get_kids() ), forward );
+                        }
+                } else {
+                        makeScalarFunction( src, dstParam, field, func->get_name(), back_inserter( func->get_statements()->get_kids() ) );
+                        if ( isGeneric && returnVal ) makeScalarFunction( src, returnVal, field, func->get_name(), back_inserter( func->get_statements()->get_kids() ) );
                 } // if
         }
@@ -216 +242 @@
                                 }
 
-                                if ( type->get_qualifiers().isConst && func->get_name() == "?=?" ) {
-                                        // don't assign const members, but do construct/destruct
+                                if ( type->get_qualifiers().isConst ) {
+                                        // don't assign const members
                                         continue;
                                 }