Changeset 2b18848 for src

Timestamp:

Nov 10, 2020, 6:03:04 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

4a36b344, 654d5a47

Parents:

1b5c3d60 (diff), 1d379b5 (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/Pass.impl.hpp (modified) (1 diff)
• AST/Pass.proto.hpp (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (2 diffs)
• ResolvExpr/SatisfyAssertions.cpp (modified) (1 diff)

src/AST/Pass.impl.hpp

@@ -423 +423 @@
                 }
                 catch( SemanticErrorException &e ) {
-                        if (__pass::onError (visitor.core, *i, 0))
+                        if (__pass::on_error (visitor.core, *i, 0))
                                 errors.append( e );
                 }

src/AST/Pass.proto.hpp

@@ -270 +270 @@
 
         template< typename core_t >
-        static bool onError (core_t &, ptr<Decl> &, long) { return true; }
-
-        template< typename core_t >
-        static auto onError (core_t & core, ptr<Decl> & decl, int) -> decltype(core.onError(decl)) {
-                return core.onError(decl); 
+        static bool on_error (core_t &, ptr<Decl> &, long) { return true; }
+
+        template< typename core_t >
+        static auto on_error (core_t & core, ptr<Decl> & decl, int) -> decltype(core.on_error(decl)) {
+                return core.on_error(decl); 
         }
 

src/ResolvExpr/Resolver.cc

@@ -1289 +1289 @@
                 void beginScope() { managedTypes.beginScope(); }
                 void endScope() { managedTypes.endScope(); }
-                bool onError(ast::ptr<ast::Decl> & decl);
+                bool on_error(ast::ptr<ast::Decl> & decl);
         };
         // size_t Resolver_new::traceId = Stats::Heap::new_stacktrace_id("Resolver");
@@ -2068 +2068 @@
 
         // suppress error on autogen functions and mark invalid autogen as deleted.
-        bool Resolver_new::onError(ast::ptr<ast::Decl> & decl) {
+        bool Resolver_new::on_error(ast::ptr<ast::Decl> & decl) {
                 if (auto functionDecl = decl.as<ast::FunctionDecl>()) {
                         // xxx - can intrinsic gen ever fail?

src/ResolvExpr/SatisfyAssertions.cpp

@@ -247 +247 @@
                                 auto it = inferred.find( slot );
                                 if ( it == inferred.end() ) {
-                                        std::cerr << "missing assertion " << slot << std::endl;
+                                        // std::cerr << "missing assertion " << slot << std::endl;
                                         missingSlots.push_back(slot);
                                         continue;