Changeset 70f89d00 for src/ResolvExpr

Timestamp:

May 30, 2016, 12:51:22 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:

f1b1e4c

Parents:

677c1be

Message:

function scoped const objects can be constructed, add missing copy constructors to Initializer.cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• Resolver.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc ¶

@@ -39 +39 @@
 #include "Tuples/NameMatcher.h"
 #include "Common/utility.h"
+#include "InitTweak/InitTweak.h"
 
 extern bool resolvep;
@@ -546 +547 @@
 
                 {
-                        NameExpr *fname = 0;;
-                        if ( ( fname = dynamic_cast<NameExpr *>( untypedExpr->get_function()))
-                                 && ( fname->get_name() == std::string("&&")) ) {
+                        std::string fname = InitTweak::getFunctionName( untypedExpr );
+                        if ( fname == "&&" ) {
                                 VoidType v = Type::Qualifiers();                // resolve to type void *
                                 PointerType pt( Type::Qualifiers(), v.clone() );

src/ResolvExpr/Resolver.cc ¶

@@ -492 +492 @@
                 } catch ( SemanticError ) {
                         // no alternatives for the constructor initializer - fallback on C-style initializer
-                        // xxx- not sure if this makes a ton of sense - should maybe never be able to have this situation?
+                        // xxx - not sure if this makes a ton of sense - should maybe never be able to have this situation?
+
+                        // reset type qualifiers
+                        ctorInit->get_object()->get_type()->get_qualifiers() = ctorInit->get_qualifiers();
                         fallbackInit( ctorInit );
                         return;
                 }
+                // reset type qualifiers
+                ctorInit->get_object()->get_type()->get_qualifiers() = ctorInit->get_qualifiers();
 
                 // found a constructor - can get rid of C-style initializer