forked from GitHub/gf-rgl
(Romance) mv numForms to CommonRomance; rm from Morpho*
This commit is contained in:
@@ -24,15 +24,8 @@ oper
|
|||||||
|
|
||||||
|
|
||||||
--2 Nouns
|
--2 Nouns
|
||||||
--
|
|
||||||
-- The following macro is useful for creating the forms of number-dependent
|
|
||||||
-- tables, such as common nouns.
|
|
||||||
|
|
||||||
numForms : Str -> Str -> Number => Str = \bon,bons ->
|
|
||||||
table {Sg => bon ; Pl => bons} ;
|
|
||||||
|
|
||||||
-- For example, the regular noun forms are defined as follows:
|
|
||||||
|
|
||||||
|
-- regular noun forms are defined as follows:
|
||||||
nomReg : Str -> Number => Str = \bu -> numForms bu (bu + "s") ;
|
nomReg : Str -> Number => Str = \bu -> numForms bu (bu + "s") ;
|
||||||
|
|
||||||
-- Common nouns are inflected in number and have an inherent gender.
|
-- Common nouns are inflected in number and have an inherent gender.
|
||||||
|
|||||||
@@ -19,9 +19,6 @@ resource MorphoPor = CommonRomance, ResPor **
|
|||||||
-- number-dependent tables, such as common nouns.
|
-- number-dependent tables, such as common nouns.
|
||||||
|
|
||||||
oper
|
oper
|
||||||
numForms : (_,_ : Str) -> Number => Str = \campus, campi ->
|
|
||||||
table {Sg => campus ; Pl => campi} ;
|
|
||||||
|
|
||||||
-- For example:
|
-- For example:
|
||||||
nomVinho : Str -> Number => Str = \vinho ->
|
nomVinho : Str -> Number => Str = \vinho ->
|
||||||
numForms vinho (vinho + "s") ;
|
numForms vinho (vinho + "s") ;
|
||||||
|
|||||||
@@ -203,7 +203,12 @@ oper
|
|||||||
table {
|
table {
|
||||||
Masc => bon ;
|
Masc => bon ;
|
||||||
Fem => bonne
|
Fem => bonne
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
-- The following macro is useful for creating the forms of
|
||||||
|
-- number-dependent tables, such as common nouns.
|
||||||
|
numForms : (_,_ : Str) -> Number => Str = \campus, campi ->
|
||||||
|
table {Sg => campus ; Pl => campi} ;
|
||||||
|
|
||||||
aagrForms : (x1,_,_,x4 : Str) -> (AAgr => Str) = \tout,toute,tous,toutes ->
|
aagrForms : (x1,_,_,x4 : Str) -> (AAgr => Str) = \tout,toute,tous,toutes ->
|
||||||
table {
|
table {
|
||||||
@@ -241,4 +246,3 @@ oper
|
|||||||
param RPolarity = RPos | RNeg Bool ; -- RNeg True = "ne", RNeg False = "ne - pas"
|
param RPolarity = RPos | RNeg Bool ; -- RNeg True = "ne", RNeg False = "ne - pas"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,16 +17,8 @@ resource MorphoSpa = CommonRomance, ResSpa **
|
|||||||
|
|
||||||
|
|
||||||
--2 Nouns
|
--2 Nouns
|
||||||
--
|
|
||||||
-- The following macro is useful for creating the forms of number-dependent
|
|
||||||
-- tables, such as common nouns.
|
|
||||||
|
|
||||||
oper
|
oper
|
||||||
numForms : (_,_ : Str) -> Number => Str = \vino, vini ->
|
|
||||||
table {Sg => vino ; Pl => vini} ;
|
|
||||||
|
|
||||||
-- For example:
|
|
||||||
|
|
||||||
nomVino : Str -> Number => Str = \vino ->
|
nomVino : Str -> Number => Str = \vino ->
|
||||||
numForms vino (vino + "s") ;
|
numForms vino (vino + "s") ;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user