Changeset 8d70648 for src/ResolvExpr/Resolver.cc

Timestamp:

May 30, 2019, 4:15:08 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

a935892, f474e91

Parents:

d76c588 (diff), d88f8b3b (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

File:

• src/ResolvExpr/Resolver.cc (modified) (8 diffs)

src/ResolvExpr/Resolver.cc

@@ -45 +45 @@
 #include "SynTree/Visitor.h"             // for acceptAll, maybeAccept
 #include "Tuples/Tuples.h"
+#include "Validate/FindSpecialDecls.h"   // for SizeType
 
 using namespace std;
@@ -237 +238 @@
                                 winner.cost = winner.cvtCost;
                         }
-                        
+
                         // produce ambiguous errors, if applicable
                         if ( winners.size() != 1 ) {
@@ -257 +258 @@
 
                         // xxx - check for ambiguous expressions
-                        
+
                         // output selected choice
                         alt = std::move( choice );
@@ -421 +422 @@
         void Resolver_old::handlePtrType( PtrType * type ) {
                 if ( type->get_dimension() ) {
-                        findSingleExpression( type->dimension, SymTab::SizeType->clone(), indexer );
+                        findSingleExpression( type->dimension, Validate::SizeType->clone(), indexer );
                 }
         }
@@ -446 +447 @@
                 // default value expressions have an environment which shouldn't be there and trips up 
                 // later passes.
-                // xxx - it might be necessary to somehow keep the information from this environment, but I 
+                // xxx - it might be necessary to somehow keep the information from this environment, but I
                 // can't currently see how it's useful.
                 for ( Declaration * d : functionDecl->type->parameters ) {
@@ -797 +798 @@
                 initExpr->expr = nullptr;
                 std::swap( initExpr->env, newExpr->env );
-                // InitExpr may have inferParams in the case where the expression specializes a function 
-                // pointer, and newExpr may already have inferParams of its own, so a simple swap is not 
+                // InitExpr may have inferParams in the case where the expression specializes a function
+                // pointer, and newExpr may already have inferParams of its own, so a simple swap is not
                 // sufficient.
                 newExpr->spliceInferParams( initExpr );
                 delete initExpr;
 
-                // get the actual object's type (may not exactly match what comes back from the resolver 
+                // get the actual object's type (may not exactly match what comes back from the resolver
                 // due to conversions)
                 Type * initContext = currentObject.getCurrentType();
@@ -816 +817 @@
                                         if ( isCharType( pt->get_base() ) ) {
                                                 if ( CastExpr * ce = dynamic_cast< CastExpr * >( newExpr ) ) {
-                                                        // strip cast if we're initializing a char[] with a char *, 
+                                                        // strip cast if we're initializing a char[] with a char *,
                                                         // e.g.  char x[] = "hello";
                                                         newExpr = ce->get_arg();
@@ -839 +840 @@
                 // move cursor into brace-enclosed initializer-list
                 currentObject.enterListInit();
-                // xxx - fix this so that the list isn't copied, iterator should be used to change current 
+                // xxx - fix this so that the list isn't copied, iterator should be used to change current
                 // element
                 std::list<Designation *> newDesignations;
                 for ( auto p : group_iterate(listInit->get_designations(), listInit->get_initializers()) ) {
-                        // iterate designations and initializers in pairs, moving the cursor to the current 
+                        // iterate designations and initializers in pairs, moving the cursor to the current
                         // designated object and resolving the initializer against that object.
                         Designation * des = std::get<0>(p);