Changes in src/Parser/ParseNode.h [630a82a:5721a6d]

File:

• src/Parser/ParseNode.h (modified) (8 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 : Fri Apr  8 16:27:20 2016
-// Update Count     : 205
+// Last Modified On : Mon Feb  1 13:32:32 2016
+// Update Count     : 184
 //
 
@@ -329 +329 @@
         enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
         enum Modifier  { Signed, Unsigned, Short, Long };
-        enum Aggregate { Struct, Union, Trait };
+        enum Aggregate { Struct, Union, Context };
         enum TypeClass { Type, Dtype, Ftype };
-        enum BuiltinType { Valist };
 
         static const char *storageName[];  
@@ -339 +338 @@
         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 );
@@ -354 +352 @@
         static DeclarationNode *newFromTypeGen( std::string *, ExpressionNode *params );
         static DeclarationNode *newTypeParam( TypeClass, std::string *);
-        static DeclarationNode *newTrait( std::string *name, DeclarationNode *params, DeclarationNode *asserts );
-        static DeclarationNode *newTraitUse( std::string *name, ExpressionNode *params );
+        static DeclarationNode *newContext( std::string *name, DeclarationNode *params, DeclarationNode *asserts );
+        static DeclarationNode *newContextUse( std::string *name, ExpressionNode *params );
         static DeclarationNode *newTypeDecl( std::string *name, DeclarationNode *typeParams );
         static DeclarationNode *newPointer( DeclarationNode *qualifiers );
@@ -365 +363 @@
         static DeclarationNode *newAttr( std::string *, ExpressionNode *expr );
         static DeclarationNode *newAttr( std::string *, DeclarationNode *type );
-        static DeclarationNode *newBuiltinType( BuiltinType );
 
         DeclarationNode *addQualifiers( DeclarationNode *);
@@ -404 +401 @@
         LinkageSpec::Type get_linkage() const { return linkage; }
         DeclarationNode *extractAggregate() const;
-        ExpressionNode *get_enumeratorValue() const { return enumeratorValue; }
 
         DeclarationNode();
@@ -417 +413 @@
         std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
-        ExpressionNode *enumeratorValue;
         InitializerNode *initializer;
         bool hasEllipsis;
@@ -535 +530 @@
         bool aggregate;
         ExpressionNode *designator; // may be list
-        InitializerNode *kids;
-};
-
-class CompoundLiteralNode : public ExpressionNode {
-  public:
-        CompoundLiteralNode( DeclarationNode *type, InitializerNode *kids );
-        CompoundLiteralNode( const CompoundLiteralNode &type );
-        ~CompoundLiteralNode();
-
-        virtual CompoundLiteralNode *clone() const;
-
-        DeclarationNode *get_type() const { return type; }
-        CompoundLiteralNode *set_type( DeclarationNode *t ) { type = t; return this; }
-
-        InitializerNode *get_initializer() const { return kids; }
-        CompoundLiteralNode *set_initializer( InitializerNode *k ) { kids = k; return this; }
-
-        void print( std::ostream &, int indent = 0 ) const;
-        void printOneLine( std::ostream &, int indent = 0 ) const;
-
-        virtual Expression *build() const;
-  private:
-        DeclarationNode *type;
         InitializerNode *kids;
 };