Merge pull request #211 from inariksit/export-romance-copulas

(Cat,Por,Spa) Export CopulaType and {ser,estar}Copula in Paradigms
This commit is contained in:
Inari Listenmaa
2019-03-29 12:53:55 +01:00
committed by GitHub
3 changed files with 30 additions and 2 deletions

View File

@@ -28,6 +28,7 @@ resource ParadigmsCat =
open open
(Predef=Predef), (Predef=Predef),
Prelude, Prelude,
DiffCat,
MorphoCat, MorphoCat,
BeschCat, BeschCat,
CatCat in { CatCat in {
@@ -64,6 +65,9 @@ oper
mkPrep : Str -> Prep ; -- other preposition mkPrep : Str -> Prep ; -- other preposition
CopulaType : Type ;
serCopula : CopulaType ;
estarCopula : CopulaType ;
--2 Nouns --2 Nouns
@@ -295,10 +299,13 @@ oper
Gender = MorphoCat.Gender ; Gender = MorphoCat.Gender ;
Number = MorphoCat.Number ; Number = MorphoCat.Number ;
CopulaType = DiffCat.CopulaType ;
masculine = Masc ; masculine = Masc ;
feminine = Fem ; feminine = Fem ;
singular = Sg ; singular = Sg ;
plural = Pl ; plural = Pl ;
serCopula = DiffCat.serCopula ;
estarCopula = DiffCat.estarCopula ;
accusative = complAcc ** {lock_Prep = <>} ; accusative = complAcc ** {lock_Prep = <>} ;
genitive = complGen ** {lock_Prep = <>} ; genitive = complGen ** {lock_Prep = <>} ;

View File

@@ -35,6 +35,7 @@ resource ParadigmsPor =
Prelude, Prelude,
MorphoPor, MorphoPor,
BeschPor, BeschPor,
DiffPor,
CatPor in { CatPor in {
flags optimize=all ; flags optimize=all ;
@@ -79,6 +80,18 @@ oper
dative : Prep ; -- preposition "a" and its contractions dative : Prep ; -- preposition "a" and its contractions
dative = lin Prep complDat ; dative = lin Prep complDat ;
CopulaType : Type ;
CopulaType = DiffPor.CopulaType ;
serCopula : CopulaType ;
serCopula = DiffPor.serCopula ;
estarCopula : CopulaType ;
estarCopula = DiffPor.estarCopula ;
ficarCopula : CopulaType ;
ficarCopula = DiffPor.ficarCopula ;
mkPrep = overload { mkPrep = overload {
mkPrep : Str -> Prep -- other preposition mkPrep : Str -> Prep -- other preposition
= \p -> lin Prep {s = p ; c = Acc ; isDir = False} ; = \p -> lin Prep {s = p ; c = Acc ; isDir = False} ;

View File

@@ -28,6 +28,7 @@ resource ParadigmsSpa =
(Predef=Predef), (Predef=Predef),
Prelude, Prelude,
MorphoSpa, MorphoSpa,
DiffSpa,
BeschSpa, BeschSpa,
CatSpa in { CatSpa in {
@@ -60,6 +61,10 @@ oper
genitive : Prep ; -- preposition "de" and its contractions genitive : Prep ; -- preposition "de" and its contractions
dative : Prep ; -- preposition "a" and its contractions dative : Prep ; -- preposition "a" and its contractions
CopulaType : Type ;
serCopula : CopulaType ;
estarCopula : CopulaType ;
mkPrep : overload { mkPrep : overload {
mkPrep : Str -> Prep ; -- other preposition mkPrep : Str -> Prep ; -- other preposition
mkPrep : Str -> Prep -> Prep ; -- compound prepositions, e.g. "antes de", made as mkPrep "antes" genitive mkPrep : Str -> Prep -> Prep ; -- compound prepositions, e.g. "antes de", made as mkPrep "antes" genitive
@@ -322,10 +327,13 @@ oper
Gender = MorphoSpa.Gender ; Gender = MorphoSpa.Gender ;
Number = MorphoSpa.Number ; Number = MorphoSpa.Number ;
CopulaType = DiffSpa.CopulaType ;
masculine = Masc ; masculine = Masc ;
feminine = Fem ; feminine = Fem ;
singular = Sg ; singular = Sg ;
plural = Pl ; plural = Pl ;
serCopula = DiffSpa.serCopula ;
estarCopula = DiffSpa.estarCopula ;
accusative = complAcc ** {lock_Prep = <>} ; accusative = complAcc ** {lock_Prep = <>} ;
genitive = complGen ** {lock_Prep = <>} ; genitive = complGen ** {lock_Prep = <>} ;