Changeset e67a82d for src/SynTree

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (1 diff)
• Expression.cc (modified) (1 diff)
• Statement.h (modified) (1 diff)

src/SynTree/ApplicationExpr.cc

@@ -34 +34 @@
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
-                decl( other.decl ), declptr( maybeClone( other.declptr ) ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ) {
+                decl( other.decl ), declptr( other.declptr ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ) {
 }
 
 ParamEntry::~ParamEntry() {
-        delete declptr;
+        // delete declptr;
         delete actualType;
         delete formalType;

src/SynTree/Expression.cc

@@ -69 +69 @@
 void Expression::print( std::ostream & os, Indenter indent ) const {
         printInferParams( inferParams, os, indent+1, 0 );
+
+        if ( result ) {
+                os << std::endl << indent << "with resolved type:" << std::endl;
+                os << (indent+1);
+                result->print( os, indent+1 );
+        }
 
         if ( env ) {

src/SynTree/Statement.h

@@ -518 +518 @@
 class ImplicitCtorDtorStmt : public Statement {
   public:
-        // Non-owned pointer to the constructor/destructor statement
+        // the constructor/destructor call statement; owned here for a while, eventually transferred elsewhere
         Statement * callStmt;