GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

support Ints n as a parameter type

Browse Source
This commit is contained in:
krangelov
2021-12-14 15:27:03 +01:00
parent 51e337a910
commit f332a03c79
4 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/compiler/GF/Compile/Compute/Concrete.hs
View File

@@ -83,7 +83,7 @@ data Value s
| VStrs [Value s] | VStrs [Value s]
-- These last constructors are only generated internally -- These last constructors are only generated internally
-- in the PMCFG generator. -- in the PMCFG generator.
| VSymCat Int LIndex [(LIndex, Thunk s)] | VSymCat Int LIndex [(LIndex, (Thunk s, Type))]
| VSymVar Int Int | VSymVar Int Int
@@ -224,9 +224,9 @@ eval env (Alts d as) [] = do vd <- eval env d []
return (VAlts vd vas) return (VAlts vd vas)
eval env (Strs ts) [] = do vs <- mapM (\t -> eval env t []) ts eval env (Strs ts) [] = do vs <- mapM (\t -> eval env t []) ts
return (VStrs vs) return (VStrs vs)
eval env (TSymCat d r rs) []= do rs <- forM rs $ \(i,pv) -> eval env (TSymCat d r rs) []= do rs <- forM rs $ \(i,(pv,ty)) ->
case lookup pv env of case lookup pv env of
Just tnk -> return (i,tnk) Just tnk -> return (i,(tnk,ty))
Nothing -> evalError ("Variable" <+> pp pv <+> "is not in scope") Nothing -> evalError ("Variable" <+> pp pv <+> "is not in scope")
return (VSymCat d r rs) return (VSymCat d r rs)
eval env (TSymVar d r) [] = do return (VSymVar d r) eval env (TSymVar d r) [] = do return (VSymVar d r)
@@ -385,14 +385,17 @@ patternMatch v0 ((env0,ps,args0,t):eqs) = match env0 ps eqs args0
s <- readSTRef i s <- readSTRef i
case s of case s of
Narrowing id (QC q) -> case lookupOrigInfo gr q of Narrowing id (QC q) -> case lookupOrigInfo gr q of
Ok (m,ResParam (Just (L _ ps)) _) -> bind gr k mt r s m ps Ok (m,ResParam (Just (L _ ps)) _) -> bindParam gr k mt r s m ps
Bad msg -> return (Fail (pp msg)) Bad msg -> return (Fail (pp msg))
Narrowing id ty
| Just max <- isTypeInts ty
-> bindInt gr k mt r s 0 max
Evaluated v -> case ki v of Evaluated v -> case ki v of
EvalM f -> f gr k mt r EvalM f -> f gr k mt r
_ -> k (VSusp i env ki vs) mt r _ -> k (VSusp i env ki vs) mt r
where where
bind gr k mt r s m [] = return (Success r) bindParam gr k mt r s m [] = return (Success r)
bind gr k mt r s m ((p, ctxt):ps) = do bindParam gr k mt r s m ((p, ctxt):ps) = do
(mt',tnks) <- mkArgs mt ctxt (mt',tnks) <- mkArgs mt ctxt
let v = VApp (m,p) tnks let v = VApp (m,p) tnks
writeSTRef i (Evaluated v) writeSTRef i (Evaluated v)
@@ -401,7 +404,7 @@ patternMatch v0 ((env0,ps,args0,t):eqs) = match env0 ps eqs args0
writeSTRef i s writeSTRef i s
case res of case res of
Fail msg -> return (Fail msg) Fail msg -> return (Fail msg)
Success r -> bind gr k mt r s m ps Success r -> bindParam gr k mt r s m ps
mkArgs mt [] = return (mt,[]) mkArgs mt [] = return (mt,[])
mkArgs mt ((_,_,ty):ctxt) = do mkArgs mt ((_,_,ty):ctxt) = do
@@ -412,6 +415,18 @@ patternMatch v0 ((env0,ps,args0,t):eqs) = match env0 ps eqs args0
(mt,tnks) <- mkArgs (Map.insert i tnk mt) ctxt (mt,tnks) <- mkArgs (Map.insert i tnk mt) ctxt
return (mt,tnk:tnks) return (mt,tnk:tnks)
bindInt gr k mt r s iv max
| iv < max = do
let v = VInt iv
writeSTRef i (Evaluated v)
res <- case ki v of
EvalM f -> f gr k mt r
writeSTRef i s
case res of
Fail msg -> return (Fail msg)
Success r -> bindInt gr k mt r s (iv+1) max
| otherwise = return (Success r)
value2term i (VApp q tnks) = value2term i (VApp q tnks) =
foldM (\e1 tnk -> fmap (App e1) (force tnk >>= value2term i)) (if fst q == cPredef then Q q else QC q) tnks foldM (\e1 tnk -> fmap (App e1) (force tnk >>= value2term i)) (if fst q == cPredef then Q q else QC q) tnks
value2term i (VMeta m env tnks) = do value2term i (VMeta m env tnks) = do

