Changeset c28afead for src/Parser

Timestamp:

Apr 19, 2018, 6:11:07 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

8633f060

Parents:

9dc31c10 (diff), 60ba456 (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:

fix conflict

Location:

src/Parser

Files:

• DeclarationNode.cc (modified) (1 diff)
• ExpressionNode.cc (modified) (3 diffs)
• TypeData.cc (modified) (1 diff)

src/Parser/DeclarationNode.cc

@@ -928 +928 @@
                                 delete newType->aggInst.aggregate->enumeration.constants;
                                 newType->aggInst.aggregate->enumeration.constants = nullptr;
+                                newType->aggInst.aggregate->enumeration.body = false;
                         } else {
                                 assert( newType->aggInst.aggregate->kind == TypeData::Aggregate );
                                 delete newType->aggInst.aggregate->aggregate.fields;
                                 newType->aggInst.aggregate->aggregate.fields = nullptr;
+                                newType->aggInst.aggregate->aggregate.body = false;
                         } // if
                         // don't hoist twice

src/Parser/ExpressionNode.cc

@@ -211 +211 @@
         if ( Unsigned && size < 2 ) {                                           // hh or h, less than int ?
                 // int i = -1uh => 65535 not -1, so cast is necessary for unsigned, which unfortunately eliminates warnings for large values.
-                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ) );
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ), false );
         } else if ( lnth != -1 ) {                                                      // explicit length ?
                 if ( lnth == 5 ) {                                                              // int128 ?
                         size = 5;
-                        ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ) );
+                        ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[Unsigned][size] ), false );
                 } else {
-                        ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][lnth], false ) );
+                        ret = new CastExpr( ret, new TypeInstType( Type::Qualifiers(), lnthsInt[Unsigned][lnth], false ), false );
                 } // if
         } // if
@@ -285 +285 @@
         Expression * ret = new ConstantExpr( Constant( new BasicType( noQualifiers, kind[complx][size] ), str, v ) );
         if ( lnth != -1 ) {                                                                     // explicit length ?
-                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ) );
+                ret = new CastExpr( ret, new BasicType( Type::Qualifiers(), kind[complx][size] ), false );
         } // if
 
@@ -408 +408 @@
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
-                return new CastExpr( maybeMoveBuild< Expression >(expr_node) );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node), false );
         } else {
-                return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType );
+                return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType, false );
         } // if
 } // build_cast

src/Parser/TypeData.cc

@@ -490 +490 @@
         switch ( td->kind ) {
           case TypeData::Aggregate:
-                if ( ! toplevel && td->aggregate.fields ) {
+                if ( ! toplevel && td->aggregate.body ) {
                         ret = td->clone();
                 } // if
                 break;
           case TypeData::Enum:
-                if ( ! toplevel && td->enumeration.constants ) {
+                if ( ! toplevel && td->enumeration.body ) {
                         ret = td->clone();
                 } // if