some godis additions to dialogue

1 files changed, 21 insertions, 13 deletions

diff --git a/examples/dialogue/DialogueI.gf b/examples/dialogue/DialogueI.gf
index e88497135..20da618ac 100644
--- a/examples/dialogue/DialogueI.gf
+++ b/examples/dialogue/DialogueI.gf
@@ -3,6 +3,8 @@ incomplete concrete DialogueI of Dialogue = open Lang, Prelude in {
   lincat
     Move   = Phr ;
     Action = {s : ActType => Str} ;
+    Proposition = Phr ; ----
+    Question = Phr ;
     Kind   = CN ;
     Object = NP ;
     Oper0  = V ;
@@ -11,9 +13,17 @@ incomplete concrete DialogueI of Dialogue = open Lang, Prelude in {
 
   lin
     MRequest a = ss (a.s ! ARequest) ;
-    MAnswer  a = ss (a.s ! AAnswer) ;
+    MConfirm a = ss (a.s ! AConfirm) ;
+    MAnswer  a = a ;
+    MIssue   a = a ;
 
-    MQuery k = 
+    MYes = yes_Phr ;
+    MNo  = no_Phr ;
+    MObject _ ob = PhrUtt NoPConj (UttNP ob) optPlease ;
+
+    PAction a  = ss (a.s ! AConfirm) ;
+
+    QKind k = 
       PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos 
         (ExistIP (IDetCN whichPl_IDet NoNum NoOrd k)))) NoVoc ;
 
@@ -21,12 +31,12 @@ incomplete concrete DialogueI of Dialogue = open Lang, Prelude in {
     AOper1 _   op x   = mkAction (ComplV2 op x) ;
     AOper2 _ _ op x y = mkAction (ComplV3 op x y) ;
 
-    OAll k = PredetNP all_Predet (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) k) ;
+    OAll k   = PredetNP all_Predet (DetCN (DetPl (PlQuant IndefArt) NoNum NoOrd) k) ;
     OIndef k = DetCN (DetSg (SgQuant IndefArt) NoOrd) k ;
-    ODef k = DetCN (DetSg (SgQuant DefArt) NoOrd) k ;
+    ODef k   = DetCN (DetSg (SgQuant DefArt) NoOrd) k ;
 
   param
-    ActType = ARequest | AAnswer ; -- and some others
+    ActType  = ARequest | AConfirm ; -- and some others
 
   oper
 
@@ -37,29 +47,27 @@ incomplete concrete DialogueI of Dialogue = open Lang, Prelude in {
       s = table {
         ARequest => variants {
           aImp vp ;
-          aImpPlease vp ;
           aWant vp ;
           aCanYou vp
           } ;
-        AAnswer => variants {
+        AConfirm => variants {
           aInf vp
           }
         }
       } ;
 
-   aImp : VP -> Str = \vp ->
-     (PhrUtt NoPConj (UttImpSg PPos (ImpVP vp)) NoVoc).s ;
+   optPlease : Voc = variants {NoVoc ; please_Voc} ;
 
-   aImpPlease : VP -> Str = \vp ->
-     (PhrUtt NoPConj (UttImpSg PPos (ImpVP vp)) please_Voc).s ;
+   aImp : VP -> Str = \vp ->
+     (PhrUtt NoPConj (UttImpSg PPos (ImpVP vp)) optPlease).s ;
 
    aWant : VP -> Str = \vp ->
      (PhrUtt NoPConj (UttS (UseCl TPres ASimul PPos (PredVP (UsePron i_Pron) 
-        (ComplVV want_VV vp)))) NoVoc).s ;
+        (ComplVV want_VV vp)))) optPlease).s ;
 
    aCanYou : VP -> Str = \vp ->
      (PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos (QuestCl (PredVP 
-        (UsePron youSg_Pron) (ComplVV can_VV vp))))) NoVoc).s ;
+        (UsePron youSg_Pron) (ComplVV can_VV vp))))) optPlease).s ;
 
    aInf : VP -> Str = \vp ->
      (PhrUtt NoPConj (UttVP vp) NoVoc).s ;