summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrasimir Angelov <kr.angelov@gmail.com>2017-09-01 14:31:08 +0200
committerKrasimir Angelov <kr.angelov@gmail.com>2017-09-01 14:31:08 +0200
commitbbdbf2bc5d34d75cef032b395e4a5cc35a89066d (patch)
tree5718b6b3108eed7fb22cd2ba6171e7094c8bce9e
parentc48f3bdfbc789820e678e3e44aeafb4a82e18395 (diff)
silence Tab warnings in the Haskell runtime
-rw-r--r--src/runtime/haskell/PGF/CId.hs12
-rw-r--r--src/runtime/haskell/PGF/Parse.hs42
-rw-r--r--src/runtime/haskell/PGF/Probabilistic.hs10
3 files changed, 32 insertions, 32 deletions
diff --git a/src/runtime/haskell/PGF/CId.hs b/src/runtime/haskell/PGF/CId.hs
index 785642cdf..ed4990300 100644
--- a/src/runtime/haskell/PGF/CId.hs
+++ b/src/runtime/haskell/PGF/CId.hs
@@ -71,12 +71,12 @@ pIdent =
-- where
insideChar = RP.readS_to_P $ \s ->
case s of
- [] -> []
- ('\\':'\\':cs) -> [('\\',cs)]
- ('\\':'\'':cs) -> [('\'',cs)]
- ('\\':cs) -> []
- ('\'':cs) -> []
- (c:cs) -> [(c,cs)]
+ [] -> []
+ ('\\':'\\':cs) -> [('\\',cs)]
+ ('\\':'\'':cs) -> [('\'',cs)]
+ ('\\':cs) -> []
+ ('\'':cs) -> []
+ (c:cs) -> [(c,cs)]
isIdentFirst c =
(c == '_') ||
diff --git a/src/runtime/haskell/PGF/Parse.hs b/src/runtime/haskell/PGF/Parse.hs
index 322385a84..51b1d3273 100644
--- a/src/runtime/haskell/PGF/Parse.hs
+++ b/src/runtime/haskell/PGF/Parse.hs
@@ -297,27 +297,27 @@ process flit ftok cnc (item@(Active j ppos funid seqid args key0):items) acc cha
Nothing -> process flit ftok cnc items4 acc' chart{active=insertAC key (Set.singleton item,new_sc) (active chart)}
Just (set,sc) | Set.member item set -> process flit ftok cnc items acc chart
| otherwise -> process flit ftok cnc items2 acc chart{active=insertAC key (Set.insert item set,IntMap.unionWith Set.union new_sc sc) (active chart)}
- SymKS tok -> let !acc' = ftok_ [tok] (Active j (ppos+1) funid seqid args key0) acc
- in process flit ftok cnc items acc' chart
- SymNE -> process flit ftok cnc items acc chart
- SymBIND -> let !acc' = ftok_ ["&+"] (Active j (ppos+1) funid seqid args key0) acc
- in process flit ftok cnc items acc' chart
- SymSOFT_BIND->process flit ftok cnc ((Active j (ppos+1) funid seqid args key0):items) acc chart
- SymSOFT_SPACE->process flit ftok cnc ((Active j (ppos+1) funid seqid args key0):items) acc chart
- SymCAPIT -> let !acc' = ftok_ ["&|"] (Active j (ppos+1) funid seqid args key0) acc
- in process flit ftok cnc items acc' chart
- SymALL_CAPIT->let !acc' = ftok_ ["&|"] (Active j (ppos+1) funid seqid args key0) acc
- in process flit ftok cnc items acc' chart
- SymKP syms vars
- -> let to_tok (SymKS t) = [t]
- to_tok SymBIND = ["&+"]
- to_tok SymSOFT_BIND = []
- to_tok SymSOFT_SPACE= []
- to_tok SymCAPIT = ["&|"]
- to_tok SymALL_CAPIT = ["&|"]
- to_tok _ = []
-
- !acc' = foldl (\acc syms -> ftok_ (concatMap to_tok syms) (Active j (ppos+1) funid seqid args key0) acc) acc
+ SymKS tok -> let !acc' = ftok_ [tok] (Active j (ppos+1) funid seqid args key0) acc
+ in process flit ftok cnc items acc' chart
+ SymNE -> process flit ftok cnc items acc chart
+ SymBIND -> let !acc' = ftok_ ["&+"] (Active j (ppos+1) funid seqid args key0) acc
+ in process flit ftok cnc items acc' chart
+ SymSOFT_BIND->process flit ftok cnc ((Active j (ppos+1) funid seqid args key0):items) acc chart
+ SymSOFT_SPACE->process flit ftok cnc ((Active j (ppos+1) funid seqid args key0):items) acc chart
+ SymCAPIT -> let !acc' = ftok_ ["&|"] (Active j (ppos+1) funid seqid args key0) acc
+ in process flit ftok cnc items acc' chart
+ SymALL_CAPIT->let !acc' = ftok_ ["&|"] (Active j (ppos+1) funid seqid args key0) acc
+ in process flit ftok cnc items acc' chart
+ SymKP syms vars
+ -> let to_tok (SymKS t) = [t]
+ to_tok SymBIND = ["&+"]
+ to_tok SymSOFT_BIND = []
+ to_tok SymSOFT_SPACE= []
+ to_tok SymCAPIT = ["&|"]
+ to_tok SymALL_CAPIT = ["&|"]
+ to_tok _ = []
+
+ !acc' = foldl (\acc syms -> ftok_ (concatMap to_tok syms) (Active j (ppos+1) funid seqid args key0) acc) acc
(syms:[syms' | (syms',_) <- vars])
in process flit ftok cnc items acc' chart
SymLit d r -> let PArg hypos fid = args !! d
diff --git a/src/runtime/haskell/PGF/Probabilistic.hs b/src/runtime/haskell/PGF/Probabilistic.hs
index 780e1c12f..37db7f7ff 100644
--- a/src/runtime/haskell/PGF/Probabilistic.hs
+++ b/src/runtime/haskell/PGF/Probabilistic.hs
@@ -109,11 +109,11 @@ mkProbDefs :: PGF -> ([[CId]],[(CId,Type,[Equation])])
mkProbDefs pgf =
let cs = [(c,hyps,fns) | (c,(hyps0,fs,_)) <- Map.toList (cats (abstract pgf)),
not (elem c [cidString,cidInt,cidFloat]),
- let hyps = zipWith (\(bt,_,ty) n -> (bt,mkCId ('v':show n),ty))
- hyps0
- [1..]
- fns = [(f,ty) | (_,f) <- fs,
- let Just (ty,_,_,_) = Map.lookup f (funs (abstract pgf))]
+ let hyps = zipWith (\(bt,_,ty) n -> (bt,mkCId ('v':show n),ty))
+ hyps0
+ [1..]
+ fns = [(f,ty) | (_,f) <- fs,
+ let Just (ty,_,_,_) = Map.lookup f (funs (abstract pgf))]
]
((_,css),eqss) = mapAccumL (\(ngen,css) (c,hyps,fns) ->
let st0 = (1,Map.empty)