Changeset 546e712 for src/SynTree

Timestamp:

Jun 6, 2019, 3:01:46 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8c0d801, f46bfd2f

Parents:

2a54479

Message:

Fix for 1 bug of N

Location:

src/SynTree

Files:

• DeclReplacer.h (modified) (1 diff)
• Expression.cc (modified) (1 diff)
• Expression.h (modified) (1 diff)

src/SynTree/DeclReplacer.h

@@ -33 +33 @@
 
         size_t replace( BaseSyntaxNode *& node, const ExprMap & exprMap, bool debug = false);
+
         template<typename T>
-                void replace( T *& node, const ExprMap & exprMap, bool debug = false ) {
-                if ( ! node ) return;
+        size_t replace( T *& node, const ExprMap & exprMap, bool debug = false ) {
+                if ( ! node ) return 0ul;
                 BaseSyntaxNode * arg = node;
-                replace( arg, exprMap, debug );
+                size_t replaced = replace( arg, exprMap, debug );
                 node = dynamic_cast<T *>( arg );
                 assertf( node, "DeclReplacer fundamentally changed the type of its argument." );
+                return replaced;
         }
 }

src/SynTree/Expression.cc

@@ -102 +102 @@
         SemanticError( this, "Constant expression of non-integral type " );
 }
+
+VariableExpr::VariableExpr() : Expression(), var( nullptr ) {}
 
 VariableExpr::VariableExpr( DeclarationWithType *_var ) : Expression(), var( _var ) {

src/SynTree/Expression.h

@@ -299 +299 @@
         DeclarationWithType * var;
 
+        VariableExpr();
         VariableExpr( DeclarationWithType * var );
         VariableExpr( const VariableExpr & other );