[kaya] Add in keyword in let statement
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Aug 28 09:19:49 UTC 2013
commit 5b65dc3e80c192bfeea134c640d0806988a20354
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Aug 28 11:19:35 2013 +0200
Add in keyword in let statement
kaya-0.5.2-ghc76.patch | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/kaya-0.5.2-ghc76.patch b/kaya-0.5.2-ghc76.patch
index 3f7de65..3312df1 100644
--- a/kaya-0.5.2-ghc76.patch
+++ b/kaya-0.5.2-ghc76.patch
@@ -1,6 +1,6 @@
diff -up kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 kaya-0.5.2/compiler/CodegenCPP.hs
---- kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 2013-08-27 21:47:07.488306019 +0200
-+++ kaya-0.5.2/compiler/CodegenCPP.hs 2013-08-27 21:48:17.920648399 +0200
+--- kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 2013-08-28 10:49:13.712430846 +0200
++++ kaya-0.5.2/compiler/CodegenCPP.hs 2013-08-28 10:49:13.769427124 +0200
@@ -17,6 +17,8 @@ import Debug.Trace
import Lib
import Data.List
@@ -20,8 +20,8 @@ diff -up kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 kaya-0.5.2/compiler/CodegenCPP.
writecpp :: [CompileResult] -> [Output]
writecpp [] = []
diff -up kaya-0.5.2/compiler/Driver.hs.ghc76 kaya-0.5.2/compiler/Driver.hs
---- kaya-0.5.2/compiler/Driver.hs.ghc76 2013-08-27 22:10:31.976436068 +0200
-+++ kaya-0.5.2/compiler/Driver.hs 2013-08-28 10:35:38.659241807 +0200
+--- kaya-0.5.2/compiler/Driver.hs.ghc76 2013-08-28 10:49:13.719430389 +0200
++++ kaya-0.5.2/compiler/Driver.hs 2013-08-28 11:09:33.519884124 +0200
@@ -37,6 +37,7 @@ import System.Random
import System.IO
import Debug.Trace
@@ -30,20 +30,20 @@ diff -up kaya-0.5.2/compiler/Driver.hs.ghc76 kaya-0.5.2/compiler/Driver.hs
import Control.Monad
-- Compile a file, with extra options to gcc, and main options. Returns the
-@@ -68,8 +69,8 @@ compileFile prtype modname fn extra opts
+@@ -67,8 +68,8 @@ compileFile prtype modname fn extra opts
+ -- lazy)
catch (do startup <- getStartup prtype libdirs
let pt = addToPT (parse newroot libdirs (prog++startup) fn) pinput
- compile newroot libdirs opts pt extra mainfile)
+- compile newroot libdirs opts pt extra mainfile)
- (\e -> do putStrLn (show e)
-- return CompError)
-+ (\ (e :: SomeException) -> (do putStrLn (show e)
-+ return CompError))
++ in compile newroot libdirs opts pt extra mainfile)
++ (\ (e :: SomeException) -> do putStrLn (show e)
+ return CompError)
outputfile Module mod = showuser mod ++ ".o"
- -- TMP HACK: This should probably be a %extension "cgi" directive in the .ks
diff -up kaya-0.5.2/compiler/Module.hs.ghc76 kaya-0.5.2/compiler/Module.hs
---- kaya-0.5.2/compiler/Module.hs.ghc76 2013-08-27 21:33:00.658326051 +0200
-+++ kaya-0.5.2/compiler/Module.hs 2013-08-27 21:33:00.689323999 +0200
+--- kaya-0.5.2/compiler/Module.hs.ghc76 2013-08-28 10:49:13.738429149 +0200
++++ kaya-0.5.2/compiler/Module.hs 2013-08-28 10:49:13.774426798 +0200
@@ -14,8 +14,9 @@ module Module(importVersion, findFile, f
getAllLibDirs, linkFiles, getObjs) where
@@ -66,7 +66,7 @@ diff -up kaya-0.5.2/compiler/Module.hs.ghc76 kaya-0.5.2/compiler/Module.hs
-- KAYA_LIBRARY_PATH environment variable.
diff -up kaya-0.5.2/compiler/Portability64.hs.ghc76 kaya-0.5.2/compiler/Portability64.hs
--- kaya-0.5.2/compiler/Portability64.hs.ghc76 2009-04-12 12:02:24.000000000 +0200
-+++ kaya-0.5.2/compiler/Portability64.hs 2013-08-27 21:33:00.692323801 +0200
++++ kaya-0.5.2/compiler/Portability64.hs 2013-08-28 10:49:13.777426602 +0200
@@ -5,12 +5,14 @@ import System.IO
import System.Environment
import qualified Data.Map as Map
@@ -84,8 +84,8 @@ diff -up kaya-0.5.2/compiler/Portability64.hs.ghc76 kaya-0.5.2/compiler/Portabil
tempfile :: IO (FilePath, Handle)
tempfile = do env <- environment "TMPDIR"
diff -up kaya-0.5.2/compiler/REPL.hs.in.ghc76 kaya-0.5.2/compiler/REPL.hs.in
---- kaya-0.5.2/compiler/REPL.hs.in.ghc76 2013-08-27 21:33:35.693007532 +0200
-+++ kaya-0.5.2/compiler/REPL.hs.in 2013-08-27 21:34:53.229876977 +0200
+--- kaya-0.5.2/compiler/REPL.hs.in.ghc76 2013-08-28 10:49:13.750428365 +0200
++++ kaya-0.5.2/compiler/REPL.hs.in 2013-08-28 10:49:13.780426406 +0200
@@ -35,6 +35,8 @@ import System.IO
import @readlinemodule@
import System.Directory
More information about the scm-commits
mailing list