use consistent lin X everywhere

This commit is contained in:
Krasimir Angelov
2025-11-14 14:12:57 +01:00
parent 48658e3689
commit c7fe453c12
58 changed files with 330 additions and 334 deletions

View File

@@ -353,7 +353,7 @@ concrete ExtendEst of Extend =
-- : VPSlash -> AP ; -- täna leitud
PastPartAP vp = {
s = \\_,_ => vp2adv <vp : VP> <True : Bool> <PastPart Pass : VForm> ;
s = \\_,_ => vp2adv (lin VP vp) <True : Bool> <PastPart Pass : VForm> ;
infl = Invariable
} ;
@@ -366,7 +366,7 @@ concrete ExtendEst of Extend =
-- : VPSlash -> NP -> AP -- hobisukeldujate poolt leitud (süvaveepomm)
PastPartAgentAP vp np = {
s = \\_,_ => appCompl True Pos by8agent_Prep np
++ vp2adv <vp : VP> <True : Bool> <PastPart Pass : VForm> ;
++ vp2adv (lin VP vp) <True : Bool> <PastPart Pass : VForm> ;
infl = Invariable
} ;
@@ -374,7 +374,7 @@ concrete ExtendEst of Extend =
-- : AP -> VP -> Cl ; -- it is good to walk / on hea kõndida
PredAPVP ap vp =
let heaOllaVP : VP = insertObj (\\_,_,_ => ap.s ! True ! NCase Sg Nom) vp ; -- puts AP into the s2 field
let heaOllaVP : VP = lin VP (insertObj (\\_,_,_ => ap.s ! True ! NCase Sg Nom) vp) ; -- puts AP into the s2 field
heaOllaComp : Comp = CompVP ASimul PPos heaOllaVP ; -- chooses InfDa, fixes word order
heaOlla : VP = UseComp heaOllaComp -- looks silly, but I want to reuse the abstract syntax funs :-P
in existClause noSubj (agrP3 Sg) heaOlla ;

View File

@@ -970,9 +970,9 @@ oper
mkV2Q v p = lin V2Q (mk2V2 v p) ;
mkAS a = a ;
mkA2S a p = mkA2 a p ;
mkA2S a p = lin A (mkA2 a p) ;
mkAV a = a ;
mkA2V a p = mkA2 a p ;
mkA2V a p = lin A (mkA2 a p) ;
mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;