From 5c9917ff8d18ddaefd5a8bf4b223009747477fd8 Mon Sep 17 00:00:00 2001
From: bringert <unknown>
Date: Thu, 21 Apr 2005 15:21:02 +0000
Subject: Fixed module names and imports after giant file move.

---
 src/GF/Parsing/MCFG/Active.hs      | 10 +++++-----
 src/GF/Parsing/MCFG/Incremental.hs | 10 +++++-----
 src/GF/Parsing/MCFG/Naive.hs       |  8 ++++----
 src/GF/Parsing/MCFG/PInfo.hs       | 10 +++++-----
 src/GF/Parsing/MCFG/Range.hs       |  6 +++---
 src/GF/Parsing/MCFG/ViaCFG.hs      | 14 +++++++-------
 6 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/GF/Parsing/MCFG')

diff --git a/src/GF/Parsing/MCFG/Active.hs b/src/GF/Parsing/MCFG/Active.hs
index dd8516379..44661b0c9 100644
--- a/src/GF/Parsing/MCFG/Active.hs
+++ b/src/GF/Parsing/MCFG/Active.hs
@@ -1,14 +1,14 @@
 
-module GF.NewParsing.MCFG.Active (parse) where
+module GF.Parsing.MCFG.Active (parse) where
 
-import GF.NewParsing.GeneralChart
+import GF.Data.GeneralDeduction
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Formalism.Utilities
-import GF.NewParsing.MCFG.Range
-import GF.NewParsing.MCFG.PInfo
+import GF.Parsing.MCFG.Range
+import GF.Parsing.MCFG.PInfo
 import GF.System.Tracing
-import Monad (guard)
+import Control.Monad (guard)
 
 ----------------------------------------------------------------------
 -- * parsing
diff --git a/src/GF/Parsing/MCFG/Incremental.hs b/src/GF/Parsing/MCFG/Incremental.hs
index 897d365c9..21467078f 100644
--- a/src/GF/Parsing/MCFG/Incremental.hs
+++ b/src/GF/Parsing/MCFG/Incremental.hs
@@ -8,19 +8,19 @@
                As described in Ljunglöf (2004)   
 ------------------------------------------------------------------------------}
 
-module IncrementalParse where
+module GF.Parsing.MCFG.Incremental where
 
 
 -- Haskell
-import List
+import Data.List
 
 -- GF modules
 import Examples
-import GeneralChart
-import MCFGrammar
+import GF.OldParsing.GeneralChart
+import GF.OldParsing.MCFGrammar
 import MCFParser
 import Parser
-import Range
+import GF.Parsing.MCFG.Range
 import Nondet
 
 
diff --git a/src/GF/Parsing/MCFG/Naive.hs b/src/GF/Parsing/MCFG/Naive.hs
index 1d315506d..4b994e726 100644
--- a/src/GF/Parsing/MCFG/Naive.hs
+++ b/src/GF/Parsing/MCFG/Naive.hs
@@ -1,14 +1,14 @@
 
-module GF.NewParsing.MCFG.Naive (parse) where
+module GF.Parsing.MCFG.Naive (parse) where
 
 
 -- GF modules
-import GF.NewParsing.GeneralChart
+import GF.Data.GeneralDeduction
 import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Formalism.Utilities
-import GF.NewParsing.MCFG.Range
-import GF.NewParsing.MCFG.PInfo
+import GF.Parsing.MCFG.Range
+import GF.Parsing.MCFG.PInfo
 import GF.Data.SortedList
 import GF.Data.Assoc
 import GF.System.Tracing
diff --git a/src/GF/Parsing/MCFG/PInfo.hs b/src/GF/Parsing/MCFG/PInfo.hs
index a51ec7d20..b89ce6d5e 100644
--- a/src/GF/Parsing/MCFG/PInfo.hs
+++ b/src/GF/Parsing/MCFG/PInfo.hs
@@ -4,14 +4,14 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/04/20 12:49:45 $ 
--- > CVS $Author: peb $
--- > CVS $Revision: 1.2 $
+-- > CVS $Date: 2005/04/21 16:23:14 $ 
+-- > CVS $Author: bringert $
+-- > CVS $Revision: 1.3 $
 --
 -- MCFG parsing, parser information
 -----------------------------------------------------------------------------
 
-module GF.NewParsing.MCFG.PInfo where
+module GF.Parsing.MCFG.PInfo where
 
 import GF.System.Tracing
 import GF.Infra.Print
@@ -21,7 +21,7 @@ import GF.Formalism.GCFG
 import GF.Formalism.MCFG
 import GF.Data.SortedList
 import GF.Data.Assoc
-import GF.NewParsing.MCFG.Range
+import GF.Parsing.MCFG.Range
 
 ----------------------------------------------------------------------
 -- type declarations
diff --git a/src/GF/Parsing/MCFG/Range.hs b/src/GF/Parsing/MCFG/Range.hs
index e60b9916e..994f8fdb7 100644
--- a/src/GF/Parsing/MCFG/Range.hs
+++ b/src/GF/Parsing/MCFG/Range.hs
@@ -1,10 +1,10 @@
 
-module GF.NewParsing.MCFG.Range where
+module GF.Parsing.MCFG.Range where
 
 
 -- Haskell
-import List
-import Monad
+import Data.List
+import Control.Monad
 
 -- GF modules
 import GF.Formalism.GCFG
diff --git a/src/GF/Parsing/MCFG/ViaCFG.hs b/src/GF/Parsing/MCFG/ViaCFG.hs
index f1b76bb75..5007eec20 100644
--- a/src/GF/Parsing/MCFG/ViaCFG.hs
+++ b/src/GF/Parsing/MCFG/ViaCFG.hs
@@ -8,24 +8,24 @@
 	       Ljunglöf (2004)   
 ------------------------------------------------------------------------------}
 
-module ApproxParse where
+module GF.Parsing.MCFG.ViaCFG where
 
 
 -- Haskell modules
-import List
-import Monad
+import Data.List
+import Control.Monad
 
 -- GF modules 
 import ConvertMCFGtoDecoratedCFG
 import qualified DecoratedCFParser as CFP
 import qualified DecoratedGrammar as CFG
 import Examples
-import GeneralChart
-import qualified MCFGrammar as MCFG 
+import GF.OldParsing.GeneralChart
+import qualified GF.OldParsing.MCFGrammar as MCFG
 import MCFParser
 import Nondet 
 import Parser
-import Range
+import GF.Parsing.MCFG.Range
 
 
 {-- Datatypes -----------------------------------------------------------------
@@ -180,4 +180,4 @@ symToRec beta = map makeLblRng $ groupBy (\(_, d) (_, d') -> (d == d'))
 	  sBd (_, d) (_, d') 
 	      | d < d' = LT
 	      | d > d' = GT
-	      | otherwise = EQ
\ No newline at end of file
+	      | otherwise = EQ
-- 
cgit v1.2.3