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

(zul) fixed demonstratives

Browse Source
This commit is contained in:
Laurette Marais
2022-06-01 13:23:51 +02:00
parent 8073d2a91b
commit 4c03a40aef
3 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/zulu/ExtraExtZul.gf
View File

@@ -507,10 +507,7 @@ concrete ExtraExtZul of ExtraExt =
it17_Pron = mkPron (Third C17 Sg) ; it17_Pron = mkPron (Third C17 Sg) ;
yonder_Quant = { yonder_Quant = {
s = \\b,a => case b of { s = \\b,a => dem_pron!Dem3!a ;
False => dem_pron!Dem3!a ;
True => dem_pron!Dem3!a ++ dem_pron_na!Dem3!a
} ;
dist = Dem3 dist = Dem3
} ; } ;

26
src/zulu/ResZul.gf
View File

@@ -216,8 +216,7 @@ resource ResZul = open Prelude,Predef,ParamX in {
} }
} ; } ;
dem_pron_na : Distance => Agr => Str = table { dem_pron_na : Agr => Str = table {
Dem1 => table {
First Sg => BIND++"na" ; First Sg => BIND++"na" ;
First Pl => [] ; First Pl => [] ;
Second Sg => BIND++"na" ; Second Sg => BIND++"na" ;
@@ -241,17 +240,6 @@ resource ResZul = open Prelude,Predef,ParamX in {
Third C14 _ => [] ; Third C14 _ => [] ;
Third C15 _ => [] ; Third C15 _ => [] ;
Third C17 _ => [] Third C17 _ => []
} ;
Dem2 => table {
First _ => [] ;
Second _ => [] ;
Third _ _ => []
} ;
Dem3 => table {
First _ => [] ;
Second _ => [] ;
Third _ _ => []
}
} ; } ;
----------- -----------
@@ -976,10 +964,14 @@ resource ResZul = open Prelude,Predef,ParamX in {
case <cg,n> of case <cg,n> of
{ {
<C1_2,Sg> => case root of { <C1_2,Sg> => case root of {
#vowel+_ => "um"+root ;
_+#cons+#vowel+#cons+_+#vowel+_ => "um"+root ; _+#cons+#vowel+#cons+_+#vowel+_ => "um"+root ;
_ => "umu"+root _ => "umu"+root
} ; -- umu for single syllables, um for the rest } ; -- umu for single syllables, um for the rest
<C1_2,Pl> => "aba"+root ; -- abe for tribes or guilds <C1_2,Pl> => case root of {
#vowel+_ => "ab"+root ;
_ => "aba"+root -- abe for tribes or guilds
} ;
<C1a_2a,Sg> => "u"+root ; <C1a_2a,Sg> => "u"+root ;
<C1a_2a,Pl> => "o"+root ; <C1a_2a,Pl> => "o"+root ;
<C3_4,Sg> => case root of { <C3_4,Sg> => case root of {
@@ -1024,10 +1016,14 @@ resource ResZul = open Prelude,Predef,ParamX in {
case <cg,n> of case <cg,n> of
{ {
<C1_2,Sg> => case root of { <C1_2,Sg> => case root of {
#vowel+_ => "kum"+root ;
_+#cons+#vowel+#cons+_+#vowel+_ => "kum"+root ; _+#cons+#vowel+#cons+_+#vowel+_ => "kum"+root ;
_ => "kumu"+root _ => "kumu"+root
} ; -- umu for single syllables, um for the rest } ; -- umu for single syllables, um for the rest
<C1_2,Pl> => "kuba"+root ; -- abe for tribes or guilds <C1_2,Pl> => case root of {
#vowel+_ => "kub"+root ;
_ => "kuba"+root -- abe for tribes or guilds
} ;
<C1a_2a,Sg> => "ku"+root ; <C1a_2a,Sg> => "ku"+root ;
<C1a_2a,Pl> => "ko"+root ; <C1a_2a,Pl> => "ko"+root ;
<C3_4,Sg> => case root of { <C3_4,Sg> => case root of {

7
src/zulu/StructuralZul.gf
View File

@@ -130,17 +130,14 @@ concrete StructuralZul of Structural = CatZul **
-- Quant (we use this category for demonstratives only) -- Quant (we use this category for demonstratives only)
that_Quant = { that_Quant = {
s = \\b,a => case b of { s = \\b,a => dem_pron!Dem2!a ;
False => dem_pron!Dem2!a ;
True => dem_pron_na!Dem2!a
} ;
dist = Dem2 dist = Dem2
} ; } ;
-- this_Quant = { s = [] ; dist = Dem1 } ; -- this_Quant = { s = [] ; dist = Dem1 } ;
this_Quant = { this_Quant = {
s = \\b,a => case b of { s = \\b,a => case b of {
False => dem_pron!Dem1!a ; False => dem_pron!Dem1!a ;
True => dem_pron_na!Dem1!a True => dem_pron!Dem1!a ++ dem_pron_na!a
} ; } ;
dist = Dem1 dist = Dem1
} ; } ;