summaryrefslogtreecommitdiff
path: root/src/GF/Grammar/Grammar.hs
diff options
context:
space:
mode:
authorkrasimir <krasimir@chalmers.se>2009-10-28 16:47:01 +0000
committerkrasimir <krasimir@chalmers.se>2009-10-28 16:47:01 +0000
commit980844a4ad13c0423a3223f0e89e43d6e9be1ba3 (patch)
tree810ad7002888c5f5f3847d8a6b7b9773c9672576 /src/GF/Grammar/Grammar.hs
parentf2e5281602516e1c0eb4a2f69d64e6c075fb79da (diff)
restructure ResParam and ResValue
Diffstat (limited to 'src/GF/Grammar/Grammar.hs')
-rw-r--r--src/GF/Grammar/Grammar.hs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/GF/Grammar/Grammar.hs b/src/GF/Grammar/Grammar.hs
index 1b76fe27e..8d1468d9d 100644
--- a/src/GF/Grammar/Grammar.hs
+++ b/src/GF/Grammar/Grammar.hs
@@ -20,7 +20,6 @@ module GF.Grammar.Grammar (SourceGrammar,
SourceModule,
mapSourceModule,
Info(..),
- PValues,
Type,
Cat,
Fun,
@@ -37,7 +36,6 @@ module GF.Grammar.Grammar (SourceGrammar,
Labelling,
Assign,
Case,
- Cases,
LocalDef,
Param,
Altern,
@@ -66,9 +64,6 @@ type SourceModule = (Ident, SourceModInfo)
mapSourceModule :: (SourceModInfo -> SourceModInfo) -> (SourceModule -> SourceModule)
mapSourceModule f (i,mi) = (i, f mi)
--- this is created in CheckGrammar, and so are Val and PVal
-type PValues = [Term]
-
-- | the constructors are judgements in
--
-- - abstract syntax (/ABS/)
@@ -84,8 +79,8 @@ data Info =
| AbsFun (Maybe Type) (Maybe Int) (Maybe [Equation]) -- ^ (/ABS/) type, arrity and definition of function
-- judgements in resource
- | ResParam (Maybe ([Param],Maybe PValues)) -- ^ (/RES/)
- | ResValue (Maybe (Type,Maybe Int)) -- ^ (/RES/) to mark parameter constructors for lookup
+ | ResParam (Maybe [Param]) (Maybe [Term]) -- ^ (/RES/) the second parameter is list of all possible values
+ | ResValue Type -- ^ (/RES/) to mark parameter constructors for lookup
| ResOper (Maybe Type) (Maybe Term) -- ^ (/RES/)
| ResOverload [Ident] [(Type,Term)] -- ^ (/RES/) idents: modules inherited