Changeset 1db21619 for src/Parser/ParseNode.h

Timestamp:

Jul 16, 2015, 5:28:24 PM (9 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:

994ec2c

Parents:

724c2b6

Message:

add CFA flag, remove -p from cc1, typedef on functions become function declarations, move isInline/isNoreturn to Declaration, cleaned up label code

File:

• src/Parser/ParseNode.h (modified) (6 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 : Thu Jul  2 17:57:05 2015
-// Update Count     : 84
+// Last Modified On : Tue Jul 14 14:58:25 2015
+// Update Count     : 91
 //
 
@@ -265 +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 };
@@ -352 +352 @@
         std::string name;
         std::list< StorageClass > storageClasses;
+        std::list< std::string > attributes;
         ExpressionNode *bitfieldWidth;
         InitializerNode *initializer;
@@ -358 +359 @@
 
         static UniqueName anonymous;
-};
+}; // DeclarationNode
 
 class StatementNode : public ParseNode {
@@ -380 +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; }
@@ -409 +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 {