forked from GitHub/gf-rgl
use consistent lin X everywhere
This commit is contained in:
@@ -161,14 +161,14 @@ oper
|
||||
verbExample : CatFin.Cl -> Str = \cl -> (S.mkUtt cl).s ;
|
||||
{-
|
||||
-} --# notpresent
|
||||
inflVerb : CatFin.V -> Str = \verb0 ->
|
||||
inflVerb : SVerb1 -> Str = \verb0 ->
|
||||
let
|
||||
verb = sverb2verbSep verb0 ;
|
||||
vfin : ResFin.VForm -> Str = \f ->
|
||||
verb.s ! f ;
|
||||
|
||||
nounNounHeading : Parameter -> Parameter -> Str = \n1,n2 ->
|
||||
(S.mkUtt (G.PossNP (S.mkCN n1) (S.mkNP (snoun2nounSep n2)))).s ;
|
||||
(S.mkUtt (G.PossNP (S.mkCN n1) (S.mkNP (lin N (snoun2nounSep n2))))).s ;
|
||||
in
|
||||
heading3 (nounNounHeading present_Parameter indicative_Parameter) ++
|
||||
frameTable (
|
||||
|
||||
@@ -258,7 +258,7 @@ lin PresPartAP vp = {
|
||||
hasPrefix = False
|
||||
} ;
|
||||
lin PastPartAP vps = {
|
||||
s = \\_,nf => preCompVP <vps : VP> (PastPartAct (AN nf)) ;
|
||||
s = \\_,nf => preCompVP (lin VP vps) (PastPartAct (AN nf)) ;
|
||||
p = vps.c2.s.p1 ;
|
||||
hasPrefix = False
|
||||
} ;
|
||||
|
||||
@@ -406,10 +406,10 @@ mkVS = overload {
|
||||
|
||||
mkQuant = overload {
|
||||
mkQuant : N -> Quant =
|
||||
\noun -> heavyQuant {s1 = \\n,c => (snoun2nounBind noun).s ! NCase n c ; s2 = \\_ => [] ; isNum,isPoss,isNeg,isDef = False} ;
|
||||
\noun -> lin Quant (heavyQuant {s1 = \\n,c => (snoun2nounBind noun).s ! NCase n c ; s2 = \\_ => [] ; isNum,isPoss,isNeg,isDef = False}) ;
|
||||
mkQuant : N -> N -> Quant =
|
||||
\sg,pl -> heavyQuant {s1 = table {Sg => \\c => (snoun2nounBind pl).s ! NCase Sg c ; Pl => \\c => (snoun2nounBind pl).s ! NCase Pl c} ;
|
||||
s2 = \\_ => [] ; isNum,isPoss,isNeg,isDef = False} ;
|
||||
\sg,pl -> lin Quant (heavyQuant {s1 = table {Sg => \\c => (snoun2nounBind pl).s ! NCase Sg c ; Pl => \\c => (snoun2nounBind pl).s ! NCase Pl c} ;
|
||||
s2 = \\_ => [] ; isNum,isPoss,isNeg,isDef = False}) ;
|
||||
} ;
|
||||
|
||||
mkInterj : Str -> Interj
|
||||
|
||||
Reference in New Issue
Block a user