Changeset 6c3a988f for src/SynTree

Timestamp:

Jan 5, 2017, 3:47:36 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

f831177

Parents:

1e3d5b6

Message:

fix inferred parameter data structures to correctly associate parameters with the entity that requested them, modify tuple specialization and unification to work with self-recursive assertions

Location:

src/SynTree

Files:

• ApplicationExpr.cc (modified) (4 diffs)
• Expression.h (modified) (2 diffs)
• TupleExpr.cc (modified) (1 diff)

src/SynTree/ApplicationExpr.cc ¶

@@ -24 +24 @@
 
 ParamEntry::ParamEntry( const ParamEntry &other ) :
-                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ) {
+                decl( other.decl ), actualType( maybeClone( other.actualType ) ), formalType( maybeClone( other.formalType ) ), expr( maybeClone( other.expr ) ), inferParams( new InferredParams( *other.inferParams ) ) {
 }
 
@@ -34 +34 @@
         formalType = maybeClone( other.formalType );
         expr = maybeClone( other.expr );
+        *inferParams = *other.inferParams;
         return *this;
 }
@@ -62 +63 @@
 }
 
+void printInferParams( const InferredParams & inferParams, std::ostream &os, int indent, int level ) {
+        if ( ! inferParams.empty() ) {
+                os << std::string(indent, ' ') << "with inferred parameters " << level << ":" << std::endl;
+                for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
+                        os << std::string(indent+2, ' ');
+                        Declaration::declFromId( i->second.decl )->printShort( os, indent+2 );
+                        os << std::endl;
+                        printInferParams( *i->second.inferParams, os, indent+2, level+1 );
+                } // for
+        } // if
+}
+
 void ApplicationExpr::print( std::ostream &os, int indent ) const {
         os << "Application of" << std::endl << std::string(indent+2, ' ');
@@ -69 +82 @@
                 printAll( args, os, indent+2 );
         } // if
-        if ( ! inferParams.empty() ) {
-                os << std::string(indent, ' ') << "with inferred parameters:" << std::endl;
-                for ( InferredParams::const_iterator i = inferParams.begin(); i != inferParams.end(); ++i ) {
-                        os << std::string(indent+2, ' ');
-                        Declaration::declFromId( i->second.decl )->printShort( os, indent+2 );
-                        os << std::endl;
-                } // for
-        } // if
+        printInferParams( inferParams, os, indent+2, 0 );
         Expression::print( os, indent );
 }

src/SynTree/Expression.h ¶

@@ -54 +54 @@
 };
 
+struct ParamEntry;
+typedef std::map< UniqueId, ParamEntry > InferredParams;
+
 /// ParamEntry contains the i.d. of a declaration and a type that is derived from that declaration,
 /// but subject to decay-to-pointer and type parameter renaming
 struct ParamEntry {
-        ParamEntry(): decl( 0 ), actualType( 0 ), formalType( 0 ), expr( 0 ) {}
-        ParamEntry( UniqueId decl, Type *actualType, Type *formalType, Expression* expr ): decl( decl ), actualType( actualType ), formalType( formalType ), expr( expr ) {}
+        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();
@@ -67 +70 @@
         Type *formalType;
         Expression* expr;
-};
-
-typedef std::map< UniqueId, ParamEntry > InferredParams;
+        std::unique_ptr< InferredParams > inferParams;
+};
 
 /// ApplicationExpr represents the application of a function to a set of parameters.  This is the result of running an

src/SynTree/TupleExpr.cc ¶

@@ -58 +58 @@
 TupleIndexExpr::TupleIndexExpr( Expression * tuple, unsigned int index ) : tuple( tuple ), index( index )  {
         TupleType * type = safe_dynamic_cast< TupleType * >( tuple->get_result() );
-        assertf( type->size() > index, "TupleIndexExpr index out of bounds: tuple size %d, requested index %d", type->size(), index );
+        assertf( type->size() > index, "TupleIndexExpr index out of bounds: tuple size %d, requested index %d in expr %s", type->size(), index, toString( tuple ).c_str() );
         set_result( (*std::next( type->get_types().begin(), index ))->clone() );
         get_result()->set_isLvalue( type->get_isLvalue() );