Changeset add7117 for src/Parser/ParseNode.h

Timestamp:

Sep 10, 2016, 11:08:47 AM (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:

5af62f1

Parents:

f5e81d1 (diff), 03e3117 (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/AlternativeFinder.cc
src/ResolvExpr/AlternativeFinder.h

File:

• src/Parser/ParseNode.h (modified) (3 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 29 21:45:43 2016
-// Update Count     : 583
+// Last Modified On : Thu Sep  8 21:58:06 2016
+// Update Count     : 587
 //
 
@@ -290 +290 @@
         // bool buildFuncSpecifier( StorageClass key ) const;
 
-        struct Enumeration_t {
-                std::string name;
-                DeclarationNode * constants;
-        };
-        Enumeration_t enumeration;
-
         struct Variable_t {
                 DeclarationNode::TypeClass tyClass;
@@ -408 +402 @@
                         if ( result ) {
                                 *out++ = result;
-                        } else {
                         } // if
                 } catch( SemanticError &e ) {