"Committed_by_peb"

10 files changed, 48 insertions, 105 deletions

diff --git a/src/GF/Data/ErrM.hs b/src/GF/Data/ErrM.hs
index fe9796d7f..0c0759215 100644
--- a/src/GF/Data/ErrM.hs
+++ b/src/GF/Data/ErrM.hs
@@ -9,7 +9,7 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- hack for BNFC generated files. AR 21/9/2003
 -----------------------------------------------------------------------------
 
 module ErrM (
@@ -18,4 +18,3 @@ module ErrM (
 
 import Operations
 
--- hack for BNFC generated files. AR 21/9/2003
diff --git a/src/GF/Data/Glue.hs b/src/GF/Data/Glue.hs
index cfbe0e746..c541446b1 100644
--- a/src/GF/Data/Glue.hs
+++ b/src/GF/Data/Glue.hs
@@ -9,17 +9,15 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- AR 8-11-2003, using Markus Forsberg's implementation of Huet's @unglue@
 -----------------------------------------------------------------------------
 
-module Glue where
+module Glue (decomposeSimple, exTrie) where
 
 import Trie2
 import Operations
 import List
 
--------- AR 8/11/2003, using Markus Forsberg's implementation of Huet's unglue
-
 decomposeSimple :: Trie Char a -> [Char] -> Err [[Char]]
 decomposeSimple t s = do
   let ss = map (decompose t) $ words s
diff --git a/src/GF/Data/Map.hs b/src/GF/Data/Map.hs
index 60ba69052..107a2f6c9 100644
--- a/src/GF/Data/Map.hs
+++ b/src/GF/Data/Map.hs
@@ -1,9 +1,9 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
+-- Module      : Map
+-- Maintainer  : Markus Forsberg
+-- Stability   : Stable
+-- Portability : Haskell 98
 --
 -- > CVS $Date $ 
 -- > CVS $Author $
@@ -12,16 +12,6 @@
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-{- 
-   **************************************************************
-   * Filename      : Map.hs                                     *
-   * Author        : Markus Forsberg                            *
-   *                 markus@cs.chalmers.se                      *
-   * Last Modified : 15 December, 2001                          *
-   * Lines         : 53                                         *
-   ************************************************************** 
--}
-
 module Map 
            (
            Map,
diff --git a/src/GF/Data/OrdMap2.hs b/src/GF/Data/OrdMap2.hs
index 213f40b52..2d0f58f51 100644
--- a/src/GF/Data/OrdMap2.hs
+++ b/src/GF/Data/OrdMap2.hs
@@ -1,30 +1,22 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
+-- Module      : OrdMap2
+-- Maintainer  : Peter Ljunglöf
+-- Stability   : Obsolete
+-- Portability : Haskell 98
 --
 -- > CVS $Date $ 
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- The class of finite maps, as described in
+-- "Pure Functional Parsing", section 2.2.2
+-- and an example implementation,
+-- derived from appendix A.2
+--
+-- /OBSOLETE/! this is only used in cf\/ChartParser.hs
 -----------------------------------------------------------------------------
 
-{- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   Filename:    OrdMap2.hs
-   Author:      Peter Ljunglöf
-   Time-stamp:  <2004-05-07 14:16:03 peb>
-
-   Description: The class of finite maps, as described in
-                "Pure Functional Parsing", section 2.2.2
-		and an example implementation,
-		derived from appendix A.2
-
-  OBSOLETE! this is only used in cf/ChartParser.hs
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -}
-
 module OrdMap2 (OrdMap(..), Map) where
 
 import List (intersperse)
diff --git a/src/GF/Data/OrdSet.hs b/src/GF/Data/OrdSet.hs
index 79393a892..f2a1ec115 100644
--- a/src/GF/Data/OrdSet.hs
+++ b/src/GF/Data/OrdSet.hs
@@ -1,30 +1,22 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
+-- Module      : OrdSet
+-- Maintainer  : Peter Ljunglöf
+-- Stability   : Obsolete
+-- Portability : Haskell 98
 --
 -- > CVS $Date $ 
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- The class of ordered sets, as described in
+-- "Pure Functional Parsing", section 2.2.1,
+-- and an example implementation
+-- derived from appendix A.1
+--
+-- /OBSOLETE/! this is only used in cf\/ChartParser.hs
 -----------------------------------------------------------------------------
 
-{- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   Filename:    OrdSet.hs
-   Author:      Peter Ljunglöf
-   Time-stamp:  <2004-05-07 14:16:12 peb>
-
-   Description: The class of ordered sets, as described in
-                "Pure Functional Parsing", section 2.2.1,
-		and an example implementation
-		derived from appendix A.1
-
-  OBSOLETE! this is only used in cf/ChartParser.hs
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -}
-
 module OrdSet (OrdSet(..), Set) where
 
 import List (intersperse)
diff --git a/src/GF/Data/Parsers.hs b/src/GF/Data/Parsers.hs
index 234ddff90..357868217 100644
--- a/src/GF/Data/Parsers.hs
+++ b/src/GF/Data/Parsers.hs
@@ -1,15 +1,17 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
+-- Module      : Parsers
+-- Maintainer  : Aarne Ranta
+-- Stability   : Almost Obsolete
+-- Portability : Haskell 98
 --
 -- > CVS $Date $ 
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- some parser combinators a` la Wadler and Hutton
+-- no longer used in many places in GF
+-- (only used in EBNF.hs)
 -----------------------------------------------------------------------------
 
 module Parsers where
@@ -28,8 +30,6 @@ infixr 5 ..+
 infixr 6 |>
 infixr 3 <<<
 
--- some parser combinators a` la Wadler and Hutton
--- no longer used in many places in GF
 
 type Parser a b = [a] -> [(b,[a])]
 
diff --git a/src/GF/Data/RedBlack.hs b/src/GF/Data/RedBlack.hs
index 21e2f5586..635cbe3ad 100644
--- a/src/GF/Data/RedBlack.hs
+++ b/src/GF/Data/RedBlack.hs
@@ -1,27 +1,17 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
+-- Module      : RedBlack
+-- Maintainer  : Markus Forsberg
+-- Stability   : Stable
+-- Portability : Haskell 98
 --
 -- > CVS $Date $ 
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Modified version of Osanaki's implementation.
 -----------------------------------------------------------------------------
 
-{- 
-   **************************************************************
-   * Filename      : RedBlack.hs                                *
-   * Author        : Markus Forsberg                            *
-   *                 markus@cs.chalmers.se                      *
-   * Last Modified : 15 December, 2001                          *
-   * Lines         : 57                                         *
-   ************************************************************** 
--} -- Modified version of Osanaki's implementation.
-
 module RedBlack (
                 emptyTree,
 		isEmpty,		
diff --git a/src/GF/Data/Trie.hs b/src/GF/Data/Trie.hs
index 7cfe51fa2..e32b8560d 100644
--- a/src/GF/Data/Trie.hs
+++ b/src/GF/Data/Trie.hs
@@ -1,9 +1,9 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
+-- Module      : Trie
+-- Maintainer  : Markus Forsberg
+-- Stability   : Obsolete???
+-- Portability : Haskell 98
 --
 -- > CVS $Date $ 
 -- > CVS $Author $
@@ -12,16 +12,6 @@
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-{- 
-   **************************************************************
-   * Filename      : Trie.hs                                    *
-   * Author        : Markus Forsberg                            *
-   *                 markus@cs.chalmers.se                      *
-   * Last Modified : 17 December, 2001                          *
-   * Lines         : 51                                         *
-   ************************************************************** 
--}
-
 module Trie (
              tcompile,
 	     collapse,
diff --git a/src/GF/Data/Trie2.hs b/src/GF/Data/Trie2.hs
index d4f6a59b4..5f2d3de0a 100644
--- a/src/GF/Data/Trie2.hs
+++ b/src/GF/Data/Trie2.hs
@@ -1,9 +1,9 @@
 ----------------------------------------------------------------------
 -- |
--- Module      : (Module)
--- Maintainer  : (Maintainer)
--- Stability   : (stable)
--- Portability : (portable)
+-- Module      : Trie2
+-- Maintainer  : Markus Forsberg
+-- Stability   : Stable
+-- Portability : Haskell 98
 --
 -- > CVS $Date $ 
 -- > CVS $Author $
@@ -12,12 +12,6 @@
 -- (Description of the module)
 -----------------------------------------------------------------------------
 
-{- 
-   **************************************************************
-   * Author        : Markus Forsberg                            *
-   *                 markus@cs.chalmers.se                      *
-   ************************************************************** 
--}
 module Trie2 (
              tcompile,
 	     collapse,
diff --git a/src/GF/Data/Zipper.hs b/src/GF/Data/Zipper.hs
index 31174b71e..6d3766c51 100644
--- a/src/GF/Data/Zipper.hs
+++ b/src/GF/Data/Zipper.hs
@@ -9,15 +9,13 @@
 -- > CVS $Author $
 -- > CVS $Revision $
 --
--- (Description of the module)
+-- Gérard Huet's zipper (JFP 7 (1997)). AR 10/8/2001
 -----------------------------------------------------------------------------
 
 module Zipper where
 
 import Operations
 
--- Gérard Huet's zipper (JFP 7 (1997)). AR 10/8/2001
-
 newtype Tr a = Tr (a,[Tr a]) deriving (Show,Eq)
     
 data Path a =