Changeset 4040425 for src/Parser/ParseNode.h

Timestamp:

Mar 2, 2016, 6:15:02 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

36ebd03, b63e376

Parents:

8f610e85

Message:

change keyword type to otype and context to trait

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 : Wed Mar  2 14:00:06 2016
-// Update Count     : 189
+// 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 };
@@ -354 +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 );