Verified Commit b5525a59 authored by Camil Staps's avatar Camil Staps 🙂

Make work on the master compiler

parent 003941f8
Subproject commit 42403fe26924d3ceab328c44f20f8aad4b710468
Subproject commit 38ddb57139493f82fbb31eaedf1b5eeaea002eb9
This diff is collapsed.
This diff is collapsed.
......@@ -10,11 +10,10 @@ import StdTuple
import Control.Applicative
import Control.Monad
import qualified Data.Foldable as Foldable
import qualified Data.Foldable
from Data.Func import $, on, `on`, instance Functor ((->) r), mapSt
import Data.Functor
import Data.List
import qualified Data.Map as M
import Data.Maybe
import Data.Maybe.Ord
import Data.Tuple
......@@ -90,7 +89,7 @@ search` {unify,name,className,typeName,using,modules,libraries,page,include_buil
# (allsyns,cdb) = allTypeSynonyms cdb
# (alwaysUnique,cdb) = alwaysUniquePredicate cdb
# mbPreppedType = prepare_unification True alwaysUnique allsyns <$> (unify >>= parseType o fromString)
# usedsyns = 'Foldable'.concat (fst <$> mbPreppedType)
# usedsyns = 'Data.Foldable'.concat (fst <$> mbPreppedType)
# mbType = snd <$> mbPreppedType
# strat = addStrategy (SSUnify <$> mbType) strat
// Usage search
......
......@@ -16,7 +16,7 @@ import Data.Functor
from Data.GenLexOrd import :: LexOrd, generic gLexOrd
import qualified Data.GenLexOrd
from Data.List import instance Foldable []
import qualified Data.Map as M
import qualified Data.Map
import Data.Maybe
import Data.Tuple
import System.Process
......@@ -180,7 +180,7 @@ where
rankConstraints :: ![(Request, RankConstraint)] !*CloogleDB -> *([String], *CloogleDB)
rankConstraints constraints cdb
# (constraints,cdb) = findConstraints constraints 'M'.newMap cdb
# (constraints,cdb) = findConstraints constraints 'Data.Map'.newMap cdb
= (default ++ constraints,cdb)
where
default =
......@@ -205,10 +205,10 @@ findConstraints ::
!(Map Request (!Maybe Type,!Map String [TypeDef],![TypeDef],![(!CloogleEntry,![Annotation])]))
!*CloogleDB -> *([String], *CloogleDB)
findConstraints [(req,LT urid1 urid2):rest] results cdb
# (orgsearchtype,allsyns,usedsyns,entries,cdb) = case 'M'.get req results of
# (orgsearchtype,allsyns,usedsyns,entries,cdb) = case 'Data.Map'.get req results of
Just (t,as,us,es) -> (t,as,us,es,cdb)
_ -> search` req cdb
# results = 'M'.put req (orgsearchtype,allsyns,usedsyns,entries) results
# results = 'Data.Map'.put req (orgsearchtype,allsyns,usedsyns,entries) results
# (e1,annots1,cdb) = findEntry orgsearchtype allsyns usedsyns urid1 entries cdb
# (e2,annots2,cdb) = findEntry orgsearchtype allsyns usedsyns urid2 entries cdb
# ri1 = symbolicDistance e1 annots1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment