Changeset a181494 for src/SymTab

Timestamp:

Feb 21, 2018, 4:07:10 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:

5a806be4

Parents:

599fbb6

git-author:

Rob Schluntz <rschlunt@…> (02/21/18 15:52:43)

git-committer:

Rob Schluntz <rschlunt@…> (02/21/18 16:07:10)

Message:

Adding cost for reference-to-rvalue conversions

Location:

src/SymTab

Files:

• Indexer.cc (modified) (2 diffs)
• Indexer.h (modified) (2 diffs)

src/SymTab/Indexer.cc

@@ -603 +603 @@
                                         if ( dynamic_cast< StructInstType * >( t ) || dynamic_cast< UnionInstType * >( t ) ) {
                                                 Expression * base = expr->clone();
-                                                ResolvExpr::referenceToRvalueConversion( base );
+                                                ResolvExpr::Cost cost = ResolvExpr::Cost::zero; // xxx - carry this cost into the indexer as a base cost?
+                                                ResolvExpr::referenceToRvalueConversion( base, cost );
                                                 addMembers( t->getAggr(), new MemberExpr( dwt, base ), handleConflicts );
                                         }
@@ -705 +706 @@
         }
 
-        Expression * Indexer::IdData::combine() const {
+        Expression * Indexer::IdData::combine( ResolvExpr::Cost & cost ) const {
                 Expression * ret = nullptr;
                 if ( baseExpr ) {
                         Expression * base = baseExpr->clone();
-                        ResolvExpr::referenceToRvalueConversion( base );
+                        ResolvExpr::referenceToRvalueConversion( base, cost );
                         ret = new MemberExpr( id, base );
                         // xxx - this introduces hidden environments, for now remove them.

src/SymTab/Indexer.h

@@ -23 +23 @@
 #include "SynTree/Visitor.h"  // for Visitor
 #include "SynTree/SynTree.h"  // for AST nodes
+
+namespace ResolvExpr {
+class Cost;
+}
 
 namespace SymTab {
@@ -51 +55 @@
                         IdData( DeclarationWithType * id, Expression * baseExpr, BaseSyntaxNode * deleteStmt ) : id( id ), baseExpr( baseExpr ), deleteStmt( deleteStmt ) {}
 
-                        Expression * combine() const;
+                        Expression * combine( ResolvExpr::Cost & cost ) const;
                 };