Changeset 8686f31

Timestamp:

Jul 7, 2015, 10:48:14 AM (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, string, with_gc

Children:

0a0a65b, 413f7f8

Parents:

28a8cf9

Message:

fix generated enum assignment for nested declarations

Location:

src

Files:

• SymTab/Validate.cc (modified) (3 diffs)
• main.cc (modified) (1 diff)

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Jul 03 13:17:07 2015
-// Update Count     : 131
+// Last Modified On : Tue Jul 07 10:41:23 2015
+// Update Count     : 136
 //
 
@@ -560 +560 @@
                 // E ?=?(E volatile *, E)
                 Type *etype = refType->clone();
-                etype->get_qualifiers() += Type::Qualifiers(false, true, false, false, false, false);
+                // etype->get_qualifiers() += Type::Qualifiers(false, true, false, false, false, false);
 
                 ObjectDecl *dstParam = new ObjectDecl( "_dst", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new PointerType( Type::Qualifiers(), etype ), 0 );
@@ -589 +589 @@
 
                 LibCfa::makeLibCfa( assigns );
+
+                // need to remove the prototypes, since these can appear nested in a routine
+                for (int start = 0, end = assigns.size()/2; start < end; start++) {
+                        delete assigns.front();
+                        assigns.pop_front();
+                }
 
                 declsToAdd.insert( declsToAdd.begin(), assigns.begin(), assigns.end() );

src/main.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-<<<<<<< Updated upstream
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 29 17:09:21 2015
-// Update Count     : 77
-=======
 // Last Modified By : Rob Schluntz
-// Last Modified On : Fri Jul 03 13:08:52 2015
-// Update Count     : 75
->>>>>>> Stashed changes
+// Last Modified On : Mon Jul 06 15:01:26 2015
+// Update Count     : 79
 //