mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 09:28:54 -06:00
(Por) generalize acuteToVowel to diacriticToVowel
- also fix parenthesis that broke build
This commit is contained in:
@@ -64,17 +64,17 @@ oper
|
|||||||
"i" => "í" ;
|
"i" => "í" ;
|
||||||
"o" => "ó" ;
|
"o" => "ó" ;
|
||||||
"u" => "ú" ;
|
"u" => "ú" ;
|
||||||
_ => error "input '" ++ v ++ "' must be vowel character."
|
_ => error ("input '" ++ v ++ "' must be vowel character.")
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
acuteToVowel : Str -> Str = \v ->
|
diacriticToVowel : Str -> Str = \v ->
|
||||||
case v of {
|
case v of {
|
||||||
"á" => "a" ;
|
("á"|"â"|"ã") => "a" ;
|
||||||
"é" => "e" ;
|
("é"|"ê") => "e" ;
|
||||||
"í" => "i" ;
|
"í" => "i" ;
|
||||||
"ó" => "o" ;
|
("ó"|"ô"|"õ") => "o" ;
|
||||||
"ú" => "u" ;
|
"ú" => "u" ;
|
||||||
_ => error "input '" ++ v ++ "' must be an acute vowel character."
|
_ => error ("input '" ++ v ++ "' must be a vowel character with an accent.")
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
-- Common nouns are inflected in number and have an inherent gender.
|
-- Common nouns are inflected in number and have an inherent gender.
|
||||||
@@ -130,7 +130,7 @@ oper
|
|||||||
|
|
||||||
home + "m" => mkNoun (nomNuvem vinho) Masc ;
|
home + "m" => mkNoun (nomNuvem vinho) Masc ;
|
||||||
|
|
||||||
g + v@("á"|"é"|"í"|"ó"|"ú"|"ê") + "s" => mkNoun (numForms vinho (g + acuteToVowel v + "ses")) Masc ;
|
g + v@("á"|"é"|"í"|"ó"|"ú"|"ê") + "s" => mkNoun (numForms vinho (g + diacriticToVowel v + "ses")) Masc ;
|
||||||
|
|
||||||
ônibu + "s" => mkNoun (nomAreia vinho) Masc ;
|
ônibu + "s" => mkNoun (nomAreia vinho) Masc ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user