Changeset b58affe7 for src/ResolvExpr/Resolver.cc

Timestamp:

Jun 24, 2019, 11:24:31 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

0e464f6, 3253c32

Parents:

4d978d5 (diff), c1ea11b (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) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -1154 +1154 @@
                         return findKindExpression( untyped, symtab );
                 }
-
-                /// Resolve `untyped` to the single expression whose candidate is the best match for the 
-                /// given type.
+        } // anonymous namespace
+
                 ast::ptr< ast::Expr > findSingleExpression(
                         const ast::Expr * untyped, const ast::Type * type, const ast::SymbolTable & symtab
@@ -1167 +1166 @@
                 }
 
+        namespace {
                 /// Predicate for "Candidate has integral type"
                 bool hasIntegralType( const Candidate & i ) {