Changes in / [8568319:3cd5fdd]

Location:

src

Files:

• AST/Print.hpp (modified) (1 diff)
• AST/SymbolTable.hpp (modified) (1 diff)
• AST/porting.md (modified) (1 diff)
• Common/Indenter.h (modified) (1 diff)
• Makefile.in (modified) (4 diffs)
• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• ResolvExpr/Candidate.cpp (added)
• ResolvExpr/Candidate.hpp (added)
• ResolvExpr/CandidateFinder.cpp (added)
• ResolvExpr/CandidateFinder.hpp (added)
• ResolvExpr/ResolveAssertions.cc (modified) (2 diffs)
• ResolvExpr/Resolver.cc (modified) (12 diffs)
• ResolvExpr/module.mk (modified) (1 diff)
• ResolvExpr/typeops.h (modified) (1 diff)
• SynTree/BaseSyntaxNode.h (modified) (1 diff)

src/AST/Print.hpp

@@ -29 +29 @@
 void print( std::ostream & os, const ast::Node * node, Indenter indent = {} );
 
-/// Wrap any standard format printer (matching above) with integer Indenter constructor
-template<typename T>
-inline void print( std::ostream & os, T && x, unsigned int indent ) {
-    print( os, std::forward<T>(x), Indenter{ Indenter::tabsize, indent });
-}
-
 /// Print a declaration in its short form
 void printShort( std::ostream & os, const ast::Decl * node, Indenter indent = {} );
 
 inline void printShort( std::ostream & os, const ast::Decl * node, unsigned int indent ) {
-    printShort( os, node, Indenter{ Indenter::tabsize, indent } );
+    printShort( os, node, Indenter{ indent } );
 }
 

src/AST/SymbolTable.hpp

@@ -85 +85 @@
 
 public:
-        explicit SymbolTable();
+        SymbolTable();
         ~SymbolTable();
 

src/AST/porting.md

@@ -295 +295 @@
 * changed `WidenMode widenMode` => `WidenMode widen`
 
+`Alternative` => `Candidate`
+* `openVars` => `open`
+
 [1] https://gcc.gnu.org/onlinedocs/gcc-9.1.0/gcc/Type-Attributes.html#Type-Attributes
 

src/Common/Indenter.h

@@ -18 +18 @@
 
 struct Indenter {
-        static unsigned tabsize;
+        static unsigned tabsize;  ///< default number of spaces in one level of indentation
 
-        Indenter( unsigned int amt = tabsize, unsigned int indent = 0 ) : amt( amt ), indent( indent ) {}
-        unsigned int amt;  // amount 1 level increases indent by (i.e. how much to increase by in operator++)
-        unsigned int indent;
+        unsigned int indent;      ///< number of spaces to indent
+        unsigned int amt;         ///< spaces in one level of indentation
 
+        Indenter( unsigned int indent = 0, unsigned int amt = tabsize ) 
+        : indent( indent*amt ), amt( amt ) {}
+        
         Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
         Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }

src/Makefile.in

@@ -189 +189 @@
         ResolvExpr/Alternative.$(OBJEXT) \
         ResolvExpr/AlternativeFinder.$(OBJEXT) \
+        ResolvExpr/Candidate.$(OBJEXT) \
+        ResolvExpr/CandidateFinder.$(OBJEXT) \
         ResolvExpr/CastCost.$(OBJEXT) ResolvExpr/CommonType.$(OBJEXT) \
         ResolvExpr/ConversionCost.$(OBJEXT) \
@@ -622 +624 @@
       ResolvExpr/Alternative.cc \
       ResolvExpr/AlternativeFinder.cc \
+      ResolvExpr/Candidate.cpp \
+      ResolvExpr/CandidateFinder.cpp \
       ResolvExpr/CastCost.cc \
       ResolvExpr/CommonType.cc \
@@ -872 +876 @@
 ResolvExpr/AlternativeFinder.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
         ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/Candidate.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
+ResolvExpr/CandidateFinder.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
+        ResolvExpr/$(DEPDIR)/$(am__dirstamp)
 ResolvExpr/CastCost.$(OBJEXT): ResolvExpr/$(am__dirstamp) \
         ResolvExpr/$(DEPDIR)/$(am__dirstamp)
