Changeset 36ebd03 for src/Parser/ParseNode.h

Timestamp:

Mar 3, 2016, 1:28:56 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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:

3627356

Parents:

9d7b3ea (diff), 4040425 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/ParseNode.h (modified) (7 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 Feb  1 13:32:32 2016
-// Update Count     : 184
+// Last Modified On : Wed Mar  2 17:26:35 2016
+// Update Count     : 190
 //
 
@@ -329 +329 @@
         enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
         enum Modifier  { Signed, Unsigned, Short, Long };
-        enum Aggregate { Struct, Union, Context };
+        enum Aggregate { Struct, Union, Trait };
         enum TypeClass { Type, Dtype, Ftype };
+        enum BuiltinType { Valist };
 
         static const char *storageName[];  
@@ -338 +339 @@
         static const char *aggregateName[];
         static const char *typeClassName[];
+        static const char *builtinTypeName[];
 
         static DeclarationNode *newFunction( std::string *name, DeclarationNode *ret, DeclarationNode *param, StatementNode *body, bool newStyle = false );
@@ -352 +354 @@
         static DeclarationNode *newFromTypeGen( std::string *, ExpressionNode *params );
         static DeclarationNode *newTypeParam( TypeClass, std::string *);
-        static DeclarationNode *newContext( std::string *name, DeclarationNode *params, DeclarationNode *asserts );
-        static DeclarationNode *newContextUse( std::string *name, ExpressionNode *params );
+        static DeclarationNode *newTrait( std::string *name, DeclarationNode *params, DeclarationNode *asserts );
+        static DeclarationNode *newTraitUse( std::string *name, ExpressionNode *params );
         static DeclarationNode *newTypeDecl( std::string *name, DeclarationNode *typeParams );
         static DeclarationNode *newPointer( DeclarationNode *qualifiers );
@@ -363 +365 @@
         static DeclarationNode *newAttr( std::string *, ExpressionNode *expr );
         static DeclarationNode *newAttr( std::string *, DeclarationNode *type );
+        static DeclarationNode *newBuiltinType( BuiltinType );
 
         DeclarationNode *addQualifiers( DeclarationNode *);
@@ -401 +404 @@
         LinkageSpec::Type get_linkage() const { return linkage; }
         DeclarationNode *extractAggregate() const;
+        ExpressionNode *get_enumeratorValue() const { return enumeratorValue; }
 
         DeclarationNode();
@@ -413 +417 @@
         std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
+        ExpressionNode *enumeratorValue;
         InitializerNode *initializer;
         bool hasEllipsis;