Diff interface for Phrasebook

7 files changed, 41 insertions, 2 deletions

diff --git a/examples/phrasebook/DiffPhrasebook.gf b/examples/phrasebook/DiffPhrasebook.gf
new file mode 100644
index 000000000..8be58bb7e
--- /dev/null
+++ b/examples/phrasebook/DiffPhrasebook.gf
@@ -0,0 +1,8 @@
+interface DiffPhrasebook = open Syntax in {
+
+oper
+  want_V2 : V2 ;
+  like_V2 : V2 ;
+
+
+}
diff --git a/examples/phrasebook/DiffPhrasebookFin.gf b/examples/phrasebook/DiffPhrasebookFin.gf
new file mode 100644
index 000000000..3865c9091
--- /dev/null
+++ b/examples/phrasebook/DiffPhrasebookFin.gf
@@ -0,0 +1,12 @@
+instance DiffPhrasebookFin of DiffPhrasebook = open 
+  SyntaxFin,
+  ParadigmsFin 
+in {
+
+flags coding = utf8 ;
+
+oper
+  want_V2 = mkV2 (mkV "haluta")  ;
+  like_V2 = mkV2 (mkV "pitää") elative ;
+
+}
diff --git a/examples/phrasebook/DiffPhrasebookRon.gf b/examples/phrasebook/DiffPhrasebookRon.gf
new file mode 100644
index 000000000..027ab1dfe
--- /dev/null
+++ b/examples/phrasebook/DiffPhrasebookRon.gf
@@ -0,0 +1,12 @@
+instance DiffPhrasebookRon of DiffPhrasebook = open 
+  SyntaxRon,
+  ParadigmsRon 
+in {
+
+flags coding = utf8 ;
+
+oper
+  want_V2 = dirV2 (lin V want_VV)  ;  -- mkVV (v_besch74 "vrea")
+  like_V2 = dirV2 (mkV "părăsi") ;
+
+}
diff --git a/examples/phrasebook/Sentences.gf b/examples/phrasebook/Sentences.gf
index 0a9c7b57e..7afd69435 100644
--- a/examples/phrasebook/Sentences.gf
+++ b/examples/phrasebook/Sentences.gf
@@ -8,6 +8,7 @@ abstract Sentences = Numeral ** {
     IsNot : Item -> Quality -> Sentence ;
 
     IWant : Object -> Sentence ;
+    ILike : Item -> Sentence ; 
     DoYouHave : Kind -> Sentence ;
     WhetherIs : Item -> Quality -> Sentence ;
     ObjItem : Item -> Object ;
diff --git a/examples/phrasebook/SentencesFin.gf b/examples/phrasebook/SentencesFin.gf
index 9c5cd6297..3e55038ca 100644
--- a/examples/phrasebook/SentencesFin.gf
+++ b/examples/phrasebook/SentencesFin.gf
@@ -1,2 +1,3 @@
 concrete SentencesFin of Sentences = NumeralFin ** SentencesI with 
+  (DiffPhrasebook = DiffPhrasebookFin), 
   (Syntax = SyntaxFin) ;
diff --git a/examples/phrasebook/SentencesI.gf b/examples/phrasebook/SentencesI.gf
index b917d70c9..73c0c9e97 100644
--- a/examples/phrasebook/SentencesI.gf
+++ b/examples/phrasebook/SentencesI.gf
@@ -1,5 +1,8 @@
 incomplete concrete SentencesI of Sentences = Numeral ** 
-  open Syntax in {
+  open
+    DiffPhrasebook, 
+    Syntax 
+  in {
   lincat
     Sentence = Utt ; 
     Item = NP ;
@@ -10,7 +13,8 @@ incomplete concrete SentencesI of Sentences = Numeral **
     Is item quality = mkUtt (mkCl item quality) ;
     IsNot item quality = mkUtt (mkS negativePol (mkCl item quality)) ;
     WhetherIs item quality = mkUtt (mkQCl (mkCl item quality)) ;
-    IWant obj = mkUtt (mkCl (mkNP i_Pron) want_VV (mkVP have_V2 obj)) ;
+    IWant obj = mkUtt (mkCl (mkNP i_Pron) want_V2 obj) ;
+    ILike item = mkUtt (mkCl (mkNP i_Pron) like_V2 item) ;
     DoYouHave kind = 
       mkUtt (mkQCl (mkCl (mkNP youPol_Pron) have_V2 (mkNP kind))) ;
     ObjItem i = i ;
diff --git a/examples/phrasebook/SentencesRon.gf b/examples/phrasebook/SentencesRon.gf
index ab6b67585..eec9ea756 100644
--- a/examples/phrasebook/SentencesRon.gf
+++ b/examples/phrasebook/SentencesRon.gf
@@ -1,2 +1,3 @@
 concrete SentencesRon of Sentences = NumeralRon ** SentencesI with 
+  (DiffPhrasebook = DiffPhrasebookRon), 
   (Syntax = SyntaxRon) ;