msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

(Eng) minor cleanup,change date format in comments

Browse Source
This commit is contained in:
Inari Listenmaa
2022-04-07 10:03:14 +08:00
committed by Meowyam
parent 7fe4fd01f5
commit 0245dc2d59
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/english/ResEng.gf
View File

@@ -159,12 +159,12 @@ param
s = table { s = table {
AAdj Posit c => adjCompar.s ! AAdj Posit c ; AAdj Posit c => adjCompar.s ! AAdj Posit c ;
AAdv => adjCompar.s ! AAdv ; AAdv => adjCompar.s ! AAdv ;
_ => nonExist } ; -- IL 06/2021. Replace with an actual string, if this causes problems. _ => nonExist } ; -- IL 2021-06. Replace with an actual string, if this causes problems.
isMost = True } ; isMost = True } ;
_ => adjCompar _ => adjCompar
} ; } ;
-- IL 06/2021: remove "more" and "most" from A & A2's inflection table -- IL 2021-06: remove "more" and "most" from A & A2's inflection table
getCompar : Case -> Adjective -> Str = \c,a -> case a.isMost of { getCompar : Case -> Adjective -> Str = \c,a -> case a.isMost of {
True => "more" ++ a.s ! AAdj Posit c ; True => "more" ++ a.s ! AAdj Posit c ;
False => a.s ! AAdj Compar c False => a.s ! AAdj Compar c
@@ -395,7 +395,7 @@ param
False => {aux = x ; adv = "not" ; fin = [] ; inf = z} False => {aux = x ; adv = "not" ; fin = [] ; inf = z}
} ; } ;
{- IL 24/04/2018 To fix scope of reflexives: {- IL 2018-04 To fix scope of reflexives:
a) ComplSlash ( … ReflVP … ) X: reflexive should agree with X a) ComplSlash ( … ReflVP … ) X: reflexive should agree with X
LangEng> l PredVP (UsePron i_Pron) (ComplSlash (SlashV2V beg_V2V (ReflVP (SlashV2a like_V2))) (UsePron he_Pron)) LangEng> l PredVP (UsePron i_Pron) (ComplSlash (SlashV2V beg_V2V (ReflVP (SlashV2a like_V2))) (UsePron he_Pron))
I beg him to like /himself/ I beg him to like /himself/
@@ -421,42 +421,22 @@ param
insertExtra obj vp ** {c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle ; missingAdv = vp.missingAdv } ; insertExtra obj vp ** {c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle ; missingAdv = vp.missingAdv } ;
--- AR 7/3/2013 move the particle after the object --- AR 7/3/2013 move the particle after the object
insertObjPartLast : (Agr => Str) -> VP -> VP = \obj,vp -> { insertObjPartLast : (Agr => Str) -> VP -> VP = \obj,vp -> vp ** {
s = vp.s ;
p = [] ; -- remove particle from here p = [] ; -- remove particle from here
prp = vp.prp ;
ptp = vp.ptp ;
inf = vp.inf ;
ad = vp.ad ;
s2 = \\a => obj ! a ++ vp.s2 ! a ++ vp.p ; -- and put it here ; corresponds to insertObjPre s2 = \\a => obj ! a ++ vp.s2 ! a ++ vp.p ; -- and put it here ; corresponds to insertObjPre
isSimple = False ; isSimple = False ;
ext = vp.ext
} ; } ;
--- The adverb should be before the finite verb. --- The adverb should be before the finite verb.
insertAdV : Str -> VP -> VP = \ad -> insertAdVAgr (\\_ => ad) ; insertAdV : Str -> VP -> VP = \ad -> insertAdVAgr (\\_ => ad) ;
insertAdVAgr : (Agr => Str) -> VP -> VP = \ad,vp -> { insertAdVAgr : (Agr => Str) -> VP -> VP = \ad,vp -> vp ** {
s = vp.s ;
p = vp.p ;
prp = vp.prp ;
ptp = vp.ptp ;
inf = vp.inf ;
ad = \\a => vp.ad ! a ++ ad ! a ; ad = \\a => vp.ad ! a ++ ad ! a ;
s2 = \\a => vp.s2 ! a ;
isSimple = False ; isSimple = False ;
ext = vp.ext
} ; } ;
insertExtra : Str -> VP -> VP = \e,vp -> { insertExtra : Str -> VP -> VP = \e,vp -> vp ** {
s = vp.s ;
p = vp.p ;
prp = vp.prp ;
ptp = vp.ptp ;
inf = vp.inf ;
ad = vp.ad ;
s2 = vp.s2 ;
isSimple = False ; isSimple = False ;
ext = vp.ext ++ e --- there should be at most one, one might think; but: I would say that it will be raining if I saw clouds ext = vp.ext ++ e --- there should be at most one, one might think; but: I would say that it will be raining if I saw clouds
} ; } ;
@@ -523,7 +503,7 @@ param
haveContr = agrVerb (cBind "s") (cBind "ve") ; haveContr = agrVerb (cBind "s") (cBind "ve") ;
haventContr = agrVerb (cBind "s not") (cBind "ve not") ; haventContr = agrVerb (cBind "s not") (cBind "ve not") ;
Aux = { Aux : Type = {
pres : Polarity => Agr => Str ; pres : Polarity => Agr => Str ;
contr : Polarity => Agr => Str ; -- contracted forms contr : Polarity => Agr => Str ; -- contracted forms
past : Polarity => Agr => Str ; --# notpresent past : Polarity => Agr => Str ; --# notpresent