forked from GitHub/gf-rgl
add mkVS
This commit is contained in:
@@ -54,16 +54,17 @@ noPrep : Prep = mkPrep "" ;
|
|||||||
mkVV : Str -> VV ;
|
mkVV : Str -> VV ;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
mkVS : overload {
|
||||||
|
mkVS : V -> VS ;
|
||||||
|
} ;
|
||||||
--
|
--
|
||||||
mkVA : overload {
|
mkVA : overload {
|
||||||
mkVA : V -> VA ;
|
mkVA : V -> VA ;
|
||||||
} ;
|
} ;
|
||||||
-- mkVQ : Str -> VQ
|
-- mkVQ : Str -> VQ
|
||||||
-- = \s -> lin VQ (regV s) ;
|
-- = \s -> lin VQ (regV s) ;
|
||||||
mkVS : overload {
|
|
||||||
mkV : (root : Str) -> V ; -- Verb that takes meng as a active prefix
|
|
||||||
mkV : (root : Str) -> Prefix -> V -- Root and prefix
|
|
||||||
} ;
|
|
||||||
--
|
--
|
||||||
-- mkV2A : Str -> V2A
|
-- mkV2A : Str -> V2A
|
||||||
-- = \s -> lin V2A (regV s ** {c2 = noPrep}) ;
|
-- = \s -> lin V2A (regV s ** {c2 = noPrep}) ;
|
||||||
@@ -162,6 +163,13 @@ noPrep : Prep = mkPrep "" ;
|
|||||||
mkVV : Str -> VV = \vv -> lin VV (ss vv)
|
mkVV : Str -> VV = \vv -> lin VV (ss vv)
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
mkVS = overload {
|
||||||
|
mkVS : V -> VS = \v -> lin VS (v)
|
||||||
|
} ;
|
||||||
|
|
||||||
|
mkVA = overload {
|
||||||
|
mkVA : V -> VA = \v -> lin VA (v)
|
||||||
|
} ;
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -330,6 +330,7 @@ oper
|
|||||||
|
|
||||||
Sentence : Type = {s : Str} ;
|
Sentence : Type = {s : Str} ;
|
||||||
|
|
||||||
|
|
||||||
predVP : NounPhrase -> VerbPhrase -> Clause = \np,vp -> {
|
predVP : NounPhrase -> VerbPhrase -> Clause = \np,vp -> {
|
||||||
subj = np.s ! Bare ;
|
subj = np.s ! Bare ;
|
||||||
pred = vp.s
|
pred = vp.s
|
||||||
@@ -338,6 +339,9 @@ oper
|
|||||||
predVPSlash : NounPhrase -> VPSlash -> ClSlash = \np,vps ->
|
predVPSlash : NounPhrase -> VPSlash -> ClSlash = \np,vps ->
|
||||||
predVP np <vps : VerbPhrase> ** {c2 = vps.c2} ;
|
predVP np <vps : VerbPhrase> ** {c2 = vps.c2} ;
|
||||||
|
|
||||||
|
linS : Sentence -> Str = \sent -> sent.s ;
|
||||||
|
|
||||||
|
|
||||||
-- mkClause : Str -> NounPhrase -> VPSlash -> Clause = \str,np,vp -> {
|
-- mkClause : Str -> NounPhrase -> VPSlash -> Clause = \str,np,vp -> {
|
||||||
-- subj = str ++ np.s ! Bare;
|
-- subj = str ++ np.s ! Bare;
|
||||||
-- pred = vp.s
|
-- pred = vp.s
|
||||||
|
|||||||
@@ -23,13 +23,14 @@ lin
|
|||||||
ComplVA va ap = ResMay.insertComp ap (useV va) ;
|
ComplVA va ap = ResMay.insertComp ap (useV va) ;
|
||||||
|
|
||||||
-- : VS -> S -> VP ;
|
-- : VS -> S -> VP ;
|
||||||
-- ComplVS vs s =
|
ComplVS vs s = ResMay.insertObj (linS s) (useV vs) ;
|
||||||
|
|
||||||
-- let vps = useV vs ;
|
-- let vps = useV vs ;
|
||||||
-- subord = SubjS {s=""} s ;
|
-- subord = SubjS {s=""} s ;
|
||||||
-- in vps ** {} ;
|
-- in vps ** {} ;
|
||||||
|
|
||||||
{-
|
{-
|
||||||
-- : VQ -> QS -> VP ;
|
-- : VQ -> QS -> VP ;s
|
||||||
ComplVQ vq qs = ;
|
ComplVQ vq qs = ;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user