diff --git a/src/catalan/AllCat.gf b/src/catalan/AllCat.gf index d679dac5..254b1da2 100644 --- a/src/catalan/AllCat.gf +++ b/src/catalan/AllCat.gf @@ -3,5 +3,6 @@ concrete AllCat of AllCatAbs = LangCat, IrregCat, - ExtraCat - ** {} ; + ExtraCat + ** open ExtendCat + in {} ; diff --git a/src/catalan/ExtendCat.gf b/src/catalan/ExtendCat.gf new file mode 100644 index 00000000..20ab56ae --- /dev/null +++ b/src/catalan/ExtendCat.gf @@ -0,0 +1,19 @@ +--# -path=alltenses:../common:../abstract:../romance +concrete ExtendCat of Extend = CatCat ** ExtendRomanceFunctor-- - + -- [ + -- ] + -- don't forget to put the names of your own + -- definitions here + with + (Grammar = GrammarCat), (Syntax = SyntaxCat), (ResRomance = ResCat) ** + open + GrammarCat, + ResCat, + MorphoCat, + Coordination, + Prelude, + ParadigmsCat in { + -- put your own definitions here + + +} ; diff --git a/src/common/ParamX.gf b/src/common/ParamX.gf index 65901de6..a9940665 100644 --- a/src/common/ParamX.gf +++ b/src/common/ParamX.gf @@ -11,7 +11,7 @@ resource ParamX = open Prelude in { Simul | Anter --# notpresent ; - Tense = + Tense = Pres | Past --# notpresent | Fut --# notpresent diff --git a/src/english/QuestionEng.gf b/src/english/QuestionEng.gf index 2723a410..a2f478d8 100644 --- a/src/english/QuestionEng.gf +++ b/src/english/QuestionEng.gf @@ -13,7 +13,7 @@ concrete QuestionEng of Question = CatEng ** open ResEng, Prelude in { } ---- "whether" in ExtEng } ; - QuestVP qp vp = + QuestVP qp vp = let cl = mkClause (qp.s ! npNom) (agrP3 qp.n) vp in {s = \\t,a,b,_ => cl.s ! t ! a ! b ! oDir} ; ---- diff --git a/src/italian/AllIta.gf b/src/italian/AllIta.gf index 67ce19e8..d2eece40 100644 --- a/src/italian/AllIta.gf +++ b/src/italian/AllIta.gf @@ -4,4 +4,5 @@ concrete AllIta of AllItaAbs = LangIta, -- IrregIta, ExtraIta - ** {} ; + ** open ExtendIta + in {} ; diff --git a/src/italian/ExtendIta.gf b/src/italian/ExtendIta.gf new file mode 100644 index 00000000..0df8be02 --- /dev/null +++ b/src/italian/ExtendIta.gf @@ -0,0 +1,19 @@ +--# -path=alltenses:../common:../abstract:../romance +concrete ExtendIta of Extend = CatIta ** ExtendRomanceFunctor-- - + -- [ + -- ] + -- don't forget to put the names of your own + -- definitions here + with + (Grammar = GrammarIta), (Syntax = SyntaxIta), (ResRomance = ResIta) ** + open + GrammarIta, + ResIta, + MorphoIta, + Coordination, + Prelude, + ParadigmsIta in { + -- put your own definitions here + + +} ; diff --git a/src/romance/ResRomance.gf b/src/romance/ResRomance.gf index ad38ed32..a53575de 100644 --- a/src/romance/ResRomance.gf +++ b/src/romance/ResRomance.gf @@ -215,7 +215,7 @@ oper clit = refl ++ vp.clit1 ++ vp.clit2 ++ vp.clit3.s ; ---- refl first? verb = vp.s.s ; - vaux = auxVerb vp.s.vtyp ; + vaux = auxVerb vtyp ; ---- VPAgr : this is where it really matters part = case vp.agr.p2 of {