enabled more from Construction in App

13 files changed, 13 insertions, 49 deletions

diff --git a/examples/app/App.gf b/examples/app/App.gf
index c9ee9430b..5791ae58d 100644
--- a/examples/app/App.gf
+++ b/examples/app/App.gf
@@ -17,12 +17,9 @@ abstract App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
   ,Phrasebook
diff --git a/examples/app/AppBul.gf b/examples/app/AppBul.gf
index 305226584..528164c2d 100644
--- a/examples/app/AppBul.gf
+++ b/examples/app/AppBul.gf
@@ -20,12 +20,9 @@ concrete AppBul of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppChi.gf b/examples/app/AppChi.gf
index e6237d53e..611153a10 100644
--- a/examples/app/AppChi.gf
+++ b/examples/app/AppChi.gf
@@ -20,12 +20,9 @@ concrete AppChi of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppDut.gf b/examples/app/AppDut.gf
index 8592aefdf..6657cc6d0 100644
--- a/examples/app/AppDut.gf
+++ b/examples/app/AppDut.gf
@@ -20,12 +20,9 @@ concrete AppDut of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppEng.gf b/examples/app/AppEng.gf
index b2218a761..f3f39e448 100644
--- a/examples/app/AppEng.gf
+++ b/examples/app/AppEng.gf
@@ -20,12 +20,9 @@ concrete AppEng of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppFin.gf b/examples/app/AppFin.gf
index 5d61d968b..3a2143b1a 100644
--- a/examples/app/AppFin.gf
+++ b/examples/app/AppFin.gf
@@ -20,12 +20,9 @@ concrete AppFin of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppFre.gf b/examples/app/AppFre.gf
index d9ee0ac17..92fcff805 100644
--- a/examples/app/AppFre.gf
+++ b/examples/app/AppFre.gf
@@ -20,12 +20,9 @@ concrete AppFre of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppGer.gf b/examples/app/AppGer.gf
index e170d49e0..eb90a0f39 100644
--- a/examples/app/AppGer.gf
+++ b/examples/app/AppGer.gf
@@ -20,12 +20,9 @@ concrete AppGer of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppHin.gf b/examples/app/AppHin.gf
index df4ddda61..6e5df5511 100644
--- a/examples/app/AppHin.gf
+++ b/examples/app/AppHin.gf
@@ -20,12 +20,9 @@ concrete AppHin of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
   ,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
diff --git a/examples/app/AppIta.gf b/examples/app/AppIta.gf
index 42b3894d3..d27bc82ac 100644
--- a/examples/app/AppIta.gf
+++ b/examples/app/AppIta.gf
@@ -20,12 +20,9 @@ concrete AppIta of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppSpa.gf b/examples/app/AppSpa.gf
index 80195ab3f..f6983652d 100644
--- a/examples/app/AppSpa.gf
+++ b/examples/app/AppSpa.gf
@@ -21,12 +21,9 @@ concrete AppSpa of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/AppSwe.gf b/examples/app/AppSwe.gf
index 87804f820..adcf8fbc3 100644
--- a/examples/app/AppSwe.gf
+++ b/examples/app/AppSwe.gf
@@ -19,12 +19,9 @@ concrete AppSwe of App =
     ExistIP,
     ExistNPAdv, ExistIPAdv,
     ImpP3,
-    SelfAdvVP, SelfAdVVP, SelfNP,
+    SelfAdvVP, SelfAdVVP, SelfNP
     
   -- Construction
-    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
-    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
-    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP
   -- Extensions
   ]
 
diff --git a/examples/app/MkApp.hs b/examples/app/MkApp.hs
index 582441b6f..29caf2fd5 100644
--- a/examples/app/MkApp.hs
+++ b/examples/app/MkApp.hs
@@ -2,7 +2,7 @@
 -- the new files are produced in ./tmp/
 -- usage: runghc MkApp.hs
 
-langs = words "Bul Chi Eng Fin Fre Ger Hin Ita Spa Swe"
+langs = words "Bul Chi Dut Eng Fin Fre Ger Hin Ita Spa Swe"
 appCnc lang = "App" ++ lang ++ ".gf"
 
 appAbs = "App.gf"