Skip to content

Commit

Permalink
removed double spaces after =
Browse files Browse the repository at this point in the history
git-svn-id: https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk@10689 cec4b9c1-7d33-0410-9eda-942365e851bb
  • Loading branch information
Christian Maeder authored and Christian Maeder committed Sep 18, 2008
1 parent 74d9a38 commit de2f13b
Show file tree
Hide file tree
Showing 19 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions CASL/Amalgamability.hs
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ colimitIsThin simeq' embs' c0 =

embDomS (n, dom, _) = maybe (error "embDomS") id
$ findTag simeqT (n, dom)
embCodS (n, _, cod) = maybe (error "embCodS") id
embCodS (n, _, cod) = maybe (error "embCodS") id
$ findTag simeqT (n, cod)
-- checkAllSorts: check the C = B condition for all colimit sorts
checkAllSorts m | Map.null m = {-trace "CT: Yes"-} True
Expand Down Expand Up @@ -959,7 +959,7 @@ sim diag embs' =
in if rel1 == rel2 then rel1 else fixCong rel2

rel = map (\e -> (e, e)) embs'
rel' = fixCong rel
rel' = fixCong rel
rel'' = mergeEquivClassesBy diagRule rel'
in taggedValsToEquivClasses rel''

Expand Down
20 changes: 10 additions & 10 deletions CASL/ColimSign.hs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ signColimit graph extColimit = let
sigmaRel = sigmaSort{sortRel = relS}
phiRel = Map.map (\ phi -> phi{mtarget = sigmaRel}) phiSort
(sigmaOp, phiOp) = computeColimitOp graph sigmaRel phiRel
(sigmaPred, phiPred) = computeColimitPred graph sigmaOp phiOp
(sigmaPred, phiPred) = computeColimitPred graph sigmaOp phiOp
(sigAssoc, phiAssoc) = colimitAssoc graph sigmaPred phiPred
extGraph = emap (\(i, phi) -> (i, extended_map phi)) $ nmap extendedInfo graph
(extInfo, extMaps) = extColimit extGraph
Expand All @@ -67,7 +67,7 @@ renameSorts :: (Set.Set (Id, Node), Map.Map Node (Map.Map Id (Id, Node))) ->
(Set.Set Id, Map.Map Node (EndoMap Id))
renameSorts (set, fun) = let
fstEqual (x1,_) (x2,_) = x1 == x2
partList pairSet = leqClasses fstEqual pairSet
partList pairSet = leqClasses fstEqual pairSet
namePartitions elemList f0 s1 f1 = case elemList of
[] -> (s1, f1)
p:ps -> if length p == 1 then
Expand Down Expand Up @@ -160,7 +160,7 @@ renameOpSymbols :: Gr (Sign f e)(Int,Morphism f e m)
-> Map.Map Node (Morphism f e m)
-> (Sign f e, Map.Map Node (Morphism f e m))
renameOpSymbols graph opsList morMap sigmaRel phiSRel = let
(partList, partMap) = tempNames opsList morMap [] $
(partList, partMap) = tempNames opsList morMap [] $
Map.fromList $ zip (nodes graph) (repeat Map.empty)
lengthDesc (_, s1) (_, s2) =
case compare (Set.size s1) $ Set.size s2 of
Expand Down Expand Up @@ -221,7 +221,7 @@ finalNames rezList opList opsMap1 sigmaRel phiSRel = let
opsMap2 = updateMap opsMap1 id0 [(id0,set)]
in finalNames rezList1 ops opsMap2 sigmaRel phiSRel
(_, setList):_ -> let
opSet = Set.map arity set
opSet = Set.map arity set
getOpTypes oSet = Set.map arity oSet
opSetList = map getOpTypes setList
oldFunSymbols = Set.unions opSetList
Expand Down Expand Up @@ -279,7 +279,7 @@ tempNames :: [ColimitOpSymbWithLabel]
-> Map.Map Node (Map.Map (Id, OpType) ColimitOpSymbWithLabel)
-> ([(Id, Set.Set OpSymbolLabel)],
Map.Map Node (Map.Map (Id, OpType) ColimitOpSymbWithLabel))
tempNames opsList morMap rezList morMap1 = loopGroups (groupOps opsList)
tempNames opsList morMap rezList morMap1 = loopGroups (groupOps opsList)
morMap rezList morMap1

