mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-28 01:18:57 -06:00
some fixes and extensions
This commit is contained in:
@@ -8,7 +8,7 @@ concrete AdverbLat of Adverb = CatLat ** open ResLat, Prelude, ParadigmsLat in
|
|||||||
|
|
||||||
-- PrepNP : Prep -> NP -> Adv ; -- in the house
|
-- PrepNP : Prep -> NP -> Adv ; -- in the house
|
||||||
PrepNP prep np =
|
PrepNP prep np =
|
||||||
mkAdv (prep.s ++ np.adv ++ (combineNounPhrase np) ! PronNonDrop ! prep.c ) ;
|
mkAdv (prep.s ++ (combineNounPhrase np) ! PronNonDrop ! prep.c ) ;
|
||||||
|
|
||||||
|
|
||||||
-- ComparAdvAdj : CAdv -> A -> NP -> Adv ; -- more warmly than John
|
-- ComparAdvAdj : CAdv -> A -> NP -> Adv ; -- more warmly than John
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ concrete ExtendLat of Extend = CatLat ** open ResLat in {
|
|||||||
-- EmbedPresPart : VP -> SC ; -- looking at Mary (is fun)
|
-- EmbedPresPart : VP -> SC ; -- looking at Mary (is fun)
|
||||||
|
|
||||||
-- PastPartAP : VPSlash -> AP ; -- lost (opportunity) ; (opportunity) lost in space
|
-- PastPartAP : VPSlash -> AP ; -- lost (opportunity) ; (opportunity) lost in space
|
||||||
PastPartAP vp = { s = vp.part ! VPassPerf } ;
|
PastPartAP vp = { s = \\ag => vp.part ! VPassPerf ! ag ++ vp.adv ++ vp.c.s} ; -- TODO
|
||||||
-- PastPartAgentAP : VPSlash -> NP -> AP ; -- (opportunity) lost by the company
|
-- PastPartAgentAP : VPSlash -> NP -> AP ; -- (opportunity) lost by the company
|
||||||
|
|
||||||
-- -- this is a generalization of Verb.PassV2 and should replace it in the future.
|
-- -- this is a generalization of Verb.PassV2 and should replace it in the future.
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
|
|||||||
--
|
--
|
||||||
DetQuant quant num = {
|
DetQuant quant num = {
|
||||||
s = \\g,c => quant.s ! Ag g num.n c ++ num.s ! g ! c ;
|
s = \\g,c => quant.s ! Ag g num.n c ++ num.s ! g ! c ;
|
||||||
sp = \\g,c => quant.sp ! Ag g num.n c ++ num.s ! g ! c ;
|
sp = \\g,c => quant.sp ! Ag g num.n c ;
|
||||||
n = num.n
|
n = num.n
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
@@ -182,6 +182,6 @@ concrete NounLat of Noun = CatLat ** open ResLat, Prelude, ConjunctionLat in {
|
|||||||
|
|
||||||
-- CountNP : Det -> NP -> NP ; -- three of them, some of the boys
|
-- CountNP : Det -> NP -> NP ; -- three of them, some of the boys
|
||||||
CountNP det np = np ** {
|
CountNP det np = np ** {
|
||||||
det = det
|
det = det ** { s = \\g,c => det.s ! g ! c++ np.det.s ! g ! c } ;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -351,6 +351,7 @@ param
|
|||||||
VAct VSim (VPres VInd) Sg P1 => -- Present Indicative
|
VAct VSim (VPres VInd) Sg P1 => -- Present Indicative
|
||||||
( case pres_ind_base of {
|
( case pres_ind_base of {
|
||||||
_ + "a" => ( init pres_ind_base ) ;
|
_ + "a" => ( init pres_ind_base ) ;
|
||||||
|
-- | _ + "ui" => ( init pres_ind_base ) ;
|
||||||
_ => pres_ind_base
|
_ => pres_ind_base
|
||||||
}
|
}
|
||||||
) + "o" ; --actPresEnding Sg P1 ;
|
) + "o" ; --actPresEnding Sg P1 ;
|
||||||
|
|||||||
Reference in New Issue
Block a user