Changeset b5b0907 for src/Parser/TypeData.h

Timestamp:

Jun 15, 2015, 12:45:26 PM (11 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, string, with_gc

Children:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

• src/Parser/TypeData.h (modified) (4 diffs)

src/Parser/TypeData.h

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 16 15:20:00 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 07:26:16 2015
+// Update Count     : 5
 //
 
@@ -44 +44 @@
 
         struct Aggregate_t {
-                DeclarationNode::TyCon kind;
+                DeclarationNode::Aggregate kind;
                 std::string name;
                 DeclarationNode *params;
@@ -120 +120 @@
         TypeData *extractAggregate( bool toplevel = true ) const;
         // helper function for DeclNodeImpl::build
-        Declaration * buildDecl( std::string name, Declaration::StorageClass sc, Expression *bitfieldWidth, bool isInline, LinkageSpec::Type linkage, Initializer *init = 0 ) const;
+        Declaration * buildDecl( std::string name, DeclarationNode::StorageClass sc, Expression *bitfieldWidth, bool isInline, LinkageSpec::Type linkage, Initializer *init = 0 ) const;
         // helper functions for build()
         Type::Qualifiers buildQualifiers() const;
@@ -128 +128 @@
         AggregateDecl * buildAggregate() const;
         ReferenceToType * buildAggInst() const;
-        NamedTypeDecl * buildSymbolic( const std::string &name, Declaration::StorageClass sc ) const;
+        NamedTypeDecl * buildSymbolic( const std::string &name, DeclarationNode::StorageClass sc ) const;
         TypeDecl* buildVariable() const;
         EnumDecl* buildEnum() const;