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

overload checking and messages; resource.txt modifs

Browse Source
This commit is contained in:
aarne
2007-05-31 09:58:38 +00:00
parent 1c59cd63f9
commit d01dfff9d3
7 changed files with 136 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/resource-1.0/api/Combinators.gf
View File

@@ -12,19 +12,19 @@ incomplete resource Combinators = open Grammar in {
--2 Predication
pred : overload {
pred : V -> NP -> Cl ;
pred : V2 -> NP -> NP -> Cl ;
pred : V3 -> NP -> NP -> NP -> Cl ;
pred : V -> NP -> NP -> Cl ;
pred : A -> NP -> Cl ;
pred : A2 -> NP -> NP -> Cl ;
pred : A -> NP -> NP -> Cl ;
pred : N -> NP -> Cl ;
pred : CN -> NP -> Cl ;
pred : NP -> NP -> Cl ;
pred : N -> NP -> NP -> Cl ;
pred : Adv -> NP -> Cl ;
pred : Prep -> NP -> NP -> Cl
pred : V -> NP -> Cl ; -- x converges
pred : V2 -> NP -> NP -> Cl ; -- x intersects y
pred : V3 -> NP -> NP -> NP -> Cl ; -- x intersects y at z
pred : V -> NP -> NP -> Cl ; -- x and y intersect
pred : A -> NP -> Cl ; -- x is even
pred : A2 -> NP -> NP -> Cl ; -- x is divisible by y
pred : A -> NP -> NP -> Cl ; -- x and y are equal
pred : N -> NP -> Cl ; -- x is a maximum
pred : CN -> NP -> Cl ; -- x is a local maximum
pred : NP -> NP -> Cl ; -- x is the neutral element
pred : N -> NP -> NP -> Cl ; -- x and y are inverses
pred : Adv -> NP -> Cl ; -- x is in scope
pred : Prep -> NP -> NP -> Cl -- x is outside y
} ;
--2 Function application

32
lib/resource-1.0/finnish/CatFin.gf
View File

@@ -1,4 +1,4 @@
concrete CatFin of Cat = CommonX - [Adv] ** open ResFin, Prelude in {
concrete CatFin of Cat = CommonX ** open ResFin, Prelude in {
flags optimize=all_subs ;
@@ -70,28 +70,24 @@ concrete CatFin of Cat = CommonX - [Adv] ** open ResFin, Prelude in {
Conj = {s : Str ; n : Number} ;
DConj = {s1,s2 : Str ; n : Number} ;
Subj = {s : Str} ;
Prep = Compl ;
-- Open lexical classes, e.g. Lexicon
V = ResFin.V ;
V2 = ResFin.V2 ;
VA = ResFin.VA ;
VS = ResFin.VS ;
VQ = ResFin.VQ ;
V2A = ResFin.V2A ;
VV = ResFin.VV ;
V3 = ResFin.V3 ;
V, VS, VQ = Verb1 ; -- = {s : VForm => Str ; sc : Case} ;
V2, VA = Verb1 ** {c2 : Compl} ;
V2A = Verb1 ** {c2, c3 : Compl} ;
VV = Verb1 ; ---- infinitive form
V3 = Verb1 ** {c2, c3 : Compl} ;
A = ResFin.A ;
A2 = ResFin.A2 ;
A = {s : Degree => AForm => Str} ;
A2 = {s : Degree => AForm => Str ; c2 : Compl} ;
N = ResFin.N ;
N2 = ResFin.N2 ;
N3 = ResFin.N3 ;
PN = ResFin.PN ;
Adv = ResFin.Adv ;
Prep = ResFin.Prep ;
N = {s : NForm => Str} ;
N2 = {s : NForm => Str} ** {c2 : Compl} ;
N3 = {s : NForm => Str} ** {c2,c3 : Compl} ;
PN = {s : Case => Str} ;
oper Verb1 = {s : VForm => Str ; sc : NPForm} ;
}

2
lib/resource-1.0/finnish/GrammarFin.gf
View File

@@ -11,7 +11,7 @@ concrete GrammarFin of Grammar =
RelativeFin,
ConjunctionFin,
PhraseFin,
TextX - [Adv],
TextX,
IdiomFin,
StructuralFin
** {

3
lib/resource-1.0/finnish/ParadigmsFin.gf
View File

@@ -25,7 +25,8 @@
resource ParadigmsFin = open
(Predef=Predef),
Prelude,
MorphoFin
MorphoFin,
CatFin
in {
flags optimize=noexpand ;

22
lib/resource-1.0/finnish/ResFin.gf
View File

@@ -569,26 +569,4 @@ oper
a = agrP3 Sg ; -- does not matter (--- at least in Slash)
isPron = False -- has no special accusative
} ;
-- To export
N : Type = {s : NForm => Str} ;
N2 = {s : NForm => Str} ** {c2 : Compl} ;
N3 = {s : NForm => Str} ** {c2,c3 : Compl} ;
PN = {s : Case => Str} ;
A = {s : Degree => AForm => Str} ;
A2 = {s : Degree => AForm => Str ; c2 : Compl} ;
V, VS, VQ = Verb1 ; -- = {s : VForm => Str ; sc : Case} ;
V2, VA = Verb1 ** {c2 : Compl} ;
V2A = Verb1 ** {c2, c3 : Compl} ;
VV = Verb1 ; ---- infinitive form
V3 = Verb1 ** {c2, c3 : Compl} ;
Verb1 = {s : VForm => Str ; sc : NPForm} ;
Prep = Compl ;
Adv = {s : Str} ;
}