GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-09 04:59:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

passe simple in ExtraRomance

Browse Source
This commit is contained in:
aarne
2006-06-18 19:08:47 +00:00
parent 865d84508f
commit 7dec4c8a89
14 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/resource-1.0/french/CatFre.gf
View File

@@ -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) ;

2
lib/resource-1.0/french/GrammarFre.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarFre of Grammar =
RelativeFre,
ConjunctionFre,
PhraseFre,
TextX,
TextX - [Tense,TPres,TPast,TFut,TCond],
IdiomFre,
StructuralFre
** {

2
lib/resource-1.0/french/IdiomFre.gf
View File

@@ -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

2
lib/resource-1.0/italian/CatIta.gf
View File

@@ -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) ;

2
lib/resource-1.0/italian/GrammarIta.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarIta of Grammar =
RelativeIta,
ConjunctionIta,
PhraseIta,
TextX,
TextX - [Tense,TPres,TPast,TFut,TCond],
IdiomIta,
StructuralIta

2
lib/resource-1.0/italian/IdiomIta.gf
View File

@@ -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
} ;
}

20
lib/resource-1.0/romance/CatRomance.gf
View File

@@ -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
}

8
lib/resource-1.0/romance/CommonRomance.gf
View File

@@ -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

1
lib/resource-1.0/romance/ExtraRomance.gf
View File

@@ -3,5 +3,6 @@ incomplete concrete ExtraRomance of ExtraRomanceAbs = CatRomance **
CommonRomance,
ResRomance in {
lin TPasseSimple = {s = []} ** {t = RPasse} ; --# notpresent
}

2
lib/resource-1.0/romance/ExtraRomanceAbs.gf
View File

@@ -1,3 +1,5 @@
abstract ExtraRomanceAbs = Extra ** {
fun TPasseSimple : Tense ; --# notpresent
}

11
lib/resource-1.0/romance/ResRomance.gf
View File

@@ -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 ;

2
lib/resource-1.0/spanish/CatSpa.gf
View File

@@ -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) ;

2
lib/resource-1.0/spanish/GrammarSpa.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarSpa of Grammar =
RelativeSpa,
ConjunctionSpa,
PhraseSpa,
TextSpa, -- special punctuation
TextSpa - [Tense,TPres,TPast,TFut,TCond], -- special punctuation
IdiomSpa,
StructuralSpa

2
lib/resource-1.0/spanish/IdiomSpa.gf
View File

@@ -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
} ;
}