@@ -1254 +1262 @@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/AlternativeFinder.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/AlternativePrinter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/Candidate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/CandidateFinder.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/CastCost.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ResolvExpr/$(DEPDIR)/CommonType.Po@am__quote@

src/ResolvExpr/AlternativeFinder.cc

@@ -136 +136 @@
 
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt ) {
-                Indenter indent = { Indenter::tabsize, indentAmt };
+                Indenter indent = { indentAmt };
                 for ( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) {
                         i->print( os, indent );

src/ResolvExpr/ResolveAssertions.cc

@@ -365 +365 @@
                                         // fail early if any assertion is not resolvable
                                         if ( ! resolveAssertion( assn, resn ) ) {
-                                                Indenter tabs{ Indenter::tabsize, 3 };
+                                                Indenter tabs{ 3 };
                                                 std::ostringstream ss;
                                                 ss << tabs << "Unsatisfiable alternative:\n";
@@ -391 +391 @@
                                         // fail early if no mutually-compatible assertion satisfaction
                                         if ( compatible.empty() ) {
-                                                Indenter tabs{ Indenter::tabsize, 3 };
+                                                Indenter tabs{ 3 };
                                                 std::ostringstream ss;
                                                 ss << tabs << "Unsatisfiable alternative:\n";

src/ResolvExpr/Resolver.cc

@@ -21 +21 @@
 #include "Alternative.h"                 // for Alternative, AltList
 #include "AlternativeFinder.h"           // for AlternativeFinder, resolveIn...
+#include "Candidate.hpp"
+#include "CandidateFinder.hpp"
 #include "CurrentObject.h"               // for CurrentObject
 #include "RenameVars.h"                  // for RenameVars, global_renamer
@@ -31 +33 @@
 #include "AST/Init.hpp"
 #include "AST/Pass.hpp"
+#include "AST/Print.hpp"
 #include "AST/SymbolTable.hpp"
 #include "Common/PassVisitor.h"          // for PassVisitor
@@ -116 +119 @@
 
         namespace {
-                struct DeleteFinder : public WithShortCircuiting        {
+                struct DeleteFinder_old : public WithShortCircuiting    {
                         DeletedExpr * delExpr = nullptr;
                         void previsit( DeletedExpr * expr ) {
@@ -130 +133 @@
 
         DeletedExpr * findDeletedExpr( Expression * expr ) {
-                PassVisitor<DeleteFinder> finder;
+                PassVisitor<DeleteFinder_old> finder;
                 expr->accept( finder );
                 return finder.pass.delExpr;
@@ -136 +139 @@
 
         namespace {
-                struct StripCasts {
+                struct StripCasts_old {
                         Expression * postmutate( CastExpr * castExpr ) {
                                 if ( castExpr->isGenerated && ResolvExpr::typesCompatible( castExpr->arg->result, castExpr->result, SymTab::Indexer() ) ) {
@@ -149 +152 @@
 
                         static void strip( Expression *& expr ) {
-                                PassVisitor<StripCasts> stripper;
+                                PassVisitor<StripCasts_old> stripper;
                                 expr = expr->acceptMutator( stripper );
                         }
@@ -157 +160 @@
                         expr->env = oldenv ? oldenv->clone() : new TypeSubstitution;
                         env.makeSubstitution( *expr->env );
-                        StripCasts::strip( expr ); // remove unnecessary casts that may be buried in an expression
+                        StripCasts_old::strip( expr ); // remove unnecessary casts that may be buried in an expression
                 }
 
@@ -940 +943 @@
         ///////////////////////////////////////////////////////////////////////////
 
+        namespace {
+                /// Finds deleted expressions in an expression tree
+                struct DeleteFinder_new final : public ast::WithShortCircuiting {
+                        const ast::DeletedExpr * delExpr = nullptr;
+
+                        void previsit( const ast::DeletedExpr * expr ) {
+                                if ( delExpr ) { visit_children = false; }
+                                else { delExpr = expr; }
+                        }
+
+                        void previsit( const ast::Expr * ) {
+                                if ( delExpr ) { visit_children = false; }
+                        }
+                };
+
+                /// Check if this expression is or includes a deleted expression
+                const ast::DeletedExpr * findDeletedExpr( const ast::Expr * expr ) {
+                        ast::Pass<DeleteFinder_new> finder;
+                        expr->accept( finder );
+                        return finder.pass.delExpr;
+                }
+
+                /// Calls the CandidateFinder and finds the single best candidate
+                CandidateRef findUnfinishedKindExpression(
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab, const std::string & kind, 
+                        std::function<bool(const Candidate &)> pred, ResolvMode mode = {}
+                ) {
+                        if ( ! untyped ) return nullptr;
+
+                        // xxx - this isn't thread-safe, but should work until we parallelize the resolver
+                        static unsigned recursion_level = 0;
+
+                        ++recursion_level;
+                        ast::TypeEnvironment env;
+                        CandidateFinder finder{ symtab, env };
+                        finder.find( untyped, recursion_level == 1 ? mode.atTopLevel() : mode );
+                        --recursion_level;
+
+                        // produce a filtered list of candidates
+                        CandidateList candidates;
+                        for ( auto & cand : finder.candidates ) {
+                                if ( pred( *cand ) ) { candidates.emplace_back( cand ); }
+                        }
+
+                        // produce invalid error if no candidates
+                        if ( candidates.empty() ) {
+                                SemanticError( untyped, 
+                                        toString( "No reasonable alternatives for ", kind, (kind != "" ? " " : ""), 
+                                        "expression: ") );
+                        }
+
+                        // search for cheapest candidate
+                        CandidateList winners;
+                        bool seen_undeleted = false;
+                        for ( CandidateRef & cand : candidates ) {
+                                int c = winners.empty() ? -1 : cand->cost.compare( winners.front()->cost );
+
+                                if ( c > 0 ) continue;  // skip more expensive than winner
+
+                                if ( c < 0 ) {
+                                        // reset on new cheapest
+                                        seen_undeleted = ! findDeletedExpr( cand->expr );
+                                        winners.clear();
+                                } else /* if ( c == 0 ) */ {
+                                        if ( findDeletedExpr( cand->expr ) ) {
+                                                // skip deleted expression if already seen one equivalent-cost not
+                                                if ( seen_undeleted ) continue;
+                                        } else if ( ! seen_undeleted ) {
+                                                // replace list of equivalent-cost deleted expressions with one non-deleted
+                                                winners.clear();
+                                                seen_undeleted = true;
+                                        }
+                                }
+
+                                winners.emplace_back( std::move( cand ) );
+                        }
+
+                        // promote candidate.cvtCost to .cost
+                        for ( CandidateRef & cand : winners ) {
+                                cand->cost = cand->cvtCost;
+                        }
+
+                        // produce ambiguous errors, if applicable
+                        if ( winners.size() != 1 ) {
+                                std::ostringstream stream;
+                                stream << "Cannot choose between " << winners.size() << " alternatives for " 
+                                        << kind << (kind != "" ? " " : "") << "expression\n";
+                                ast::print( stream, untyped );
+                                stream << " Alternatives are:\n";
+                                print( stream, winners, 1 );
+                                SemanticError( untyped->location, stream.str() );
+                        }
+
+                        // single selected choice
+                        CandidateRef & choice = winners.front();
+
+                        // fail on only expression deleted
+                        if ( ! seen_undeleted ) {
+                                SemanticError( untyped->location, choice->expr.get(), "Unique best alternative "
+                                "includes deleted identifier in " );
+                        }
+
+                        return std::move( choice );
+                }
+
+                /// Strips extraneous casts out of an expression
+                struct StripCasts_new final {
+                        const ast::Expr * postmutate( const ast::CastExpr * castExpr ) {
+                                if ( 
+                                        castExpr->isGenerated 
+                                        && typesCompatible( castExpr->arg->result, castExpr->result ) 
+                                ) {
+                                        // generated cast is the same type as its argument, remove it after keeping env
+                                        ast::ptr<ast::Expr> arg = castExpr->arg;
+                                        arg.get_and_mutate()->env = castExpr->env;
+                                        return arg;
+                                }
+                                return castExpr;
+                        }
+
+                        static void strip( ast::ptr< ast::Expr > & expr ) {
+                                ast::Pass< StripCasts_new > stripper;
+                                expr = expr->accept( stripper );
+                        }
+                };
+
+                /// Establish post-resolver invariants for expressions
+                void finishExpr( 
+                        ast::ptr< ast::Expr > & expr, const ast::TypeEnvironment & env, 
+                        const ast::TypeSubstitution * oldenv = nullptr
+                ) {
+                        // set up new type substitution for expression
+                        ast::ptr< ast::TypeSubstitution > newenv = 
+                                 oldenv ? oldenv : new ast::TypeSubstitution{};
+                        env.writeToSubstitution( *newenv.get_and_mutate() );
+                        expr.get_and_mutate()->env = std::move( newenv );
+                        // remove unncecessary casts
+                        StripCasts_new::strip( expr );
+                }
+                
+                /// resolve `untyped` to the expression whose candidate satisfies `pred` with the 
+                /// lowest cost, returning the resolved version
+                ast::ptr< ast::Expr > findKindExpression(
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab, const std::string & kind, 
+                        std::function<bool(const Candidate &)> pred, ResolvMode mode = {}
+                ) {
+                        if ( ! untyped ) return {};
+                        CandidateRef choice = 
+                                findUnfinishedKindExpression( untyped, symtab, kind, pred, mode );
+                        finishExpr( choice->expr, choice->env, untyped->env );
+                        return std::move( choice->expr );
+                }
+
+                /// Predicate for "Candidate has integral type"
+                bool hasIntegralType( const Candidate & i ) {
+                        const ast::Type * type = i.expr->result;
+                        
+                        if ( auto bt = dynamic_cast< const ast::BasicType * >( type ) ) {
+                                return bt->isInteger();
+                        } else if ( 
+                                dynamic_cast< const ast::EnumInstType * >( type ) 
+                                || dynamic_cast< const ast::ZeroType * >( type )
+                                || dynamic_cast< const ast::OneType * >( type )
+                        ) {
+                                return true;
+                        } else return false;
+                }
+
+                /// Resolve `untyped` as an integral expression, returning the resolved version
+                ast::ptr< ast::Expr > findIntegralExpression( 
+                        const ast::Expr * untyped, const ast::SymbolTable & symtab 
+                ) {
+                        return findKindExpression( untyped, symtab, "condition", hasIntegralType );
+                }
+        }
+
         class Resolver_new final
         : public ast::WithSymbolTable, public ast::WithGuards,
@@ -947 +1126 @@
                 ast::ptr< ast::Type > functionReturn = nullptr;
                 // ast::CurrentObject currentObject = nullptr;
-                // bool inEnumDecl = false;
+                bool inEnumDecl = false;
 
         public:
@@ -953 +1132 @@
                 Resolver_new( const ast::SymbolTable & syms ) { symtab = syms; }
 
-                void previsit( const ast::FunctionDecl * functionDecl );
-                const ast::FunctionDecl * postvisit( const ast::FunctionDecl * functionDecl );
-                void previsit( const ast::ObjectDecl * objectDecl );
-                void previsit( const ast::EnumDecl * enumDecl );
-                void previsit( const ast::StaticAssertDecl * assertDecl );
-
-                void previsit( const ast::ArrayType * at );
-                void previsit( const ast::PointerType * pt );
-
-                void previsit( const ast::ExprStmt * exprStmt );
-                void previsit( const ast::AsmExpr * asmExpr );
-                void previsit( const ast::AsmStmt * asmStmt );
-                void previsit( const ast::IfStmt * ifStmt );
-                void previsit( const ast::WhileStmt * whileStmt );
-                void previsit( const ast::ForStmt * forStmt );
-                void previsit( const ast::SwitchStmt * switchStmt );
-                void previsit( const ast::CaseStmt * caseStmt );
-                void previsit( const ast::BranchStmt * branchStmt );
-                void previsit( const ast::ReturnStmt * returnStmt );
-                void previsit( const ast::ThrowStmt * throwStmt );
-                void previsit( const ast::CatchStmt * catchStmt );
-                void previsit( const ast::WaitForStmt * stmt );
-
-                void previsit( const ast::SingleInit * singleInit );
-                void previsit( const ast::ListInit * listInit );
-                void previsit( const ast::ConstructorInit * ctorInit );
+                void previsit( const ast::FunctionDecl * );
+                const ast::FunctionDecl * postvisit( const ast::FunctionDecl * );
+                void previsit( const ast::ObjectDecl * );
+                void previsit( const ast::EnumDecl * );
+                const ast::StaticAssertDecl * previsit( const ast::StaticAssertDecl * );
+
+                void previsit( const ast::ArrayType * );
+                void previsit( const ast::PointerType * );
+
+                void previsit( const ast::ExprStmt * );
+                void previsit( const ast::AsmExpr * );
+                void previsit( const ast::AsmStmt * );
+                void previsit( const ast::IfStmt * );
+                void previsit( const ast::WhileStmt * );
+                void previsit( const ast::ForStmt * );
+                void previsit( const ast::SwitchStmt * );
+                void previsit( const ast::CaseStmt * );
+                void previsit( const ast::BranchStmt * );
+                void previsit( const ast::ReturnStmt * );
+                void previsit( const ast::ThrowStmt * );
+                void previsit( const ast::CatchStmt * );
+                void previsit( const ast::WaitForStmt * );
+
+                void previsit( const ast::SingleInit * );
+                void previsit( const ast::ListInit * );
+                void previsit( const ast::ConstructorInit * );
         };
 
@@ -1004 +1183 @@
                                         ast::chain_mutate( ret )
                                                 ( &ast::FunctionDecl::type )
-                                                        ( &ast::FunctionType::params )
-                                                                [i]
+                                                        ( &ast::FunctionType::params )[i]
                                                                 ( &ast::ObjectDecl::init )
                                                                         ( &ast::SingleInit::value )->env = nullptr;
@@ -1023 +1201 @@
         }
 
-        void Resolver_new::previsit( const ast::EnumDecl * enumDecl ) {
-                #warning unimplemented; Resolver port in progress
-                (void)enumDecl;
-                assert(false);
-        }
-
-        void Resolver_new::previsit( const ast::StaticAssertDecl * assertDecl ) {
-                #warning unimplemented; Resolver port in progress
-                (void)assertDecl;
-                assert(false);
+        void Resolver_new::previsit( const ast::EnumDecl * ) {
+                // in case we decide to allow nested enums
+                GuardValue( inEnumDecl );
+                inEnumDecl = false;
+        }
+
+        const ast::StaticAssertDecl * Resolver_new::previsit( 
+                const ast::StaticAssertDecl * assertDecl 
+        ) {
+                ast::ptr< ast::Expr > cond = findIntegralExpression( assertDecl->cond, symtab );
+                if ( cond == assertDecl->cond ) return assertDecl;
+                
+                ast::StaticAssertDecl * ret = mutate( assertDecl );
+                ret->cond = cond;
+                return ret;
         }
 

src/ResolvExpr/module.mk

@@ -19 +19 @@
       ResolvExpr/Alternative.cc \
       ResolvExpr/AlternativeFinder.cc \
+      ResolvExpr/Candidate.cpp \
+      ResolvExpr/CandidateFinder.cpp \
       ResolvExpr/CastCost.cc \
       ResolvExpr/CommonType.cc \

src/ResolvExpr/typeops.h

@@ -103 +103 @@
 
         bool typesCompatible( 
-                const ast::Type *, const ast::Type *, const ast::SymbolTable &, 
+                const ast::Type *, const ast::Type *, const ast::SymbolTable & symtab = {}, 
                 const ast::TypeEnvironment & env = {} );
         

src/SynTree/BaseSyntaxNode.h

@@ -41 +41 @@
   /// * Expressions should not finish with a newline, since the expression's parent has better information.
         virtual void print( std::ostream & os, Indenter indent = {} ) const = 0;
-  void print( std::ostream & os, unsigned int indent ) {
-    print( os, Indenter{ Indenter::tabsize, indent });
-  }
 };