[major cleanups of directory structure, jhc's source is now in the src/ directory
John Meacham <john@repetae.net>**20090709040209
 Ignore-this: 44ffa20a1701e9a285215b7f34fa8400
] adddir ./src
move ./C ./src/C
move ./CharIO.hs ./src/CharIO.hs
move ./Cmm ./src/Cmm
move ./DataConstructors.hs ./src/DataConstructors.hs
move ./DataConstructors.hs-boot ./src/DataConstructors.hs-boot
move ./DerivingDrift ./src/DerivingDrift
move ./E ./src/E
move ./FindFixpoint.hs ./src/FindFixpoint.hs
move ./Fixer ./src/Fixer
move ./FlagDump.flags ./src/FlagDump.flags
move ./FlagOpts.flags ./src/FlagOpts.flags
move ./FrontEnd ./src/FrontEnd
move ./GenUtil.hs ./src/GenUtil.hs
move ./Grin ./src/Grin
move ./Ho ./src/Ho
move ./Info ./src/Info
move ./Interactive.hs ./src/Interactive.hs
move ./Main.hs ./src/Main.hs
move ./Name ./src/Name
move ./Options.hs ./src/Options.hs
move ./PackedString.hs ./src/PackedString.hs
move ./Stats.hs ./src/Stats.hs
move ./StringTable ./src/StringTable
move ./Support ./src/Support
move ./Util ./src/Util
move ./Version ./src/Version
move ./cbits ./src/cbits
move ./data ./src/data
move ./selftest ./src/selftest
move ./test ./examples
hunk ./Makefile.am 7
-jhc_SOURCES = Main.hs  $(HSFILES) $(BUILT_SOURCES) $(HSBOOT) $(DRIFTFILES)
+jhc_SOURCES = src/Main.hs  $(HSFILES) $(BUILT_SOURCES) $(HSBOOT) $(DRIFTFILES)
hunk ./Makefile.am 9
-SUFFIXES= .hs .lhs .o .hi .hsc .c .h .ly .hi-boot .hs-boot .o-boot
+#SUFFIXES= .hs .lhs .o .hi .hsc .c .h .ly .hi-boot .hs-boot .o-boot
+#SUFFIXES=
hunk ./Makefile.am 12
-BUILT_SOURCES= PrimitiveOperators.hs RawFiles.hs FrontEnd/HsParser.hs FlagDump.hs \
-	       FlagOpts.hs Name/Prim.hs Info/Properties.hs $(DRIFTFILES)
+BUILT_SOURCES= src/PrimitiveOperators.hs src/RawFiles.hs src/FrontEnd/HsParser.hs src/FlagDump.hs \
+	       src/FlagOpts.hs src/Name/Prim.hs src/Info/Properties.hs $(DRIFTFILES)
hunk ./Makefile.am 15
-MY_CINCLUDES= -I$(srcdir)/data -I$(srcdir)/StringTable -I$(srcdir)/cbits -I$(builddir)/cbits
+MY_CINCLUDES= -I$(srcdir)/src/data -I$(srcdir)/src/StringTable -I$(srcdir)/src/cbits -I$(builddir)/src/cbits
hunk ./Makefile.am 18
-HSFILES=C/Generate.hs CharIO.hs Cmm/Number.hs Cmm/OpEval.hs DerivingDrift/DataP.hs \
-	DerivingDrift/Drift.hs DerivingDrift/RuleUtils.hs Doc/Attr.hs Doc/Chars.hs Doc/DocLike.hs \
-	Doc/PPrint.hs Doc/Pretty.hs E/Annotate.hs E/Binary.hs E/Diff.hs E/E.hs E/Eta.hs E/Eval.hs \
-	E/FreeVars.hs E/FromHs.hs E/Inline.hs E/LetFloat.hs E/PrimOpt.hs E/Program.hs E/Rules.hs \
-	E/Show.hs E/Subst.hs E/Traverse.hs E/TypeAnalysis.hs E/Values.hs E/WorkerWrapper.hs \
-	FindFixpoint.hs Fixer/Fixer.hs Fixer/Supply.hs Fixer/VMap.hs FlagDump.hs FlagOpts.hs \
-	FrontEnd/DataConsAssump.hs FrontEnd/DeclsDepends.hs FrontEnd/DependAnalysis.hs FrontEnd/Desugar.hs \
-	FrontEnd/Diagnostic.hs FrontEnd/FrontEnd.hs FrontEnd/HsErrors.hs FrontEnd/HsParser.hs \
-	FrontEnd/HsPretty.hs FrontEnd/Infix.hs FrontEnd/Lexer.hs FrontEnd/ParseMonad.hs FrontEnd/ParseUtils.hs \
-	FrontEnd/Rename.hs FrontEnd/Syn/Options.hs FrontEnd/Syn/Traverse.hs FrontEnd/Tc/Class.hs FrontEnd/Tc/Main.hs \
-	FrontEnd/Tc/Module.hs FrontEnd/Tc/Type.hs FrontEnd/Tc/Unify.hs FrontEnd/TypeSigs.hs FrontEnd/TypeSynonyms.hs\
-       	FrontEnd/TypeSyns.hs FrontEnd/Unlit.hs FrontEnd/Utils.hs FrontEnd/Warning.hs GenUtil.hs Grin/DeadCode.hs\
-       	Grin/Devolve.hs Grin/EvalInline.hs Grin/FromE.hs Grin/Grin.hs Grin/HashConst.hs Grin/Lint.hs\
-       	Grin/NodeAnalyze.hs Grin/Noodle.hs Grin/Optimize.hs Grin/Show.hs Grin/Simplify.hs Grin/Val.hs \
-	Grin/Whiz.hs Ho/Binary.hs Ho/Collected.hs Ho/Library.hs Info/Binary.hs Info/Info.hs Info/Properties.hs \
-	Info/Types.hs Interactive.hs Main.hs Name/Binary.hs Name/Id.hs Name/Name.hs Name/Names.hs \
-	Name/Prim.hs PackedString.hs PrimitiveOperators.hs \
-	RawFiles.hs Stats.hs Support/CanType.hs Support/CFF.hs Support/Compat.hs \
-	Support/FreeVars.hs Support/MapBinaryInstance.hs Support/MD5.hs Support/Tickle.hs Support/Transform.hs \
-	Support/Tuple.hs Support/Unparse.hs Util/BitSet.hs Util/ContextMonad.hs Util/FilterInput.hs \
-	Util/Gen.hs Util/Graph.hs Util/Graphviz.hs Util/HasSize.hs Util/Histogram.hs Util/Inst.hs \
-	Util/IntBag.hs Util/Interact.hs Util/NameMonad.hs Util/Once.hs Util/Perhaps.hs Util/ReaderWriter.hs \
-	Util/Relation.hs Util/RWS.hs Util/SameShape.hs Util/Seq.hs Util/SetLike.hs Util/UnionFind.hs \
-	Util/UnionSolve.hs Util/UniqueMonad.hs Util/Util.hs Util/VarName.hs Version/Config.hs Version/Version.hs \
-	Support/IniParse.hs E/Lint.hs
+HSFILES=src/C/Generate.hs src/CharIO.hs src/Cmm/Number.hs src/Cmm/OpEval.hs src/DerivingDrift/DataP.hs \
+	src/DerivingDrift/Drift.hs src/DerivingDrift/RuleUtils.hs src/Doc/Attr.hs src/Doc/Chars.hs src/Doc/DocLike.hs \
+	src/Doc/PPrint.hs src/Doc/Pretty.hs src/E/Annotate.hs src/E/Binary.hs src/E/Diff.hs src/E/E.hs src/E/Eta.hs src/E/Eval.hs \
+	src/E/FreeVars.hs src/E/FromHs.hs src/E/Inline.hs src/E/LetFloat.hs src/E/PrimOpt.hs src/E/Program.hs src/E/Rules.hs \
+	src/E/Show.hs src/E/Subst.hs src/E/Traverse.hs src/E/TypeAnalysis.hs src/E/Values.hs src/E/WorkerWrapper.hs \
+	src/FindFixpoint.hs src/Fixer/Fixer.hs src/Fixer/Supply.hs src/Fixer/VMap.hs src/FlagDump.hs src/FlagOpts.hs \
+	src/FrontEnd/DataConsAssump.hs src/FrontEnd/DeclsDepends.hs src/FrontEnd/DependAnalysis.hs src/FrontEnd/Desugar.hs \
+	src/FrontEnd/Diagnostic.hs src/FrontEnd/FrontEnd.hs src/FrontEnd/HsErrors.hs src/FrontEnd/HsParser.hs \
+	src/FrontEnd/HsPretty.hs src/FrontEnd/Infix.hs src/FrontEnd/Lexer.hs src/FrontEnd/ParseMonad.hs src/FrontEnd/ParseUtils.hs \
+	src/FrontEnd/Rename.hs src/FrontEnd/Syn/Options.hs src/FrontEnd/Syn/Traverse.hs src/FrontEnd/Tc/Class.hs src/FrontEnd/Tc/Main.hs \
+	src/FrontEnd/Tc/Module.hs src/FrontEnd/Tc/Type.hs src/FrontEnd/Tc/Unify.hs src/FrontEnd/TypeSigs.hs src/FrontEnd/TypeSynonyms.hs\
+       	src/FrontEnd/TypeSyns.hs src/FrontEnd/Unlit.hs src/FrontEnd/Utils.hs src/FrontEnd/Warning.hs src/GenUtil.hs src/Grin/DeadCode.hs\
+       	src/Grin/Devolve.hs src/Grin/EvalInline.hs src/Grin/FromE.hs src/Grin/Grin.hs src/Grin/HashConst.hs src/Grin/Lint.hs\
+       	src/Grin/NodeAnalyze.hs src/Grin/Noodle.hs src/Grin/Optimize.hs src/Grin/Show.hs src/Grin/Simplify.hs src/Grin/Val.hs \
+	src/Grin/Whiz.hs src/Ho/Binary.hs src/Ho/Collected.hs src/Ho/Library.hs src/Info/Binary.hs src/Info/Info.hs src/Info/Properties.hs \
+	src/Info/Types.hs src/Interactive.hs src/Main.hs src/Name/Binary.hs src/Name/Id.hs src/Name/Name.hs src/Name/Names.hs \
+	src/Name/Prim.hs src/PackedString.hs src/PrimitiveOperators.hs \
+	src/RawFiles.hs src/Stats.hs src/Support/CanType.hs src/Support/CFF.hs src/Support/Compat.hs \
+	src/Support/FreeVars.hs src/Support/MapBinaryInstance.hs src/Support/MD5.hs src/Support/Tickle.hs src/Support/Transform.hs \
+	src/Support/Tuple.hs src/Support/Unparse.hs src/Util/BitSet.hs src/Util/ContextMonad.hs src/Util/FilterInput.hs \
+	src/Util/Gen.hs src/Util/Graph.hs src/Util/Graphviz.hs src/Util/HasSize.hs src/Util/Histogram.hs src/Util/Inst.hs \
+	src/Util/IntBag.hs src/Util/Interact.hs src/Util/NameMonad.hs src/Util/Once.hs src/Util/Perhaps.hs src/Util/ReaderWriter.hs \
+	src/Util/Relation.hs src/Util/RWS.hs src/Util/SameShape.hs src/Util/Seq.hs src/Util/SetLike.hs src/Util/UnionFind.hs \
+	src/Util/UnionSolve.hs src/Util/UniqueMonad.hs src/Util/Util.hs src/Util/VarName.hs src/Version/Config.hs src/Version/Version.hs \
+	src/Support/IniParse.hs src/E/Lint.hs
hunk ./Makefile.am 48
-	 -i$(srcdir)/.  -i$(builddir) -odir $(builddir) -hidir $(builddir)
+	 -i$(srcdir)/src  -i$(builddir)/src -odir $(builddir)/src -hidir $(builddir)/src
hunk ./Makefile.am 61
-EXTRA_DIST = data utils docs FrontEnd/HsParser.y $(BUILT_SOURCES) \
+EXTRA_DIST = src/data utils docs src/FrontEnd/HsParser.y $(BUILT_SOURCES) \
hunk ./Makefile.am 63
-	     StringTable/StringTable_cbits.c StringTable/StringTable_cbits.h cbits/md5sum.c jhc.1 \
-	     StringTable/Atom.hsc jhc.spec lib/applicative/applicative.cabal lib/containers.cabal \
+	     src/StringTable/StringTable_cbits.c src/StringTable/StringTable_cbits.h src/cbits/md5sum.c jhc.1 \
+	     src/StringTable/Atom.hsc jhc.spec lib/applicative/applicative.cabal lib/containers.cabal \
hunk ./Makefile.am 85
-	$(INSTALL_DATA) "$(srcdir)/data/HsFFI.h" $(DESTDIR)$(datadir)/@PACKAGE@-@SHORTVERSION@/include ;
-	$(INSTALL_DATA) "$(srcdir)/data/targets.ini" $(DESTDIR)$(sysconfdir)/@PACKAGE@-@SHORTVERSION@ ;
+	$(INSTALL_DATA) "$(srcdir)/src/data/HsFFI.h" $(DESTDIR)$(datadir)/@PACKAGE@-@SHORTVERSION@/include ;
+	$(INSTALL_DATA) "$(srcdir)/src/data/targets.ini" $(DESTDIR)$(sysconfdir)/@PACKAGE@-@SHORTVERSION@ ;
hunk ./Makefile.am 99
-RAWFILES = data/HsFFI.h data/rts/jhc_rts.c data/rts/jhc_rts_header.h data/wsize.h data/rts/jhc_rts_alloc.c data/rts/jhc_rts2.c data/ViaGhc.hs ChangeLog data/shortchange.txt data/prelude.m4
+RAWFILES = src/data/HsFFI.h src/data/rts/jhc_rts.c src/data/rts/jhc_rts_header.h src/data/wsize.h src/data/rts/jhc_rts_alloc.c src/data/rts/jhc_rts2.c src/data/ViaGhc.hs ChangeLog src/data/shortchange.txt src/data/prelude.m4 src/data/targets.ini
hunk ./Makefile.am 109
-drift_processed/%: %
+drift_processed/%: src/%
hunk ./Makefile.am 114
-CFILES =  StringTable/StringTable_cbits.o  cbits/md5sum.o
+CFILES =  src/StringTable/StringTable_cbits.o  src/cbits/md5sum.o
hunk ./Makefile.am 120
-jhc: Main.hs  $(HSFILES) $(BUILT_SOURCES) StringTable/Atom.hs $(CFILES)
+jhc: src/Main.hs  $(HSFILES) $(BUILT_SOURCES) src/StringTable/Atom.hs $(CFILES)
hunk ./Makefile.am 123
-jhcp: Main.hs $(BUILT_SOURCES) $(HSFILES) StringTable/Atom.hs $(CFILES)
+jhcp: src/Main.hs $(BUILT_SOURCES) $(HSFILES) src/StringTable/Atom.hs $(CFILES)
hunk ./Makefile.am 131
-HSBOOT= DataConstructors.hs-boot FrontEnd/Tc/Class.hs-boot Grin/Grin.hs-boot Grin/Show.hs-boot Info/Binary.hs-boot E/Show.hs-boot
+HSBOOT= src/DataConstructors.hs-boot src/FrontEnd/Tc/Class.hs-boot src/Grin/Grin.hs-boot src/Grin/Show.hs-boot src/Info/Binary.hs-boot src/E/Show.hs-boot
hunk ./Makefile.am 146
-Info/Properties.hs: data/props.txt utils/gen_props.prl
+src/Info/Properties.hs: src/data/props.txt utils/gen_props.prl
hunk ./Makefile.am 150
-PrimitiveOperators.hs: utils/op_process.prl data/operators.txt data/primitives.txt data/PrimitiveOperators-in.hs
+src/PrimitiveOperators.hs: utils/op_process.prl src/data/operators.txt src/data/primitives.txt src/data/PrimitiveOperators-in.hs
hunk ./Makefile.am 153
-Name/Prim.hs: utils/op_names.prl data/primitives.txt data/names.txt
+src/Name/Prim.hs: utils/op_names.prl src/data/primitives.txt src/data/names.txt
hunk ./Makefile.am 156
-RawFiles.hs:  utils/op_raw.prl $(RAWFILES)
+src/RawFiles.hs:  utils/op_raw.prl $(RAWFILES)
hunk ./Makefile.am 159
-FrontEnd/HsParser.hs: FrontEnd/HsParser.y
+src/FrontEnd/HsParser.hs: src/FrontEnd/HsParser.y
hunk ./Makefile.am 164
-.SECONDARY: _darcs/hashed_inventory data/shortchange.txt
+.SECONDARY: _darcs/hashed_inventory src/data/shortchange.txt
hunk ./Makefile.am 169
-data/shortchange.txt: ChangeLog
+src/data/shortchange.txt: ChangeLog
hunk ./Makefile.am 190
-	$(HC) -M -optdep-f -optdep$@ $(GHCOPTS) Main.hs
+	$(HC) -M -optdep-f -optdep$@ $(GHCOPTS) src/Main.hs
hunk ./Makefile.am 201
-	$(HC) --interactive $(GHCOPTS) Main.hs $(CFILES)
+	$(HC) --interactive $(GHCOPTS) src/Main.hs $(CFILES)
hunk ./Makefile.am 251
-manual: utils/stitch.prl FlagDump.mkd FlagOpts.mkd options.mkd
-	find . ! -wholename '*/test/*'  ! -wholename '*/_darcs/*' ! -wholename '*/drift_processed/*'  ! -wholename '*/regress/*'  \( -name '*.hs' -o -name '*.hsc' -o -name '*.mkd' -o -wholename '*/data/rts/*.c' \) | xargs perl utils/stitch.prl > manual.mkd
+manual: utils/stitch.prl src/FlagDump.mkd src/FlagOpts.mkd options.mkd
+	find . ! -wholename '*/examples/*'  ! -wholename '*/_darcs/*' ! -wholename '*/drift_processed/*'  ! -wholename '*/regress/*'  \( -name '*.hs' -o -name '*.hsc' -o -name '*.mkd' -o -wholename '*/data/rts/*.c' \) | xargs perl utils/stitch.prl > manual.mkd
hunk ./Makefile.am 255
-man: utils/stitch.prl FlagDump.mkd FlagOpts.mkd options.mkd docs/man_header.mkd
-	find . ! -wholename '*/test/*'  ! -wholename '*/_darcs/*' ! -wholename '*/drift_processed/*'  ! -wholename '*/regress/*'  \( -name '*.hs' -o -name '*.hsc' -o -name '*.mkd' -o -wholename '*/data/rts/*.c' \) | xargs perl utils/stitch.prl -h docs/man_header.mkd -c Using,Options > jhc_man.mkd
+man: utils/stitch.prl src/FlagDump.mkd src/FlagOpts.mkd options.mkd docs/man_header.mkd
+	find . ! -wholename '*/examples/*'  ! -wholename '*/_darcs/*' ! -wholename '*/drift_processed/*'  ! -wholename '*/regress/*'  \( -name '*.hs' -o -name '*.hsc' -o -name '*.mkd' -o -wholename '*/data/rts/*.c' \) | xargs perl utils/stitch.prl -h docs/man_header.mkd -c Using,Options > jhc_man.mkd
hunk ./Makefile.am 272
-helloworld: test/HelloWorld.hs jhc
+%: examples/%.hs jhc
hunk ./Makefile.am 274
-	./jhc -v -L- -L. $(JHC_TEST) test/HelloWorld.hs -o $@ 2>&1 | tee $@.log
-calendar: test/Calendar.hs jhc
-	-[ -e $@.log ] && mv -f $@.log $@.log.bak
-	./jhc -v -L- -L. $(JHC_TEST) test/Calendar.hs -o $@ 2>&1 | tee $@.log
-primes: test/Primes.hs jhc
-	-[ -e $@.log ] && mv -f $@.log $@.log.bak
-	./jhc -v -L- -L. $(JHC_TEST) test/Primes.hs -o $@ 2>&1 | tee $@.log
+	./jhc -v -L- -L. $(JHC_TEST) $< -o $@ 2>&1 | tee $@.log
+
hunk ./configure.ac 2
-AC_CONFIG_SRCDIR(Main.hs)
+AC_CONFIG_SRCDIR(src/Main.hs)
hunk ./configure.ac 44
-AX_CREATE_STDINT_H([cbits/_stdint.h])
+dnl AX_CREATE_STDINT_H([cbits/_stdint.h])
hunk ./configure.ac 58
-AC_CONFIG_FILES([Makefile jhc.spec Version/Config.hs docs/building.mkd cbits/config.h])
+AC_CONFIG_FILES([Makefile jhc.spec src/Version/Config.hs docs/building.mkd src/cbits/config.h])
hunk ./docs/development.mkd 21
-    * binary ghc library
-    * zlib ghc library
-    * utf8-string ghc library
hunk ./docs/development.mkd 26
+    * for ghc 6.8 you need the binary, zlib, and utf8-string libraries installed. ghc 6.10 may require more depending on how it is installed.
hunk ./docs/development.mkd 32
-    cd jhc
+    cd jhc/src
hunk ./docs/development.mkd 34
-    cd lib
+    cd ../lib
hunk ./docs/development.mkd 50
-    make helloworld
+    make HelloWorld
hunk ./docs/development.mkd 56
-    ./jhc -v --noauto -ilib/base -ilib/haskell98 test/HelloWorld.hs -o helloworld
+    ./jhc -v --noauto -ilib/base -ilib/haskell98 examples/HelloWorld.hs -o helloworld
addfile ./examples/BinaryTrees.hs
hunk ./examples/BinaryTrees.hs 1
+{-# OPTIONS_GHC -fglasgow-exts -O2 -optc-O3 -funbox-strict-fields #-}
+-- The Great Computer Language Shootout
+-- http://shootout.alioth.debian.org/
+-- Simon Marlow
+-- Shortened by Don Stewart
+-- De-optimized by Isaac Gouy
+
+import System; import Text.Printf; import Control.Monad
+
+data Tree = Nil | Node !Int Tree Tree
+
+min' = 4 :: Int
+
+main = do max' <- getArgs >>= return . max (min'+2) . read . head
+          printf "stretch tree of depth %d\t check: %d\n" (max'+1) (itemCheck $ make 0 (max'+1))
+          depthLoop min' max'
+          printf "long lived tree of depth %d\t check: %d\n" max' (itemCheck $ make 0 max')
+
+depthLoop :: Int -> Int -> IO ()
+depthLoop d m = when (d <= m) $ do
+        printf "%d\t trees of depth %d\t check: %d\n" (2*n) d (sumLoop n d 0)
+        depthLoop (d+2) m
+    where n = 2^(m - d + min')
+
+sumLoop 0 d acc = acc
+sumLoop k d acc = c `seq` sumLoop (k-1) d (acc + c + c')
+    where (c,c')  = (itemCheck (make k d), itemCheck (make (-1*k) d))
+
+-- make i (0::Int) = i `seq` Nil
+make :: Int -> Int -> Tree
+make i 0 = Node i Nil Nil
+make i d = Node i (make ((2*i)-1) (d-1)) (make (2*i) (d-1))
+
+itemCheck Nil = 0
+itemCheck (Node x l r) = x + itemCheck l - itemCheck r
hunk ./examples/jump.hs 1
-import System.IO.Continuation
-
-
-go :: IOCont s String -> IO ()
-go cont = do
-    putStrLn "hello"
-    --newContinuation (go' cont) (const undefined)
-    callContinuation cont "there"
-    putStrLn "you"
-
-
-main = do
-    newContinuation go putStrLn
rmfile ./examples/jump.hs
hunk ./examples/test.sh 1
-echo `pwd`
-mkdir _darcs
-touch _darcs/inventory
-[ -e Doc ] || darcs get http://repetae.net/john/repos/Doc
-[ -e Boolean ] || darcs get http://repetae.net/john/repos/Boolean
-make && ./jhc $* -flint -v test/HelloWorld.hs
rmfile ./examples/test.sh
hunk ./src/Options.hs 36
+import RawFiles(targets_ini)
hunk ./src/Options.hs 326
-    inis <- parseIniFiles (optVerbose o2 > 0) ["data/targets.ini", confDir ++ "/targets.ini", confDir ++ "/targets-local.ini", home ++ "/etc/jhc/targets.ini", home ++ "/.jhc/targets.ini"] (optArch o2)
+    inis <- parseIniFiles (optVerbose o2 > 0) targets_ini [confDir ++ "/targets.ini", confDir ++ "/targets-local.ini", home ++ "/etc/jhc/targets.ini", home ++ "/.jhc/targets.ini"] (optArch o2)
hunk ./src/StringTable/StringTable_cbits.h 4
-#include <_stdint.h>
+#include <stdint.h>
hunk ./src/Support/IniParse.hs 109
-    
hunk ./src/Support/IniParse.hs 110
+
hunk ./src/Support/IniParse.hs 112
-parseIniFile fp = do
+parseIniFile fp = readFile fp >>= parseIniRaw fp
+
+parseIniRaw :: String -> String -> IO (Seq.Seq (String,Seq.Seq (String,String)))
+parseIniRaw fp c = do
hunk ./src/Support/IniParse.hs 117
-    c <- readFile fp
hunk ./src/Support/IniParse.hs 120
-parseIniFiles 
+parseIniFiles
hunk ./src/Support/IniParse.hs 122
+    -> String        -- ^ raw ini contents to parse first
hunk ./src/Support/IniParse.hs 124
-    -> [String]      -- ^ the m-flags 
+    -> [String]      -- ^ the m-flags
hunk ./src/Support/IniParse.hs 126
-parseIniFiles verbose fs ss = do
-    let rf fn = catch (do c <- parseIniFile fn; pverb ("reading " ++ fn); return c) (\_ -> return Seq.empty) 
+parseIniFiles verbose raw fs ss = do
+    let rf fn = catch (do c <- parseIniFile fn; pverb ("reading " ++ fn); return c) (\_ -> return Seq.empty)
hunk ./src/Support/IniParse.hs 129
+    rawp <- parseIniRaw "(builtin targets.ini)" raw
hunk ./src/Support/IniParse.hs 131
-    let pini = processIni (foldr (Seq.><) Seq.empty fsc)
+    let pini = processIni (foldr (Seq.><) Seq.empty (rawp:fsc))
hunk ./src/Support/IniParse.hs 141
-        
+
hunk ./src/cbits/md5sum.c 29
-#include "_stdint.h"
+#include <stdint.h>
hunk ./utils/op_names.prl 14
-open PR, "<data/primitives.txt";
+open PR, "<src/data/primitives.txt";
hunk ./utils/op_names.prl 60
-open my $fd, "<data/names.txt";
+open my $fd, "<src/data/names.txt";
hunk ./utils/op_process.prl 7
-open OP, "<data/operators.txt";
+open OP, "<src/data/operators.txt";
hunk ./utils/op_process.prl 91
-open PR, "<data/primitives.txt";
+open PR, "<src/data/primitives.txt";
hunk ./utils/op_process.prl 239
-my $head = `cat data/PrimitiveOperators-in.hs`;
+my $head = `cat src/data/PrimitiveOperators-in.hs`;
hunk ./utils/op_raw.prl 7
+$mod =~ s/^.*\///;
hunk ./utils/opt_sets.prl 15
+$name =~ s/^.*\///;