groupOps :: [ColimitOpSymbWithLabel] -> [[ColimitOpSymbWithLabel]]
Expand Down Expand Up @@ -354,9 +354,9 @@ loopOpSets graph clsFun sigmaRel phiSRel opSetsList opsList morMap =
map ((Map.!)phiSRel) $ nodes graph
graph1 = buildOpGraphNodes graph Graph.empty funSort
opSet $ labNodes graph
(setN, funN) = computeColimitSet graph1
(setN, funN) = computeColimitSet graph1
(opsList1, morMap1) = labelColimitElements funSort clsFun setN funN
opsList2 = opsList ++ opsList1
opsList2 = opsList ++ opsList1
morMap2 = Map.fromList $ map (\n-> (n, Map.union (morMap1 Map.! n)
(morMap Map.!n))) $ nodes graph
in loopOpSets graph clsFun sigmaRel phiSRel opSets opsList2 morMap2
Expand Down Expand Up @@ -853,7 +853,7 @@ finalPNames rezList predList predsMap1 sigmaRel phiSRel = let
predsMap2 = updateMap predsMap1 id0 [(id0,set)]
in finalPNames rezList1 preds predsMap2 sigmaRel phiSRel
(_, setList):_ -> let
predSet = Set.map arityP set
predSet = Set.map arityP set
getPredTypes pSet = Set.map arityP pSet
predSetList = map getPredTypes setList
funSymbols = Set.union predSet $ Set.unions predSetList
Expand Down Expand Up @@ -910,7 +910,7 @@ tempPNames :: [ColimitPredSymbWithLabel]
-> Map.Map Node (Map.Map (Id, PredType) ColimitPredSymbWithLabel)
-> ([(Id, Set.Set PredSymbolLabel)],
Map.Map Node (Map.Map (Id, PredType) ColimitPredSymbWithLabel))
tempPNames predsList morMap rezList morMap1 = loopPGroups
tempPNames predsList morMap rezList morMap1 = loopPGroups
(groupPreds predsList) morMap rezList morMap1

groupPreds :: [ColimitPredSymbWithLabel] -> [[ColimitPredSymbWithLabel]]
Expand Down Expand Up @@ -1066,7 +1066,7 @@ assocSymbols = opSymbolsOf . assocOps

colimitAssoc :: Gr (Sign f e) (Int,Morphism f e m) -> Sign f e ->
Map.Map Int (Morphism f e m) -> (Sign f e, Map.Map Int (Morphism f e m))
colimitAssoc graph sig morMap = let
colimitAssoc graph sig morMap = let
assocOpList = nub $ concatMap
(\ (node, sigma) -> map (applyMor ((Map.!)morMap node)) $
assocSymbols sigma ) $ labNodes graph
Expand Down
2 changes: 1 addition & 1 deletion CASL/QuickCheck.hs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ insertSen qm sen =
Sort_gen_ax cs _ ->
let s = zip (map newSort cs) (map (const [f]) [1..length cs])
ins = foldr $ uncurry $ Map.insertWith (++)
in qm { carrierSens = ins (carrierSens qm) s }
in qm { carrierSens = ins (carrierSens qm) s }
-- axiom forcing empty carrier?
Quantification Universal [Var_decl [_] s _] (False_atom _) _ ->
qm { carrierSens = Map.insertWith (++) s [f] (carrierSens qm) }
Expand Down
2 changes: 1 addition & 1 deletion CASL/Simplify.hs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ simplifyRecord mf = (mapRecord mf)
(True_atom _, Universal) -> qf
(False_atom _, Existential) -> qf
_ -> nf
, foldConjunction = \ _ fs ps -> if any is_False_atom fs
, foldConjunction = \ _ fs ps -> if any is_False_atom fs
then False_atom ps else case nub $ filter (not . is_True_atom) fs of
[] -> True_atom ps
[f] -> f
Expand Down
6 changes: 3 additions & 3 deletions CASL/StaticAna.hs
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ instance Eq Component where
(i1, opArgs t1, opRes t1) == (i2, opArgs t2, opRes t2)

