Changeset 6943f051

Timestamp:

Mar 18, 2016, 6:09:23 PM (9 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:

4cc4286

Parents:

f5ef08c

Message:

fix implicit type assertion ordering - assignment must come first

Location:

src

Files:

• CodeGen/OperatorTable.cc (modified) (2 diffs)
• GenPoly/CopyParams.cc (modified) (4 diffs)
• Parser/TypeData.cc (modified) (2 diffs)

src/CodeGen/OperatorTable.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// OperatorTable.cc -- 
+// OperatorTable.cc --
 //
 // Author           : Richard C. Bilson
@@ -22 +22 @@
                         {       "?[?]",         "",             "_operator_index",                              OT_INDEX                        },
                         {       "?{}",          "",             "_constructor",                                 OT_CTOR                         },
-                        {       "^?{}",         "",             "_destructor",                                  OT_DTOR                         }, // ~?{}, -?{}, !?{}, $?{}, ??{}, ^?{}, ?destroy, ?delete
+                        {       "^?{}",         "",             "_destructor",                                  OT_DTOR                         },
                         {       "?()",          "",             "_operator_call",                               OT_CALL                         },
                         {       "?++",          "++",   "_operator_postincr",                   OT_POSTFIXASSIGN        },

src/GenPoly/CopyParams.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// CopyParams.cc -- 
+// CopyParams.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
+// Last Modified By : Rob Schluntz
 // Last Modified On : Tue May 19 07:33:31 2015
 // Update Count     : 1
@@ -29 +29 @@
           public:
                 CopyParams();
-  
+
                 virtual void visit( FunctionDecl *funcDecl );
                 virtual void visit( AddressExpr *addrExpr );
@@ -50 +50 @@
                 if ( funcDecl->get_statements() ) {
                         funcDecl->get_statements()->accept( *this );
-        
+
                         if ( ! modVars.empty() ) {
                                 std::map< std::string, DeclarationWithType* > assignOps;
@@ -57 +57 @@
                                         if ( (*tyVar)->get_kind() == TypeDecl::Any ) {
                                                 assert( !(*tyVar)->get_assertions().empty() );
+                                                assert( (*tyVar)->get_assertions().front()->get_name() == "?=?" );
                                                 assignOps[ (*tyVar)->get_name() ] = (*tyVar)->get_assertions().front();
                                         } // if

src/Parser/TypeData.cc

@@ -436 +436 @@
         for ( std::list< TypeDecl* >::iterator i = outputList.begin(); i != outputList.end(); ++i ) {
                 if ( (*i)->get_kind() == TypeDecl::Any ) {
-                        // add assertion parameters to `type' tyvars
+                        // add assertion parameters to `type' tyvars in reverse order
+                        // add dtor:  void ^?{}(T *)
+                        FunctionType *dtorType = new FunctionType( Type::Qualifiers(), false );
+                        dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
+                        (*i)->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) );
+                        // add copy ctor:  void ?{}(T *, T)
+                        FunctionType *copyCtorType = new FunctionType( Type::Qualifiers(), false );
+                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
+                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
+                        (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, copyCtorType, 0, false, false ) );
+
+                        // add default ctor:  void ?{}(T *)
+                        FunctionType *ctorType = new FunctionType( Type::Qualifiers(), false );
+                        ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
+                        (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) );
+
                         // add assignment operator:  T * ?=?(T *, T)
                         FunctionType *assignType = new FunctionType( Type::Qualifiers(), false );
@@ -443 +458 @@
                         assignType->get_returnVals().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
                         (*i)->get_assertions().push_front( new FunctionDecl( "?=?", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, assignType, 0, false, false ) );
-
-                        // add default ctor:  void ?{}(T *)
-                        FunctionType *ctorType = new FunctionType( Type::Qualifiers(), false );
-                        ctorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
-                        (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, ctorType, 0, false, false ) );
-
-                        // add copy ctor:  void ?{}(T *, T)
-                        FunctionType *copyCtorType = new FunctionType( Type::Qualifiers(), false );
-                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
-                        copyCtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ), 0 ) );
-                        (*i)->get_assertions().push_front( new FunctionDecl( "?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, copyCtorType, 0, false, false ) );
-
-                        // add dtor:  void ^?{}(T *)
-                        FunctionType *dtorType = new FunctionType( Type::Qualifiers(), false );
-                        dtorType->get_parameters().push_back( new ObjectDecl( "", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), new TypeInstType( Type::Qualifiers(), (*i)->get_name(), *i ) ), 0 ) );
-                        (*i)->get_assertions().push_front( new FunctionDecl( "^?{}", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, dtorType, 0, false, false ) );
                 } // if
         } // for