Changeset f5ef08c

Timestamp:

Mar 18, 2016, 1:56:41 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6943f051

Parents:

dac0aa9

Message:

added missing char ctor/dtors to prelude

Location:

src

Files:

• SymTab/Autogen.cc (modified) (2 diffs)
• libcfa/prelude.cf (modified) (3 diffs)

src/SymTab/Autogen.cc

@@ -261 +261 @@
                                 if ( parameter != params.end() ) {
                                         // matching parameter, initialize field with copy ctor
-                                        std::cerr << "matching parameter - copy ctor" << std::endl;
                                         Expression *srcselect = new VariableExpr(*parameter);
                                         makeStructMemberOp( dstParam, srcselect, field, func, genericSubs, isGeneric );
                                         ++parameter;
                                 } else {
-                                        std::cerr << "no matching parameter - default ctor" << std::endl;
                                         // no matching parameter, initialize field with default ctor
                                         makeStructMemberOp( dstParam, NULL, field, func, genericSubs, isGeneric );
@@ -320 +318 @@
 
                 // create constructors which take each member type as a parameter.
-                // we might be able to eventually collapse this into a single function
-                // which uses default parameters
+                // for example, for struct A { int x, y; }; generate
+                // void ?{}(A *, int) and void ?{}(A *, int, int)
                 std::list<Declaration *> memCtors;
                 FunctionType * memCtorType = ctorType->clone();

src/libcfa/prelude.cf

@@ -639 +639 @@
 // default ctor
 void    ?{}( _Bool * ),                         ?{}( volatile _Bool * );
-void    ?{}( unsigned char * ),                 ?{}( volatile unsigned char * );
+void    ?{}( char * ),  ?{}( volatile char * );
+void    ?{}( unsigned char * ), ?{}( volatile unsigned char * );
+void    ?{}( char signed * ),                   ?{}( volatile char signed * );
+void    ?{}( int short * ),                             ?{}( volatile int short * );
+void    ?{}( int short unsigned * ),    ?{}( volatile int short unsigned * );
 void    ?{}( signed int * ),                    ?{}( volatile signed int * );
 void    ?{}( unsigned int * ),                  ?{}( volatile unsigned int * );
@@ -655 +659 @@
 // copy ctor
 void    ?{}( _Bool *, _Bool ),                                  ?{}( volatile _Bool *, _Bool );
+void    ?{}( char *, char ),    ?{}( volatile char *, char );
 void    ?{}( unsigned char *, unsigned char ),                  ?{}( volatile unsigned char *, unsigned char );
+void    ?{}( char signed *, char signed ),                      ?{}( volatile char signed *, char signed );
+void    ?{}( int short *, int short ),                          ?{}( volatile int short *, int short );
+void    ?{}( int short unsigned *, int short unsigned ),        ?{}( volatile int short unsigned *, int short unsigned );
 void    ?{}( signed int *, signed int),                         ?{}( volatile signed int *, signed int );
 void    ?{}( unsigned int *, unsigned int),                     ?{}( volatile unsigned int *, unsigned int );
@@ -671 +679 @@
 // dtor
 void    ^?{}( _Bool * ),                        ^?{}( volatile _Bool * );
+void    ^?{}( char * ), ^?{}( volatile char * );
+void    ^?{}( char unsigned * ),                        ^?{}( volatile char unsigned * );
+void    ^?{}( char signed * ),                  ^?{}( volatile char signed * );
+void    ^?{}( int short * ),                            ^?{}( volatile int short * );
+void    ^?{}( int short unsigned * ),   ^?{}( volatile int short unsigned * );
 void    ^?{}( signed int * ),                   ^?{}( volatile signed int * );
 void    ^?{}( unsigned int * ),                 ^?{}( volatile unsigned int * );