Changeset 12730
- Timestamp:
- 26.10.2009 17:16:14 (4 weeks ago)
- Location:
- trunk
- Files:
-
- 62 modified
-
CASL/CompositionTable/ModelChecker.hs (modified) (1 diff)
-
CASL/QuickCheck.hs (modified) (1 diff)
-
CASL_DL/StatAna.hs (modified) (1 diff)
-
CMDL/ConsCommands.hs (modified) (1 diff)
-
CMDL/DataTypesUtils.hs (modified) (1 diff)
-
CMDL/DgCommands.hs (modified) (1 diff)
-
CMDL/InfoCommands.hs (modified) (2 diffs)
-
CMDL/ProveCommands.hs (modified) (2 diffs)
-
CMDL/Shell.hs (modified) (1 diff)
-
CMDL/UndoRedo.hs (modified) (1 diff)
-
CMDL/Utils.hs (modified) (1 diff)
-
Common/ProverTools.hs (modified) (1 diff)
-
Comorphisms/CASL2PCFOL.hs (modified) (1 diff)
-
Comorphisms/CASL_DL2CASL.hs (modified) (2 diffs)
-
Comorphisms/CoCASL2CoPCFOL.hs (modified) (1 diff)
-
Comorphisms/CoCASL2CoSubCFOL.hs (modified) (1 diff)
-
Comorphisms/Haskell2IsabelleHOLCF.hs (modified) (1 diff)
-
Comorphisms/Hs2HOLCF.hs (modified) (1 diff)
-
Comorphisms/Hs2HOLCFaux.hs (modified) (2 diffs)
-
Comorphisms/LogicGraph.hs (modified) (1 diff)
-
Comorphisms/OWL2CASL.hs (modified) (1 diff)
-
CspCASL/StatAnaCSP.hs (modified) (1 diff)
-
Driver/Options.hs (modified) (1 diff)
-
GUI/AbstractGraphView.hs (modified) (1 diff)
-
GUI/GraphAbstraction.hs (modified) (2 diffs)
-
GUI/GraphLogic.hs (modified) (1 diff)
-
HasCASL/ConvertTypePattern.hs (modified) (1 diff)
-
HasCASL/Merge.hs (modified) (1 diff)
-
HasCASL/OpDecl.hs (modified) (1 diff)
-
HasCASL/ParseTerm.hs (modified) (1 diff)
-
HasCASL/TypeAna.hs (modified) (1 diff)
-
HasCASL/TypeCheck.hs (modified) (1 diff)
-
Interfaces/GenericATPState.hs (modified) (1 diff)
-
Interfaces/History.hs (modified) (1 diff)
-
Logic/Morphism.hs (modified) (1 diff)
-
Maude/Language.hs (modified) (1 diff)
-
Maude/Logic_Maude.hs (modified) (2 diffs)
-
Maude/Morphism.hs (modified) (4 diffs)
-
Maude/Symbol.hs (modified) (1 diff)
-
OMDoc/Export.hs (modified) (1 diff)
-
OWL/Conservativity.hs (modified) (1 diff)
-
OWL/ProvePellet.hs (modified) (1 diff)
-
PGIP/XMLparsing.hs (modified) (1 diff)
-
Proofs/Composition.hs (modified) (1 diff)
-
Proofs/Global.hs (modified) (1 diff)
-
Proofs/HideTheoremShift.hs (modified) (1 diff)
-
Proofs/Local.hs (modified) (1 diff)
-
Proofs/SimpleTheoremHideShift.hs (modified) (1 diff)
-
Propositional/Analysis.hs (modified) (1 diff)
-
Propositional/Conservativity.hs (modified) (1 diff)
-
Propositional/Parse_AS_Basic.hs (modified) (1 diff)
-
Propositional/Prove.hs (modified) (1 diff)
-
Propositional/ProveMinisat.hs (modified) (2 diffs)
-
Propositional/ProveWithTruthTable.hs (modified) (1 diff)
-
RelationalScheme/StaticAnalysis.hs (modified) (1 diff)
-
SoftFOL/MathServMapping.hs (modified) (1 diff)
-
SoftFOL/PrintTPTP.hs (modified) (1 diff)
-
SoftFOL/ProverState.hs (modified) (1 diff)
-
Static/ToXml.hs (modified) (1 diff)
-
Taxonomy/MMiSSOntology.hs (modified) (1 diff)
-
Taxonomy/MMiSSOntologyGraph.hs (modified) (1 diff)
-
VSE/Ana.hs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CASL/CompositionTable/ModelChecker.hs
r11620 r12730 30 30 import Data.Maybe 31 31 import Data.List 32 import Control.Monad33 32 34 33 modelCheck :: SIMPLE_ID -> (Sign () (), [Named (FORMULA ())]) -
trunk/CASL/QuickCheck.hs
r12661 r12730 39 39 import Control.Monad.Error 40 40 import Control.Concurrent 41 import Control.Concurrent.MVar42 43 import System.IO44 41 45 42 import GUI.GenericATP -
trunk/CASL_DL/StatAna.hs
r12405 r12730 45 45 import Common.ConvertLiteral 46 46 import Common.ExtSign 47 48 import Data.List49 47 50 48 instance FreeVars DL_FORMULA where -
trunk/CMDL/ConsCommands.hs
r12530 r12730 40 40 import qualified Common.OrderedMap as OMap 41 41 42 import System.IO(IO)43 42 import Data.Graph.Inductive.Graph(LNode, LEdge) 44 import Data.Char(String) 45 import Data.List((++), map, groupBy, find, sortBy, concatMap) 43 import Data.List (groupBy, find, sortBy) 46 44 47 45 -- Command that processes the input and applies a -
trunk/CMDL/DataTypesUtils.hs
r12587 r12730 47 47 48 48 import Data.Graph.Inductive.Graph(LNode, LEdge, Node) 49 import Data.List ((++), filter, find, null)49 import Data.List (find) 50 50 51 51 import Common.Result(Result(maybeResult, Result)) -
trunk/CMDL/DgCommands.hs
r12626 r12730 64 64 import Common.AS_Annotation 65 65 66 import Control.Monad67 66 68 67 import Data.Graph.Inductive.Graph (LEdge) 69 68 import qualified Data.Map as Map 70 69 import qualified Data.Set as Set 71 import Data.Maybe72 70 73 71 -- | Wraps Result structure around the result of a dg all style command -
trunk/CMDL/InfoCommands.hs
r12639 r12730 62 62 import Data.List 63 63 import qualified Data.Set as Set 64 import qualified Data.Map as Map65 64 66 65 import Logic.Logic (Sentences(sym_of)) … … 72 71 import Interfaces.Command (cmdNameStr, describeCmd, showCmd) 73 72 import Interfaces.DataTypes 74 import Interfaces.Utils (getAllEdges , getAllNodes)73 import Interfaces.Utils (getAllEdges) 75 74 76 75 -- show list of all goals(i.e. prints their name) -
trunk/CMDL/ProveCommands.hs
r12661 r12730 41 41 import Common.Utils(trim) 42 42 43 import Data.List ((++), filter, map, find, nub, words, concatMap)43 import Data.List (find, nub) 44 44 45 45 import Comorphisms.LogicGraph(lookupComorphism_in_LG) … … 55 55 import System.Posix.Signals(Handler(Catch), installHandler, sigINT) 56 56 #endif 57 import System.IO(IO)58 57 59 58 import Interfaces.GenericATPState(ATPTacticScript(tsTimeLimit, tsExtraOpts)) -
trunk/CMDL/Shell.hs
r12661 r12730 51 51 import Data.List 52 52 import System.Directory(doesDirectoryExist, getDirectoryContents) 53 import System.IO(IO)54 53 55 54 register2history :: CmdlCmdDescription -> CmdlState -> IO CmdlState -
trunk/CMDL/UndoRedo.hs
r12484 r12730 15 15 , cRedo 16 16 ) where 17 18 19 import Data.List((++))20 21 import System.IO(IO)22 17 23 18 import Interfaces.History(redoOneStep, undoOneStep) -
trunk/CMDL/Utils.hs
r12525 r12730 39 39 import Data.List 40 40 import Data.Maybe 41 import Data.Char (Char, String,isDigit, isSpace)41 import Data.Char (isDigit, isSpace) 42 42 import Data.Graph.Inductive.Graph(LNode, LEdge) 43 43 -
trunk/Common/ProverTools.hs
r11854 r12730 17 17 import Common.Utils 18 18 19 import System.IO20 19 import System.Directory 21 import Data.List22 20 import System.IO.Unsafe 23 21 -
trunk/Comorphisms/CASL2PCFOL.hs
r12721 r12730 18 18 import Logic.Comorphism 19 19 20 import Data.List21 20 import qualified Data.Set as Set 22 21 -
trunk/Comorphisms/CASL_DL2CASL.hs
r12398 r12730 32 32 import CASL_DL.PredefinedSign 33 33 import CASL_DL.StatAna -- DLSign 34 import CASL_DL.PredefinedSign35 34 import CASL_DL.Sublogics 36 35 … … 42 41 import CASL.Sublogic as Sublogic 43 42 44 import Data.List45 43 import qualified Data.Set as Set 46 44 -
trunk/Comorphisms/CoCASL2CoPCFOL.hs
r11695 r12730 28 28 import CASL.Sign 29 29 import CASL.Morphism 30 import CASL.Sublogic31 30 import CASL.Inject 32 31 import CASL.Project -
trunk/Comorphisms/CoCASL2CoSubCFOL.hs
r11695 r12730 26 26 import CASL.Sign 27 27 import CASL.Morphism 28 import CASL.Sublogic29 28 import CASL.Fold 30 29 import CASL.Simplify -
trunk/Comorphisms/Haskell2IsabelleHOLCF.hs
r10552 r12730 27 27 import Isabelle.IsaSign as IsaSign 28 28 import Isabelle.Logic_Isabelle 29 30 -- Programatica31 import PNT32 import TiPropDecorate33 29 34 30 -- * Comorphisms -
trunk/Comorphisms/Hs2HOLCF.hs
r12314 r12730 30 30 31 31 import TiTypes 32 import TiKinds33 32 34 33 import PNT 35 34 import UniqueNames 36 35 37 import SyntaxRec38 36 import TiPropDecorate 39 37 import PropSyntaxStruct -
trunk/Comorphisms/Hs2HOLCFaux.hs
r12314 r12730 88 88 import SourceNames 89 89 import TiTypes 90 import TiKinds91 90 import TiInstanceDB 92 91 … … 95 94 import UniqueNames 96 95 97 import SyntaxRec98 96 import TiPropDecorate 99 97 import PropSyntaxStruct as HsName -
trunk/Comorphisms/LogicGraph.hs
r12684 r12730 46 46 ) where 47 47 48 import Data.Maybe49 48 import Data.List 50 49 import qualified Data.Map as Map -
trunk/Comorphisms/OWL2CASL.hs
r11988 r12730 30 30 import OWL.Sublogic 31 31 import OWL.Morphism 32 import OWL.AS33 32 import qualified OWL.Sign as OS 34 33 --CASL_DL = codomain -
trunk/CspCASL/StatAnaCSP.hs
r12398 r12730 20 20 import qualified Control.Monad as Monad 21 21 import qualified Data.Map as Map 22 import qualified Data.Maybe as Maybe23 22 import qualified Data.Set as S 24 23 import CASL.AS_Basic_CASL (FORMULA(..), OpKind(..), SORT, TERM(..), VAR, -
trunk/Driver/Options.hs
r12707 r12730 54 54 import System.Directory 55 55 import System.Console.GetOpt 56 import System.IO.Error57 56 import System.Exit 58 57 -
trunk/GUI/AbstractGraphView.hs
r11649 r12730 56 56 import GUI.UDGUtils 57 57 import qualified UDrawGraph.Types as DVT 58 import Util.Computation59 58 60 59 import ATC.DevGraph() -
trunk/GUI/GraphAbstraction.hs
r12462 r12730 42 42 import GUI.Utils (pulseBar) 43 43 import qualified UDrawGraph.Types as DVT 44 import qualified UDrawGraph.Basic as DVB45 44 import Events.Destructible as Destructible 46 45 import Reactor.BSem … … 53 52 import qualified Data.Map as Map 54 53 import Data.Graph.Inductive.Graph (LEdge) 55 import qualified Data.Graph.Inductive.Graph as Graph56 54 import Data.Maybe (isNothing) 57 55 -
trunk/GUI/GraphLogic.hs
r12717 r12730 83 83 import Data.Char(toLower) 84 84 import Data.List(partition, delete, isPrefixOf) 85 import Data.Maybe86 85 import Data.Graph.Inductive.Graph (Node, LEdge, LNode) 87 86 import qualified Data.Map as Map -
trunk/HasCASL/ConvertTypePattern.hs
r9214 r12730 17 17 , convertTypePattern 18 18 ) where 19 20 import Data.Maybe21 19 22 20 import Common.Lexer -
trunk/HasCASL/Merge.hs
r11351 r12730 37 37 38 38 import Control.Monad(foldM) 39 import Data.List40 39 41 40 mergeTypeInfo :: ClassMap -> TypeInfo -> TypeInfo -> Result TypeInfo -
trunk/HasCASL/OpDecl.hs
r12103 r12730 25 25 26 26 import Common.Id 27 import Common.AS_Annotation28 27 import Common.Lib.State as State 29 28 import Common.Result -
trunk/HasCASL/ParseTerm.hs
r12725 r12730 24 24 25 25 import Text.ParserCombinators.Parsec 26 27 import Control.Monad28 26 29 27 import Data.List ((\\)) -
trunk/HasCASL/TypeAna.hs
r12549 r12730 27 27 import Common.Lib.State 28 28 import Data.List as List 29 import Data.Maybe30 29 import Control.Monad 31 30 -
trunk/HasCASL/TypeCheck.hs
r12551 r12730 48 48 import Common.Lib.State 49 49 50 import Data.List as List51 50 import Data.Maybe (catMaybes) 52 51 import Control.Monad (when, unless) -
trunk/Interfaces/GenericATPState.hs
r12661 r12730 29 29 import Common.Utils 30 30 31 import Data.List32 31 import Data.Maybe (fromMaybe) 33 32 import Data.Time (TimeOfDay, midnight) -
trunk/Interfaces/History.hs
r12493 r12730 31 31 32 32 import qualified Data.Map as Map 33 import Data.List34 33 35 34 -- | Datatype used to differentiate between the two actions (so that code does -
trunk/Logic/Morphism.hs
r12526 r12730 28 28 import Logic.Comorphism 29 29 import qualified Data.Set as Set 30 import Data.Maybe31 30 import Data.Typeable 32 31 import ATerm.Lib -- (ShATermConvertible) -
trunk/Maude/Language.hs
r12355 r12730 28 28 ) where 29 29 30 import Text.ParserCombinators.Parsec (ParseError, CharParser) 31 import Text.ParserCombinators.Parsec.Prim ((<|>)) 32 import Text.ParserCombinators.Parsec.Char 33 import Text.ParserCombinators.Parsec.Combinator 30 import Text.ParserCombinators.Parsec hiding (parseFromFile, parse) 34 31 import qualified Text.ParserCombinators.Parsec.Token as Token 35 32 import qualified Text.ParserCombinators.Parsec.Language as Language -
trunk/Maude/Logic_Maude.hs
r12681 r12730 23 23 import Maude.Morphism (Morphism) 24 24 import qualified Maude.Symbol as Symbol 25 import qualified Maude.Sentence as Sentence26 25 import qualified Maude.Sign as Sign 27 26 import qualified Maude.Morphism as Morphism … … 35 34 import Common.ExtSign 36 35 import System.IO.Unsafe 37 38 import Data.Maybe39 40 36 41 37 -- | Lid for Maude -
trunk/Maude/Morphism.hs
r12653 r12730 54 54 import Maude.Sentence (Sentence) 55 55 import qualified Maude.Sign as Sign 56 import qualified Maude.Sentence as Sen57 56 58 57 import Data.List (partition) … … 62 61 63 62 import Common.Result (Result) 64 import qualified Common.Result as Result65 63 66 64 import Common.Doc hiding (empty) … … 89 87 instance Pretty Morphism where 90 88 pretty mor = let 91 pr'pair txt left right = hsep 89 pr'pair txt left right = hsep 92 90 [txt, pretty left, text "to", pretty right] 93 91 pr'ops src tgt = pr'pair (text "op") src (getName tgt) … … 168 166 ren'sort = mapOpMap $ uncurry renameSortOpMap syms 169 167 add'labl = mapLabelMap $ uncurry Map.insert syms 170 use'labl = if apply 168 use'labl = if apply 171 169 then mapTarget $ uncurry Sign.renameLabel syms 172 170 else id -
trunk/Maude/Symbol.hs
r12361 r12730 42 42 import Common.Lib.Rel (Rel) 43 43 import qualified Data.Set as Set 44 import qualified Data.Map as Map45 44 import qualified Common.Lib.Rel as Rel 46 45 -
trunk/OMDoc/Export.hs
r12493 r12730 32 32 33 33 import Data.Graph.Inductive.Graph 34 import Data.List35 34 import Data.Maybe 36 35 -
trunk/OWL/Conservativity.hs
r12527 r12730 20 20 21 21 import Control.Concurrent 22 import Control.Concurrent.MVar23 22 import Data.Time.Clock (UTCTime(..), getCurrentTime) 24 23 -
trunk/OWL/ProvePellet.hs
r12661 r12730 50 50 import Control.Monad (when) 51 51 import Control.Concurrent 52 import Control.Concurrent.MVar53 52 54 53 data PelletProverState = PelletProverState -
trunk/PGIP/XMLparsing.hs
r12657 r12730 41 41 42 42 import Data.List (isInfixOf) 43 import Control.Monad44 43 45 44 -- | Generates the XML packet that contains information about what -
trunk/Proofs/Composition.hs
r12527 r12730 33 33 import qualified Data.Map as Map 34 34 import Data.Graph.Inductive.Graph 35 import Data.List36 35 37 36 compositionCreatingEdgesFromList :: LibName -> [LEdge DGLinkLab] -> LibEnv -
trunk/Proofs/Global.hs
r12677 r12730 23 23 import Data.Graph.Inductive.Graph 24 24 import qualified Data.Map as Map 25 import Data.List26 25 27 26 import Static.GTheory -
trunk/Proofs/HideTheoremShift.hs
r12527 r12730 42 42 import qualified Data.Map as Map 43 43 import Data.Graph.Inductive.Graph 44 import Data.List45 44 46 45 type ListSelector m a = [a] -> m (Maybe a) -
trunk/Proofs/Local.hs
r12604 r12730 45 45 import qualified Data.Map as Map 46 46 import Data.Graph.Inductive.Graph 47 import Data.List48 47 49 48 -- | local decomposition -
trunk/Proofs/SimpleTheoremHideShift.hs
r12493 r12730 39 39 import qualified Data.Map as Map 40 40 import Data.Graph.Inductive.Graph 41 import Data.List42 41 43 42 -- | rule name -
trunk/Propositional/Analysis.hs
r12726 r12730 26 26 where 27 27 28 import qualified Propositional.AS_BASIC_Propositional as AS_BASIC29 import Propositional.Sign as Sign30 import qualified Common.GlobalAnnotations as GlobalAnnos31 import qualified Common.AS_Annotation as AS_Anno32 import qualified Common.Result as Result33 import qualified Common.Id as Id34 import qualified Data.List as List35 import qualified Data.Set as Set36 import qualified Data.Map as Map37 import qualified Propositional.Symbol as Symbol38 import qualified Propositional.Morphism as Morphism39 import Common.Doc ()40 import Common.DocUtils41 28 import Common.ExtSign 42 29 import Common.Lib.Graph 30 import Common.SetColimit 43 31 import Data.Graph.Inductive.Graph 44 import Common.SetColimit 32 import Propositional.Sign as Sign 33 import qualified Common.AS_Annotation as AS_Anno 34 import qualified Common.GlobalAnnotations as GlobalAnnos 35 import qualified Common.Id as Id 36 import qualified Common.Result as Result 37 import qualified Data.List as List 38 import qualified Data.Map as Map 39 import qualified Data.Set as Set 40 import qualified Propositional.AS_BASIC_Propositional as AS_BASIC 41 import qualified Propositional.Morphism as Morphism 42 import qualified Propositional.Symbol as Symbol 45 43 46 44 -- | Datatype for formulas with diagnosis data -
trunk/Propositional/Conservativity.hs
r12527 r12730 26 26 import System.Exit 27 27 import System.IO.Unsafe 28 import Control.Monad29 28 import qualified Data.Map as Map 30 import Common.Id31 29 import System.Cmd 32 30 import System.Directory -
trunk/Propositional/Parse_AS_Basic.hs
r12725 r12730 33 33 import Propositional.AS_BASIC_Propositional as AS_BASIC 34 34 import Text.ParserCombinators.Parsec 35 36 import Control.Monad37 35 38 36 propKeywords :: [String] -
trunk/Propositional/Prove.hs
r12662 r12730 48 48 import qualified Control.Concurrent as Concurrent 49 49 import qualified Common.Exception as Exception 50 import Data.Char51 50 import Data.List 52 51 import Data.Maybe -
trunk/Propositional/ProveMinisat.hs
r12661 r12730 43 43 import Control.Monad (when) 44 44 import qualified Control.Concurrent as Concurrent 45 import Data.Char46 import Data.List47 import Data.Maybe48 45 import Data.Time (timeToTimeOfDay) 49 46 import System.Directory … … 55 52 56 53 import Control.Concurrent 57 import Control.Concurrent.MVar58 54 59 55 -- * Prover implementation -
trunk/Propositional/ProveWithTruthTable.hs
r12661 r12730 44 44 import qualified Common.Id as Id 45 45 46 import Data.Char47 import Data.List48 import Data.Maybe49 46 import qualified Data.Set as Set 50 47 import qualified Common.OrderedMap as OMap 51 import System.IO52 48 import System.IO.Unsafe 53 49 -
trunk/RelationalScheme/StaticAnalysis.hs
r11854 r12730 20 20 import RelationalScheme.AS 21 21 import RelationalScheme.Sign 22 23 import Common.AS_Annotation 22 24 import Common.ExtSign 23 25 import Common.GlobalAnnotations 26 import Common.Id 24 27 import Common.Result 25 import Common.AS_Annotation 28 29 import Control.Monad 30 31 import Data.Maybe 26 32 import qualified Data.Set as Set 27 import Common.Id28 import Control.Monad29 import Data.Maybe30 import Data.List31 33 32 34 basic_Rel_analysis :: (RSScheme, Sign,GlobalAnnos) -> -
trunk/SoftFOL/MathServMapping.hs
r12661 r12730 23 23 import SoftFOL.MathServParsing 24 24 import SoftFOL.Sign 25 26 import Data.Maybe27 25 28 26 import Interfaces.GenericATPState -
trunk/SoftFOL/PrintTPTP.hs
r11954 r12730 16 16 17 17 module SoftFOL.PrintTPTP where 18 19 import Data.Maybe20 18 21 19 import Common.AS_Annotation -
trunk/SoftFOL/ProverState.hs
r12661 r12730 30 30 31 31 import qualified Common.Exception as Exception 32 33 import Data.Maybe34 32 35 33 import Interfaces.GenericATPState -
trunk/Static/ToXml.hs
r12493 r12730 36 36 import qualified Data.Map as Map 37 37 import qualified Data.Set as Set 38 import Data.List39 38 40 39 dGraph :: LibEnv -> DGraph -> Element -
trunk/Taxonomy/MMiSSOntology.hs
r8473 r12730 69 69 ) where 70 70 71 import Control.Monad.Error 71 import Control.Monad.Error () 72 72 import Data.List 73 73 import Data.Char (toLower) -
trunk/Taxonomy/MMiSSOntologyGraph.hs
r11173 r12730 16 16 import Control.Monad 17 17 import Data.IORef 18 import Data.Char19 18 20 19 import GUI.UDGUtils -
trunk/VSE/Ana.hs
r11990 r12730 45 45 import Data.Char (toLower) 46 46 import Data.List 47 import Data.Maybe48 47 import qualified Data.Map as Map 49 48 import qualified Data.Set as Set