From e83b2b75b6f7bfb9035c303414a58cb445b622a4 Mon Sep 17 00:00:00 2001 From: joshvera Date: Wed, 31 Oct 2018 14:28:15 -0400 Subject: [PATCH] Revert "Fix up constraints" This reverts commit 922d244a6100c1740c253d8f56ad55b67cdf58b0. --- src/Semantic/Graph.hs | 26 -------------------------- src/Semantic/Util.hs | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/Semantic/Graph.hs b/src/Semantic/Graph.hs index c1ee7a97f..7ec07c26a 100644 --- a/src/Semantic/Graph.hs +++ b/src/Semantic/Graph.hs @@ -74,15 +74,6 @@ runGraph :: forall effs. ( Member Distribute effs , Member Task effs , Member Trace effs , Effects effs - , Member (Allocator (Address (Hole (Maybe Name) Precise))) effs - , Member (Resumable (BaseError (HeapError (Hole (Maybe Name) Precise)))) effs - , Member (Resumable (BaseError (ScopeError (Hole (Maybe Name) Precise)))) effs - , Member (Allocator (Hole (Maybe Name) (Located Monovariant))) effs - , Member (Reader ModuleInfo) effs - , Member (Reader Span) effs - , Member (Allocator (Address (Hole (Maybe Name) (Located Monovariant)))) effs - , Member (State (ScopeGraph (Hole (Maybe Name) Precise))) effs - , Member (Allocator (Hole (Maybe Name) Precise)) effs ) => GraphType -> Bool @@ -115,10 +106,6 @@ runCallGraph :: forall fields syntax term lang effs. ( HasField fields Span , HasPostlude lang , Member Trace effs , Effects effs - , Member (Allocator (Hole (Maybe Name) (Located Monovariant))) effs - , Member (Reader ModuleInfo) effs - , Member (Reader Span) effs - , Member (Allocator (Address (Hole (Maybe Name) (Located Monovariant)))) effs ) => Proxy lang -> Bool @@ -167,10 +154,6 @@ runImportGraphToModuleInfos :: ( Declarations term , Member (Resumable (BaseError (ScopeError (Hole (Maybe Name) Precise)))) effs , Recursive term , Effects effs - , Member (State (ScopeGraph (Hole (Maybe Name) Precise))) effs - , Member (Allocator (Hole (Maybe Name) Precise)) effs - , Member (Reader Span) effs - , Member (Reader ModuleInfo) effs ) => Proxy lang -> Package term @@ -187,10 +170,6 @@ runImportGraphToModules :: ( Declarations term , Member (Allocator (Address (Hole (Maybe Name) Precise))) effs , Member (Resumable (BaseError (HeapError (Hole (Maybe Name) Precise)))) effs , Member (Resumable (BaseError (ScopeError (Hole (Maybe Name) Precise)))) effs - , Member (State (ScopeGraph (Hole (Maybe Name) Precise))) effs - , Member (Allocator (Hole (Maybe Name) Precise)) effs - , Member (Reader Span) effs - , Member (Reader ModuleInfo) effs , Recursive term , Effects effs ) @@ -208,11 +187,6 @@ runImportGraph :: ( Declarations term , Member Trace effs , Recursive term , Effects effs - , Member (State (ScopeGraph (Hole (Maybe Name) Precise))) effs - , Member (Allocator (Hole (Maybe Name) Precise)) effs - , Member (Reader Span) effs - , Member (Reader ModuleInfo) effs - , Member (Allocator (Address (Hole (Maybe Name) Precise))) effs ) => Proxy lang -> Package term diff --git a/src/Semantic/Util.hs b/src/Semantic/Util.hs index 3edadc5bb..f5e9c9376 100644 --- a/src/Semantic/Util.hs +++ b/src/Semantic/Util.hs @@ -69,7 +69,7 @@ checking . runTypes evalGoProject = justEvaluating <=< evaluateProject (Proxy :: Proxy 'Language.Go) goParser -evalRubyProject = justEvaluating <=< evaluateProject (Proxy @'Language.Ruby) rubyParser +evalRubyProject = justEvaluating <=< evaluateProject (Proxy @'Language.Ruby) rubyParser evalPHPProject = justEvaluating <=< evaluateProject (Proxy :: Proxy 'Language.PHP) phpParser evalPythonProject = justEvaluating <=< evaluateProject (Proxy :: Proxy 'Language.Python) pythonParser evalJavaScriptProject = justEvaluating <=< evaluateProject (Proxy :: Proxy 'Language.JavaScript) typescriptParser