Changeset d99a716 for src

Timestamp:

Jan 4, 2023, 1:44:19 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

339e30a, a14926b

Parents:

0348fd8 (diff), 66a89e7 (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.hpp (modified) (2 diffs)
• AST/Pass.proto.hpp (modified) (2 diffs)
• CompilationState.cc (modified) (1 diff)
• CompilationState.h (modified) (1 diff)
• GenPoly/Box.cc (modified) (3 diffs)
• GenPoly/ScrubTyVars.cc (modified) (4 diffs)
• GenPoly/ScrubTyVars.h (modified) (5 diffs)
• Parser/RunParser.cpp (modified) (3 diffs)
• Parser/RunParser.hpp (modified) (3 diffs)
• main.cc (modified) (6 diffs)

src/AST/Pass.hpp

@@ -86 +86 @@
         {
                 // After the pass is constructed, check if it wants the have a pointer to the wrapping visitor
-                type * const * visitor = __pass::visitor(core, 0);
-                if(visitor) {
+                type * const * visitor = __pass::visitor( core, 0 );
+                if ( visitor ) {
                         *const_cast<type **>( visitor ) = this;
                 }
@@ -98 +98 @@
 
         /// If the core defines a result, call it if possible, otherwise return it.
-        inline auto get_result() -> decltype( __pass::get_result( core, '0' ) ) {
-                return __pass::get_result( core, '0' );
+        inline auto get_result() -> decltype( __pass::result::get( core, '0' ) ) {
+                return __pass::result::get( core, '0' );
         }
 

src/AST/Pass.proto.hpp

@@ -489 +489 @@
                 template<typename core_t>
                 static inline auto replace( core_t &, long, const ast::TypeInstType *& ) {}
-
         } // namespace forall
 
@@ -506 +505 @@
         }
 
-        template<typename core_t>
-        static inline auto get_result( core_t & core, char ) -> decltype( core.result() ) {
-                return core.result();
-        }
-
-        template<typename core_t>
-        static inline auto get_result( core_t & core, int ) -> decltype( core.result ) {
-                return core.result;
-        }
-
-        template<typename core_t>
-        static inline void get_result( core_t &, long ) {}
+        // For passes, usually utility passes, that have a result.
+        namespace result {
+                template<typename core_t>
+                static inline auto get( core_t & core, char ) -> decltype( core.result() ) {
+                        return core.result();
+                }
+
+                template<typename core_t>
+                static inline auto get( core_t & core, int ) -> decltype( core.result ) {
+                        return core.result;
+                }
+
+                template<typename core_t>
+                static inline void get( core_t &, long ) {}
+        }
 } // namespace __pass
 } // namespace ast

src/CompilationState.cc

@@ -33 +33 @@
         useNewAST = true,
         nomainp = false,
-        parsep = false,
         resolvep = false,
         resolvprotop = false,

src/CompilationState.h

@@ -32 +32 @@
         useNewAST,
         nomainp,
-        parsep,
         resolvep,
         resolvprotop,

src/GenPoly/Box.cc

@@ -424 +424 @@
         namespace {
                 std::string makePolyMonoSuffix( FunctionType const * function, const TyVarMap &tyVars ) {
-                        std::stringstream name;
-
                         // NOTE: this function previously used isPolyObj, which failed to produce
                         // the correct thing in some situations. It's not clear to me why this wasn't working.
@@ -432 +430 @@
                         // to take those polymorphic types as pointers. Therefore, there can be two different functions
                         // with the same mangled name, so we need to further mangle the names.
+                        std::stringstream name;
                         for ( DeclarationWithType const * const ret : function->returnVals ) {
-                                if ( isPolyType( ret->get_type(), tyVars ) ) {
-                                        name << "P";
-                                } else {
-                                        name << "M";
-                                }
-                        }
-                        name << "_";
+                                name << ( isPolyType( ret->get_type(), tyVars ) ? 'P' : 'M' );
+                        }
+                        name << '_';
                         for ( DeclarationWithType const * const arg : function->parameters ) {
-                                if ( isPolyType( arg->get_type(), tyVars ) ) {
-                                        name << "P";
-                                } else {
-                                        name << "M";
-                                }
-                        } // for
+                                name << ( isPolyType( arg->get_type(), tyVars ) ? 'P' : 'M' );
+                        }
                         return name.str();
                 }
@@ -565 +556 @@
                         // even when converted to strings, sort in the original order.
                         // (At least, that is the best explination I have.)
