mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-06-19 00:00:18 -06:00
use consistent lin X everywhere
This commit is contained in:
@@ -163,7 +163,7 @@ lin
|
||||
oper
|
||||
{-
|
||||
-} --# notpresent
|
||||
inflVerb : CatRus.V -> Str = \v ->
|
||||
inflVerb : VerbForms -> Str = \v ->
|
||||
let fut : Agr=>Str = \\a => verbFutAgree v a in
|
||||
let pres : Agr=>Str = \\a => verbPresAgree v a in
|
||||
let past : Agr=>Str = \\a => verbPastAgree v a "" in
|
||||
|
||||
@@ -292,7 +292,7 @@ oper
|
||||
|
||||
compoundN = overload {
|
||||
compoundN : A -> N -> N
|
||||
= \a, n -> applyMaybeNumber
|
||||
= \a, n -> lin N (applyMaybeNumber
|
||||
{snom = case n.g of {
|
||||
Fem => preOrPost (notB a.p) a.fsnom n.snom ;
|
||||
Masc => preOrPost (notB a.p) a.msnom n.snom ;
|
||||
@@ -349,7 +349,7 @@ oper
|
||||
g=n.g ;
|
||||
rel=(guessAdjectiveForms nonExist) ;
|
||||
rt=GenType
|
||||
} ;
|
||||
}) ;
|
||||
|
||||
compoundN : N -> Str -> N
|
||||
= \n, adv -> n ** {
|
||||
@@ -592,7 +592,7 @@ oper
|
||||
mkA : Str -> Str -> Z.ZAIndex -> ShortFormPreference -> A
|
||||
= \nom, comp, zi, spf -> lin A (makeAdjectiveFormsUseIndex nom comp zi spf) ;
|
||||
mkA : PronForms -> A
|
||||
= \pf -> pronToAdj pf ;
|
||||
= \pf -> lin A (pronToAdj pf) ;
|
||||
mkA : A -> Str -> A -> A
|
||||
= \a1,link,a2 -> lin A (mkCompoundA a1 link a2) ;
|
||||
mkA : V -> Voice -> Tense -> A
|
||||
|
||||
Reference in New Issue
Block a user