Changeset 4040425 for src/Parser/TypeData.cc

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/TypeData.cc (modified) (3 diffs)

src/Parser/TypeData.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 15:12:51 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:08:38 2016
-// Update Count     : 48
+// Last Modified On : Wed Mar  2 17:26:45 2016
+// Update Count     : 49
 //
 
@@ -820 +820 @@
                 buildForall( aggregate->params, at->get_parameters() );
                 break;
-          case DeclarationNode::Context:
-                at = new ContextDecl( aggregate->name );
+          case DeclarationNode::Trait:
+                at = new TraitDecl( aggregate->name );
                 buildList( aggregate->params, at->get_parameters() );
                 break;
@@ -860 +860 @@
                         ret = new UnionInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
                         break;
-                  case DeclarationNode::Context:
-                        ret = new ContextInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
+                  case DeclarationNode::Trait:
+                        ret = new TraitInstType( buildQualifiers(), aggInst->aggregate->aggregate->name );
                         break;
                   default: