diff options
| author | krasimir <krasimir@chalmers.se> | 2009-10-25 15:20:44 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-10-25 15:20:44 +0000 |
| commit | d63be8ac7287a7c220f62701cb5b200ba57fbbeb (patch) | |
| tree | e7db58c9b77465b66c72325dad54ffd2a1c897d9 /src/GF/Grammar | |
| parent | 116912647b4abcbce67452d622c45d41d23c17ef (diff) | |
small refactoring in GF.Compile.CheckGrammar
Diffstat (limited to 'src/GF/Grammar')
| -rw-r--r-- | src/GF/Grammar/Grammar.hs | 4 | ||||
| -rw-r--r-- | src/GF/Grammar/Lookup.hs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/GF/Grammar/Grammar.hs b/src/GF/Grammar/Grammar.hs index e3b4ddbae..a4223585a 100644 --- a/src/GF/Grammar/Grammar.hs +++ b/src/GF/Grammar/Grammar.hs @@ -91,8 +91,8 @@ data Info = | ResOverload [Ident] [(Type,Term)] -- ^ (/RES/) idents: modules inherited -- judgements in concrete syntax - | CncCat (Maybe Type) (Maybe Term) (Maybe Term) -- ^ (/CNC/) lindef ini'zed, - | CncFun (Maybe (Ident,(Context,Type))) (Maybe Term) (Maybe Term) -- ^ (/CNC/) type info added at 'TC' + | CncCat (Maybe Type) (Maybe Term) (Maybe Term) -- ^ (/CNC/) lindef ini'zed, + | CncFun (Maybe (Ident,Context,Type)) (Maybe Term) (Maybe Term) -- ^ (/CNC/) type info added at 'TC' -- indirection to module Ident | AnyInd Bool Ident -- ^ (/INDIR/) the 'Bool' says if canonical diff --git a/src/GF/Grammar/Lookup.hs b/src/GF/Grammar/Lookup.hs index 0d31b0a9e..62796aeed 100644 --- a/src/GF/Grammar/Lookup.hs +++ b/src/GF/Grammar/Lookup.hs @@ -90,8 +90,8 @@ lookupResDefKind gr m c CncCat (Just ty) _ _ -> liftM (flip (,) 1) $ lock c ty CncCat _ _ _ -> liftM (flip (,) 1) $ lock c defLinType - CncFun (Just (cat,_)) (Just tr) _ -> liftM (flip (,) 1) $ unlock cat tr - CncFun _ (Just tr) _ -> liftM (flip (,) 1) (return tr) ---- $ unlock c tr + CncFun (Just (cat,_,_)) (Just tr) _ -> liftM (flip (,) 1) $ unlock cat tr + CncFun _ (Just tr) _ -> liftM (flip (,) 1) (return tr) ---- $ unlock c tr AnyInd _ n -> look False n c ResParam _ -> return (QC m c,2) @@ -109,7 +109,7 @@ lookupResType gr m c = do -- used in reused concrete CncCat _ _ _ -> return typeType - CncFun (Just (cat,(cont@(_:_),val))) _ _ -> do + CncFun (Just (cat,cont@(_:_),val)) _ _ -> do val' <- lock cat val return $ mkProd cont val' [] CncFun _ _ _ -> lookFunType m m c |