Changeset 6611177 for src/Parser/ExpressionNode.h

Timestamp:

Apr 11, 2023, 12:48:03 PM (22 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

5541a44e

Parents:

9921573

Message:

Clean-up in parser. ClauseNode? rework, plus internal adjustments to reduce extra code and unchecked casts.

File:

• src/Parser/ExpressionNode.h (modified) (3 diffs)

src/Parser/ExpressionNode.h

@@ -41 +41 @@
         bool isExpressionType() const {  return nullptr != dynamic_cast<T>(expr.get()); }
 
-        ast::Expr * build() const {
-                ast::Expr * node = const_cast<ExpressionNode *>(this)->expr.release();
+        ast::Expr * build() {
+                ast::Expr * node = expr.release();
                 node->set_extension( this->get_extension() );
                 node->location = this->location;
@@ -53 +53 @@
         bool extension = false;
 }; // ExpressionNode
-
-/*
-// Must harmonize with OperName.
-enum class OperKinds {
-    // diadic
-    SizeOf, AlignOf, OffsetOf, Plus, Minus, Exp, Mul, Div, Mod, Or, And,
-    BitOr, BitAnd, Xor, Cast, LShift, RShift, LThan, GThan, LEThan, GEThan, Eq, Neq,
-    Assign, AtAssn, ExpAssn, MulAssn, DivAssn, ModAssn, PlusAssn, MinusAssn, LSAssn, RSAssn, AndAssn, ERAssn, OrAssn,
-    Index, Range,
-    // monadic
-    UnPlus, UnMinus, AddressOf, PointTo, Neg, BitNeg, Incr, IncrPost, Decr, DecrPost,
-    Ctor, Dtor,
-}; // OperKinds
-
-enum class EnumHiding { Visible, Hide };
-
-struct LabelNode {
-    std::vector<ast::Label> labels;
-};
-*/
 
 // These 4 routines modify the string:
@@ -99 +79 @@
 ast::Expr * build_unary_val( const CodeLocation &, OperKinds op, ExpressionNode * expr_node );
 ast::Expr * build_binary_val( const CodeLocation &, OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 );
-ast::Expr * build_binary_ptr( const CodeLocation &, OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 );
 ast::Expr * build_cond( const CodeLocation &, ExpressionNode * expr_node1, ExpressionNode * expr_node2, ExpressionNode * expr_node3 );
 ast::Expr * build_tuple( const CodeLocation &, ExpressionNode * expr_node = nullptr );