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

(Est) Minor renaming/restructuring/cleanup

Browse Source
This commit is contained in:
Inari Listenmaa
2022-07-01 08:35:37 +02:00
parent e4a195a777
commit 1b5840c89d
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/estonian/ExtendEst.gf
View File

@@ -56,6 +56,7 @@ concrete ExtendEst of Extend =
linref linref
VPS = X.linVPS (agrP3 Sg) ; VPS = X.linVPS (agrP3 Sg) ;
VPI = X.linVPI InfMa ;
lin lin
MkVPS = X.MkVPS ; MkVPS = X.MkVPS ;

34
src/estonian/ExtraEst.gf
View File

@@ -28,10 +28,19 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
} ; } ;
lincat lincat
VPI = {s : InfStem => Str} ; VPI = LinVPI ;
[VPI] = {s1,s2 : InfStem => Str} ; [VPI] = LinListVPI ;
-- VPI = {s : Str} ;
-- [VPI] = {s1,s2 : Str} ; oper
LinVPI : Type = {s : InfStem => Str} ;
LinListVPI : Type = {s1,s2 : InfStem => Str} ;
linVPI : InfForms -> LinVPI -> Str = \inf,vpi -> vpi.s ! inf.stem ;
-- Version that uses InfStem
infVPIF : NPForm -> Polarity -> Agr -> VP -> InfStem -> Str = \sc,pol,agr,vp,if ->
infVPAnt Simul sc pol agr vp {stem=if ; suf="a"} ;
lin lin
BaseVPI = twoTable InfStem ; BaseVPI = twoTable InfStem ;
ConsVPI = consrTable InfStem comma ; ConsVPI = consrTable InfStem comma ;
@@ -41,24 +50,21 @@ concrete ExtraEst of ExtraEstAbs = CatEst **
ComplVPIVV vv vpi = ComplVPIVV vv vpi =
insertObj (\\_,_,_ => vpi.s ! vv.vi.stem) (predV vv) ; insertObj (\\_,_,_ => vpi.s ! vv.vi.stem) (predV vv) ;
oper
-- Version that uses InfStem
infVPIF : NPForm -> Polarity -> Agr -> VP -> InfStem -> Str = \sc,pol,agr,vp,if ->
infVPAnt Simul sc pol agr vp {stem=if ; suf="a"} ;
linVPS : Agr -> {s : Agr => Str} -> Str = \agr,vps -> vps.s ! agr ;
lincat lincat
VPS = { VPS = LinVPS ;
[VPS] = LinListVPS ;
oper
LinVPS : Type = {
s : Agr => Str ; s : Agr => Str ;
sc : NPForm ; --- can be different for diff parts sc : NPForm ; --- can be different for diff parts
} ; } ;
LinListVPS : Type = {
[VPS] = {
s1,s2 : Agr => Str ; s1,s2 : Agr => Str ;
sc : NPForm ; --- take the first: minä osaan kutoa ja täytyy virkata sc : NPForm ; --- take the first: minä osaan kutoa ja täytyy virkata
} ; } ;
linVPS : Agr -> {s : Agr => Str} -> Str = \agr,vps -> vps.s ! agr ;
lin lin
BaseVPS x y = twoTable Agr x y ** {sc = x.sc} ; BaseVPS x y = twoTable Agr x y ** {sc = x.sc} ;
ConsVPS x y = consrTable Agr comma x y ** {sc = x.sc} ; ConsVPS x y = consrTable Agr comma x y ** {sc = x.sc} ;

2
src/estonian/ResEst.gf
View File

@@ -207,6 +207,8 @@ param
Compl : Type = {s : Str ; c : NPFormPlus ; isPre : Bool} ; Compl : Type = {s : Str ; c : NPFormPlus ; isPre : Bool} ;
emptyCompl : Compl = {s = "" ; c = case2npformp NPAcc ; isPre = False} ;
npfplus2compl : NPFormPlus -> Compl = \npf -> {s = [] ; c = npf ; isPre = False} ; npfplus2compl : NPFormPlus -> Compl = \npf -> {s = [] ; c = npf ; isPre = False} ;
appCompl : Bool -> Polarity -> Compl -> NPhrase -> Str = \isFin,b,co,np -> appCompl : Bool -> Polarity -> Compl -> NPhrase -> Str = \isFin,b,co,np ->