Changeset d5f6a14 for src

Timestamp:

Jul 5, 2021, 2:11:58 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7763da

Parents:

f7f07f6 (diff), 943bfad (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

Files:

• AST/Node.cpp (modified) (1 diff)
• GenPoly/GenPoly.cc (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (5 diffs)
• ResolvExpr/Unify.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (2 diffs)
• SynTree/AggregateDecl.cc (modified) (1 diff)
• SynTree/ReferenceToType.cc (modified) (1 diff)

src/AST/Node.cpp

@@ -47 +47 @@
         const ast::ParseNode * parse = dynamic_cast<const ast::ParseNode *>( node );
         if ( nullptr == parse ) {
-                assertf(nullptr, "%s (no location)", toString(node).c_str());
+                assertf(false, "%s (no location)", toString(node).c_str());
         } else if ( parse->location.isUnset() ) {
-                assertf(nullptr, "%s (unset location)", toString(node).c_str());
+                assertf(false, "%s (unset location)", toString(node).c_str());
         } else {
-                assertf(nullptr, "%s (at %s:%d)", toString(node).c_str(),
+                assertf(false, "%s (at %s:%d)", toString(node).c_str(),
                         parse->location.filename.c_str(), parse->location.first_line);
         }

src/GenPoly/GenPoly.cc

@@ -64 +64 @@
                 }
 
+                __attribute__((ununsed))
                 bool hasPolyParams( const std::vector<ast::ptr<ast::Expr>> & params, const TyVarMap & tyVars, const ast::TypeSubstitution * env) {
                         for (auto &param : params) {

src/ResolvExpr/CandidateFinder.cpp

@@ -597 +597 @@
                 const ast::SymbolTable & symtab;
         public:
-                static size_t traceId;
+                // static size_t traceId;
                 CandidateFinder & selfFinder;
                 CandidateList & candidates;
@@ -890 +890 @@
                                                         }
                                                 }
-                                                
+
                                                 // if argType is an unbound type parameter, all special functions need to be searched.
                                                 if (isUnboundType(argType)) {
@@ -1104 +1104 @@
                                 // unification run for side-effects
                                 unify( toType, cand->expr->result, cand->env, need, have, open, symtab );
-                                Cost thisCost = 
+                                Cost thisCost =
                                         (castExpr->isGenerated == ast::GeneratedFlag::GeneratedCast)
                             ? conversionCost( cand->expr->result, toType, cand->expr->get_lvalue(), symtab, cand->env )
@@ -1729 +1729 @@
                                                 found->second.ambiguous = true;
                                         }
-                                } else { 
+                                } else {
                                         // xxx - can satisfyAssertions increase the cost?
                                         PRINT(
                                                 std::cerr << "cost " << newCand->cost << " loses to "
                                                         << found->second.candidate->cost << std::endl;
-                                        )       
+                                        )
                                 }
                         } else {
@@ -1819 +1819 @@
                 if ( mode.failFast && pruned.empty() ) {
                         std::ostringstream stream;
-                        if (found) {            
+                        if (found) {
                                 CandidateList winners = findMinCost( candidates );
                                 stream << "Cannot choose between " << winners.size() << " alternatives for "

src/ResolvExpr/Unify.cc

@@ -1044 +1044 @@
                         }
 
-                        return { new ast::TupleType{ std::move(out) } };
+                        return new ast::TupleType{ std::move(out) };
                 }
 

src/SymTab/Validate.cc

@@ -1628 +1628 @@
                 }
         };
-        */
 
         /// expand assertions from a trait instance, performing appropriate type variable substitutions
@@ -1646 +1645 @@
                 }
         }
-
-        /*
 
         /// Associates forward declarations of aggregates with their definitions

src/SynTree/AggregateDecl.cc

@@ -92 +92 @@
         std::list< Expression * > copy_parameters;
         cloneAll( new_parameters, copy_parameters );
-        return makeInst( move( copy( copy_parameters ) ) );
+        return makeInst( copy( copy_parameters ) );
 }
 

src/SynTree/ReferenceToType.cc

@@ -207 +207 @@
         Type::print( os, indent );
         os << "instance of " << typeString() << " ";
-        const auto & name_ = get_name();
         if( deterministic_output && isUnboundType(name) ) os << "[unbound]";
         else os << name;