-                        for ( std::pair<std::string, TypeDecl::Data> const & tyParam : exprTyVars ) {
+                        for ( std::pair<const std::string, TypeDecl::Data> const & tyParam : exprTyVars ) {
                                 if ( !tyParam.second.isComplete ) continue;
                                 Type *concrete = env->lookup( tyParam.first );

src/GenPoly/ScrubTyVars.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct  7 15:42:00 2022
-// Update Count     : 5
+// Last Modified On : Wed Dec  7 17:01:00 2022
+// Update Count     : 6
 //
 
@@ -117 +117 @@
 namespace {
 
-enum class ScrubMode {
-        FromMap,
-        DynamicFromMap,
-        All,
-};
-
 struct ScrubTypeVars :
         public ast::WithGuards,
@@ -253 +247 @@
 }
 
+} // namespace
+
 const ast::Node * scrubTypeVarsBase(
-                const ast::Node * target,
-                ScrubMode mode, const TypeVarMap * typeVars ) {
+                const ast::Node * node, const TypeVarMap * typeVars, ScrubMode mode ) {
         if ( ScrubMode::All == mode ) {
                 assert( nullptr == typeVars );
@@ -262 +257 @@
         }
         ast::Pass<ScrubTypeVars> visitor( mode, typeVars );
-        return target->accept( visitor );
-}
-
-} // namespace
-
-template<>
-ast::Node const * scrubTypeVars<ast::Node>(
-        const ast::Node * target, const TypeVarMap & typeVars ) {
-        return scrubTypeVarsBase( target, ScrubMode::FromMap, &typeVars );
-}
-
-template<>
-ast::Node const * scrubTypeVarsDynamic<ast::Node>(
-        ast::Node const * target, const TypeVarMap & typeVars ) {
-        return scrubTypeVarsBase( target, ScrubMode::DynamicFromMap, &typeVars );
-}
-
-template<>
-ast::Node const * scrubAllTypeVars<ast::Node>( const ast::Node * target ) {
-        return scrubTypeVarsBase( target, ScrubMode::All, nullptr );
+        return node->accept( visitor );
 }
 

src/GenPoly/ScrubTyVars.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Oct  7 15:51:00 2022
-// Update Count     : 4
+// Last Modified On : Wed Dec  7 16:57:00 2022
+// Update Count     : 5
 //
 
@@ -109 +109 @@
         }
 
+// ScrubMode and scrubTypeVarsBase are internal.
+enum class ScrubMode { FromMap, DynamicFromMap, All };
+
+const ast::Node * scrubTypeVarsBase(
+        const ast::Node * target, const TypeVarMap * typeVars, ScrubMode mode );
+
+
 /// For all polymorphic types with type variables in `typeVars`,
 /// replaces generic types, dtypes, and ftypes with the appropriate void type,
@@ -116 +123 @@
                 node_t const * target, const TypeVarMap & typeVars ) {
         return strict_dynamic_cast<node_t const *>(
-                        scrubTypeVars<ast::Node>( target, typeVars ) );
+                        scrubTypeVarsBase( target, &typeVars, ScrubMode::FromMap ) );
 }
 
@@ -123 +130 @@
 /// and sizeof/alignof expressions with the proper variable.
 template<typename node_t>
-ast::Node const * scrubTypeVarsDynamic(
+node_t const * scrubTypeVarsDynamic(
                 node_t const * target, const TypeVarMap & typeVars ) {
         return strict_dynamic_cast<node_t const *>(
-                        scrubTypeVarsDynamic<ast::Node>( target, typeVars ) );
+                        scrubTypeVarsBase( target, &typeVars, ScrubMode::DynamicFromMap ) );
 }
 
@@ -134 +141 @@
 node_t const * scrubAllTypeVars( node_t const * target ) {
         return strict_dynamic_cast<node_t const *>(
-                        scrubAllTypeVars<ast::Node>( target ) );
+                        scrubTypeVarsBase( target, nullptr, ScrubMode::All ) );
 }
-
-// We specialize for Node as a base case.
-template<>
-ast::Node const * scrubTypeVars<ast::Node>(
-                const ast::Node * target, const TypeVarMap & typeVars );
-
-template<>
-ast::Node const * scrubTypeVarsDynamic<ast::Node>(
-                ast::Node const * target, const TypeVarMap & typeVars );
-
-template<>
-ast::Node const * scrubAllTypeVars<ast::Node>( const ast::Node * target );
 
 } // namespace GenPoly

src/Parser/RunParser.cpp

@@ -10 +10 @@
 // Created On       : Mon Dec 19 11:00:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Dec 19 11:15:00 2022
-// Update Count     : 0
+// Last Modified On : Thr Dec 22 10:18:00 2022
+// Update Count     : 1
 //
 
 #include "RunParser.hpp"
 
+#include "AST/Convert.hpp"                  // for convert
+#include "AST/TranslationUnit.hpp"          // for TranslationUnit
+#include "CodeTools/TrackLoc.h"             // for fillLocations
+#include "Common/CodeLocationTools.hpp"     // for forceFillCodeLocations
 #include "Parser/ParseNode.h"               // for DeclarationNode, buildList
 #include "Parser/TypedefTable.h"            // for TypedefTable
