Changeset 1b0020a for src/Parser/ParseNode.h

Timestamp:

Aug 5, 2016, 10:12:01 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, 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:

242d458, c331406

Parents:

4e2a1137 (diff), dae881f (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 ctor

File:

• src/Parser/ParseNode.h (modified) (4 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 : Sun Jul 24 02:17:00 2016
-// Update Count     : 269
+// Last Modified On : Fri Aug  5 07:49:32 2016
+// Update Count     : 288
 //
 
@@ -225 +225 @@
 };
 
+Expression *build_cast( TypeValueNode * arg, ExpressionNode *expr_node );
+Expression *build_fieldSel( ExpressionNode *expr_node, VarRefNode *member );
+Expression *build_pfieldSel( ExpressionNode *expr_node, VarRefNode *member );
+Expression *build_addressOf( ExpressionNode *expr_node );
+Expression *build_sizeOf( ExpressionNode *expr_node );
+Expression *build_alignOf( ExpressionNode *expr_node );
+Expression *build_offsetOf( TypeValueNode * arg, VarRefNode *member );
+Expression *build_and( ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
+Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind );
+Expression *build_opr1( OperatorNode::Type op, ExpressionNode *expr_node );
+Expression *build_opr2( OperatorNode::Type op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
+Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 );
+Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 );
+
+class CompositeExprNode2 : public ExpressionNode {
+  public:
+        CompositeExprNode2( Expression *expr );
+        CompositeExprNode2( const CompositeExprNode2 &other );
+        virtual ~CompositeExprNode2();
+
+        virtual CompositeExprNode2 *clone() const { return new CompositeExprNode2( *this ); }
+        virtual Expression *build() const { return expr->clone(); }
+
+        virtual void print( std::ostream &, int indent = 0) const;
+        virtual void printOneLine( std::ostream &, int indent = 0) const;
+  private:
+        Expression *expr;
+};
+
 class CompositeExprNode : public ExpressionNode {
   public:
@@ -290 +319 @@
   private:
         std::list< Label > labels;
-};
-
-class CommaExprNode : public CompositeExprNode {
-  public:
-        CommaExprNode();
-        CommaExprNode( ExpressionNode * );
-        CommaExprNode( ExpressionNode *, ExpressionNode * );
-        CommaExprNode( const CommaExprNode &other );
-
-        // virtual CommaExprNode *add_to_list( ExpressionNode * );
-        virtual CommaExprNode *clone() const { return new CommaExprNode( *this ); }
 };
 
@@ -533 +551 @@
 };
 
-class NullStmtNode : public CompoundStmtNode {
-  public:
-        Statement *build() const;
-        void print( std::ostream &, int indent = 0 ) const;
-};
-
 class InitializerNode : public ParseNode {
   public: