From 813e899ebb4280112f6c81ad582f2e6059db192e Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 28 Nov 2007 12:01:38 +0000
Subject: [PATCH] lookup module separated

---
 src/GF/Devel/Lookup.hs  | 58 +++++++++++++++++++++++++++++++++++++++++
 src/GF/Devel/Modules.hs | 47 ---------------------------------
 2 files changed, 58 insertions(+), 47 deletions(-)
 create mode 100644 src/GF/Devel/Lookup.hs

diff --git a/src/GF/Devel/Lookup.hs b/src/GF/Devel/Lookup.hs
new file mode 100644
index 000000000..c2f60f743
--- /dev/null
+++ b/src/GF/Devel/Lookup.hs
@@ -0,0 +1,58 @@
+module GF.Devel.Lookup where
+
+import GF.Devel.Modules
+import GF.Devel.Judgements
+import GF.Devel.Terms
+import GF.Infra.Ident
+
+import GF.Data.Operations
+
+import Data.Map
+
+-- look up fields for a constant in a grammar
+
+lookupJField :: (Judgement -> a) -> GF -> Ident -> Ident -> Err a
+lookupJField field gf m c = do
+  j <- lookupJudgement gf m c
+  return $ field j
+
+lookupJForm :: GF -> Ident -> Ident -> Err JudgementForm
+lookupJForm = lookupJField jform
+
+-- the following don't (need to) check that the jment form is adequate
+ 
+lookupCatContext :: GF -> Ident -> Ident -> Err Context
+lookupCatContext gf m c = do
+  ty <- lookupJField jtype gf m c
+  return [] ---- context of ty
+
+lookupFunType :: GF -> Ident -> Ident -> Err Term
+lookupFunType = lookupJField jtype 
+
+lookupLin :: GF -> Ident -> Ident -> Err Term
+lookupLin = lookupJField jlin
+
+lookupLincat :: GF -> Ident -> Ident -> Err Term
+lookupLincat = lookupJField jlin
+
+lookupParamValues :: GF -> Ident -> Ident -> Err [Term]
+lookupParamValues gf m c = do
+  j <- lookupJudgement gf m c
+  case jdef j of
+    V _ ts -> return ts
+    _ -> raise "no parameter values"
+
+-- infrastructure for lookup
+    
+lookupIdent :: GF -> Ident -> Ident -> Err (Either Judgement Ident)
+lookupIdent gf m c = do
+  mo <- maybe (raise "module not found") return $ mlookup m (gfmodules gf)
+  maybe (Bad "constant not found") return $ mlookup c (mjments mo)
+
+lookupJudgement :: GF -> Ident -> Ident -> Err Judgement
+lookupJudgement gf m c = do
+  eji <- lookupIdent gf m c
+  either return (\n -> lookupJudgement gf n c) eji 
+
+mlookup = Data.Map.lookup
+
diff --git a/src/GF/Devel/Modules.hs b/src/GF/Devel/Modules.hs
index 1b7a2bca5..ff02af404 100644
--- a/src/GF/Devel/Modules.hs
+++ b/src/GF/Devel/Modules.hs
@@ -48,50 +48,3 @@ data MInclude =
   | MIOnly [Ident]
 
 
--- look up fields for a constant in a grammar
-
-lookupJField :: (Judgement -> a) -> GF -> Ident -> Ident -> Err a
-lookupJField field gf m c = do
-  j <- lookupJudgement gf m c
-  return $ field j
-
-lookupJForm :: GF -> Ident -> Ident -> Err JudgementForm
-lookupJForm = lookupJField jform
-
--- the following don't (need to) check that the jment form is adequate
- 
-lookupCatContext :: GF -> Ident -> Ident -> Err Context
-lookupCatContext gf m c = do
-  ty <- lookupJField jtype gf m c
-  return [] ---- context of ty
-
-lookupFunType :: GF -> Ident -> Ident -> Err Term
-lookupFunType = lookupJField jtype 
-
-lookupLin :: GF -> Ident -> Ident -> Err Term
-lookupLin = lookupJField jlin
-
-lookupLincat :: GF -> Ident -> Ident -> Err Term
-lookupLincat = lookupJField jlin
-
-lookupParamValues :: GF -> Ident -> Ident -> Err [Term]
-lookupParamValues gf m c = do
-  j <- lookupJudgement gf m c
-  case jdef j of
-    V _ ts -> return ts
-    _ -> raise "no parameter values"
-
--- infrastructure for lookup
-    
-lookupIdent :: GF -> Ident -> Ident -> Err (Either Judgement Ident)
-lookupIdent gf m c = do
-  mo <- maybe (raise "module not found") return $ mlookup m (gfmodules gf)
-  maybe (Bad "constant not found") return $ mlookup c (mjments mo)
-
-lookupJudgement :: GF -> Ident -> Ident -> Err Judgement
-lookupJudgement gf m c = do
-  eji <- lookupIdent gf m c
-  either return (\n -> lookupJudgement gf n c) eji 
-
-mlookup = Data.Map.lookup
-