GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-30 10:28:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Eus) Fix agreement in complement clauses

Browse Source
This commit is contained in:
Inari Listenmaa
2018-04-23 16:18:43 +02:00
parent 6ca9fbe55b
commit 9e95b1df99
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/basque/IdiomEus.gf
View File

@@ -32,7 +32,7 @@ concrete IdiomEus of Idiom = CatEus ** open Prelude, ResEus, VerbEus in {
ProgrVP vp = vp ** { prc = \\tns => vp.prc ! Pres ++ "ari" } ; ProgrVP vp = vp ** { prc = \\tns => vp.prc ! Pres ++ "ari" } ;
-- : VP -> Utt ; -- let's go -- : VP -> Utt ; -- let's go
ImpPl1 vp = { s = linVPPrc vp } ; ImpPl1 vp = { s = linVPPrc vp ! Gu } ;
{- {-
ImpP3 : NP -> VP -> Utt ; -- let John walk ImpP3 : NP -> VP -> Utt ; -- let John walk

2
src/basque/PhraseEus.gf
View File

@@ -16,7 +16,7 @@ concrete PhraseEus of Phrase = CatEus ** open Prelude, ResEus in {
UttIP ip = { s = ip.s ! Abs} ; UttIP ip = { s = ip.s ! Abs} ;
UttIAdv iadv = iadv ; UttIAdv iadv = iadv ;
UttNP np = { s = np.s ! Abs} ; UttNP np = { s = np.s ! Abs} ;
UttVP vp = { s = linVPPrc vp } ; UttVP vp = { s = linVPPrc vp ! Hau } ;
UttAdv adv = adv ; UttAdv adv = adv ;
UttCN n = {s = linCNDef n } ; UttCN n = {s = linCNDef n } ;
UttCard n = n ; UttCard n = n ;

6
src/basque/ResEus.gf
View File

@@ -385,9 +385,9 @@ oper
++ (verb.aux ! Hau).indep ; ++ (verb.aux ! Hau).indep ;
-- Used in ComplVV : does not include aux! -- Used in ComplVV : does not include aux!
linVPPrc : VerbPhrase -> Str = \vp -> --TODO make it less of a hack. linVPPrc : VerbPhrase -> Agr => Str = \vp ->
vp.adv \\agr => vp.adv
++ vp.iobj.s ++ vp.dobj.s ! Pos ++ vp.comp ! Hau --all the compls! ++ vp.iobj.s ++ vp.dobj.s ! Pos ++ vp.comp ! agr --all the compls!
++ vp.prc ! Past ; --If we choose Past, then it will work with Jakin ... ++ vp.prc ! Past ; --If we choose Past, then it will work with Jakin ...

4
src/basque/SentenceEus.gf
View File

@@ -35,7 +35,7 @@ lin
--2 Imperatives --2 Imperatives
-- : VP -> Imp ; -- : VP -> Imp ;
ImpVP vp = { s = linVPPrc vp } ; --TODO: check negation ImpVP vp = { s = linVPPrc vp ! Hau } ; --TODO: check negation
--2 Embedded sentences --2 Embedded sentences
@@ -47,7 +47,7 @@ lin
EmbedQS qs = { s = linSSub (qs.s ! Indir) "la" } ; --??? EmbedQS qs = { s = linSSub (qs.s ! Indir) "la" } ; --???
-- : VP -> SC ; -- ikusi -- : VP -> SC ; -- ikusi
EmbedVP vp = { s = linVPPrc vp } ; EmbedVP vp = { s = linVPPrc vp ! Hau } ;
--2 Sentences --2 Sentences

6
src/basque/VerbEus.gf
View File

@@ -10,7 +10,7 @@ lin
-- : VV -> VP -> VP ; -- [lo egin/neska ikusi/jakin] nahi/ahal/behar dut -- : VV -> VP -> VP ; -- [lo egin/neska ikusi/jakin] nahi/ahal/behar dut
ComplVV vv vp = ComplVV vv vp =
let vcomp : Str = linVPPrc vp ; let vcomp = linVPPrc vp ;
in ResEus.insertComp vcomp (useV vv) ; in ResEus.insertComp vcomp (useV vv) ;
@@ -51,8 +51,8 @@ lin
-- : V2V -> VP -> VPSlash ; -- beg (her) to go -- : V2V -> VP -> VPSlash ; -- beg (her) to go
SlashV2V v2v vp = slashDObj v2v ** -- TODO: something wrong in this function! SlashV2V v2v vp = slashDObj v2v **
{ comp = \\agr => linVPPrc vp } ; --How about agreement with tense of the main clause??? { comp = linVPPrc vp } ; ---- No agreement with tense of the main clause
-- : V2S -> S -> VPSlash ; -- answer (to him) that it is good -- : V2S -> S -> VPSlash ; -- answer (to him) that it is good