92
src/compiler/GF/Compile/GeneratePMCFG.hs
View File

@@ -87,13 +87,13 @@ pmcfgForm gr t ctxt ty =
(r,rs,_) <- compute params (r,rs,_) <- compute params
return (PArg [] (LParam r (order rs))) return (PArg [] (LParam r (order rs)))
compute [] = return (0,[],1) compute [] = return (0,[],1)
compute (v:vs) = do compute ((v,ty):params) = do
(r, rs ,cnt ) <- param2int v (r, rs ,cnt ) <- param2int v ty
(r',rs',cnt') <- compute vs (r',rs',cnt') <- compute params
return (r*cnt'+r',combine cnt' rs rs',cnt*cnt') return (r*cnt'+r',combine cnt' rs rs',cnt*cnt')
type2metaTerm :: SourceGrammar -> Int -> Map.Map MetaId Type -> LIndex -> [(LIndex,Ident)] -> Type -> (Map.Map MetaId Type,Int,Term) type2metaTerm :: SourceGrammar -> Int -> Map.Map MetaId Type -> LIndex -> [(LIndex,(Ident,Type))] -> Type -> (Map.Map MetaId Type,Int,Term)
type2metaTerm gr d ms r rs (Sort s) | s == cStr = type2metaTerm gr d ms r rs (Sort s) | s == cStr =
(ms,r+1,TSymCat d r rs) (ms,r+1,TSymCat d r rs)
type2metaTerm gr d ms r rs (RecType lbls) = type2metaTerm gr d ms r rs (RecType lbls) =
@@ -105,7 +105,7 @@ type2metaTerm gr d ms r rs (RecType lbls) =
in (ms',r',R ass) in (ms',r',R ass)
type2metaTerm gr d ms r rs (Table p q) = type2metaTerm gr d ms r rs (Table p q) =
let pv = identS ('p':show (length rs)) let pv = identS ('p':show (length rs))
(ms',r',t) = type2metaTerm gr d ms r ((r'-r,pv):rs) q (ms',r',t) = type2metaTerm gr d ms r ((r'-r,(pv,p)):rs) q
count = case allParamValues gr p of count = case allParamValues gr p of
Ok ts -> length ts Ok ts -> length ts
Bad msg -> error msg Bad msg -> error msg
@@ -113,6 +113,10 @@ type2metaTerm gr d ms r rs (Table p q) =
type2metaTerm gr d ms r rs ty@(QC q) = type2metaTerm gr d ms r rs ty@(QC q) =
let i = Map.size ms + 1 let i = Map.size ms + 1
in (Map.insert i ty ms,r,Meta i) in (Map.insert i ty ms,r,Meta i)
type2metaTerm gr d ms r rs ty
| Just n <- isTypeInts ty =
let i = Map.size ms + 1
in (Map.insert i ty ms,r,Meta i)
flatten (VR as) (RecType lbls) st = do flatten (VR as) (RecType lbls) st = do
foldM collect st lbls foldM collect st lbls
@@ -140,10 +144,11 @@ flatten (VV _ tnks) (Table _ q) st = do
flatten v q st flatten v q st
flatten v (Sort s) (lins,params) | s == cStr = do flatten v (Sort s) (lins,params) | s == cStr = do
return (v:lins,params) return (v:lins,params)
flatten v (QC q) (lins,params) = do flatten v ty@(QC q) (lins,params) = do
return (lins,v:params) return (lins,(v,ty):params)
flatten v _ _ = do flatten v ty (lins,params)
error (showValue v) | Just n <- isTypeInts ty = return (lins,(v,ty):params)
| otherwise = error (showValue v)
str2lin (VApp q []) str2lin (VApp q [])
| q == (cPredef, cBIND) = return [SymBIND] | q == (cPredef, cBIND) = return [SymBIND]
@@ -156,9 +161,10 @@ str2lin (VStr s) = return [SymKS s]
str2lin (VSymCat d r rs) = do (r, rs) <- compute r rs str2lin (VSymCat d r rs) = do (r, rs) <- compute r rs
return [SymCat d (LParam r (order rs))] return [SymCat d (LParam r (order rs))]
where where
compute r' [] = return (r',[]) compute r' [] = return (r',[])
compute r' ((cnt',tnk):tnks) = do compute r' ((cnt',(tnk,ty)):tnks) = do
(r, rs,_) <- force tnk >>= param2int v <- force tnk
(r, rs,_) <- param2int v ty
(r',rs' ) <- compute r' tnks (r',rs' ) <- compute r' tnks
return (r*cnt'+r',combine cnt' rs rs') return (r*cnt'+r',combine cnt' rs rs')
str2lin (VSymVar d r) = return [SymVar d r] str2lin (VSymVar d r) = return [SymVar d r]
@@ -172,39 +178,47 @@ str2lin v = do t <- value2term 0 v
evalError ("the string:" <+> ppTerm Unqualified 0 t $$ evalError ("the string:" <+> ppTerm Unqualified 0 t $$
"cannot be evaluated at compile time.") "cannot be evaluated at compile time.")
param2int (VR as) = compute as param2int (VR as) (RecType lbls) = compute lbls
where where
compute [] = return (0,[],1) compute [] = return (0,[],1)
compute ((lbl,tnk):as) = do compute ((lbl,ty):lbls) = do
(r, rs ,cnt ) <- force tnk >>= param2int case lookup lbl as of
(r',rs',cnt') <- compute as Just tnk -> do v <- force tnk
return (r*cnt'+r',combine cnt' rs rs',cnt*cnt') (r, rs ,cnt ) <- param2int v ty
param2int (VApp q tnks) = do (r',rs',cnt') <- compute lbls
(r , cnt ) <- getIdxCnt q return (r*cnt'+r',combine cnt' rs rs',cnt*cnt')
(r',rs',cnt') <- compute tnks Nothing -> evalError ("Missing value for label" <+> pp lbl $$
"among" <+> hsep (punctuate (pp ',') (map fst as)))
param2int (VApp q tnks) ty = do
(r , ctxt,cnt ) <- getIdxCnt q
(r',rs', cnt') <- compute ctxt tnks
return (r+r',rs',cnt*cnt') return (r+r',rs',cnt*cnt')
where where
getIdxCnt q = do getIdxCnt q = do
(_,ResValue (L _ ty) idx) <- getInfo q (_,ResValue (L _ ty) idx) <- getInfo q
let QC p = valTypeCnc ty let (ctxt,QC p) = typeFormCnc ty
(_,ResParam _ (Just (_,cnt))) <- getInfo p (_,ResParam _ (Just (_,cnt))) <- getInfo p
return (idx,cnt) return (idx,ctxt,cnt)
compute [] = return (0,[],1) compute [] [] = return (0,[],1)
compute (tnk:tnks) = do compute ((_,_,ty):ctxt) (tnk:tnks) = do
(r, rs ,cnt ) <- force tnk >>= param2int v <- force tnk
(r',rs',cnt') <- compute tnks (r, rs ,cnt ) <- param2int v ty
(r',rs',cnt') <- compute ctxt tnks
return (r*cnt'+r',combine cnt' rs rs',cnt*cnt') return (r*cnt'+r',combine cnt' rs rs',cnt*cnt')
param2int (VMeta tnk _ _) = do param2int (VInt n) ty
| Just max <- isTypeInts ty= return (fromIntegral n,[],fromIntegral max+1)
param2int (VMeta tnk _ _) ty = do
tnk_st <- getRef tnk tnk_st <- getRef tnk
case tnk_st of case tnk_st of
Evaluated v -> param2int v Evaluated v -> param2int v ty
Narrowing j ty -> do let QC q = valTypeCnc ty Narrowing j ty -> case valTypeCnc ty of
(_,ResParam _ (Just (_,cnt))) <- getInfo q QC q -> do (_,ResParam _ (Just (_,cnt))) <- getInfo q
return (0,[(1,j-1)],cnt) return (0,[(1,j-1)],cnt)
param2int v = do t <- value2term 0 v App q (EInt cnt) -> return (0,[(1,j-1)],fromIntegral cnt)
evalError ("the parameter:" <+> ppTerm Unqualified 0 t $$ param2int v ty = do t <- value2term 0 v
"cannot be evaluated at compile time.") evalError ("the parameter:" <+> ppTerm Unqualified 0 t $$
"cannot be evaluated at compile time.")
combine cnt' [] rs' = rs' combine cnt' [] rs' = rs'
combine cnt' rs [] = [(r*cnt',pv) | (r,pv) <- rs] combine cnt' rs [] = [(r*cnt',pv) | (r,pv) <- rs]
@@ -249,8 +263,8 @@ mkLinDefault gr typ = liftM (Abs Explicit varStr) $ mkDefField typ
let (ls,ts) = unzip r let (ls,ts) = unzip r
ts <- mapM mkDefField ts ts <- mapM mkDefField ts
return $ R (zipWith assign ls ts) return $ R (zipWith assign ls ts)
_ | Just _ <- isTypeInts typ -> return $ EInt 0 -- exists in all as first val _ | Just _ <- isTypeInts ty -> return $ EInt 0 -- exists in all as first val
_ -> checkError ("linearization type field cannot be" <+> ty) _ -> checkError ("linearization type field cannot be" <+> pp (show ty))
mkLinReference :: SourceGrammar -> Type -> Check Term mkLinReference :: SourceGrammar -> Type -> Check Term
mkLinReference gr typ = do mkLinReference gr typ = do
@@ -267,7 +281,7 @@ mkLinReference gr typ = do
QC p -> return Nothing QC p -> return Nothing
RecType [] -> return Nothing RecType [] -> return Nothing
RecType rs -> traverse rs trm RecType rs -> traverse rs trm
_ | Just _ <- isTypeInts typ -> return Nothing _ | Just _ <- isTypeInts ty -> return Nothing
_ -> checkError ("linearization type field cannot be" <+> typ) _ -> checkError ("linearization type field cannot be" <+> typ)
traverse [] trm = return Nothing traverse [] trm = return Nothing

2
src/compiler/GF/Grammar/Grammar.hs
View File

@@ -391,7 +391,7 @@ data Term =
| Alts Term [(Term, Term)] -- ^ alternatives by prefix: @pre {t ; s\/c ; ...}@ | Alts Term [(Term, Term)] -- ^ alternatives by prefix: @pre {t ; s\/c ; ...}@
| Strs [Term] -- ^ conditioning prefix strings: @strs {s ; ...}@ | Strs [Term] -- ^ conditioning prefix strings: @strs {s ; ...}@
| TSymCat Int LIndex [(LIndex,Ident)] | TSymCat Int LIndex [(LIndex,(Ident,Type))]
| TSymVar Int Int | TSymVar Int Int
deriving (Show, Eq, Ord) deriving (Show, Eq, Ord)

2
src/compiler/GF/Grammar/Printer.hs
View File

@@ -248,7 +248,7 @@ ppTerm q d (Typed e t) = '<' <> ppTerm q 0 e <+> ':' <+> ppTerm q 0 t <> '>'
ppTerm q d (ImplArg e) = braces (ppTerm q 0 e) ppTerm q d (ImplArg e) = braces (ppTerm q 0 e)
ppTerm q d (ELincat cat t) = prec d 4 ("lincat" <+> cat <+> ppTerm q 5 t) ppTerm q d (ELincat cat t) = prec d 4 ("lincat" <+> cat <+> ppTerm q 5 t)
ppTerm q d (ELin cat t) = prec d 4 ("lin" <+> cat <+> ppTerm q 5 t) ppTerm q d (ELin cat t) = prec d 4 ("lin" <+> cat <+> ppTerm q 5 t)
ppTerm q d (TSymCat i r rs) = pp '<' <> pp i <> pp ',' <> ppLinFun pp r rs <> pp '>' ppTerm q d (TSymCat i r rs) = pp '<' <> pp i <> pp ',' <> ppLinFun (pp.fst) r rs <> pp '>'
ppTerm q d (TSymVar i r) = pp '<' <> pp i <> pp ',' <> pp '$' <> pp r <> pp '>' ppTerm q d (TSymVar i r) = pp '<' <> pp i <> pp ',' <> pp '$' <> pp r <> pp '>'
ppEquation q (ps,e) = hcat (map (ppPatt q 2) ps) <+> "->" <+> ppTerm q 0 e ppEquation q (ps,e) = hcat (map (ppPatt q 2) ps) <+> "->" <+> ppTerm q 0 e