diff --git a/src/GF.hs b/src/GF.hs index c610841c2..1b5432870 100644 --- a/src/GF.hs +++ b/src/GF.hs @@ -1,11 +1,16 @@ ---------------------------------------------------------------------- -- | --- Module: Main --- Responsible: Aarne Ranta (aarne@cs.chalmers.se) --- Time-stamp: <2005-02-02, 15:41> +-- Module : Main +-- Maintainer : Aarne Ranta +-- Stability : (stability) +-- Portability : (portability) -- --- This is the main module in GF ----------------------------------------------------------------------- +-- > CVS $Date: 2005/02/03 15:13:35 $ +-- > CVS $Author: peb $ +-- > CVS $Revision: 1.18 $ +-- +-- (Description) +----------------------------------------------------------------------------- module Main (main) where diff --git a/src/GF/Canon/GetGFC.hs b/src/GF/Canon/GetGFC.hs index 8bf2fab82..7da27bd90 100644 --- a/src/GF/Canon/GetGFC.hs +++ b/src/GF/Canon/GetGFC.hs @@ -18,5 +18,6 @@ getCanonModule file = do getCanonGrammar :: FilePath -> IOE CanonGrammar getCanonGrammar file = do s <- ioeIO $ readFileIf file - c <- ioeErr {- $ err2err -} $ pCanon $ myLexer s + -- c <- ioeErr $ err2err $ pCanon $ myLexer s + c <- ioeErr $ pCanon $ myLexer s return $ canon2grammar c diff --git a/src/GF/Compile/CheckGrammar.hs b/src/GF/Compile/CheckGrammar.hs index a14b614b8..8d0d2de98 100644 --- a/src/GF/Compile/CheckGrammar.hs +++ b/src/GF/Compile/CheckGrammar.hs @@ -669,7 +669,7 @@ checkEqLType env t u trm = do (RecType rs, RecType ts) -> -- and [alpha g a b && l == k --- too strong req -- | ((l,a),(k,b)) <- zip rs ts] - -- || -- if fails, try subtyping: + -- . || -- if fails, try subtyping: all (\ (l,a) -> any (\ (k,b) -> alpha g a b && l == k) ts) rs diff --git a/src/GF/Data/Operations.hs b/src/GF/Data/Operations.hs index 024318594..003f1746f 100644 --- a/src/GF/Data/Operations.hs +++ b/src/GF/Data/Operations.hs @@ -512,7 +512,7 @@ topoSort g = reverse $ tsort 0 [ffs | ffs@(f,_) <- g, inDeg f == 0] [] where -- the generic fix point iterator -iterFix :: Eq a => ([a] -> [a]) -> [a] -> [a] +iterFix :: Eq a => ([a] -> [a]) -> [a] -> [a] iterFix more start = iter start start where iter old new = if (null new') diff --git a/src/GF/GFModes.hs b/src/GF/GFModes.hs index f17c646eb..80af79d8d 100644 --- a/src/GF/GFModes.hs +++ b/src/GF/GFModes.hs @@ -1,11 +1,16 @@ ---------------------------------------------------------------------- -- | --- Module: GFModes --- Responsible: Aarne Ranta (aarne@cs.chalmers.se) --- Time-stamp: <2005-02-02, 15:24> +-- Module : Main +-- Maintainer : Aarne Ranta +-- Stability : (stability) +-- Portability : (portability) -- --- (Description of the module) ----------------------------------------------------------------------- +-- > CVS $Date: 2005/02/03 15:13:36 $ +-- > CVS $Author: peb $ +-- > CVS $Revision: 1.4 $ +-- +-- (Description) +----------------------------------------------------------------------------- module GFModes (gfInteract, gfBatch, batchCompile) where diff --git a/src/GF/Shell/CommandL.hs b/src/GF/Shell/CommandL.hs index 93214781e..a01e9cf08 100644 --- a/src/GF/Shell/CommandL.hs +++ b/src/GF/Shell/CommandL.hs @@ -75,7 +75,7 @@ pCommand = pCommandWords . words where pCommandWords s = case s of "n" : cat : _ -> CNewCat cat "t" : ws -> CNewTree $ unwords ws - "g" : ws -> CRefineWithTree $ unwords ws -- *g*ive + "g" : ws -> CRefineWithTree $ unwords ws -- example: *g*ive "p" : ws -> CRefineParse $ unwords ws "rc": i : _ -> CRefineWithClip (readIntArg i) ">" : i : _ -> CAhead $ readIntArg i diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs index 0fc7349f3..f54d0f4a0 100644 --- a/src/GF/Speech/SRG.hs +++ b/src/GF/Speech/SRG.hs @@ -44,7 +44,8 @@ data SRG = SRG { grammarName :: String -- ^ grammar name data SRGRule = SRGRule String String [SRGAlt] -- ^ SRG category name, original category name -- and productions type SRGAlt = [Symbol String Token] -type CatName = (String,String) -- ^ SRG category name and original name +type CatName = (String,String) +-- ^ SRG category name and original name type CatNames = FiniteMap String String diff --git a/src/haddock/haddock-script.csh b/src/haddock/haddock-script.csh new file mode 100644 index 000000000..90825e4d3 --- /dev/null +++ b/src/haddock/haddock-script.csh @@ -0,0 +1,81 @@ +#!/bin/tcsh + +###################################################################### +# Author: Peter Ljunglöf +# Time-stamp: "2005-02-03, 16:05" +# CVS $Date: 2005/02/03 15:13:36 $ +# CVS $Author: peb $ +# +# a script for producing documentation through Haddock +###################################################################### + +set base = `pwd` +set docdir = $base/haddock +set resourcedir = $base/haddock-resources + +set dirs = (. api compile grammar infra shell source canonical useGrammar cf newparsing parsers notrace cfgm speech visualization for-ghc) +set rmfiles = {Lex,Par}{CFG,GF,GFC}.hs + +###################################################################### + +echo 0. Cleaning Haddock directory + +rm $docdir/* + +###################################################################### + +echo 1. Selecting and copying Haskell files + +foreach d ($dirs) + echo -- Directory: $d + cd $base/$d + foreach f (*.hs) + tr "\240" " " < $f > $docdir/$f + end +end + +###################################################################### + +echo +echo 2. Removing unnecessary files + +cd $docdir +echo -- `ls $rmfiles` +rm $rmfiles + +###################################################################### + +echo +echo 3. Invoking Haddock + +cd $docdir +haddock -h -t 'Grammatical Framework' *.hs + +###################################################################### + +echo +echo 4. Restructuring to HTML framesets + +cd $docdir +echo -- Substituting for frame targets inside html files +mv index.html index-frame.html +foreach f (*.html) + perl -pe 's/ tempfile + mv tempfile $f +end + +cd $resourcedir +echo -- Copying resource files: +echo -- `ls` +cp * $docdir + +###################################################################### + +echo +echo 5. Finished +echo -- The documentation is located at: +echo -- $docdir/index.html + +cd $base + + diff --git a/src/haddock/resources/blank.html b/src/haddock/resources/blank.html new file mode 100644 index 000000000..63ab0b172 --- /dev/null +++ b/src/haddock/resources/blank.html @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/haddock/resources/index.html b/src/haddock/resources/index.html new file mode 100644 index 000000000..5d8822dc5 --- /dev/null +++ b/src/haddock/resources/index.html @@ -0,0 +1,14 @@ + + + + + + +Grammatical Framework programmer's documentation + + + + + +