Ignore:
Timestamp:
Mar 2, 2016, 6:15:02 PM (7 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, aaron-thesis, arm-eh, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/ParseNode.h

    r8f610e85 r4040425  
    1010// Created On       : Sat May 16 13:28:16 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Mar  2 14:00:06 2016
    13 // Update Count     : 189
     12// Last Modified On : Wed Mar  2 17:26:35 2016
     13// Update Count     : 190
    1414//
    1515
     
    329329        enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
    330330        enum Modifier  { Signed, Unsigned, Short, Long };
    331         enum Aggregate { Struct, Union, Context };
     331        enum Aggregate { Struct, Union, Trait };
    332332        enum TypeClass { Type, Dtype, Ftype };
    333333        enum BuiltinType { Valist };
     
    354354        static DeclarationNode *newFromTypeGen( std::string *, ExpressionNode *params );
    355355        static DeclarationNode *newTypeParam( TypeClass, std::string *);
    356         static DeclarationNode *newContext( std::string *name, DeclarationNode *params, DeclarationNode *asserts );
    357         static DeclarationNode *newContextUse( std::string *name, ExpressionNode *params );
     356        static DeclarationNode *newTrait( std::string *name, DeclarationNode *params, DeclarationNode *asserts );
     357        static DeclarationNode *newTraitUse( std::string *name, ExpressionNode *params );
    358358        static DeclarationNode *newTypeDecl( std::string *name, DeclarationNode *typeParams );
    359359        static DeclarationNode *newPointer( DeclarationNode *qualifiers );
Note: See TracChangeset for help on using the changeset viewer.