mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-06-25 19:16:28 -06:00
(Romance,Por,Spa) refactor Extend{Por,Spa} into ExtendRomanceFunctor
- couldn't get a functor on top of another working in GFSS2018, so now we just copy the relevant definitions from ExtendFunctor and add the Romance-specific ones - add stare_V to DiffRomance (and essere_V for symmetry) so that we can use it in ExtendRomance; using Latin verb name for fairness; - add two missing lins to ExtendFunctor + related changes
This commit is contained in:
odanoburu
@@ -1,6 +1,6 @@
|
||||
--# -path=.:../romance:../abstract:../common:prelude
|
||||
|
||||
instance DiffSpa of DiffRomance - [iAdvQuestionInv,otherInv,partAgr,vpAgrSubj,vpAgrClits,contractInf] = open CommonRomance, PhonoSpa, BeschSpa, Prelude in {
|
||||
instance DiffSpa of DiffRomance - [iAdvQuestionInv,otherInv,partAgr,stare_V,vpAgrSubj,vpAgrClits,contractInf] = open CommonRomance, PhonoSpa, BeschSpa, Prelude in {
|
||||
|
||||
flags optimize=noexpand ;
|
||||
coding=utf8 ;
|
||||
@@ -207,11 +207,9 @@ instance DiffSpa of DiffRomance - [iAdvQuestionInv,otherInv,partAgr,vpAgrSubj,vp
|
||||
_ => False
|
||||
} ;
|
||||
|
||||
auxPassive : Verb = verbBeschH (estar_2 "estar") ;
|
||||
copula, essere_V : Verb = verbBeschH (ser_1 "ser") ;
|
||||
|
||||
copula : Verb = verbBeschH (ser_1 "ser") ;
|
||||
|
||||
estar_V : Verb = verbBeschH (estar_2 "estar") ;
|
||||
estar_V, stare_V, auxPassive : Verb = verbBeschH (estar_2 "estar") ;
|
||||
|
||||
haber_V : Verb = verbBeschH (haber_3 "haber") ;
|
||||
|
||||
|
||||
+31
-220
@@ -1,67 +1,38 @@
|
||||
--# -path=alltenses:../common:../abstract
|
||||
|
||||
concrete ExtendSpa of Extend =
|
||||
CatSpa ** ExtendFunctor -
|
||||
[
|
||||
iFem_Pron, youFem_Pron, weFem_Pron, youPlFem_Pron, theyFem_Pron,
|
||||
youPolFem_Pron, youPolPl_Pron, youPolPlFem_Pron,
|
||||
ProDrop,
|
||||
AdAdV,
|
||||
AdjAsCN,
|
||||
AdjAsNP,
|
||||
ApposNP,
|
||||
BaseVPS,
|
||||
ByVP,
|
||||
CompBareCN,
|
||||
ComplBareVS,
|
||||
ComplSlashPartLast,
|
||||
CompoundAP,
|
||||
CompoundN,
|
||||
CompVP,
|
||||
ConjVPS,
|
||||
ConsVPS,
|
||||
--EmptyRelSlash,
|
||||
ExistsNP,
|
||||
GenIP,
|
||||
GenModIP,
|
||||
GenModNP,
|
||||
GenNP,
|
||||
GerundAdv,
|
||||
GerundCN,
|
||||
GerundNP,
|
||||
IAdvAdv,
|
||||
ICompAP,
|
||||
InOrderToVP,
|
||||
ListVPS,
|
||||
MkVPS,
|
||||
PassAgentVPSlash,
|
||||
PassVPSlash,
|
||||
PastPartAP,
|
||||
PastPartAgentAP,
|
||||
PositAdVAdj,
|
||||
PredVPS,
|
||||
PresPartAP,
|
||||
PurposeVP,
|
||||
UseComp_estar,
|
||||
VPS,
|
||||
UttAdV,
|
||||
UttVPShort,
|
||||
WithoutVP
|
||||
] -- put the names of your own definitions here
|
||||
--# -path=alltenses:../common:../abstract:../romance
|
||||
concrete ExtendSpa of Extend = CatSpa ** ExtendRomanceFunctor -
|
||||
[
|
||||
CompVP,
|
||||
CompoundAP,
|
||||
CompoundN,
|
||||
ExistsNP,
|
||||
GenRP,
|
||||
GenRP,
|
||||
IAdvAdv,
|
||||
ICompAP,
|
||||
InOrderToVP,
|
||||
WithoutVP,
|
||||
iFem_Pron,
|
||||
theyFem_Pron,
|
||||
weFem_Pron,
|
||||
youFem_Pron,
|
||||
youPlFem_Pron,
|
||||
youPolFem_Pron,
|
||||
youPolPlFem_Pron,
|
||||
youPolPl_Pron
|
||||
] -- don't forget to put the names of your own
|
||||
-- definitions here
|
||||
with
|
||||
(Grammar = GrammarSpa) **
|
||||
(Grammar = GrammarSpa), (Syntax = SyntaxSpa), (ResRomance = ResSpa) **
|
||||
open
|
||||
GrammarSpa,
|
||||
ResSpa,
|
||||
MorphoSpa,
|
||||
Coordination,
|
||||
Prelude,
|
||||
ParadigmsSpa in {
|
||||
GrammarSpa,
|
||||
ResSpa,
|
||||
MorphoSpa,
|
||||
Coordination,
|
||||
Prelude,
|
||||
ParadigmsSpa in {
|
||||
-- put your own definitions here
|
||||
|
||||
lin
|
||||
UseComp_estar comp = insertComplement comp.s (predV estar_V) ;
|
||||
|
||||
iFem_Pron = mkPronoun
|
||||
"yo" "me" "me" "mí"
|
||||
"mi" "mi" "mis" "mis"
|
||||
@@ -98,60 +69,6 @@ concrete ExtendSpa of Extend =
|
||||
"su" "su" "sus" "sus"
|
||||
Fem Pl P3 ;
|
||||
|
||||
ProDrop p = p ** {
|
||||
s = table {
|
||||
Nom => let pn = p.s ! Nom in {c1 = pn.c1 ; c2 = pn.c2 ; comp = [] ; ton = pn.ton} ;
|
||||
c => p.s ! c
|
||||
} ;
|
||||
isNeg = False
|
||||
} ;
|
||||
|
||||
--- All that follows is copied from Portuguese /IL
|
||||
|
||||
GenNP np =
|
||||
let denp = (np.s ! ResSpa.genitive).ton in {
|
||||
s = \\_,_,_,_ => [] ;
|
||||
sp = \\_,_,_ => denp ;
|
||||
s2 = denp ;
|
||||
isNeg = False ;
|
||||
} ;
|
||||
|
||||
GenIP ip = {s = \\_,_,c => ip.s ! c} ;
|
||||
|
||||
GenModNP num np cn = DetCN (DetQuant (GenNP (lin NP np)) num) cn ;
|
||||
|
||||
GenModIP num ip cn = IdetCN (IdetQuant (GenIP (lin IP ip)) num) cn ;
|
||||
|
||||
CompBareCN cn = {
|
||||
s = \\agr => cn.s ! agr.n ;
|
||||
cop = serCopula
|
||||
} ;
|
||||
|
||||
EmptyRelSlash cls = {
|
||||
s = \\agr,t,a,p,m => cls.s ! agr ! DDir ! t ! a ! p ! m ++ cls.c2.s ;
|
||||
c = Nom
|
||||
} ;
|
||||
lincat
|
||||
VPS = {s : Mood => Agr => Bool => Str} ;
|
||||
[VPS] = {s1,s2 : Mood => Agr => Bool => Str} ;
|
||||
|
||||
lin
|
||||
BaseVPS x y = twoTable3 Mood Agr Bool x y ;
|
||||
ConsVPS = consrTable3 Mood Agr Bool comma ;
|
||||
|
||||
PredVPS np vpi = {
|
||||
s = \\m => (np.s ! Nom).comp ++ vpi.s ! m ! np.a ! np.isNeg
|
||||
} ;
|
||||
|
||||
MkVPS tm p vp = {
|
||||
s = \\m,agr,isNeg =>
|
||||
tm.s ++ p.s ++
|
||||
(mkClausePol (orB isNeg vp.isNeg) [] False False agr vp).s
|
||||
! DDir ! tm.t ! tm.a ! p.p ! m
|
||||
} ;
|
||||
|
||||
ConjVPS = conjunctDistrTable3 Mood Agr Bool ;
|
||||
|
||||
ICompAP ap = {
|
||||
s =\\a => "que tan" ++ ap.s ! (genNum2Aform a.g a.n) ;
|
||||
cop = serCopula
|
||||
@@ -161,65 +78,11 @@ concrete ExtendSpa of Extend =
|
||||
s = "que tan" ++ adv.s
|
||||
} ;
|
||||
|
||||
CompIQuant iq = {s = \\aa => iq.s ! aa.n ! aa.g ! Nom ; cop = serCopula} ;
|
||||
|
||||
PrepCN prep cn = {s = prep.s ++ prepCase prep.c ++ cn.s ! Sg} ;
|
||||
|
||||
lin
|
||||
PresPartAP vp = {
|
||||
s = \\af => gerVP vp (aform2aagr af ** {p = P3}) ;
|
||||
isPre = False ;
|
||||
copTyp = serCopula
|
||||
} ;
|
||||
|
||||
PastPartAP vps = pastPartAP vps [] ;
|
||||
|
||||
PastPartAgentAP vps np = pastPartAP vps (let by = <Grammar.by8agent_Prep : Prep> in by.s ++ (np.s ! by.c).ton) ;
|
||||
|
||||
PassVPSlash vps = passVPSlash vps [] ;
|
||||
|
||||
PassAgentVPSlash vps np = passVPSlash vps (let by = <Grammar.by8agent_Prep : Prep> in by.s ++ (np.s ! by.c).ton) ;
|
||||
|
||||
ExistsNP np =
|
||||
mkClause [] True False np.a
|
||||
(insertComplement (\\_ => (np.s ! Nom).ton)
|
||||
(predV (mkV "existir"))) ;
|
||||
|
||||
PurposeVP vp = {
|
||||
s = infVP vp (Ag Masc Sg P3)
|
||||
} ;
|
||||
|
||||
ComplBareVS = ComplVS ;
|
||||
|
||||
AdjAsCN ap = {
|
||||
s =\\n => ap.s ! (genNum2Aform Masc n) ;
|
||||
g = Masc
|
||||
} ;
|
||||
|
||||
AdjAsNP ap = heavyNP {
|
||||
s = \\_c => ap.s ! ASg Masc APred ;
|
||||
a = Ag Masc Sg P3
|
||||
} ;
|
||||
|
||||
oper
|
||||
pastPartAP : VPSlash -> Str -> AP ;
|
||||
pastPartAP vps agent = lin AP {
|
||||
s = \\af => vps.comp ! (aform2aagr af ** {p = P3}) ++ vps.s.s ! VPart (aform2gender af) (aform2number af) ++ agent ;
|
||||
isPre = False ;
|
||||
copTyp = serCopula
|
||||
} ;
|
||||
|
||||
passVPSlash : VPSlash -> Str -> VP ;
|
||||
passVPSlash vps agent = let
|
||||
auxvp = predV auxPassive
|
||||
in
|
||||
vps ** {
|
||||
s = auxvp.s ;
|
||||
agr = auxvp.agr ;
|
||||
comp = \\a => vps.comp ! a ++ (let agr = complAgr a in vps.s.s ! VPart agr.g agr.n) ++ agent ;
|
||||
} ;
|
||||
|
||||
lin
|
||||
CompoundN noun noun2 = { -- order is different because that's needed for correct translation from english
|
||||
s = \\n => noun2.s ! n
|
||||
++ variants {"de" ; genForms "do" "da" ! noun.g}
|
||||
@@ -235,53 +98,14 @@ concrete ExtendSpa of Extend =
|
||||
copTyp = adj.copTyp
|
||||
} ;
|
||||
|
||||
GerundCN vp = {
|
||||
s = \\n => gerVP vp {g = Masc ; n = n ; p = P3} ;
|
||||
g = Masc
|
||||
} ;
|
||||
|
||||
GerundNP vp = let
|
||||
neutrAgr = Ag Masc Sg P3
|
||||
in heavyNP {
|
||||
s = \\_ => gerVP vp neutrAgr ;
|
||||
a = neutrAgr
|
||||
} ;
|
||||
|
||||
GerundAdv vp = {
|
||||
s = gerundStr vp
|
||||
} ;
|
||||
|
||||
WithoutVP vp = {
|
||||
s = "sin" ++ infStr vp
|
||||
} ;
|
||||
|
||||
ByVP vp = {
|
||||
s = gerundStr vp
|
||||
} ;
|
||||
|
||||
InOrderToVP vp = {
|
||||
s = "para" ++ infStr vp
|
||||
} ;
|
||||
|
||||
ApposNP np1 np2 = np1 ** {
|
||||
s = \\c => {
|
||||
c1 = (np1.s ! c).c1 ++ (np2.s ! c).c1 ;
|
||||
c2 = (np1.s ! c).c2 ++ (np2.s ! c).c2 ;
|
||||
comp = (np1.s ! c).comp ++ (np2.s ! c).comp ;
|
||||
ton = (np1.s ! c).ton ++ (np2.s ! c).ton
|
||||
} ;
|
||||
} ;
|
||||
|
||||
AdAdV aa av = {
|
||||
s = aa.s ++ av.s
|
||||
} ;
|
||||
|
||||
UttAdV av = av ;
|
||||
|
||||
PositAdVAdj a = {
|
||||
s = a.s ! Posit ! AA
|
||||
} ;
|
||||
|
||||
--TODO: actually use ant
|
||||
CompVP ant p vp = let
|
||||
neg = negation ! p.p
|
||||
@@ -290,17 +114,4 @@ concrete ExtendSpa of Extend =
|
||||
cop = serCopula
|
||||
} ;
|
||||
|
||||
UttVPShort = UttVP ;
|
||||
|
||||
ComplSlashPartLast = ComplSlash ;
|
||||
|
||||
oper
|
||||
gerundStr : VP -> Str ;
|
||||
gerundStr vp = gerVP vp (Ag Masc Sg P3) ;
|
||||
infStr : VP -> Str ;
|
||||
infStr vp = infVP vp (Ag Masc Sg P3) ;
|
||||
|
||||
lin
|
||||
UncontractedNeg = {s = [] ; p = RNeg False} ;
|
||||
|
||||
}
|
||||
} ;
|
||||
|
||||
Reference in New Issue
Block a user