diff --git a/src/latin/CatLat.gf b/src/latin/CatLat.gf index d73a4a1da..b283d8655 100644 --- a/src/latin/CatLat.gf +++ b/src/latin/CatLat.gf @@ -29,7 +29,7 @@ concrete CatLat of Cat = CommonX-[Adv] ** open ResLat, ParamX, Prelude in { -- ---- Relative -- - RCl = Gender => Number => Clause ; + RCl = { s : Gender => Number => Clause }; -- s : ResLat.Tense => Anteriority => CPolarity => Agr => Str ; -- c : Case -- } ; diff --git a/src/latin/ExtraLat.gf b/src/latin/ExtraLat.gf index d13e48d02..495426115 100644 --- a/src/latin/ExtraLat.gf +++ b/src/latin/ExtraLat.gf @@ -58,24 +58,24 @@ concrete ExtraLat of ExtraLatAbs = UttS_VInS s = { s = combineSentence s ! SAPreS ! APreV ! DPostN ! VInS ! CPostV ! SVO } ; TestRCl t p cl = { - s = \\g,n => combineSentence (combineClause (cl ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ; + s = \\g,n => combineSentence (combineClause (cl.s ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ; } ; -- UseRCl_OSV : Temp -> Pol -> RCl -> RS ; UseRCl_OSV t p cl = { - s = \\g,n => combineSentence (combineClause (cl ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreO ! APreV ! DPreN ! VReg ! CPostV ! OSV ; + s = \\g,n => combineSentence (combineClause (cl.s ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreO ! APreV ! DPreN ! VReg ! CPostV ! OSV ; } ; -- UseRCl_OVS : Temp -> Pol -> RCl -> RS ; UseRCl_OVS t p cl = { - s = \\g,n => combineSentence (combineClause (cl ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreO ! APreV ! DPreN ! VReg ! CPostV ! OVS ; -- SAPreO APreV DPreN VReg CPostV OVS + s = \\g,n => combineSentence (combineClause (cl.s ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreO ! APreV ! DPreN ! VReg ! CPostV ! OVS ; -- SAPreO APreV DPreN VReg CPostV OVS } ; -- UseRCl_SOV : Temp -> Pol -> RCl -> RS ; UseRCl_SOV t p cl = { - s = \\g,n => combineSentence (combineClause (cl ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreS ! APreV ! DPreN ! VReg ! CPostV ! SOV ; + s = \\g,n => combineSentence (combineClause (cl.s ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreS ! APreV ! DPreN ! VReg ! CPostV ! SOV ; } ; -- UseRCl_SVO : Temp -> Pol -> RCl -> RS ; UseRCl_SVO t p cl = { - s = \\g,n => combineSentence (combineClause (cl ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreS ! APreV ! DPreN ! VReg ! CPostV ! SVO ; + s = \\g,n => combineSentence (combineClause (cl.s ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SAPreS ! APreV ! DPreN ! VReg ! CPostV ! SVO ; } ; -- PrepNP_DPostN : Prep -> NP -> Adv ; -- in the house PrepNP_DPostN prep np = diff --git a/src/latin/RelativeLat.gf b/src/latin/RelativeLat.gf index 7e1a36eac..67360e8d6 100644 --- a/src/latin/RelativeLat.gf +++ b/src/latin/RelativeLat.gf @@ -9,7 +9,7 @@ concrete RelativeLat of Relative = CatLat ** open ResLat in { -- c = Nom -- } ; -- - RelVP rp vp = \\g,n => mkClause (emptyNP ** { s = \\_,c => rp.s ! (Ag g n c) ; g = g ; n = n } ) vp ; + RelVP rp vp = { s = \\g,n => mkClause (emptyNP ** { s = \\_,c => rp.s ! (Ag g n c) ; g = g ; n = n } ) vp }; -- s = \\t,ant,b,ag => -- let -- agr = case rp.a of { @@ -27,7 +27,7 @@ concrete RelativeLat of Relative = CatLat ** open ResLat in { ---- "we are looking at"). -- -- RelSlash : RP -> ClSlash -> RCl ; - RelSlash rp slash = \\g,n => slash ** { adv = rp.s ! Ag g n Gen } ; -- abuse adverbs again + RelSlash rp slash = { s = \\g,n => slash ** { adv = rp.s ! Ag g n Gen } } ; -- abuse adverbs again -- s = \\t,a,p,agr => -- slash.c2 ++ rp.s ! RPrep (fromAgr agr).g ++ slash.s ! t ! a ! p ! ODir ; -- c = Acc diff --git a/src/latin/SentenceLat.gf b/src/latin/SentenceLat.gf index e3e7065e7..4dc5e164f 100644 --- a/src/latin/SentenceLat.gf +++ b/src/latin/SentenceLat.gf @@ -58,7 +58,7 @@ concrete SentenceLat of Sentence = CatLat ** open Prelude, ResLat in { } ; -- UseRCl : Temp -> Pol -> RCl -> RS ; UseRCl t p cl = { - s = \\g,n => defaultSentence (combineClause (cl ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SOV ; + s = \\g,n => defaultSentence (combineClause (cl.s ! g ! n) (lin Tense t) t.a (lin Pol p) VQFalse) ! SOV ; -- s = \\r => t.s ++ p.s ++ cl.s ! t.t ! t.a ! ctr p.p ! r ; -- c = cl.c } ;