Changeset 66f8528 for src/SymTab

Timestamp:

Dec 15, 2016, 5:16:42 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

43385ca, f7ff3fb

Parents:

5802a4f (diff), 596f987b (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 tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:

• src/SymTab/Autogen.h (modified) (3 diffs)

src/SymTab/Autogen.h

@@ -88 +88 @@
                 if ( forward ) {
                         // generate: for ( int i = 0; i < 0; ++i )
-                        begin = new NameExpr( "0" );
+                        begin = new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0" ) );
                         end = array->get_dimension()->clone();
                         cmp = new NameExpr( "?<?" );
@@ -96 +96 @@
                         begin = new UntypedExpr( new NameExpr( "?-?" ) );
                         ((UntypedExpr*)begin)->get_args().push_back( array->get_dimension()->clone() );
-                        ((UntypedExpr*)begin)->get_args().push_back( new NameExpr( "1" ) );
-                        end = new NameExpr( "0" );
+                        ((UntypedExpr*)begin)->get_args().push_back( new ConstantExpr( Constant( new OneType( emptyQualifiers ), "1" ) ) );
+                        end = new ConstantExpr( Constant( new ZeroType( emptyQualifiers ), "0" ) );
                         cmp = new NameExpr( "?>=?" );
                         update = new NameExpr( "--?" );
@@ -175 +175 @@
 } // namespace SymTab
 #endif // AUTOGEN_H
-