diff --git a/000-readme b/000-readme --- a/000-readme +++ b/000-readme @@ -6,7 +6,7 @@ Tested with Haskell Platforms 6.12.3 and 7.0.4. Testing has not been very extensive yet. -Will try to get a quickcheck harness into freesect-0.0.6. +Will try to get a quickcheck harness into freesect-0.0.8. A patched version of haskell-src-exts is used. These patched modules are provisionally renamed HSE to avoid confusion. @@ -21,10 +21,12 @@ ./z -The script is hardcoded to use the S14.hs test file, but +The script is hardcoded to use the S25.hs test file, but you can easily adjust that. -Preprocessed outputs can be examined in ./ghc* directories. +Preprocessed outputs can be examined in ./ghc* directories, unless +you've unset the GHC_F option, in which case the outputs will be +in files ./Z_*.hs. For more information, visit http://www.fremissant.net/freesect diff --git a/Doc/index.html b/Doc/index.html --- a/Doc/index.html +++ b/Doc/index.html @@ -1,6 +1,7 @@ Free Sections : A Haskell Syntax Extension + +FreeSect - #haskell discussion (Feb. 22, 2012) + Feb. 22, 2012 -- some omissions and contractions of the literal logs.

diff --git a/FilesAndParsing.hs b/FilesAndParsing.hs --- a/FilesAndParsing.hs +++ b/FilesAndParsing.hs @@ -1,12 +1,12 @@ --- Package: freesect-0.6 --- Executable: freesect --- Author: Andrew Seniuk --- Date: March 11, 2012 --- License: BSD3 (./LICENCE) --- Synopsis: Extend Haskell to support free sections --- Example: zipWith (f __ b __ d) as bs --- Usage: See accompanying files 000-readme and z +-- Package: freesect-0.7 +-- Description: Extend Haskell to support free sections +-- Example: zipWith (f __ b __ d) as cs +-- Author: Andrew Seniuk +-- Date: March 11, 2012 +-- License: BSD3 (./LICENCE) +-- Executable: freesect +-- Usage: See accompanying files 000-readme and z {-# LANGUAGE CPP #-} diff --git a/Main.hs b/Main.hs --- a/Main.hs +++ b/Main.hs @@ -1,12 +1,12 @@ --- Package: freesect-0.6 --- Executable: freesect --- Author: Andrew Seniuk --- Date: March 11, 2012 --- License: BSD3 (./LICENCE) --- Synopsis: Extend Haskell to support free sections --- Example: zipWith (f __ b __ d) as bs --- Usage: See accompanying files 000-readme and z +-- Package: freesect-0.7 +-- Description: Extend Haskell to support free sections +-- Example: zipWith (f __ b __ d) as cs +-- Author: Andrew Seniuk +-- Date: March 11, 2012 +-- License: BSD3 (./LICENCE) +-- Executable: freesect +-- Usage: See accompanying files 000-readme and z {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE FlexibleContexts #-} -- needed for some of the type sigs. diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -# BINPATHNAME -/media/ramdisk/freesect: \ +# >>BINPATHNAME<< +./dist/build/freesect/freesect: \ ./Main.hs ./FilesAndParsing.hs ./HSE.hs ./HSE/Annotated.hs ./HSE/Annotated/Build.hs ./HSE/Annotated/ExactPrint.hs ./HSE/Annotated/Fixity.hs ./HSE/Annotated/Simplify.hs ./HSE/Annotated/Syntax.hs ./HSE/Build.hs ./HSE/Comments.hs ./HSE/ExtScheme.hs ./HSE/Extension.hs ./HSE/Fixity.hs ./HSE/Lexer.hs ./HSE/ParseMonad.hs ./HSE/ParseSyntax.hs ./HSE/ParseUtils.hs ./HSE/Parser.hs ./HSE/Pretty.hs ./HSE/SrcLoc.hs ./HSE/Syntax.hs ./HSE/InternalParser.hs csh ile # Needed because of use of CPP definitions across multiple source files. -# They are defined using -optP to GHC, so changes to those options in ./ile +# They are defined using -optP to GHC, so changes to those options in ./z # require recompilation of affected modules. ./Main.hs: ./z touch Main.hs diff --git a/S14.hs b/S14.hs --- a/S14.hs +++ b/S14.hs @@ -7,7 +7,8 @@ data D = D Int String - main = printList $ zipWith _[ f (__,b) $ D __ d ]_ as cs + main = printList $ zipWith ( f (__,b) $ D __ d ) as cs -- now possible +--main = printList $ zipWith _[ f (__,b) $ D __ d ]_ as cs where f :: (Char,Float) -> D -> String f (a,b) (D c d) = d ++ ( show ( b * fromIntegral (ord a + c) ) ) diff --git a/S15.hs b/S15.hs --- a/S15.hs +++ b/S15.hs @@ -3,11 +3,11 @@ module S15(main) where - main = do putStrLn $ unlines $ map show [v1,v2,v3,v4,v5,v6,v7,v8,v9] + main = do putStrLn $ unlines $ map show [v1,v2,v3,v4,v5,v6,v7,v8] +--main = do putStrLn $ unlines $ map show [v1,v2,v3,v4,v5,v6,v7,v8,v9] - v0= (f __ y) - v9= map (foo (g __) x) (h __) - v8= _[ __ ]_ 5 +--v9= map (foo (g __) x) (h __) + v8= [ _[ __ ]_ 5 ] v7= let f = (+) in zipWith f [1,2,3] [4,5,6] v6= let f = ( (+) __ 2 ) in map f [1,2,3] v5= let f = (+) __ 2 in map f [1,2,3] diff --git a/S23.hs b/S23.hs --- a/S23.hs +++ b/S23.hs @@ -7,12 +7,12 @@ -- -- This module won't compile, but you can examine the preprocessed code. - sectA = zipWith ( f __ y __ ) - sectB = zipWith _[ f __ y __ ]_ - sectC = zipWith $ f __ y __ - sectD = zipWith ( f __ ( g __ z ) ) xs - sectE = zipWith ( f __ $ g __ z ) xs - sectF = zipWith $ f __ $ g __ z xs - sectG = zipWith $ f __ $ g __ z - sectH = f __ $ g __ z + v= zipWith ( f __ y __ ) + v= zipWith _[ f __ y __ ]_ + v= zipWith $ f __ y __ + v= zipWith ( f __ ( g __ z ) ) xs + v= zipWith ( f __ $ g __ z ) xs + v= zipWith $ f __ $ g __ z xs + v= zipWith $ f __ $ g __ z + v= f __ $ g __ z diff --git a/S24.hs b/S24.hs --- a/S24.hs +++ b/S24.hs @@ -2,7 +2,7 @@ {- # LANGUAGE FreeSections #-} -- with GHC's -F you cannot... -- Might as well test interaction with the pre-existing - -- tuple section generalisation. + -- tuple section generalisation. (GHC knows about this one.) {-# LANGUAGE TupleSections #-} module S24 where @@ -50,18 +50,18 @@ v= _[ Ctor { f3 = __ } ]_ 2 -- EnumFrom Exp -- unbounded arithmetic sequence v= _[ [__..] ]_ - v= _[ [__..] ]_ $ 3 + v= _[ [__..] ]_ 3 -- EnumFromTo Exp Exp -- bounded arithmetic sequence - v= _[ [__..__] ]_ $ 3 5 + v= _[ [__..__] ]_ 3 5 -- EnumFromThen Exp Exp -- unbounded arithmetic sequence with stride - v= _[ [__,__..] ]_ $ 3 5 + v= _[ [__,__..] ]_ 3 5 -- EnumFromThenTo Exp Exp Exp -- bounded arithmetic sequence with stride - v= _[ [__,__..__] ]_ $ 3 5 8 + v= _[ [__,__..__] ]_ 3 5 8 -- ListComp Exp [QualStmt] -- ordinary list comprehension - v= _[ [f __ x|x<-[1..3]] $ 2 ]_ + v= _[ [f __ x|x<-[1..3]] ]_ 2 {- still not working - v= _[ [f 2 x|x<- __ ] $ [1..3] ]_ - v= _[ [f __ x|x<- __ ] $ 2 [1..3] ]_ + v= _[ [f 2 x|x<- __ ] ]_ [1..3] + v= _[ [f __ x|x<- __ ] ]_ 2 [1..3] -} -- ParComp Exp [[QualStmt]] -- parallel list comprehension --v= ?? diff --git a/S25.hs b/S25.hs --- a/S25.hs +++ b/S25.hs @@ -1,6 +1,9 @@ {- # LANGUAGE FreeSections #-} -- with GHC's -F you cannot... - {-# LANGUAGE TupleSections #-} -- with GHC's -F you cannot... + + -- Might as well test interaction with the pre-existing + -- tuple section generalisation. (GHC knows about this one.) + {-# LANGUAGE TupleSections #-} module S25 where diff --git a/S26.hs b/S26.hs --- a/S26.hs +++ b/S26.hs @@ -1,10 +1,12 @@ - {-# LANGUAGE FreeSections #-} -- with GHC's -F you cannot... + {- # LANGUAGE FreeSections #-} -- with GHC's -F you cannot... + -- Testing guarded RHS's which are finally supported. + module S26 where v x | x == 1 = g _[ a __ b ]_ __ c | x == 2 = g _[ a __ b ]_ __ c - | _[ __ == 2 ]_ = g _[ a __ b ]_ __ c +-- | _[ __ == 2 ]_ 3 = g _[ a __ b ]_ __ c -- error "not RHS context" or so | otherwise = g _[ a __ b ]_ __ c diff --git a/S27.hs b/S27.hs new file mode 100644 --- /dev/null +++ b/S27.hs @@ -0,0 +1,11 @@ + {- # LANGUAGE FreeSections #-} -- with GHC's -F you cannot... + + module S27 where + + v= f __ y + + v= a $ b __ c $ d + +--v= [x|x<- __ ] [1..3] -- XXX still a problem, but must be commented-out +-- -- because otherwise freesect runtime error. + diff --git a/cln b/cln --- a/cln +++ b/cln @@ -1,8 +1,8 @@ #!/bin/csh -# CLNSCRIPT (don't remove this comment or change the two following lines) -#echo "Check script first, it uses rm..." -#exit 1 +# >>CLNSCRIPT<< + echo "Check script first, it uses rm..." + exit 1 ## Temp file created by freesect (non GHC -F mode): rm -f Z_[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]* >&! /dev/null @@ -12,6 +12,9 @@ ## Test input's GHC-generated files: rm -f S[0-9][0-9].{o,hi} S[0-9][0-9] >&! /dev/null + +## Regenerated with cabal sdist: +#rm -rf ./dist >&! /dev/null ## FreeSect linked binary: #rm -f /media/ramdisk/freesect >&! /dev/null diff --git a/freesect.cabal b/freesect.cabal --- a/freesect.cabal +++ b/freesect.cabal @@ -1,6 +1,6 @@ Name: freesect -Version: 0.6 -Synopsis: A Haskell syntax extension for generalised sections. +Version: 0.7 +Synopsis: A Haskell syntax extension for generalised sections Description: This package provides a preprocessor executable, \'freesect\', which implements a generalisation of sections (\'free sections\') @@ -10,18 +10,17 @@ Homepage: http://fremissant.net/freesect License: BSD3 License-file: LICENSE -Author: Andrew Seniuk +Author: Andrew Seniuk Maintainer: Andrew Seniuk -bug-reports: Please send email to the maintainer. Stability: Provisional Category: Language Build-type: Custom Cabal-version: >= 1.2.3 Extra-source-files: - -- You may not make use of all of these ones: - 000-readme, Makefile, cln, freesect.sh, ile, z, zpack + -- You might not make use of these ones: + 000-readme, Makefile, cln, freesect.sh, ile, z, zpack, -- These are example modules containing free sections for testing: - S14.hs, S15.hs, S23.hs, S24.hs, S25.hs, S26.hs + S14.hs, S15.hs, S23.hs, S24.hs, S25.hs, S26.hs, S27.hs, -- Snapshot of documentation; visit the homepage for up-to-date versions: Doc/index.html, Doc/irc.html, -- The rest are critical for building freesect: diff --git a/freesect.sh b/freesect.sh --- a/freesect.sh +++ b/freesect.sh @@ -1,11 +1,11 @@ #!/bin/sh -# RTSOPTS (do not remove this comment; the next line is automatically edited) +# >>RTSOPTS<< rtsopts="+RTS -K96m -RTS" -# BINPATHNAME (do not remove comment, or change the following two lines) - binpathname=/media/ramdisk/freesect -#binpathname=./dist/build/freesect/freesect +# >>BINPATHNAME<< +#binpathname=/media/ramdisk/freesect + binpathname=./dist/build/freesect/freesect $binpathname \ $rtsopts \ diff --git a/ile b/ile --- a/ile +++ b/ile @@ -10,9 +10,9 @@ mkdir -p dist/build/freesect/freesect-tmp >&! /dev/null -# BINPATHNAME (do not remove comment, or change the following two lines) - set binpathname = /media/ramdisk/freesect -#set binpathname = ./dist/build/freesect/freesect +# >>BINPATHNAME<< +#set binpathname = /media/ramdisk/freesect + set binpathname = ./dist/build/freesect/freesect ghc --make \ -idist/build/freesect/freesect-tmp \ diff --git a/z b/z --- a/z +++ b/z @@ -10,10 +10,10 @@ if ( ${#argv} == 0 ) then set test=S25 else if ( ${#argv} > 1 ) then - shift foreach i ( $* ) - source ./z + source ./z $i end + exit else set test=$1 endif @@ -102,9 +102,9 @@ echo freesect infiles=$infiles outfile=$outfile -# BINPATHNAME (do not remove comment, or change the following two lines) - set binpathname = /media/ramdisk/freesect -#set binpathname = ./dist/build/freesect/freesect +# >>BINPATHNAME<< +#set binpathname = /media/ramdisk/freesect + set binpathname = ./dist/build/freesect/freesect $binpathname \ $rtsopts \ diff --git a/zpack b/zpack --- a/zpack +++ b/zpack @@ -1,6 +1,6 @@ # -# Package with cabal, and attempt build in test dir ../TestPack. +# Package with cabal, and attempt build in test dir ./TestBuild. # 1) We need to change the path to build the binary executable, # from /media/ramdisk to . (dot). @@ -25,7 +25,7 @@ 'EOF' ed -s ./Makefile >&! /dev/null <<'EOF' /BINPATHNAME/ -.+1s/..*/.\/.\/dist\/build\/freesect\/freesect: \\/ +.+1s/..*/.\/dist\/build\/freesect\/freesect: \\/ wq 'EOF' ed -s ./cln >&! /dev/null <<'EOF' @@ -80,10 +80,10 @@ # 4) Set up the TestBuild dir. set srcdir=$cwd -/bin/rm -rf ../TestBuild >&! /dev/null -mkdir ../TestBuild -cp -p dist/freesect-*.tar.gz ../TestBuild -cd ../TestBuild +/bin/rm -rf TestBuild >&! /dev/null +mkdir TestBuild +cp -p dist/freesect-*.tar.gz TestBuild +cd TestBuild tar zxf freesect-*.tar.gz cd freesect-*[0-9]