mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-20 16:42:51 -06:00
bug fix in Shell commands at, wt
This commit is contained in:
@@ -31,6 +31,13 @@ abstract Demonstrative = Cat, Tense ** {
|
||||
DemV2 : V2 -> DNP -> MVP ; -- takes this (here)
|
||||
DemVV : VV -> MVP -> MVP ; -- wants to fly (here)
|
||||
|
||||
DemComp : DComp -> MVP ; -- is here ; is bigger than this
|
||||
|
||||
DCompAP : DAP -> DComp ; -- bigger than this
|
||||
DCompNP : DNP -> DComp ; -- the price of this
|
||||
DCompAdv : DAdv -> DComp ; -- here
|
||||
|
||||
|
||||
-- Adverbial modification of a verb phrase.
|
||||
|
||||
AdvMVP : MVP -> DAdv -> MVP ;
|
||||
@@ -39,8 +46,8 @@ abstract Demonstrative = Cat, Tense ** {
|
||||
|
||||
this_DNP : Point -> DNP ; -- this
|
||||
that_DNP : Point -> DNP ; -- that
|
||||
thisDet_DNP : Point -> CN -> DNP ; -- this car
|
||||
thatDet_DNP : Point -> CN -> DNP ; -- that car
|
||||
thisDet_DNP : CN -> Point -> DNP ; -- this car
|
||||
thatDet_DNP : CN -> Point -> DNP ; -- that car
|
||||
|
||||
-- Demonstrative adverbs.
|
||||
|
||||
|
||||
@@ -26,18 +26,24 @@ incomplete concrete DemonstrativeI of Demonstrative = Cat, TenseX **
|
||||
DemV2 verb obj = mkDem VP (ComplV2 verb obj) obj ;
|
||||
DemVV vv vp = mkDem VP (ComplVV vv vp) vp ;
|
||||
|
||||
DemComp comp = mkDem Comp (UseComp comp) ;
|
||||
DCompAP
|
||||
|
||||
|
||||
AdvMVP vp adv =
|
||||
mkDem VP (AdvVP vp adv) (concatPoint vp adv) ;
|
||||
|
||||
this_DNP = mkDem NP this_NP ;
|
||||
that_DNP = mkDem NP that_NP ;
|
||||
|
||||
-- thisDet_DNP p cn = mkDem (DetNP this_Det cn) p ;
|
||||
-- thatDet_DNP p cn = mkDem (DetNP that_Det cn) p ;
|
||||
thisDet_DNP cn =
|
||||
mkDem NP (DetCN (MkDet NoPredet this_Quant NoNum NoOrd) cn) ;
|
||||
thatDet_DNP p cn = mkDem (DetNP that_Det cn) ;
|
||||
mkDem NP (DetCN (MkDet NoPredet that_Quant NoNum NoOrd) cn) ;
|
||||
|
||||
here_DAdv = mkDem Adv here_Adv ;
|
||||
-- here7from_DAdv = mkDem here7from_Adv ;
|
||||
-- here7to_DAdv = mkDem here7to_Adv ;
|
||||
here7from_DAdv = mkDem Adv here7from_Adv ;
|
||||
here7to_DAdv = mkDem Adv here7to_Adv ;
|
||||
|
||||
PrepDNP p np = mkDem Adv (PrepNP p np) np ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user