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

fixed naming conflicts in resource

Browse Source
This commit is contained in:
aarne
2007-06-17 22:52:27 +00:00
parent 3adf824e8e
commit 6a2cbe19d2
21 changed files with 68337 additions and 68334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/resource-1.0/german/CatGer.gf
View File

@@ -14,21 +14,21 @@ concrete CatGer of Cat =
-- Sentence
Cl = {s : Mood => Tense => Anteriority => Polarity => Order => Str} ;
Slash = {s : Mood => Tense => Anteriority => Polarity => Order => Str} **
Cl = {s : Mood => ResGer.Tense => Anteriority => Polarity => Order => Str} ;
Slash = {s : Mood => ResGer.Tense => Anteriority => Polarity => Order => Str} **
{c2 : Preposition} ;
Imp = {s : Polarity => ImpForm => Str} ;
-- Question
QCl = {s : Mood => Tense => Anteriority => Polarity => QForm => Str} ;
QCl = {s : Mood => ResGer.Tense => Anteriority => Polarity => QForm => Str} ;
IP = {s : Case => Str ; n : Number} ;
IComp = {s : Agr => Str} ;
IDet = {s : Gender => Case => Str ; n : Number} ;
-- Relative
RCl = {s : Mood => Tense => Anteriority => Polarity => GenNum => Str ; c : Case} ;
RCl = {s : Mood => ResGer.Tense => Anteriority => Polarity => GenNum => Str ; c : Case} ;
RP = {s : GenNum => Case => Str ; a : RAgr} ;
-- Verb
@@ -80,7 +80,7 @@ concrete CatGer of Cat =
-- tense with possibility to choose conjunctive forms
Tense = {s : Str ; t : Tense ; m : Mood} ;
Tense = {s : Str ; t : ResGer.Tense ; m : Mood} ;
lin
TPres = {s = [] ; t = Pres ; m = MIndic} ;

6
lib/resource-1.0/german/IdiomGer.gf
View File

@@ -9,11 +9,11 @@ concrete IdiomGer of Idiom = CatGer **
CleftNP np rs = mkClause "es" (agrP3 Sg)
(insertExtrapos (rs.s ! gennum np.a.g np.a.n) ----
(insertObj (\\_ => np.s ! rs.c) (predV sein_V))) ;
(insertObj (\\_ => np.s ! rs.c) (predV MorphoGer.sein_V))) ;
CleftAdv ad s = mkClause "es" (agrP3 Sg)
(insertExtrapos (conjThat ++ s.s ! Sub)
(insertObj (\\_ => ad.s) (predV sein_V))) ;
(insertObj (\\_ => ad.s) (predV MorphoGer.sein_V))) ;
ExistNP np =
@@ -41,6 +41,6 @@ concrete IdiomGer of Idiom = CatGer **
} ;
oper
geben = dirV2 (mkV "geben" "gibt" "gib" "gab" "gäbe" "gegeben") ;
geben = dirV2 (mk6V "geben" "gibt" "gib" "gab" "gäbe" "gegeben") ;
}

2
lib/resource-1.0/german/LexiconGer.gf
View File

@@ -96,7 +96,7 @@ lin
harbour_N = reg2N "Hafen" "Häfen" masculine ;
hate_V2 = dirV2 (regV "hassen") ;
hat_N = reg2N "Hut" "Hüte" masculine ;
have_V2 = dirV2 haben_V ;
have_V2 = dirV2 IrregGer.haben_V ;
hear_V2 = dirV2 (regV "hören") ;
hill_N = regN "Hügel" ;
hope_VS = mkVS (regV "hoffen") ;