msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

added case (de or a) to Romance infinitive noun and adj complements

Browse Source
This commit is contained in:
aarne
2011-10-27 08:10:48 +00:00
parent 8c3449fe0e
commit da8a6dc329
12 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/catalan/CatCat.gf
View File

@@ -1,6 +1,6 @@
--# -path=.:../romance:../abstract:../common:prelude --# -path=.:../romance:../abstract:../common:prelude
concrete CatCat of Cat = concrete CatCat of Cat =
CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] **
CatRomance with -- JS restore TPast for notpresent CatRomance with -- JS restore TPast for notpresent
(ResRomance = ResCat) ; (ResRomance = ResCat) ;

2
lib/src/catalan/GrammarCat.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarCat of Grammar =
RelativeCat, RelativeCat,
ConjunctionCat, ConjunctionCat,
PhraseCat, PhraseCat,
TextX - [Temp,Tense], TextX - [SC,Temp,Tense],
IdiomCat, IdiomCat,
StructuralCat, StructuralCat,
TenseCat TenseCat

2
lib/src/french/CatFre.gf
View File

@@ -1,5 +1,5 @@
--# -path=.:../romance:../common:../abstract:../common:prelude --# -path=.:../romance:../common:../abstract:../common:prelude
concrete CatFre of Cat = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] concrete CatFre of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond]
** CatRomance with ** CatRomance with
(ResRomance = ResFre) ; (ResRomance = ResFre) ;

2
lib/src/french/GrammarFre.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarFre of Grammar =
RelativeFre, RelativeFre,
ConjunctionFre, ConjunctionFre,
PhraseFre, PhraseFre,
TextX - [Temp,Tense], TextX - [SC,Temp,Tense],
IdiomFre, IdiomFre,
StructuralFre, StructuralFre,
TenseFre TenseFre

2
lib/src/italian/CatIta.gf
View File

@@ -1,4 +1,4 @@
--# -path=.:../romance:../abstract:../common:prelude --# -path=.:../romance:../abstract:../common:prelude
concrete CatIta of Cat = CommonX - [Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with concrete CatIta of Cat = CommonX - [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with
(ResRomance = ResIta) ; (ResRomance = ResIta) ;

2
lib/src/italian/GrammarIta.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarIta of Grammar =
RelativeIta, RelativeIta,
ConjunctionIta, ConjunctionIta,
PhraseIta, PhraseIta,
TextX - [Temp,Tense], TextX - [SC,Temp,Tense],
IdiomIta, IdiomIta,
StructuralIta, StructuralIta,
TenseIta TenseIta

2
lib/src/romance/AdjectiveRomance.gf
View File

@@ -42,7 +42,7 @@ incomplete concrete AdjectiveRomance of Adjective =
} ; } ;
SentAP ap sc = { SentAP ap sc = {
s = \\a => ap.s ! a ++ sc.s ; --- mood s = \\a => ap.s ! a ++ sc.s ! dative ; -- prête à dormir --- mood
isPre = False isPre = False
} ; } ;

3
lib/src/romance/CatRomance.gf
View File

@@ -1,4 +1,4 @@
incomplete concrete CatRomance of Cat = CommonX incomplete concrete CatRomance of Cat = CommonX - [SC]
** open Prelude, CommonRomance, ResRomance, (R = ParamX) in { ** open Prelude, CommonRomance, ResRomance, (R = ParamX) in {
flags optimize=all_subs ; flags optimize=all_subs ;
@@ -15,6 +15,7 @@ incomplete concrete CatRomance of Cat = CommonX
c2 : Compl c2 : Compl
} ; } ;
SC = {s : Case => Str} ; -- de dormir / à dormir
-- Sentence -- Sentence

2
lib/src/romance/NounRomance.gf
View File

@@ -147,7 +147,7 @@ incomplete concrete NounRomance of Noun =
g = g g = g
} ; } ;
SentCN cn sc = let g = cn.g in { SentCN cn sc = let g = cn.g in {
s = \\n => cn.s ! n ++ sc.s ; s = \\n => cn.s ! n ++ sc.s ! genitive ; -- raison de dormir
g = g g = g
} ; } ;
AdvCN cn sc = let g = cn.g in { AdvCN cn sc = let g = cn.g in {

8
lib/src/romance/SentenceRomance.gf
View File

@@ -6,7 +6,7 @@ incomplete concrete SentenceRomance of Sentence =
lin lin
PredVP np vp = mkClause (np.s ! Nom).comp np.hasClit np.isPol np.a vp ; PredVP np vp = mkClause (np.s ! Nom).comp np.hasClit np.isPol np.a vp ;
PredSCVP sc vp = mkClause sc.s False False (agrP3 Masc Sg) vp ; PredSCVP sc vp = mkClause (sc.s ! Nom) False False (agrP3 Masc Sg) vp ;
ImpVP vp = { ImpVP vp = {
s = \\p,i,g => case i of { s = \\p,i,g => case i of {
@@ -47,9 +47,9 @@ incomplete concrete SentenceRomance of Sentence =
c2 = slash.c2 c2 = slash.c2
} ; } ;
EmbedS s = {s = conjThat ++ s.s ! Indic} ; --- mood EmbedS s = {s = \\_ => conjThat ++ s.s ! Indic} ; --- mood
EmbedQS qs = {s = qs.s ! QIndir} ; EmbedQS qs = {s = \\_ => qs.s ! QIndir} ;
EmbedVP vp = {s = infVP vp (agrP3 Masc Sg)} ; --- agr ---- compl EmbedVP vp = {s = \\c => prepCase c ++ infVP vp (agrP3 Masc Sg)} ; --- agr ---- compl
UseCl t p cl = { UseCl t p cl = {
s = \\o => t.s ++ p.s ++ cl.s ! DDir ! t.t ! t.a ! p.p ! o s = \\o => t.s ++ p.s ++ cl.s ! DDir ! t.t ! t.a ! p.p ! o

2
lib/src/spanish/CatSpa.gf
View File

@@ -1,5 +1,5 @@
--# -path=.:../romance:../abstract:../common:prelude --# -path=.:../romance:../abstract:../common:prelude
concrete CatSpa of Cat = CommonX - concrete CatSpa of Cat = CommonX -
[Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with [SC,Temp,TTAnt,Tense,TPres,TPast,TFut,TCond] ** CatRomance with
(ResRomance = ResSpa) ; (ResRomance = ResSpa) ;

2
lib/src/spanish/GrammarSpa.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarSpa of Grammar =
RelativeSpa, RelativeSpa,
ConjunctionSpa, ConjunctionSpa,
PhraseSpa, PhraseSpa,
TextSpa - [Temp,Tense], -- special punctuation TextSpa - [SC,Temp,Tense], -- special punctuation
IdiomSpa, IdiomSpa,
StructuralSpa, StructuralSpa,
TenseSpa TenseSpa