Changeset 98399b2 for src/ResolvExpr

Timestamp:

Aug 9, 2019, 11:09:43 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

4f5a8a2

Parents:

8c63bb4 (diff), 0f19f5e5 (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/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• ConversionCost.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -1135 +1135 @@
         bool isLvalue( Expression *expr ) {
                 // xxx - recurse into tuples?
-                return expr->result && ( expr->result->get_lvalue() || dynamic_cast< ReferenceType * >( expr->result ) );
+                return expr->result && ( expr->get_lvalue() || dynamic_cast< ReferenceType * >( expr->result ) );
         }
 

src/ResolvExpr/ConversionCost.cc

@@ -98 +98 @@
         }
 
-        Cost convertToReferenceCost( const Type * src, const Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
+        static Cost convertToReferenceCost( const Type * src, const Type * dest, int diff, const SymTab::Indexer & indexer, const TypeEnvironment & env, PtrsFunction func ) {
                 PRINT( std::cerr << "convert to reference cost... diff " << diff << " " << src << " / " << dest << std::endl; )
                 if ( diff > 0 ) {
@@ -534 +534 @@
 }
 
-Cost convertToReferenceCost( const ast::Type * src, const ast::Type * dst, int diff,
-                const ast::SymbolTable & symtab, const ast::TypeEnvironment & env,
+static Cost convertToReferenceCost( const ast::Type * src, const ast::Type * dst,
+                int diff, const ast::SymbolTable & symtab, const ast::TypeEnvironment & env,
                 NumCostCalculation func ) {
         if ( 0 < diff ) {