sifflet-lib 1.2.4 → 1.2.5

raw patch · 8 files changed

+21/−22 lines, 8 filesdep −haskell98dep ~basedep ~filepathdep ~process

Dependencies removed: haskell98

Dependency ranges changed: base, filepath, process, unix

Files

• LICENSE +1/−1
• Sifflet/Foreign/ToHaskell.hs +1/−1
• Sifflet/Foreign/ToPython.hs +1/−1
• Sifflet/Language/Expr.hs +1/−1
• Sifflet/Rendering/DrawTreeGraph.hs +1/−1
• Sifflet/UI/Tool.hs +8/−9
• Sifflet/UI/Window.hs +1/−1
• sifflet-lib.cabal +7/−7

@@ -1,6 +1,6 @@ Sifflet License -Copyright (C) 2010 Gregory D. Weber+Copyright (C) 2010-2012 Gregory D. Weber All rights reserved.  Redistribution and use in source and binary forms, with or without

@@ -12,7 +12,7 @@     ) where -import Char (toUpper)+import Data.Char (toUpper) import qualified Data.Map as M import System.FilePath (dropExtension, takeFileName) 

@@ -17,7 +17,7 @@  where -import Char (isAlpha, isDigit, ord)+import Data.Char (isAlpha, isDigit, ord) import Control.Monad (unless) import Data.Map ((!)) import System.Directory (copyFile, doesFileExist)

@@ -44,7 +44,7 @@ -- drop this after debugging: import System.IO.Unsafe(unsafePerformIO) -import Data.Map as Map hiding (filter, map, null)+import Data.Map as Map hiding (filter, foldl, map, null) import Data.List as List  import Data.Number.Sifflet

@@ -8,7 +8,7 @@  where -import IO+import System.IO import Data.IORef import System.Cmd import Graphics.UI.Gtk.Gdk.EventM

@@ -8,7 +8,6 @@     , makeCopyTool     , makeDeleteTool     , makeDisconnectTool-    , makeFixedArgTool     , makeIfTool     , makeMoveTool     , showFunctionEntry@@ -95,8 +94,8 @@       ToolMove -> makeMoveTool       ToolDelete -> makeDeleteTool       ToolFunction funcname -> functionTool funcname-      ToolLiteral e -> makeFixedLiteralTool e-      ToolArg argname -> makeFixedArgTool argname+      ToolLiteral e -> makeBoundLiteralTool e+      ToolArg argname -> makeBoundArgTool argname   defaultContextDescription :: String@@ -231,8 +230,8 @@           -- not in an edit frame, do nothing           return canvas -makeFixedLiteralTool :: Expr -> Tool-makeFixedLiteralTool e =+makeBoundLiteralTool :: Expr -> Tool+makeBoundLiteralTool e =     let enode node = ENode node EvalUntried         addLitNode node vw toolContext _mods x y =             case toolContext of@@ -251,15 +250,15 @@          EString s -> mktool (NString s)          EList es -> if exprIsLiteral e                      then mktool (NList es)-                     else errcats ["makeFixedLiteralTool: ",+                     else errcats ["makeBoundLiteralTool: ",                                    "non-literal list expression",                                    show e]          _ ->-             errcats ["makeFixedLiteralTool: non-literal or",+             errcats ["makeBoundLiteralTool: non-literal or",                       "extended expression", show e] -makeFixedArgTool :: String -> Tool-makeFixedArgTool label = +makeBoundArgTool :: String -> Tool+makeBoundArgTool label =      let node = ENode (NSymbol (Symbol label)) EvalUntried         addArgNode vw toolContext _mods x y =             case toolContext of

@@ -673,7 +673,7 @@ aboutText :: String aboutText =     unlines ["Sifflet version " ++ showVersion Paths.version,-             "Copyright (C) 2010 Gregory D. Weber",+             "Copyright (C) 2010-2012 Gregory D. Weber",              "",              "BSD3 License",              "",

@@ -1,5 +1,5 @@ name: sifflet-lib-version: 1.2.4+version: 1.2.5 cabal-version: >= 1.8 build-type: Simple license: BSD3@@ -16,13 +16,14 @@   tests and its exporters. description: Supporting modules for the Sifflet visual,    functional programming language (Hackage 'sifflet' package).+  Version 1.2.5: Compatibility with GHC 7.4.1.   Version 1.2.4: Dependencies revised for compatibility with HXT 9.1.   Version 1.2.3: Dependencies revised for compatibility with GHC 7.0   and Haskell Platform 2011.2. category:    Language   , Visual Programming-tested-with: GHC == 6.12.3, GHC == 7.0.1+tested-with: GHC == 7.4.1 data-files: sifflet.scm sifflet.py siffml-1.0.dtd data-dir: datafiles extra-tmp-files:@@ -33,7 +34,7 @@ library    build-depends:-    base >= 4.0 && < 4.4,+    base >= 4.0 && < 4.6, -- begin GTK stuff, these no longer need to have the same version -- numbers     cairo >= 0.11 && < 0.13,@@ -42,15 +43,14 @@ -- end     containers >= 0.2 && < 0.5,     directory >= 1.0 && < 1.2,-    filepath >= 1.1 && < 1.3,+    filepath >= 1.1 && < 1.4,     fgl >= 5.4 && < 5.5,-    haskell98 >= 1.0.1 && < 1.2,     hxt >= 9.0 && < 10.0,     mtl >= 1.1 && < 2.1,     parsec >= 2.1.0.1 && < 3.2, -    process >= 1.0 && < 1.1+    process >= 1.0 && < 1.2   if !os(windows)-    build-depends: unix >= 2.3 && < 2.5+    build-depends: unix >= 2.3 && < 2.6   buildable: True   extensions: ForeignFunctionInterface CPP   ghc-options: -Wall