diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/peacekeeping/EXAMPLES | 2 | ||||
| -rw-r--r-- | examples/peacekeeping/PeaceKeep.gf | 2 | ||||
| -rw-r--r-- | examples/peacekeeping/PeaceKeepI.gf | 1 | ||||
| -rw-r--r-- | examples/peacekeeping/PeaceLex.gf | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/examples/peacekeeping/EXAMPLES b/examples/peacekeeping/EXAMPLES index 3438fc262..bc48fa959 100644 --- a/examples/peacekeeping/EXAMPLES +++ b/examples/peacekeeping/EXAMPLES @@ -10,6 +10,7 @@ Who gives water to the children? Who is hungry? Where do you sleep? Where do you see the landmine? +Where is the factory? The doctor sleeps. I see a small girl. @@ -32,7 +33,6 @@ Give water to the boy! == Should work == -Where is the factory? (no QuestIAdv_NP) Drink this water! (can't modify MassCN) Drink! (drink is V2) diff --git a/examples/peacekeeping/PeaceKeep.gf b/examples/peacekeeping/PeaceKeep.gf index 4f951deae..2278385f1 100644 --- a/examples/peacekeeping/PeaceKeep.gf +++ b/examples/peacekeeping/PeaceKeep.gf @@ -23,7 +23,7 @@ abstract PeaceKeep = Cat, PeaceLex ** { QuestIP_A : A -> IP -> Quest ; QuestIAdv_V : V -> NP -> IAdv -> Quest ; QuestIAdv_V2 : V2 -> NP -> NP -> IAdv -> Quest ; --- QuestIAdv_NP : NP -> IAdv -> Quest ; + QuestIAdv_NP : NP -> IAdv -> Quest ; SentV : V -> NP -> Sent ; SentV2 : V2 -> NP -> NP -> Sent ; diff --git a/examples/peacekeeping/PeaceKeepI.gf b/examples/peacekeeping/PeaceKeepI.gf index 81459a68f..a57cd03ee 100644 --- a/examples/peacekeeping/PeaceKeepI.gf +++ b/examples/peacekeeping/PeaceKeepI.gf @@ -27,6 +27,7 @@ incomplete concrete PeaceKeepI of PeaceKeep = open Lang in { QuestIP_V3Mass v ip x y = mkQuest (QuestVP ip (ComplV3 v (massNP x) y)) ; QuestIP_A : A -> IP -> Phr ; QuestIP_A a ip = mkQuest (QuestVP ip (UseComp (CompAP (PositA a)))); + QuestIAdv_NP x ia = mkQuest (QuestIComp (CompIAdv ia) x); QuestIAdv_V v x ia = mkQuest (QuestIAdv ia (PredVP x (UseV v))); QuestIAdv_V2 v x y ia = mkQuest (QuestIAdv ia (PredVP x (ComplV2 v y))); diff --git a/examples/peacekeeping/PeaceLex.gf b/examples/peacekeeping/PeaceLex.gf index 3a5464f16..71c3fc491 100644 --- a/examples/peacekeeping/PeaceLex.gf +++ b/examples/peacekeeping/PeaceLex.gf @@ -13,9 +13,9 @@ abstract PeaceLex = Cat ** { we_Pron : Pron ; youPl_Pron : Pron ; they_Pron : Pron ; - whoPl_IP : IP ; -- only one who in Swadesh 207 + whoPl_IP : IP ; whoSg_IP : IP ; - whatPl_IP : IP ; -- only one what in Swadesh 207 + whatPl_IP : IP ; whatSg_IP : IP ; -- Determiners |