Changes in src/Parser/ParseNode.h [2794fff:1db21619]

File:

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

src/Parser/ParseNode.h

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 13:28:16 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Fri Jul 03 18:11:50 2015
-// Update Count     : 85
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 14 14:58:25 2015
+// Update Count     : 91
 //
 
@@ -162 +162 @@
                                 Assign, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, 
                                 ERAssn, OrAssn, Index, FieldSel, PFieldSel, Range,
-                                UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress,
-                                Ctor, Dtor,
+                                UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost, LabelAddress
         };
 
@@ -266 +265 @@
 class DeclarationNode : public ParseNode {
   public:
-        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic, Attribute };
+        enum Qualifier { Const, Restrict, Volatile, Lvalue, Atomic };
         enum StorageClass { Extern, Static, Auto, Register, Inline, Fortran, Noreturn, Threadlocal, NoStorageClass, };
         enum BasicType { Char, Int, Float, Double, Void, Bool, Complex, Imaginary };
@@ -353 +352 @@
         std::string name;
         std::list< StorageClass > storageClasses;
+        std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
         InitializerNode *initializer;
@@ -359 +359 @@
 
         static UniqueName anonymous;
-};
+}; // DeclarationNode
 
 class StatementNode : public ParseNode {
@@ -381 +381 @@
         static StatementNode *newCatchStmt( DeclarationNode *d = 0, StatementNode *s = 0, bool catchRestP = false );
 
-        void set_control( ExpressionNode * );
-        StatementNode * set_block( StatementNode * );
-
-        ExpressionNode *get_control() const ;
-        StatementNode *get_block() const;
-        StatementNode::Type get_type() const;
+        StatementNode *set_block( StatementNode *b ) {  block = b; return this; }
+        StatementNode *get_block() const { return block; }
+
+        void set_control( ExpressionNode *c ) { control = c; }
+        ExpressionNode *get_control() const { return control; }
+
+        StatementNode::Type get_type() const { return type; }
 
         StatementNode *add_label( const std::string * );
-        std::list<std::string> *get_labels() const;
+        const std::list<std::string> &get_labels() const { return labels; }
 
         void addDeclaration( DeclarationNode *newDecl ) { decl = newDecl; }
@@ -410 +411 @@
         ExpressionNode *control;
         StatementNode *block;
-        std::list<std::string> *labels;
+        std::list<std::string> labels;
         std::string *target;                            // target label for jump statements
         DeclarationNode *decl;
 
         bool isCatchRest;
-};
+}; // StatementNode
 
 class CompoundStmtNode : public StatementNode {