Changes in src/InitTweak/FixInitNew.cpp [fb4dc28:e563edf]

File:

• src/InitTweak/FixInitNew.cpp (modified) (13 diffs)

src/InitTweak/FixInitNew.cpp

@@ -14 +14 @@
 #include <utility>                     // for pair
 
-#include "AST/DeclReplacer.hpp"
-#include "AST/Expr.hpp"
 #include "AST/Inspect.hpp"             // for getFunction, getPointerBase, g...
-#include "AST/Node.hpp"
-#include "AST/Pass.hpp"
-#include "AST/Print.hpp"
-#include "AST/SymbolTable.hpp"
-#include "AST/Type.hpp"
 #include "CodeGen/GenType.h"           // for genPrettyType
 #include "CodeGen/OperatorTable.h"
+#include "Common/CodeLocationTools.hpp"
 #include "Common/PassVisitor.h"        // for PassVisitor, WithStmtsToAdd
 #include "Common/SemanticError.h"      // for SemanticError
-#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for CodeLocation, ValueGuard, toSt...
 #include "FixGlobalInit.h"             // for fixGlobalInit
 #include "GenInit.h"                   // for genCtorDtor
@@ -34 +28 @@
 #include "ResolvExpr/Unify.h"          // for typesCompatible
 #include "SymTab/Autogen.h"            // for genImplicitCall
-#include "SymTab/GenImplicitCall.hpp"  // for genImplicitCall
 #include "SymTab/Indexer.h"            // for Indexer
 #include "SymTab/Mangler.h"            // for Mangler
@@ -52 +45 @@
 #include "Validate/FindSpecialDecls.h" // for dtorStmt, dtorStructDestroy
 
+#include "AST/Expr.hpp"
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Print.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
+#include "AST/DeclReplacer.hpp"
+
 extern bool ctordtorp; // print all debug
 extern bool ctorp; // print ctor debug
@@ -62 +63 @@
 namespace InitTweak {
 namespace {
-
-        // Shallow copy the pointer list for return.
-        std::vector<ast::ptr<ast::TypeDecl>> getGenericParams( const ast::Type * t ) {
-                if ( auto inst = dynamic_cast<const ast::StructInstType *>( t ) ) {
-                        return inst->base->params;
-                }
-                if ( auto inst = dynamic_cast<const ast::UnionInstType *>( t ) ) {
-                        return inst->base->params;
-                }
-                return {};
-        }
-
-        /// Given type T, generate type of default ctor/dtor, i.e. function type void (*) (T &).
-        ast::FunctionDecl * genDefaultFunc(
-                        const CodeLocation loc,
-                        const std::string fname,
-                        const ast::Type * paramType,
-                        bool maybePolymorphic = true) {
-                std::vector<ast::ptr<ast::TypeDecl>> typeParams;
-                if ( maybePolymorphic ) typeParams = getGenericParams( paramType );
-                auto dstParam = new ast::ObjectDecl( loc,
-                        "_dst",
-                        new ast::ReferenceType( paramType ),
-                        nullptr,
-                        {},
-                        ast::Linkage::Cforall
-                );
-                return new ast::FunctionDecl( loc,
-                        fname,
-                        std::move(typeParams),
-                        {dstParam},
-                        {},
-                        new ast::CompoundStmt(loc),
-                        {},
-                        ast::Linkage::Cforall
-                );
-        }
-
         struct SelfAssignChecker {
                 void previsit( const ast::ApplicationExpr * appExpr );
@@ -144 +107 @@
         private:
                 /// hack to implement WithTypeSubstitution while conforming to mutation safety.
-                ast::TypeSubstitution * env         = nullptr;
-                bool                    envModified = false;
+                ast::TypeSubstitution * env;
+                bool                    envModified;
         };
 
@@ -158 +121 @@
                 void previsit( const ast::FunctionDecl * ) { visit_children = false; }
 
-        protected:
+          protected:
                 ObjectSet curVars;
         };
@@ -239 +202 @@
 
                 SemanticErrorException errors;
-        private:
+          private:
                 template< typename... Params >
                 void emit( CodeLocation, const Params &... params );
@@ -325 +288 @@
                 static UniqueName dtorNamer( "__cleanup_dtor" );
                 std::string name = dtorNamer.newName();
-                ast::FunctionDecl * dtorFunc = genDefaultFunc( loc, name, objDecl->type->stripReferences(), false );
+                ast::FunctionDecl * dtorFunc = SymTab::genDefaultFunc( loc, name, objDecl->type->stripReferences(), false );
                 stmtsToAdd.push_back( new ast::DeclStmt(loc, dtorFunc ) );
 
@@ -559 +522 @@
         {
                 static UniqueName tempNamer("_tmp_cp");
+                assert( env );
                 const CodeLocation loc = impCpCtorExpr->location;
                 // CP_CTOR_PRINT( std::cerr << "Type Substitution: " << *env << std::endl; )
@@ -570 +534 @@
 
                 // xxx - this originally mutates arg->result in place. is it correct?
-                assert( env );
                 result = env->applyFree( result.get() ).node;
                 auto mutResult = result.get_and_mutate();
@@ -1117 +1080 @@
         void InsertDtors::previsit( const ast::BranchStmt * stmt ) {
                 switch( stmt->kind ) {
-                case ast::BranchStmt::Continue:
-                case ast::BranchStmt::Break:
+                  case ast::BranchStmt::Continue:
+                  case ast::BranchStmt::Break:
                         // could optimize the break/continue case, because the S_L-S_G check is unnecessary (this set should
                         // always be empty), but it serves as a small sanity check.
-                case ast::BranchStmt::Goto:
+                  case ast::BranchStmt::Goto:
                         handleGoto( stmt );
                         break;
-                default:
+                  default:
                         assert( false );
                 } // switch
@@ -1340 +1303 @@
         }
 
+        template< typename Visitor, typename... Params >
+        void error( Visitor & v, CodeLocation loc, const Params &... params ) {
+                SemanticErrorException err( loc, toString( params... ) );
+                v.errors.append( err );
+        }
+
         template< typename... Params >
         void GenStructMemberCalls::emit( CodeLocation loc, const Params &... params ) {
-                SemanticErrorException err( loc, toString( params... ) );
-                errors.append( err );
+                // toggle warnings vs. errors here.
+                // warn( params... );
+                error( *this, loc, params... );
         }
 
@@ -1349 +1319 @@
                 // xxx - functions returning ast::ptr seems wrong...
                 auto res = ResolvExpr::findVoidExpression( untypedExpr, { symtab, transUnit().global } );
-                return res.release();
+                // Fix CodeLocation (at least until resolver is fixed).
+                auto fix = localFillCodeLocations( untypedExpr->location, res.release() );
+                return strict_dynamic_cast<const ast::Expr *>( fix );
         }