added PassV2 to App; PassVPSlash did not work as VPSlash was disabled for speed reasons

16 files changed, 63 insertions, 22 deletions

diff --git a/examples/app/App.gf b/examples/app/App.gf
index 112a930bb..4ac4e112a 100644
--- a/examples/app/App.gf
+++ b/examples/app/App.gf
@@ -17,9 +17,10 @@ abstract App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
   ,Phrasebook
 
@@ -33,6 +34,8 @@ fun
   Phrase_Chunk : Phrase -> Chunk ;
 
   ComplV2 : V2 -> NP -> VP ;
+  PassV2 : V2 -> VP ;
+  
 
 {-
   ComplV2V : V2V -> NP -> VP -> VP ;
diff --git a/examples/app/AppBul.gf b/examples/app/AppBul.gf
index 2c0481b11..874d2a6ca 100644
--- a/examples/app/AppBul.gf
+++ b/examples/app/AppBul.gf
@@ -18,9 +18,10 @@ concrete AppBul of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookBul - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -49,4 +50,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppCat.gf b/examples/app/AppCat.gf
index 402f46b3f..96b1c9ebb 100644
--- a/examples/app/AppCat.gf
+++ b/examples/app/AppCat.gf
@@ -19,9 +19,10 @@ concrete AppCat of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookCat - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
@@ -49,4 +50,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppChi.gf b/examples/app/AppChi.gf
index 26e72c936..c4dda6218 100644
--- a/examples/app/AppChi.gf
+++ b/examples/app/AppChi.gf
@@ -18,9 +18,10 @@ concrete AppChi of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
@@ -50,4 +51,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppDut.gf b/examples/app/AppDut.gf
index 55a63b192..62768a9ef 100644
--- a/examples/app/AppDut.gf
+++ b/examples/app/AppDut.gf
@@ -18,9 +18,10 @@ concrete AppDut of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
 	,PhrasebookDut - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -48,4 +49,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppEng.gf b/examples/app/AppEng.gf
index 4096b9042..313e0b6ff 100644
--- a/examples/app/AppEng.gf
+++ b/examples/app/AppEng.gf
@@ -18,9 +18,10 @@ concrete AppEng of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookEng - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv]
@@ -47,4 +48,6 @@ lin
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppFin.gf b/examples/app/AppFin.gf
index 6cd5df06a..85abd8696 100644
--- a/examples/app/AppFin.gf
+++ b/examples/app/AppFin.gf
@@ -18,9 +18,10 @@ concrete AppFin of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookFin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv]
@@ -48,4 +49,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppFre.gf b/examples/app/AppFre.gf
index e32f5d4f3..ad3acf0ad 100644
--- a/examples/app/AppFre.gf
+++ b/examples/app/AppFre.gf
@@ -17,9 +17,10 @@ concrete AppFre of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
   ,PhrasebookFre - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
 
@@ -48,4 +49,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppGer.gf b/examples/app/AppGer.gf
index 014e68547..858766f77 100644
--- a/examples/app/AppGer.gf
+++ b/examples/app/AppGer.gf
@@ -18,9 +18,10 @@ concrete AppGer of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
 	,PhrasebookGer - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -48,4 +49,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppHin.gf b/examples/app/AppHin.gf
index d14033d0c..e76fe0e91 100644
--- a/examples/app/AppHin.gf
+++ b/examples/app/AppHin.gf
@@ -18,9 +18,10 @@ concrete AppHin of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
   ,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
 
@@ -48,4 +49,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppIta.gf b/examples/app/AppIta.gf
index f4f8886eb..e1a31ca0b 100644
--- a/examples/app/AppIta.gf
+++ b/examples/app/AppIta.gf
@@ -18,9 +18,10 @@ concrete AppIta of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookIta - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
@@ -47,4 +48,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppJpn.gf b/examples/app/AppJpn.gf
index 2a119206e..1e5fde5af 100644
--- a/examples/app/AppJpn.gf
+++ b/examples/app/AppJpn.gf
@@ -18,9 +18,10 @@ concrete AppJpn of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookJpn ---- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
@@ -50,4 +51,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppSpa.gf b/examples/app/AppSpa.gf
index fbea1e917..e1a970461 100644
--- a/examples/app/AppSpa.gf
+++ b/examples/app/AppSpa.gf
@@ -19,9 +19,10 @@ concrete AppSpa of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
@@ -49,4 +50,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/AppSwe.gf b/examples/app/AppSwe.gf
index 1aca7874c..5740e8b48 100644
--- a/examples/app/AppSwe.gf
+++ b/examples/app/AppSwe.gf
@@ -17,9 +17,10 @@ concrete AppSwe of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookSwe - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
@@ -47,4 +48,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = SyntaxSwe.passiveVP v2 ;
+
 }
diff --git a/examples/app/AppTha.gf b/examples/app/AppTha.gf
index ee17ce7b2..b4726a9f9 100644
--- a/examples/app/AppTha.gf
+++ b/examples/app/AppTha.gf
@@ -18,9 +18,10 @@ concrete AppTha of App =
     ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
   -- Idiom
     CleftNP, CleftAdv,
-    ImpP3    
+    ImpP3,
   -- Construction
   -- Extensions
+    PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
   ,PhrasebookTha - [at_Prep, closed_A, open_A] --- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
@@ -50,4 +51,6 @@ ComplV3  v np vp = mkVP v np vp ;
 
 ComplV2 v np = mkVP v np ;
 
+  PassV2 v2 = passiveVP v2 ;
+  PassV2 v2 = passiveVP v2 ;
 }
diff --git a/examples/app/MkApp.hs b/examples/app/MkApp.hs
index 47d336064..e1a655c22 100644
--- a/examples/app/MkApp.hs
+++ b/examples/app/MkApp.hs
@@ -22,10 +22,6 @@ putImports i s =
 
 extra s = unlines (init (lines s) ++ extraLines ++ ["}"])
 
-extraLines = -- [] -- default: no extra
-
-  [
-  "",
-  "ComplV2 v np = mkVP v np ;",
-  ""
-  ]
\ No newline at end of file
+extraLines = [
+  "  PassV2 v2 = passiveVP v2 ;"
+  ] -- default: no extra