forked from GitHub/gf-rgl
(Pes) add defVV + cleanup
This commit is contained in:
@@ -31,7 +31,7 @@ oper
|
|||||||
Mod : Type ; -- Argument to mkDet and mkPrep
|
Mod : Type ; -- Argument to mkDet and mkPrep
|
||||||
ezafe : Mod ; -- e.g. mkPrep "برای" ezafe
|
ezafe : Mod ; -- e.g. mkPrep "برای" ezafe
|
||||||
-- poss : Mod ; -- TODO is this needed?
|
-- poss : Mod ; -- TODO is this needed?
|
||||||
--clitic : Mod ; -- TODO is this needed?
|
-- clitic : Mod ; -- TODO is this needed?
|
||||||
--2 Nouns
|
--2 Nouns
|
||||||
|
|
||||||
mkN : overload {
|
mkN : overload {
|
||||||
@@ -164,6 +164,8 @@ oper
|
|||||||
= \isAux,vvf,v -> v ** {isAux = isAux ; compl = vvf ; isDef = False}
|
= \isAux,vvf,v -> v ** {isAux = isAux ; compl = vvf ; isDef = False}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
defVV : VV -> VV = \vv -> vv ** {isDef=True} ;
|
||||||
|
|
||||||
mkV2V = overload {
|
mkV2V = overload {
|
||||||
mkV2V : V -> (cN : Str) -> (isAux : Bool) -> V2V -- Verb, complementiser for the noun, whether it's auxiliary.
|
mkV2V : V -> (cN : Str) -> (isAux : Bool) -> V2V -- Verb, complementiser for the noun, whether it's auxiliary.
|
||||||
= \v,s,b -> let vv : VV = mkVV b subjunctive v in
|
= \v,s,b -> let vv : VV = mkVV b subjunctive v in
|
||||||
|
|||||||
@@ -137,12 +137,6 @@ oper
|
|||||||
Add => v.s ! PerfStem ++ v.prefix ;
|
Add => v.s ! PerfStem ++ v.prefix ;
|
||||||
Replace => v.prefix
|
Replace => v.prefix
|
||||||
} ;
|
} ;
|
||||||
-- s = table {
|
|
||||||
-- ImpPrefix p => becomeVerb.s ! ImpPrefix p ;
|
|
||||||
-- x => case verb.passive of {
|
|
||||||
-- Add => verb.s ! PerfStem ;
|
|
||||||
-- Replace => []}
|
|
||||||
-- ++ becomeVerb.s ! x }
|
|
||||||
} ;
|
} ;
|
||||||
-- ---------------------
|
-- ---------------------
|
||||||
-- VP complementation
|
-- VP complementation
|
||||||
|
|||||||
Reference in New Issue
Block a user