forked from GitHub/gf-rgl
overload checking and messages; resource.txt modifs
This commit is contained in:
@@ -12,19 +12,19 @@ incomplete resource Combinators = open Grammar in {
|
|||||||
--2 Predication
|
--2 Predication
|
||||||
|
|
||||||
pred : overload {
|
pred : overload {
|
||||||
pred : V -> NP -> Cl ;
|
pred : V -> NP -> Cl ; -- x converges
|
||||||
pred : V2 -> NP -> NP -> Cl ;
|
pred : V2 -> NP -> NP -> Cl ; -- x intersects y
|
||||||
pred : V3 -> NP -> NP -> NP -> Cl ;
|
pred : V3 -> NP -> NP -> NP -> Cl ; -- x intersects y at z
|
||||||
pred : V -> NP -> NP -> Cl ;
|
pred : V -> NP -> NP -> Cl ; -- x and y intersect
|
||||||
pred : A -> NP -> Cl ;
|
pred : A -> NP -> Cl ; -- x is even
|
||||||
pred : A2 -> NP -> NP -> Cl ;
|
pred : A2 -> NP -> NP -> Cl ; -- x is divisible by y
|
||||||
pred : A -> NP -> NP -> Cl ;
|
pred : A -> NP -> NP -> Cl ; -- x and y are equal
|
||||||
pred : N -> NP -> Cl ;
|
pred : N -> NP -> Cl ; -- x is a maximum
|
||||||
pred : CN -> NP -> Cl ;
|
pred : CN -> NP -> Cl ; -- x is a local maximum
|
||||||
pred : NP -> NP -> Cl ;
|
pred : NP -> NP -> Cl ; -- x is the neutral element
|
||||||
pred : N -> NP -> NP -> Cl ;
|
pred : N -> NP -> NP -> Cl ; -- x and y are inverses
|
||||||
pred : Adv -> NP -> Cl ;
|
pred : Adv -> NP -> Cl ; -- x is in scope
|
||||||
pred : Prep -> NP -> NP -> Cl
|
pred : Prep -> NP -> NP -> Cl -- x is outside y
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
--2 Function application
|
--2 Function application
|
||||||
|
|||||||
@@ -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 ;
|
flags optimize=all_subs ;
|
||||||
|
|
||||||
@@ -70,28 +70,24 @@ concrete CatFin of Cat = CommonX - [Adv] ** open ResFin, Prelude in {
|
|||||||
Conj = {s : Str ; n : Number} ;
|
Conj = {s : Str ; n : Number} ;
|
||||||
DConj = {s1,s2 : Str ; n : Number} ;
|
DConj = {s1,s2 : Str ; n : Number} ;
|
||||||
Subj = {s : Str} ;
|
Subj = {s : Str} ;
|
||||||
|
Prep = Compl ;
|
||||||
|
|
||||||
-- Open lexical classes, e.g. Lexicon
|
-- Open lexical classes, e.g. Lexicon
|
||||||
|
|
||||||
V = ResFin.V ;
|
V, VS, VQ = Verb1 ; -- = {s : VForm => Str ; sc : Case} ;
|
||||||
V2 = ResFin.V2 ;
|
V2, VA = Verb1 ** {c2 : Compl} ;
|
||||||
VA = ResFin.VA ;
|
V2A = Verb1 ** {c2, c3 : Compl} ;
|
||||||
VS = ResFin.VS ;
|
VV = Verb1 ; ---- infinitive form
|
||||||
VQ = ResFin.VQ ;
|
V3 = Verb1 ** {c2, c3 : Compl} ;
|
||||||
V2A = ResFin.V2A ;
|
|
||||||
VV = ResFin.VV ;
|
|
||||||
V3 = ResFin.V3 ;
|
|
||||||
|
|
||||||
A = ResFin.A ;
|
A = {s : Degree => AForm => Str} ;
|
||||||
A2 = ResFin.A2 ;
|
A2 = {s : Degree => AForm => Str ; c2 : Compl} ;
|
||||||
|
|
||||||
N = ResFin.N ;
|
N = {s : NForm => Str} ;
|
||||||
N2 = ResFin.N2 ;
|
N2 = {s : NForm => Str} ** {c2 : Compl} ;
|
||||||
N3 = ResFin.N3 ;
|
N3 = {s : NForm => Str} ** {c2,c3 : Compl} ;
|
||||||
PN = ResFin.PN ;
|
PN = {s : Case => Str} ;
|
||||||
|
|
||||||
Adv = ResFin.Adv ;
|
|
||||||
Prep = ResFin.Prep ;
|
|
||||||
|
|
||||||
|
oper Verb1 = {s : VForm => Str ; sc : NPForm} ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ concrete GrammarFin of Grammar =
|
|||||||
RelativeFin,
|
RelativeFin,
|
||||||
ConjunctionFin,
|
ConjunctionFin,
|
||||||
PhraseFin,
|
PhraseFin,
|
||||||
TextX - [Adv],
|
TextX,
|
||||||
IdiomFin,
|
IdiomFin,
|
||||||
StructuralFin
|
StructuralFin
|
||||||
** {
|
** {
|
||||||
|
|||||||
@@ -25,7 +25,8 @@
|
|||||||
resource ParadigmsFin = open
|
resource ParadigmsFin = open
|
||||||
(Predef=Predef),
|
(Predef=Predef),
|
||||||
Prelude,
|
Prelude,
|
||||||
MorphoFin
|
MorphoFin,
|
||||||
|
CatFin
|
||||||
in {
|
in {
|
||||||
|
|
||||||
flags optimize=noexpand ;
|
flags optimize=noexpand ;
|
||||||
|
|||||||
@@ -569,26 +569,4 @@ oper
|
|||||||
a = agrP3 Sg ; -- does not matter (--- at least in Slash)
|
a = agrP3 Sg ; -- does not matter (--- at least in Slash)
|
||||||
isPron = False -- has no special accusative
|
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} ;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user