mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-21 17:12:50 -06:00
fixed bugs in AllFin so that it now compiles
This commit is contained in:
@@ -20,14 +20,14 @@ concrete ExtraFin of ExtraFinAbs = CatFin **
|
|||||||
BaseVPI = twoSS ;
|
BaseVPI = twoSS ;
|
||||||
ConsVPI = consrSS comma ;
|
ConsVPI = consrSS comma ;
|
||||||
|
|
||||||
MkVPI vp = {s = infVP (NPCase Nom) Pos (agrP3 Sg) vp} ;
|
MkVPI vp = {s = infVP (NPCase Nom) Pos (agrP3 Sg) vp Inf1} ;
|
||||||
ConjVPI = conjunctSS ;
|
ConjVPI = conjunctDistrSS ;
|
||||||
ComplVPIVV vv vpi =
|
ComplVPIVV vv vpi =
|
||||||
insertObj (\\_,_,_ => vpi.s) (predV vv) ;
|
insertObj (\\_,_,_ => vpi.s) (predV vv) ;
|
||||||
|
|
||||||
AdvExistNP adv np =
|
AdvExistNP adv np =
|
||||||
mkClause (\_ -> adv.s) np.a (insertObj
|
mkClause (\_ -> adv.s) np.a (insertObj
|
||||||
(\\_,b,_ => np.s ! NPCase Nom) (predV (verbOlla ** {sc = NPCase Nom}))) ;
|
(\\_,b,_ => np.s ! NPCase Nom) (predV (verbOlla ** {sc = NPCase Nom ; qp = "ko"}))) ;
|
||||||
|
|
||||||
RelExistNP prep rp np = {
|
RelExistNP prep rp np = {
|
||||||
s = \\t,ant,bo,ag =>
|
s = \\t,ant,bo,ag =>
|
||||||
@@ -37,7 +37,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin **
|
|||||||
np.a
|
np.a
|
||||||
(insertObj
|
(insertObj
|
||||||
(\\_,b,_ => np.s ! NPCase Nom)
|
(\\_,b,_ => np.s ! NPCase Nom)
|
||||||
(predV (verbOlla ** {sc = NPCase Nom}))) ;
|
(predV (verbOlla ** {sc = NPCase Nom ; qp = "ko"}))) ;
|
||||||
in
|
in
|
||||||
cl.s ! t ! ant ! bo ! SDecl ;
|
cl.s ! t ! ant ! bo ! SDecl ;
|
||||||
c = NPCase Nom
|
c = NPCase Nom
|
||||||
@@ -58,7 +58,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin **
|
|||||||
|
|
||||||
PartCN cn =
|
PartCN cn =
|
||||||
let
|
let
|
||||||
acn = DetCN (DetArtSg IndefArt) cn
|
acn = DetArtSg IndefArt cn
|
||||||
in {
|
in {
|
||||||
s = table {
|
s = table {
|
||||||
NPCase Nom | NPAcc => acn.s ! NPCase Part ;
|
NPCase Nom | NPAcc => acn.s ! NPCase Part ;
|
||||||
@@ -69,7 +69,7 @@ concrete ExtraFin of ExtraFinAbs = CatFin **
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|
||||||
vai_Conj = {s = "vai" ; n = Sg} ;
|
vai_Conj = {s1 = [] ; s2 = "vai" ; n = Sg} ;
|
||||||
|
|
||||||
|
|
||||||
CompPartAP ap = {
|
CompPartAP ap = {
|
||||||
|
|||||||
Reference in New Issue
Block a user