Changeset 690166d for src/SynTree

Timestamp:

Jan 11, 2019, 3:21:59 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

def9d4e

Parents:

0689cd9 (diff), 52ffa30 (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

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (4 diffs)
• Expression.cc (modified) (5 diffs)
• Expression.h (modified) (5 diffs)
• FunctionDecl.cc (modified) (1 diff)
• FunctionType.cc (modified) (1 diff)
• ObjectDecl.cc (modified) (1 diff)
• ReferenceToType.cc (modified) (3 diffs)

src/SynTree/ApplicationExpr.cc

@@ -29 +29 @@
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
-                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ), inferParams( new InferredParams( *other.inferParams ) ) {
+                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) )/*, inferParams( new InferredParams( *other.inferParams ) )*/ {
 }
 
@@ -39 +39 @@
         formalType = maybeClone( other.formalType );
         expr = maybeClone( other.expr );
-        *inferParams = *other.inferParams;
+        // *inferParams = *other.inferParams;
         return *this;
 }
@@ -50 +50 @@
 
 ParamEntry::ParamEntry( ParamEntry && other ) :
-                decl( other.decl ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr ), inferParams( std::move( other.inferParams ) ) {
+                decl( other.decl ), actualType( other.actualType ), formalType( other.formalType ), expr( other.expr )/*, inferParams( std::move( other.inferParams ) )*/ {
         other.actualType = nullptr;
         other.formalType = nullptr;
@@ -68 +68 @@
         other.formalType = nullptr;
         other.expr = nullptr;
-        inferParams = std::move( other.inferParams );
+        // inferParams = std::move( other.inferParams );
         return *this;
 }

src/SynTree/Expression.cc

@@ -40 +40 @@
                         Declaration::declFromId( i->second.decl )->printShort( os, indent+1 );
                         os << std::endl;
-                        printInferParams( *i->second.inferParams, os, indent+1, level+1 );
+                        printInferParams( i->second.expr->inferParams, os, indent+1, level+1 );
                 } // for
         } // if
@@ -47 +47 @@
 Expression::Expression() : result( 0 ), env( 0 ) {}
 
-Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ), inferParams( other.inferParams ) {
-}
+Expression::Expression( const Expression &other ) : BaseSyntaxNode( other ), result( maybeClone( other.result ) ), env( maybeClone( other.env ) ), extension( other.extension ), inferParams( other.inferParams ), resnSlots( other.resnSlots ) {}
 
 void Expression::spliceInferParams( Expression * other ) {
@@ -55 +54 @@
                 inferParams[p.first] = std::move( p.second );
         }
+        resnSlots.insert( resnSlots.end(), other->resnSlots.begin(), other->resnSlots.end() );
 }
 
@@ -376 +376 @@
         os << "Untyped Member Expression, with field: " << std::endl << indent+1;
         member->print(os, indent+1 );
-        os << indent << "... from aggregate: " << std::endl << indent+1;
+        os << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent+1);
         Expression::print( os, indent );
@@ -405 +405 @@
 
 void MemberExpr::print( std::ostream &os, Indenter indent ) const {
-        os << "Member Expression, with field: " << std::endl;
+        os << "Member Expression, with field:" << std::endl;
         os << indent+1;
         member->print( os, indent+1 );
-        os << std::endl << indent << "... from aggregate: " << std::endl << indent+1;
+        os << std::endl << indent << "... from aggregate:" << std::endl << indent+1;
         aggregate->print(os, indent + 1);
         Expression::print( os, indent );

src/SynTree/Expression.h

@@ -21 +21 @@
 #include <memory>                 // for allocator, unique_ptr
 #include <string>                 // for string
+#include <vector>                 // for vector
 
 #include "BaseSyntaxNode.h"       // for BaseSyntaxNode
@@ -38 +39 @@
 /// but subject to decay-to-pointer and type parameter renaming
 struct ParamEntry {
-        ParamEntry(): decl( 0 ), actualType( 0 ), formalType( 0 ), expr( 0 ), inferParams( new InferredParams ) {}
-        ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr ), inferParams( new InferredParams ) {}
+        ParamEntry(): decl( 0 ), actualType( 0 ), formalType( 0 ), expr( 0 )/*, inferParams( new InferredParams )*/ {}
+        ParamEntry( UniqueId decl, Type * actualType, Type * formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr )/*, inferParams( new InferredParams )*/ {}
         ParamEntry( const ParamEntry & other );
         ParamEntry( ParamEntry && other );
@@ -50 +51 @@
         Type * formalType;
         Expression * expr;
-        std::unique_ptr< InferredParams > inferParams;
+        // std::unique_ptr< InferredParams > inferParams;
 };
 
@@ -59 +60 @@
         TypeSubstitution * env;
         bool extension = false;
-        InferredParams inferParams;
+        InferredParams inferParams;       ///< Post-resolution inferred parameter slots
+        std::vector<UniqueId> resnSlots;  ///< Pre-resolution inferred parameter slots
+        
+        // xxx - should turn inferParams+resnSlots into a union to save some memory
 
         Expression();
@@ -73 +77 @@
         bool get_extension() const { return extension; }
         Expression * set_extension( bool exten ) { extension = exten; return this; }
-
-        InferredParams & get_inferParams() { return inferParams; }
 
         // move other's inferParams to this

src/SynTree/FunctionDecl.cc

@@ -87 +87 @@
 
         if ( statements ) {
-                os << indent << "... with body " << endl << indent+1;
+                os << indent << "... with body" << endl << indent+1;
                 statements->print( os, indent+1 );
         } // if

src/SynTree/FunctionType.cc

@@ -66 +66 @@
                 os << indent+1 << "accepting unspecified arguments" << endl;
         } // if
-        os << indent << "... returning ";
+        os << indent << "... returning";
         if ( returnVals.empty() ) {
-                os << "nothing " << endl;
+                os << " nothing" << endl;
         } else {
                 os << endl;

src/SynTree/ObjectDecl.cc

@@ -66 +66 @@
 
         if ( ! attributes.empty() ) {
-                os << std::endl << indent << "... with attributes: " << std::endl;
+                os << std::endl << indent << "... with attributes:" << std::endl;
                 printAll( attributes, os, indent+1 );
         }

src/SynTree/ReferenceToType.cc

@@ -93 +93 @@
         else {
                 Type::print( os, indent );
-                os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseStruct->has_body();
                 if ( ! parameters.empty() ) {
                         os << endl << indent << "... with parameters" << endl;
@@ -136 +136 @@
         else {
                 Type::print( os, indent );
-                os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseUnion->has_body();
                 if ( ! parameters.empty() ) {
                         os << endl << indent << "... with parameters" << endl;
@@ -160 +160 @@
         else {
                 Type::print( os, indent );
-                os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body() << " ";
+                os << "instance of " << typeString() << " " << name << " with body " << baseEnum->has_body();
         } // if
 }