Changeset a172972 for src/ResolvExpr/Resolver.cc

Timestamp:

Feb 23, 2016, 11:20:39 AM (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:

ae42f2a

Parents:

7528ba1 (diff), 6ce67ce (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ctor

Conflicts:

src/ResolvExpr/Resolver.cc

File:

• src/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -324 +324 @@
                                                                                                 BasicType::SignedInt);
                                 } else {
-                                        DeclarationWithType * decl = lookupId(n);
+                                        DeclarationWithType * decl = lookupId( n );
                                         initContext = decl->get_type();
                                 }
@@ -346 +346 @@
                                         if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_results().front() ) ) {
                                                 if ( isCharType( pt->get_base() ) ) {
-                                                        // strip cast if we're initializing a char[] with a char *, e.g.
-                                                        // char x[] = "hello";
+                                                        // strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
                                                         CastExpr *ce = dynamic_cast< CastExpr * >( newExpr );
                                                         singleInit->set_value( ce->get_arg() );