Changes in src/Parser/DeclarationNode.cc [4040425:1db21619]

File:

• src/Parser/DeclarationNode.cc (modified) (8 diffs)

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:26:24 2016
-// Update Count     : 134
+// Last Modified On : Tue Jul 14 14:46:32 2015
+// Update Count     : 126
 //
 
@@ -34 +34 @@
 const char *DeclarationNode::storageName[] = { "extern", "static", "auto", "register", "inline", "fortran", "_Noreturn", "_Thread_local", "" };
 const char *DeclarationNode::qualifierName[] = { "const", "restrict", "volatile", "lvalue", "_Atomic" };
-const char *DeclarationNode::basicTypeName[] = { "char", "int", "float", "double", "void", "_Bool", "_Complex", "_Imaginary",  };
+const char *DeclarationNode::basicTypeName[] = { "char", "int", "float", "double", "void", "_Bool", "_Complex", "_Imaginary" };
 const char *DeclarationNode::modifierName[]  = { "signed", "unsigned", "short", "long" };
 const char *DeclarationNode::aggregateName[] = { "struct", "union", "context" };
 const char *DeclarationNode::typeClassName[] = { "type", "dtype", "ftype" };
-const char *DeclarationNode::builtinTypeName[] = { "__builtin_va_list" };
 
 UniqueName DeclarationNode::anonymous( "__anonymous" );
@@ -148 +147 @@
         newnode->type = new TypeData( TypeData::Basic );
         newnode->type->basic->typeSpec.push_back( bt );
-        return newnode;
-}
-
-DeclarationNode *DeclarationNode::newBuiltinType( BuiltinType bt ) {
-        DeclarationNode *newnode = new DeclarationNode;
-        newnode->type = new TypeData( TypeData::Builtin );
-        newnode->type->builtin->type = bt;
         return newnode;
 }
@@ -223 +215 @@
         DeclarationNode *newnode = new DeclarationNode;
         newnode->name = assign_strptr( name );
-        newnode->enumeratorValue = constant;
+        // do something with the constant
         return newnode;
 }
@@ -251 +243 @@
 }
 
-DeclarationNode *DeclarationNode::newTrait( std::string *name, DeclarationNode *params, DeclarationNode *asserts ) {
+DeclarationNode *DeclarationNode::newContext( std::string *name, DeclarationNode *params, DeclarationNode *asserts ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::Aggregate );
-        newnode->type->aggregate->kind = Trait;
+        newnode->type->aggregate->kind = Context;
         newnode->type->aggregate->params = params;
         newnode->type->aggregate->fields = asserts;
@@ -261 +253 @@
 }
 
-DeclarationNode *DeclarationNode::newTraitUse( std::string *name, ExpressionNode *params ) {
+DeclarationNode *DeclarationNode::newContextUse( std::string *name, ExpressionNode *params ) {
         DeclarationNode *newnode = new DeclarationNode;
         newnode->type = new TypeData( TypeData::AggregateInst );
         newnode->type->aggInst->aggregate = new TypeData( TypeData::Aggregate );
-        newnode->type->aggInst->aggregate->aggregate->kind = Trait;
+        newnode->type->aggInst->aggregate->aggregate->kind = Context;
         newnode->type->aggInst->aggregate->aggregate->name = assign_strptr( name );
         newnode->type->aggInst->params = params;
@@ -802 +794 @@
                         errors.append( e );
                 } // try
-                cur = dynamic_cast<DeclarationNode *>( cur->get_link() );
+                cur = dynamic_cast< DeclarationNode *>( cur->get_link() );
         } // while
         if ( ! errors.isEmpty() ) {
@@ -889 +881 @@
                           ret = new UnionInstType( type->buildQualifiers(), type->aggregate->name );
                           break;
-                        case DeclarationNode::Trait:
-                          ret = new TraitInstType( type->buildQualifiers(), type->aggregate->name );
+                        case DeclarationNode::Context:
+                          ret = new ContextInstType( type->buildQualifiers(), type->aggregate->name );
                           break;
                         default: