Changeset 367e082 for src

Timestamp:

May 25, 2015, 3:15:21 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, string, with_gc

Children:

49205cf

Parents:

53a2e97

Message:

generated assignment routine will not attempt to assign to a const array field

Location:

src

Files:

• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/Declaration.h (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 May 22 15:29:16 2015
-// Update Count     : 9
+// Last Modified On : Mon May 25 14:27:15 2015
+// Update Count     : 21
 //
 
@@ -560 +560 @@
                 for ( std::list< Declaration * >::const_iterator member = aggregateDecl->get_members().begin(); member != aggregateDecl->get_members().end(); ++member ) {
                         if ( DeclarationWithType *dwt = dynamic_cast< DeclarationWithType * >( *member ) ) {
-                                Type::Qualifiers & qualifiers = dwt->get_type()->get_qualifiers();
-                                if ( qualifiers.isConst ) {
+                                // query the type qualifiers of this field and skip assigning it if it is marked const. 
+                                // If it is an array type, we need to strip off the array layers to find its qualifiers.
+                                Type * type = dwt->get_type();
+                                while ( ArrayType * at = dynamic_cast< ArrayType * >( type ) ) {
+                                        type = at->get_base();
+                                }
+
+                                if ( type->get_qualifiers().isConst ) {
                                         // don't assign const members
                                         continue;

src/SynTree/Declaration.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-<<<<<<< Updated upstream
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon May 25 13:54:32 2015
-=======
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 21 16:27:31 2015
->>>>>>> Stashed changes
-// Update Count     : 5
+// Last Modified On : Mon May 25 14:08:10 2015
+// Update Count     : 6
 //