mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 01:18:57 -06:00
(Som) Small fixes in noun morphology
This commit is contained in:
@@ -41,7 +41,7 @@ lin bird_N = mkN "shimbir" fem ;
|
|||||||
-- lin bone_N = mkN "" ;
|
-- lin bone_N = mkN "" ;
|
||||||
-- lin boot_N = mkN "" ;
|
-- lin boot_N = mkN "" ;
|
||||||
-- lin boss_N = mkN "" ;
|
-- lin boss_N = mkN "" ;
|
||||||
lin book_N = (mk2N "buug" "buugaag") ** {pl = F TA} ;
|
lin book_N = (mk2N "buug" "buugaag") ** {gda = MF GA TA} ;
|
||||||
lin boy_N = mk2N "wiil" "wiilal" ;
|
lin boy_N = mk2N "wiil" "wiilal" ;
|
||||||
lin bread_N = mkN "rooti" ; --masc/fem
|
lin bread_N = mkN "rooti" ; --masc/fem
|
||||||
-- lin break_V2 = mkV2 "" ;
|
-- lin break_V2 = mkV2 "" ;
|
||||||
@@ -222,7 +222,7 @@ lin language_N = mkN "af" ;
|
|||||||
----
|
----
|
||||||
-- M
|
-- M
|
||||||
|
|
||||||
lin man_N = mkN "nin" ;
|
lin man_N = (mk2N "nin" "niman") ** {gda = MM KA KA} ;
|
||||||
-- lin married_A2 = mkA "" ;
|
-- lin married_A2 = mkA "" ;
|
||||||
lin meat_N = mkN "hilib" "hilbo" masc ;
|
lin meat_N = mkN "hilib" "hilbo" masc ;
|
||||||
-- lin milk_N = mkN "" ;
|
-- lin milk_N = mkN "" ;
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ oper
|
|||||||
mkN : overload {
|
mkN : overload {
|
||||||
mkN : (bisad : Str) -> N ; -- Predictable nouns
|
mkN : (bisad : Str) -> N ; -- Predictable nouns
|
||||||
mkN : (shimbir : Str) -> (fem : Gender) -> N ; -- Unpredictable gender
|
mkN : (shimbir : Str) -> (fem : Gender) -> N ; -- Unpredictable gender
|
||||||
|
-- mkN : (nin, niman : Str) -> N ; -- Monosyllable word with unpredictable plural
|
||||||
mkN : (maalin,maalmo : Str) -> Gender -> N ; -- Consonant cluster in stem
|
mkN : (maalin,maalmo : Str) -> Gender -> N ; -- Consonant cluster in stem
|
||||||
--mkN : N -> Gender -> N ; -- Otherwise predictable but not gender (TODO does this even happen?)
|
--mkN : N -> Gender -> N ; -- Otherwise predictable but not gender (TODO does this even happen?)
|
||||||
} ;
|
} ;
|
||||||
@@ -165,7 +166,8 @@ oper
|
|||||||
mkN = overload {
|
mkN = overload {
|
||||||
mkN : Str -> N = \s -> lin N (mkN1 s) ;
|
mkN : Str -> N = \s -> lin N (mkN1 s) ;
|
||||||
mkN : Str -> Gender -> N = \s,g -> lin N (mkNg s g) ;
|
mkN : Str -> Gender -> N = \s,g -> lin N (mkNg s g) ;
|
||||||
mkN : (_,_ : Str) -> Gender -> N = \s,t,g -> lin N (nMaalin s t g) ;
|
mkN : (sg, pl : Str) -> N = \sg,pl -> lin N (mk2N sg pl) ;
|
||||||
|
mkN : (indefsg,defsg : Str) -> Gender -> N = \s,t,g -> lin N (nMaalin s t g) ;
|
||||||
--mkN : N -> Gender -> N = \n,g -> n ** {g = g }
|
--mkN : N -> Gender -> N = \n,g -> n ** {g = g }
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -85,11 +85,11 @@ oper
|
|||||||
mkNoun ul (u + sha) (ul + o) (ul + "aha") Fem ;
|
mkNoun ul (u + sha) (ul + o) (ul + "aha") Fem ;
|
||||||
|
|
||||||
-- 4b) Masculine, plural with ó, 2 syllables
|
-- 4b) Masculine, plural with ó, 2 syllables
|
||||||
nGuri guri = let o = allomorph mO guri ;
|
nGuri guri = let ga = allomorph mKa guri ;
|
||||||
ga = allomorph mKa guri ;
|
|
||||||
gury = case last guri of { -- TODO does this generalise? Or just exception?
|
gury = case last guri of { -- TODO does this generalise? Or just exception?
|
||||||
"i" => init guri + "y" ;
|
"i" => init guri + "y" ;
|
||||||
_ => guri } in
|
_ => guri } ;
|
||||||
|
o = allomorph mO gury in
|
||||||
mkNoun guri (guri + ga) (gury + o) (gury + "aha") Masc ;
|
mkNoun guri (guri + ga) (gury + o) (gury + "aha") Masc ;
|
||||||
|
|
||||||
-- 4c) Masculine, plural with -ó, 3 syllables or longer
|
-- 4c) Masculine, plural with -ó, 3 syllables or longer
|
||||||
|
|||||||
Reference in New Issue
Block a user