instance Ord Component where
Component i1 t1 <= Component i2 t2 =
Component i1 t1 <= Component i2 t2 =
(i1, opArgs t1, opRes t1) <= (i2, opArgs t2, opRes t2)

instance Pretty Component where
Expand Down Expand Up @@ -711,7 +711,7 @@ makeDisjoint l = case l of
$ mkForall (v1 ++ v2) (Negation (Strong_equation t1 t2 p) p) p

catSels :: [(Maybe Id, OpType)] -> [(Id, OpType)]
catSels = map ( \ (m, t) -> (fromJust m, t)) .
catSels = map ( \ (m, t) -> (fromJust m, t)) .
filter ( \ (m, _) -> isJust m)

makeUndefForm :: (Id, OpType) -> (Id, [VAR_DECL], TERM f, [(Id, OpType)])
Expand Down Expand Up @@ -817,7 +817,7 @@ ana_COMPONENTS s c = do
-- | utility
resultToState :: (a -> Result a) -> a -> State (Sign f e) a
resultToState f a = do
let r = f a
let r = f a
addDiags $ diags r
case maybeResult r of
Nothing -> return a
Expand Down
2 changes: 1 addition & 1 deletion Common/AnalyseAnnos.hs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ addGlobalAnnos ga all_annos = do
n_display_annos <- store_display_annos (display_annos ga) annos
n_literal_annos <- store_literal_annos (literal_annos ga) annos
n_literal_map <- store_literal_map (literal_map ga) annos
return ga { prec_annos = n_prec_annos
return ga { prec_annos = n_prec_annos
, assoc_annos = n_assoc_annos
, display_annos = n_display_annos
, literal_annos = n_literal_annos
Expand Down
4 changes: 2 additions & 2 deletions Common/AnnoState.hs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ addLineAnnos :: AParser st ()
addLineAnnos = getState >>= parseLineAnnos >>= setState

getUserState :: AParser st st
getUserState = fmap userState getState
getUserState = fmap userState getState

setUserState :: st -> AParser st ()
setUserState st = getState >>= \ s -> setState s { userState = st }
Expand Down Expand Up @@ -158,7 +158,7 @@ itemAux :: [String] -> AParser st a
itemAux startKeywords itemParser =
do a <- itemParser
(m, an) <- optSemi
let r = return ([a], [], [an])
let r = return ([a], [], [an])
if null m then r else (tryItemEnd startKeywords >> r) <|>
do (ergs, ts, ans) <- itemAux startKeywords itemParser
return (a:ergs, m++ts, an:ans)
Expand Down
2 changes: 1 addition & 1 deletion Common/Anno_Parser.hs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ commaIds :: GenParser Char st [Id]
commaIds = commaSep1 some_id

annoArg :: Annote_text -> String
annoArg txt = case txt of
annoArg txt = case txt of
Line_anno str -> str
Group_anno ls -> unlines ls

Expand Down
2 changes: 1 addition & 1 deletion Common/ConvertMixfixToken.hs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ makeFloatTerm f d e asAppl t@(Token s p) =
convertMixfixToken :: LiteralAnnos -> AsAppl a
-> (Token -> a) -> Token -> ([Diagnosis], a)
convertMixfixToken ga asAppl toTerm t = let
te = toTerm t
te = toTerm t
err s = ([Diag Error ("missing %" ++ s ++ " annotation") (tokPos t)], te)
in if isString t then
case string_lit ga of
Expand Down
2 changes: 1 addition & 1 deletion Common/Earley.hs
Original file line number Diff line number Diff line change
Expand Up @@ -447,6 +447,6 @@ getResolved pp p toExpr st = let
Nothing

showAmbigs :: (a -> ShowS) -> Range -> [a] -> Diagnosis
showAmbigs pp p as = Diag Error
showAmbigs pp p as = Diag Error
("ambiguous mixfix term\n " ++ showSepList (showString "\n ") pp
(take 5 as) "") p
4 changes: 2 additions & 2 deletions Common/Id.hs
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ appendNumber (Id tokList idList range) nr = let
isAlphaToken tok = case tokStr tok of
c : _ -> isAlpha c
"" -> False
genTok tList tList1 n = case tList of
genTok tList tList1 n = case tList of
[] -> [mkSimpleId $ genNamePrefix ++ "n" ++ show n]
-- for invisible identifiers
tok : tokens ->
Expand Down Expand Up @@ -338,7 +338,7 @@ getPlainTokenList = getTokenList place
-- Replace top-level places with the input String
getTokenList :: String -> Id -> [Token]
getTokenList placeStr (Id ts cs ps) =
let convert = map (\ t -> if isPlace t then t {tokStr = placeStr} else t)
let convert = map (\ t -> if isPlace t then t {tokStr = placeStr} else t)
-- reconstruct tokens of a compound list
-- although positions will be replaced (by scan)
getCompoundTokenList comps = concat .
Expand Down
2 changes: 1 addition & 1 deletion Common/Token.hs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ innerMix2 l = let p = innerList l in

-- | any mixfix components within braces or brackets
innerList :: ([String], [String]) -> GenParser Char st [Token]
innerList l = option [] (innerMix1 l <|> innerMix2 l <?> "token")
innerList l = option [] (innerMix1 l <|> innerMix2 l <?> "token")

-- | mixfix components starting with a 'sid' (outside 'innerList')
topMix1 :: ([String], [String]) -> GenParser Char st [Token]
Expand Down
2 changes: 1 addition & 1 deletion Common/test_parser.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Common.Id
import Common.Token(parseId)

testP :: Show a => (b -> a) -> CharParser () b -> SourceName -> String -> IO ()
testP f p n s = case parse p n s of
testP f p n s = case parse p n s of
Left err -> putStr "parse error at " >> print err
Right x -> print $ f x

Expand Down
2 changes: 1 addition & 1 deletion HasCASL/Le.hs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ putClassMap ce = do

-- | store local assumptions
putLocalVars :: Map.Map Id VarDefn -> State.State Env ()
putLocalVars vs = do
putLocalVars vs = do
e <- State.get
State.put e { localVars = vs }

Expand Down
2 changes: 1 addition & 1 deletion HasCASL/PrintAs.hs
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ sameType g1 g2 = case (g1, g2) of
_ -> False

printVarDeclType :: Type -> Doc
printVarDeclType t = case t of
printVarDeclType t = case t of
MixfixType [] -> empty
_ -> colon <+> pretty t

Expand Down
2 changes: 1 addition & 1 deletion HasCASL/Unify.hs
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ subst m = if Map.null m then id else foldType mapTypeRec
Nothing -> t }

showDocWithPos :: Type -> ShowS
showDocWithPos a = let p = getRange a in
showDocWithPos a = let p = getRange a in
showChar '\'' . showDoc a . showChar '\''
. noShow (isNullRange p) (showChar ' ' .
showParen True (showPos $ maximum (rangeToList p)))
Expand Down
2 changes: 1 addition & 1 deletion HasCASL/VarDecl.hs
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ convTypeToKind ty = let s = showDoc ty "" in
_ -> Nothing

convertTypeToKind :: Env -> Type -> Result (Variance, Kind)
convertTypeToKind e ty = case convTypeToKind ty of
convertTypeToKind e ty = case convTypeToKind ty of
Just (v, k) -> let Result ds _ = anaKindM k $ classMap e in
if null ds then return (v, k) else Result ds Nothing
_ -> fail $ "not a kind '" ++ showDoc ty "'"
Expand Down
2 changes: 1 addition & 1 deletion Isabelle/IsaParse.hs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ typefree :: Parser String
typefree = prime <:> ident

indexsuffix :: Parser String
indexsuffix = option "" (char '.' <:> nat)
indexsuffix = option "" (char '.' <:> nat)

typevar :: Parser String
typevar = try (string "?'") <++> ident <++> option "" (char '.' <:> nat)
Expand Down
2 changes: 1 addition & 1 deletion VSE/ToSExpr.hs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ addUniformRestr sig nsens = let
(sig{
predMap = addMapSet (predMap sig) $ procsToPredMap $ Procs newProcs,

extendedInfo = Procs $ Map.union newProcs (procsMap $ extendedInfo sig)},
extendedInfo = Procs $ Map.union newProcs (procsMap $ extendedInfo sig)},
trSens ++ filter (\x -> not $ x `elem` namedConstr) nsens)

namedSenToSExpr :: Sign f Procs -> Named Sentence -> SExpr
Expand Down

0 comments on commit de2f13b

Please sign in to comment.