Changeset dbae916 for src/Parser/ParseNode.h

Timestamp:

Mar 14, 2023, 4:21:05 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

1afd9ccb, 360bfe41, 6e6989c

Parents:

5217569 (diff), c19ca4b (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Parser/ParseNode.h

@@ -137 +137 @@
         bool isExpressionType() const { return nullptr != dynamic_cast<T>(expr.get()); }
 
-        Expression * build() const { return const_cast<ExpressionNode *>(this)->expr.release(); }
+        Expression * build() const {
+                Expression * node = const_cast<ExpressionNode *>(this)->expr.release();
+                node->set_extension( this->get_extension() );
+                node->location = this->location;
+                return node;
+        }
 
         std::unique_ptr<Expression> expr;                                       // public because of lifetime implications
@@ -143 +148 @@
         bool extension = false;
 }; // ExpressionNode
-
-template< typename T >
-struct maybeBuild_t< Expression, T > {
-        static inline Expression * doit( const T * orig ) {
-                if ( orig ) {
-                        Expression * p = orig->build();
-                        p->set_extension( orig->get_extension() );
-                        p->location = orig->location;
-                        return p;
-                } else {
-                        return nullptr;
-                } // if
-        }
-};
 
 // Must harmonize with OperName.
@@ -199 +190 @@
 Expression * build_and_or( ExpressionNode * expr_node1, ExpressionNode * expr_node2, bool kind );
 Expression * build_unary_val( OperKinds op, ExpressionNode * expr_node );
-Expression * build_unary_ptr( OperKinds op, ExpressionNode * expr_node );
 Expression * build_binary_val( OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 );
 Expression * build_binary_ptr( OperKinds op, ExpressionNode * expr_node1, ExpressionNode * expr_node2 );
@@ -213 +203 @@
 struct DeclarationNode : public ParseNode {
         // These enumerations must harmonize with their names in DeclarationNode.cc.
-        enum BasicType { Void, Bool, Char, Int, Int128,
-                                         Float, Double, LongDouble, uuFloat80, uuFloat128,
-                                         uFloat16, uFloat32, uFloat32x, uFloat64, uFloat64x, uFloat128, uFloat128x, NoBasicType };
+        enum BasicType {
+                Void, Bool, Char, Int, Int128,
+                Float, Double, LongDouble, uuFloat80, uuFloat128,
+                uFloat16, uFloat32, uFloat32x, uFloat64, uFloat64x, uFloat128, uFloat128x,
+                NoBasicType
+        };
         static const char * basicTypeNames[];
         enum ComplexType { Complex, NoComplexType, Imaginary }; // Imaginary unsupported => parse, but make invisible and print error message
@@ -401 +394 @@
 
 struct ForCtrl {
-        ForCtrl( ExpressionNode * expr, ExpressionNode * condition, ExpressionNode * change ) :
-                init( new StatementNode( build_expr( expr ) ) ), condition( condition ), change( change ) {}
-        ForCtrl( DeclarationNode * decl, ExpressionNode * condition, ExpressionNode * change ) :
-                init( new StatementNode( decl ) ), condition( condition ), change( change ) {}
+        ForCtrl( StatementNode * stmt, ExpressionNode * condition, ExpressionNode * change ) :
+                init( stmt ), condition( condition ), change( change ) {}
 
         StatementNode * init;
@@ -451 +442 @@
         while ( cur ) {
                 try {
-                        SynTreeType * result = dynamic_cast< SynTreeType * >( maybeBuild< typename std::pointer_traits< decltype(cur->build())>::element_type >( cur ) );
+                        SynTreeType * result = dynamic_cast< SynTreeType * >( maybeBuild( cur ) );
                         if ( result ) {
                                 result->location = cur->location;