@@ -41 +45 @@
 } // parse
 
-void dumpParseTree( std::ostream & out ) {
-        parseTree->printList( out );
-        delete parseTree;
-        parseTree = nullptr;
-}
-
-std::list<Declaration *> buildUnit(void) {
+ast::TranslationUnit buildUnit(void) {
         std::list<Declaration *> translationUnit;
         buildList( parseTree, translationUnit );
@@ -54 +52 @@
         parseTree = nullptr;
 
-        return translationUnit;
+        // When the parse/buildList code is translated to the new ast, these
+        // fill passes (and the one after 'Hoist Type Decls') should be redundent
+        // because the code locations should already be filled.
+        CodeTools::fillLocations( translationUnit );
+        ast::TranslationUnit transUnit = convert( std::move( translationUnit ) );
+        forceFillCodeLocations( transUnit );
+        return transUnit;
 }
 

src/Parser/RunParser.hpp

@@ -10 +10 @@
 // Created On       : Mon Dec 19 10:42:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Dec 19 11:15:00 2022
-// Update Count     : 0
+// Last Modified On : Thr Dec 22 10:23:00 2022
+// Update Count     : 1
 //
 
@@ -17 +17 @@
 
 #include <iosfwd>                           // for ostream
-#include <list>                             // for list
 
 #include "SynTree/LinkageSpec.h"            // for Spec
-class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 // The Parser does not have an enclosing namespace.
@@ -30 +31 @@
 void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit = false );
 
-/// Drain the internal accumulator of parsed code and print it to the stream.
-void dumpParseTree( std::ostream & );
-
 /// Drain the internal accumulator of parsed code and build a translation
 /// unit from it.
-std::list<Declaration *> buildUnit(void);
+ast::TranslationUnit buildUnit(void);
 
 // Local Variables: //

src/main.cc

@@ -228 +228 @@
         ostream * output = & cout;
         list< Declaration * > translationUnit;
+        ast::TranslationUnit transUnit;
 
         Signal( SIGSEGV, sigSegvBusHandler, SA_SIGINFO );
@@ -294 +295 @@
                 parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, yydebug );
 
-                if ( parsep ) {
-                        dumpParseTree( cout );
-                        return EXIT_SUCCESS;
-                } // if
-
-                translationUnit = buildUnit();
+                transUnit = buildUnit();
 
                 if ( astp ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                // Temporary: fill locations after parsing so that every node has a location, for early error messages.
-                // Eventually we should pass the locations from the parser to every node, but this quick and dirty solution
-                // works okay for now.
-                CodeTools::fillLocations( translationUnit );
+                        dump( std::move( transUnit ) );
+                        return EXIT_SUCCESS;
+                } // if
+
                 Stats::Time::StopBlock();
 
@@ -316 +308 @@
                         ast::pass_visitor_stats.max = Stats::Counters::build<Stats::Counters::MaxCounter<double>>("Max depth - New");
                 }
-                auto transUnit = convert( std::move( translationUnit ) );
-
-                forceFillCodeLocations( transUnit );
-
-                PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
-                if ( exdeclp ) {
-                        dump( std::move( transUnit ) );
-                        return EXIT_SUCCESS;
-                }
-
-                PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) );
+
                 PASS( "Hoist Type Decls", Validate::hoistTypeDecls( transUnit ) );
                 // Hoist Type Decls pulls some declarations out of contexts where
@@ -333 +315 @@
                 forceFillCodeLocations( transUnit );
 
+                PASS( "Translate Exception Declarations", ControlStruct::translateExcept( transUnit ) );
+                if ( exdeclp ) {
+                        dump( std::move( transUnit ) );
+                        return EXIT_SUCCESS;
+                }
+
+                PASS( "Verify Ctor, Dtor & Assign", Validate::verifyCtorDtorAssign( transUnit ) );
                 PASS( "Replace Typedefs", Validate::replaceTypedef( transUnit ) );
                 PASS( "Fix Return Types", Validate::fixReturnTypes( transUnit ) );
@@ -474 +463 @@
                 if ( errorp ) {
                         cerr << "---AST at error:---" << endl;
-                        dump( translationUnit, cerr );
+                        // We check which section the errors came from without looking at
+                        // transUnit because std::move means it could look like anything.
+                        if ( !translationUnit.empty() ) {
+                                dump( translationUnit, cerr );
+                        } else {
+                                dump( std::move( transUnit ), cerr );
+                        }
                         cerr << endl << "---End of AST, begin error message:---\n" << endl;
                 } // if
@@ -578 +573 @@
         { "rproto", resolvprotop, true, "resolver-proto instance" },
         { "rsteps", resolvep, true, "print resolver steps" },
-        { "tree", parsep, true, "print parse tree" },
         // code dumps
         { "ast", astp, true, "print AST after parsing" },