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

(zul) miscellaneous fixes

Browse Source
This commit is contained in:
Laurette Marais
2022-07-20 12:10:54 +02:00
parent 1b9c4613bf
commit f634af931e
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/zulu/ExtraExtZul.gf
View File

@@ -160,12 +160,19 @@ concrete ExtraExtZul of ExtraExt =
PossLocNP locn np = { PossLocNP locn np = {
empty = np.empty ; empty = np.empty ;
s = \\n,nform => locn.s ; s = \\n,nform => locn.s ++ poss_concord!(C17)!n!np.i ++BIND++ (poss_NP np);
mod = \\num => poss_concord!(C17)!Sg!np.i ++BIND++ (poss_NP np) ; -- mod = \\num => poss_concord!(C17)!Sg!np.i ++BIND++ (poss_NP np) ;
c = C17 ; c = C17 ;
emph = False emph = False
} ; } ;
PossNPLoc cn np = {
empty = np.empty ;
s = \\n,nform => cn.s!n!nform ++ poss_concord!cn.c!n!RC ++BIND++"s"++BIND++ (loc_NP np);
c = cn.c ;
emph = False
} ;
InstrNPAdv np = InstrNPAdv np =
let let
pref = instrPref!(initNP np.isPron np.agr) pref = instrPref!(initNP np.isPron np.agr)

1
src/zulu/ParadigmsZul.gf
View File

@@ -77,6 +77,7 @@ oper
} ; } ;
mkPN = overload { mkPN = overload {
mkPN : (John : Str) -> N = \n -> lin N (regNoun n C1a_2a) ;
mkPN : (John : Str) -> ClassGender -> N = \n,c -> lin N (regNoun n c) ; -- "thing" nouns mkPN : (John : Str) -> ClassGender -> N = \n,c -> lin N (regNoun n c) ; -- "thing" nouns
mkPN : (nyaka,onyakeni,eminyakeni : Str) -> ClassGender -> N = \n,ls,lp,c -> lin N (semiRegNoun n ls lp c) ; mkPN : (nyaka,onyakeni,eminyakeni : Str) -> ClassGender -> N = \n,ls,lp,c -> lin N (semiRegNoun n ls lp c) ;
mkPN : (iso,amehlo,esweni,emehlweni : Str) -> ClassGender -> N = \ns,np,ls,lp,c -> lin N (mkNoun ns np ls lp c) ; mkPN : (iso,amehlo,esweni,emehlweni : Str) -> ClassGender -> N = \ns,np,ls,lp,c -> lin N (mkNoun ns np ls lp c) ;

14
src/zulu/ResZul.gf
View File

@@ -960,7 +960,7 @@ resource ResZul = open Prelude,Predef,ParamX in {
_+"wo" => (init root)+"eni" ; _+"wo" => (init root)+"eni" ;
_+"o" => (init root)+"weni" ; _+"o" => (init root)+"weni" ;
_+"u" => (init root)+"wini" ; _+"u" => (init root)+"wini" ;
_ => (init root)+"ini" _ => root+"ini"
} ; } ;
drop_init_vowel : Str -> Str = \s -> drop_init_vowel : Str -> Str = \s ->
@@ -1154,16 +1154,16 @@ resource ResZul = open Prelude,Predef,ParamX in {
loc_NP : { loc_NP : {
empty : Str ; empty : Str ;
s : NForm => Str ; s : NForm => Str ;
mod : Str ; -- mod : Str ;
dem : Str ; -- dem : Str ;
predet_pre : Str ; -- predet_pre : Str ;
predet_post : Str ; -- predet_post : Str ;
agr : Agr ; agr : Agr ;
proDrop : Bool ; proDrop : Bool ;
isPron : Bool ; isPron : Bool ;
-- reqLocS : Bool ; -- reqLocS : Bool ;
qdef : QuantDef -- qdef : QuantDef
} -> Str = \np -> np.s!NLoc ++ np.dem ++ np.mod ++ np.predet_pre ++ np.predet_post ; } -> Str = \np -> np.s!NLoc ;
poss_NP : { poss_NP : {
empty : Str ; empty : Str ;

1
src/zulu/abstract_ext/ExtraExt.gf
View File

@@ -28,6 +28,7 @@ abstract ExtraExt =
-- RelV : CN -> V -> Temp -> Pol -> CN ; -- lights that flash -- RelV : CN -> V -> Temp -> Pol -> CN ; -- lights that flash
PossLocNP : LocN -> NP -> CN ; PossLocNP : LocN -> NP -> CN ;
PossNPLoc : CN -> NP -> CN ; -- zasepulazini
InstrNPAdv : NP -> Adv ; -- ngokuhlinzwa InstrNPAdv : NP -> Adv ; -- ngokuhlinzwa
InstrAdvNPAdv : Adv -> NP -> Adv ; -- cishe ngehora InstrAdvNPAdv : Adv -> NP -> Adv ; -- cishe ngehora