From 7dec4c8a8943864e0c60acd86ea58fc97e0163b5 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 18 Jun 2006 19:08:47 +0000 Subject: [PATCH] passe simple in ExtraRomance --- lib/resource-1.0/french/CatFre.gf | 2 +- lib/resource-1.0/french/GrammarFre.gf | 2 +- lib/resource-1.0/french/IdiomFre.gf | 2 +- lib/resource-1.0/italian/CatIta.gf | 2 +- lib/resource-1.0/italian/GrammarIta.gf | 2 +- lib/resource-1.0/italian/IdiomIta.gf | 2 +- lib/resource-1.0/romance/CatRomance.gf | 20 +++++++++++++++----- lib/resource-1.0/romance/CommonRomance.gf | 8 ++++++++ lib/resource-1.0/romance/ExtraRomance.gf | 1 + lib/resource-1.0/romance/ExtraRomanceAbs.gf | 2 ++ lib/resource-1.0/romance/ResRomance.gf | 11 ++++++----- lib/resource-1.0/spanish/CatSpa.gf | 2 +- lib/resource-1.0/spanish/GrammarSpa.gf | 2 +- lib/resource-1.0/spanish/IdiomSpa.gf | 2 +- 14 files changed, 41 insertions(+), 19 deletions(-) diff --git a/lib/resource-1.0/french/CatFre.gf b/lib/resource-1.0/french/CatFre.gf index dc0a09446..2daa7decc 100644 --- a/lib/resource-1.0/french/CatFre.gf +++ b/lib/resource-1.0/french/CatFre.gf @@ -1,4 +1,4 @@ --# -path=.:../romance:../common:../abstract:../common:prelude -concrete CatFre of Cat = CommonX ** CatRomance with +concrete CatFre of Cat = CommonX - [Tense,TPres,TPast,TFut,TCond] ** CatRomance with (ResRomance = ResFre) ; diff --git a/lib/resource-1.0/french/GrammarFre.gf b/lib/resource-1.0/french/GrammarFre.gf index fb21f05ab..698cea528 100644 --- a/lib/resource-1.0/french/GrammarFre.gf +++ b/lib/resource-1.0/french/GrammarFre.gf @@ -11,7 +11,7 @@ concrete GrammarFre of Grammar = RelativeFre, ConjunctionFre, PhraseFre, - TextX, + TextX - [Tense,TPres,TPast,TFut,TCond], IdiomFre, StructuralFre ** { diff --git a/lib/resource-1.0/french/IdiomFre.gf b/lib/resource-1.0/french/IdiomFre.gf index 812455911..90f49e630 100644 --- a/lib/resource-1.0/french/IdiomFre.gf +++ b/lib/resource-1.0/french/IdiomFre.gf @@ -32,7 +32,7 @@ concrete IdiomFre of Idiom = CatFre ** (predV copula) ; ImpPl1 vp = {s = - (mkClause [] {g = Fem ; n = Pl ; p = P1} vp).s ! P.Pres ! Simul ! Pos ! Indic + (mkClause [] {g = Fem ; n = Pl ; p = P1} vp).s ! RPres ! Simul ! Pos ! Indic } ; oper diff --git a/lib/resource-1.0/italian/CatIta.gf b/lib/resource-1.0/italian/CatIta.gf index b44364a0e..9be8ca6de 100644 --- a/lib/resource-1.0/italian/CatIta.gf +++ b/lib/resource-1.0/italian/CatIta.gf @@ -1,4 +1,4 @@ --# -path=.:../romance:../abstract:../common:prelude -concrete CatIta of Cat = CommonX ** CatRomance with +concrete CatIta of Cat = CommonX - [Tense,TPres,TPast,TFut,TCond] ** CatRomance with (ResRomance = ResIta) ; diff --git a/lib/resource-1.0/italian/GrammarIta.gf b/lib/resource-1.0/italian/GrammarIta.gf index 5f5f315e9..326a06568 100644 --- a/lib/resource-1.0/italian/GrammarIta.gf +++ b/lib/resource-1.0/italian/GrammarIta.gf @@ -11,7 +11,7 @@ concrete GrammarIta of Grammar = RelativeIta, ConjunctionIta, PhraseIta, - TextX, + TextX - [Tense,TPres,TPast,TFut,TCond], IdiomIta, StructuralIta diff --git a/lib/resource-1.0/italian/IdiomIta.gf b/lib/resource-1.0/italian/IdiomIta.gf index 62cbc7118..54bdd8dbd 100644 --- a/lib/resource-1.0/italian/IdiomIta.gf +++ b/lib/resource-1.0/italian/IdiomIta.gf @@ -41,7 +41,7 @@ concrete IdiomIta of Idiom = CatIta ** (predV (essereV (verboV (stare_16 "stare")))) ; ImpPl1 vp = {s = - (mkClause [] {g = Fem ; n = Pl ; p = P1} vp).s ! P.Pres ! Simul ! Pos ! Indic + (mkClause [] {g = Fem ; n = Pl ; p = P1} vp).s ! RPres ! Simul ! Pos ! Indic } ; } diff --git a/lib/resource-1.0/romance/CatRomance.gf b/lib/resource-1.0/romance/CatRomance.gf index 1b03e6685..d877a9bec 100644 --- a/lib/resource-1.0/romance/CatRomance.gf +++ b/lib/resource-1.0/romance/CatRomance.gf @@ -1,5 +1,6 @@ incomplete concrete CatRomance of Cat = - CommonX ** open Prelude, CommonRomance, ResRomance, (R = ParamX) in { + CommonX - [Tense,TPres,TPast,TFut,TCond] + ** open Prelude, CommonRomance, ResRomance, (R = ParamX) in { flags optimize=all_subs ; @@ -13,16 +14,16 @@ incomplete concrete CatRomance of Cat = -- Sentence - Cl = {s : Tense => Anteriority => Polarity => Mood => Str} ; + Cl = {s : RTense => Anteriority => Polarity => Mood => Str} ; Slash = { - s : AAgr => Tense => Anteriority => Polarity => Mood => Str ; + s : AAgr => RTense => Anteriority => Polarity => Mood => Str ; c2 : Compl } ; Imp = {s : Polarity => AAgr => Str} ; -- Question - QCl = {s : Tense => Anteriority => Polarity => QForm => Str} ; + QCl = {s : RTense => Anteriority => Polarity => QForm => Str} ; IP = {s : Case => Str ; a : AAgr} ; IComp = {s : AAgr => Str} ; IDet = {s : Gender => Case => Str ; n : Number} ; @@ -30,7 +31,7 @@ incomplete concrete CatRomance of Cat = -- Relative RCl = { - s : Agr => Tense => Anteriority => Polarity => Mood => Str ; + s : Agr => RTense => Anteriority => Polarity => Mood => Str ; c : Case } ; RP = {s : Bool => AAgr => Case => Str ; a : AAgr ; hasAgr : Bool} ; @@ -82,4 +83,13 @@ incomplete concrete CatRomance of Cat = N3 = Noun ** {c2,c3 : Compl} ; PN = {s : Str ; g : Gender} ; +-- tense augmented with passé simple + + Tense = {s : Str ; t : RTense} ; + lin + TPres = {s = []} ** {t = RPres} ; + TPast = {s = []} ** {t = RPast} ; --# notpresent + TFut = {s = []} ** {t = RFut} ; --# notpresent + TCond = {s = []} ** {t = RCond} ; --# notpresent + } diff --git a/lib/resource-1.0/romance/CommonRomance.gf b/lib/resource-1.0/romance/CommonRomance.gf index 1b5769be2..2008779aa 100644 --- a/lib/resource-1.0/romance/CommonRomance.gf +++ b/lib/resource-1.0/romance/CommonRomance.gf @@ -105,6 +105,14 @@ param | VPGerund | VPInfinit Anteriority ; + RTense = + RPres + | RPast --# notpresent + | RPasse --# notpresent + | RFut --# notpresent + | RCond --# notpresent + ; + -- Agreement of adjectives, verb phrases, and relative pronouns. oper diff --git a/lib/resource-1.0/romance/ExtraRomance.gf b/lib/resource-1.0/romance/ExtraRomance.gf index eb71331db..d00d0462d 100644 --- a/lib/resource-1.0/romance/ExtraRomance.gf +++ b/lib/resource-1.0/romance/ExtraRomance.gf @@ -3,5 +3,6 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance ** CommonRomance, ResRomance in { + lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent } diff --git a/lib/resource-1.0/romance/ExtraRomanceAbs.gf b/lib/resource-1.0/romance/ExtraRomanceAbs.gf index b3a9de9d4..53bfbe5f5 100644 --- a/lib/resource-1.0/romance/ExtraRomanceAbs.gf +++ b/lib/resource-1.0/romance/ExtraRomanceAbs.gf @@ -1,3 +1,5 @@ abstract ExtraRomanceAbs = Extra ** { + fun TPasseSimple : Tense ; --# notpresent + } diff --git a/lib/resource-1.0/romance/ResRomance.gf b/lib/resource-1.0/romance/ResRomance.gf index a49dc4397..5676fc059 100644 --- a/lib/resource-1.0/romance/ResRomance.gf +++ b/lib/resource-1.0/romance/ResRomance.gf @@ -193,15 +193,16 @@ oper } ; mkClause : Str -> Agr -> VP -> - {s : Tense => Anteriority => Polarity => Mood => Str} = + {s : RTense => Anteriority => Polarity => Mood => Str} = \subj,agr,vp -> { s = \\t,a,b,m => let tm = case t of { - Past => VImperf m ; --# notpresent - Fut => VFut ; --# notpresent - Cond => VCondit ; --# notpresent - Pres => VPres m + RPast => VImperf m ; --# notpresent + RFut => VFut ; --# notpresent + RCond => VCondit ; --# notpresent + RPasse => VPasse ; --# notpresent + RPres => VPres m } ; vps = vp.s ! VPFinite tm a ; verb = vps.fin ! agr ; diff --git a/lib/resource-1.0/spanish/CatSpa.gf b/lib/resource-1.0/spanish/CatSpa.gf index 5367eeaf9..956de7fe1 100644 --- a/lib/resource-1.0/spanish/CatSpa.gf +++ b/lib/resource-1.0/spanish/CatSpa.gf @@ -1,4 +1,4 @@ --# -path=.:../romance:../abstract:../common:prelude -concrete CatSpa of Cat = CommonX ** CatRomance with +concrete CatSpa of Cat = CommonX - [Tense,TPres,TPast,TFut,TCond] ** CatRomance with (ResRomance = ResSpa) ; diff --git a/lib/resource-1.0/spanish/GrammarSpa.gf b/lib/resource-1.0/spanish/GrammarSpa.gf index 68c8b2758..34594feb9 100644 --- a/lib/resource-1.0/spanish/GrammarSpa.gf +++ b/lib/resource-1.0/spanish/GrammarSpa.gf @@ -11,7 +11,7 @@ concrete GrammarSpa of Grammar = RelativeSpa, ConjunctionSpa, PhraseSpa, - TextSpa, -- special punctuation + TextSpa - [Tense,TPres,TPast,TFut,TCond], -- special punctuation IdiomSpa, StructuralSpa diff --git a/lib/resource-1.0/spanish/IdiomSpa.gf b/lib/resource-1.0/spanish/IdiomSpa.gf index a112230f3..fe8b580e9 100644 --- a/lib/resource-1.0/spanish/IdiomSpa.gf +++ b/lib/resource-1.0/spanish/IdiomSpa.gf @@ -37,7 +37,7 @@ concrete IdiomSpa of Idiom = CatSpa ** (predV (verboV (estar_2 "estar"))) ; ImpPl1 vp = {s = - (mkClause [] {g = Fem ; n = Pl ; p = P1} vp).s ! P.Pres ! Simul ! Pos ! Indic + (mkClause [] {g = Fem ; n = Pl ; p = P1} vp).s ! RPres ! Simul ! Pos ! Indic } ; }