Changeset 0f9e4403 for src/Parser/ParseNode.h

Timestamp:

Apr 15, 2016, 12:03:11 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, with_gc

Children:

29ad0ac

Parents:

c5833e8 (diff), 37f0da8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into gc_noraii

File:

• src/Parser/ParseNode.h (modified) (12 diffs)

src/Parser/ParseNode.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ParseNode.h -- 
+// ParseNode.h --
 //
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Feb  1 13:32:32 2016
-// Update Count     : 184
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Apr 11 11:50:52 2016
+// Update Count     : 205
 //
 
@@ -108 +108 @@
 
         ConstantNode( Type, std::string * );
-        ConstantNode( const ConstantNode &other ) : value( *new std::string( other.value ) ) {};
+        ConstantNode( const ConstantNode &other ) : type( other.type ), btype( other.btype), value( *new std::string( other.value ) ) {};
         ~ConstantNode() { delete &value; }
 
@@ -177 +177 @@
         enum Type { TupleC, Comma, TupleFieldSel, // n-adic
                                 // triadic
-                                Cond, NCond, 
+                                Cond, NCond,
                                 // diadic
-                                SizeOf, AlignOf, OffsetOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And, 
-                                BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq, 
+                                SizeOf, AlignOf, OffsetOf, Attr, CompLit, Plus, Minus, Mul, Div, Mod, Or, And,
+                                BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
                                 Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
                                 Index, FieldSel, PFieldSel, Range,
@@ -309 +309 @@
         ValofExprNode( const ValofExprNode &other );
         ~ValofExprNode();
-  
+
         virtual ValofExprNode *clone() const { return new ValofExprNode( *this ); }
 
@@ -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 };
-
-        static const char *storageName[];  
+        enum BuiltinType { Valist };
+
+        static const char *storageName[];
         static const char *qualifierName[];
         static const char *basicTypeName[];
@@ -338 +339 @@
         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 );
@@ -352 +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 );
@@ -363 +365 @@
         static DeclarationNode *newAttr( std::string *, ExpressionNode *expr );
         static DeclarationNode *newAttr( std::string *, DeclarationNode *type );
+        static DeclarationNode *newBuiltinType( BuiltinType );
 
         DeclarationNode *addQualifiers( DeclarationNode *);
@@ -401 +404 @@
         LinkageSpec::Type get_linkage() const { return linkage; }
         DeclarationNode *extractAggregate() const;
+        ExpressionNode *get_enumeratorValue() const { return enumeratorValue; }
 
         DeclarationNode();
@@ -413 +417 @@
         std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
+        ExpressionNode *enumeratorValue;
         InitializerNode *initializer;
         bool hasEllipsis;
@@ -422 +427 @@
 class StatementNode : public ParseNode {
   public:
-        enum Type { Exp,   If,        Switch,  Case,    Default,  Choose,   Fallthru, 
+        enum Type { Exp,   If,        Switch,  Case,    Default,  Choose,   Fallthru,
                                 While, Do,        For,
                                 Goto,  Continue,  Break,   Return,  Throw,
@@ -530 +535 @@
         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;
 };