diff options
| author | bringert <unknown> | 2005-04-21 15:21:02 +0000 |
|---|---|---|
| committer | bringert <unknown> | 2005-04-21 15:21:02 +0000 |
| commit | 5c9917ff8d18ddaefd5a8bf4b223009747477fd8 (patch) | |
| tree | 46345cb91a8e0fa626a0bf4c03af8f8ef4cad09f /src/GF/Parsing/CFG | |
| parent | 3433c978480f112bf04a895d03ec15529796ecce (diff) | |
Fixed module names and imports after giant file move.
Diffstat (limited to 'src/GF/Parsing/CFG')
| -rw-r--r-- | src/GF/Parsing/CFG/General.hs | 14 | ||||
| -rw-r--r-- | src/GF/Parsing/CFG/Incremental.hs | 16 | ||||
| -rw-r--r-- | src/GF/Parsing/CFG/PInfo.hs | 8 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/GF/Parsing/CFG/General.hs b/src/GF/Parsing/CFG/General.hs index 52b3c5665..4f5959a85 100644 --- a/src/GF/Parsing/CFG/General.hs +++ b/src/GF/Parsing/CFG/General.hs @@ -4,14 +4,14 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/18 14:55:33 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.3 $ +-- > CVS $Date: 2005/04/21 16:23:08 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.4 $ -- -- CFG parsing with a general chart ----------------------------------------------------------------------------- -module GF.NewParsing.CFG.General +module GF.Parsing.CFG.General (parse, Strategy) where import GF.System.Tracing @@ -19,10 +19,10 @@ import GF.Infra.Print import GF.Formalism.Utilities import GF.Formalism.CFG -import GF.NewParsing.CFG.PInfo -import GF.NewParsing.GeneralChart +import GF.Parsing.CFG.PInfo +import GF.Data.GeneralDeduction import GF.Data.Assoc -import Monad +import Control.Monad parse :: (Ord n, Ord c, Ord t) => Strategy -> CFParser c n t parse strategy grammar start = extract . diff --git a/src/GF/Parsing/CFG/Incremental.hs b/src/GF/Parsing/CFG/Incremental.hs index 54aaf3b6d..adab2b73c 100644 --- a/src/GF/Parsing/CFG/Incremental.hs +++ b/src/GF/Parsing/CFG/Incremental.hs @@ -4,29 +4,29 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/18 14:55:33 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.3 $ +-- > CVS $Date: 2005/04/21 16:23:09 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.4 $ -- -- Incremental chart parsing for CFG ----------------------------------------------------------------------------- -module GF.NewParsing.CFG.Incremental +module GF.Parsing.CFG.Incremental (parse, Strategy) where import GF.System.Tracing import GF.Infra.Print -import Array +import Data.Array -import Operations +import GF.Data.Operations import GF.Data.SortedList import GF.Data.Assoc import GF.Formalism.Utilities import GF.Formalism.CFG -import GF.NewParsing.CFG.PInfo -import GF.NewParsing.IncrementalChart +import GF.Parsing.CFG.PInfo +import GF.Data.IncrementalDeduction -- | parsing strategy: (predict:(BU, TD), filter:(BU, TD)) diff --git a/src/GF/Parsing/CFG/PInfo.hs b/src/GF/Parsing/CFG/PInfo.hs index c8bb9af29..81d8d3724 100644 --- a/src/GF/Parsing/CFG/PInfo.hs +++ b/src/GF/Parsing/CFG/PInfo.hs @@ -4,14 +4,14 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/18 14:55:33 $ --- > CVS $Author: peb $ --- > CVS $Revision: 1.3 $ +-- > CVS $Date: 2005/04/21 16:23:10 $ +-- > CVS $Author: bringert $ +-- > CVS $Revision: 1.4 $ -- -- CFG parsing, parser information ----------------------------------------------------------------------------- -module GF.NewParsing.CFG.PInfo +module GF.Parsing.CFG.PInfo (CFParser, CFPInfo(..), buildCFPInfo) where import GF.System.Tracing |