fixed Sammie examples to compile (except Spa)

6 files changed, 16 insertions, 13 deletions

diff --git a/examples/sammie/ParamSammieEng.gf b/examples/sammie/ParamSammieEng.gf
index 10be19309..b67cddc4c 100644
--- a/examples/sammie/ParamSammieEng.gf
+++ b/examples/sammie/ParamSammieEng.gf
@@ -61,7 +61,7 @@ oper
 
   WhatName = mkQCl what_IAdv ;
 
-  past = <TPast,ASimul> ;
+  past = <pastTense,simultaneousAnt> ;
 
   imperative vp = 
       mkUtt (mkImp vp)
diff --git a/examples/sammie/ParamSammieFin.gf b/examples/sammie/ParamSammieFin.gf
index 9e7613b22..4b976a68c 100644
--- a/examples/sammie/ParamSammieFin.gf
+++ b/examples/sammie/ParamSammieFin.gf
@@ -64,7 +64,8 @@ oper
 
   WhatName = mkQCl what_IAdv ;
 
-  past = <TPres,AAnter> ;
+
+  past = <presentTense,anteriorAnt> ;
 
   imperative vp = 
       mkUtt (mkImp vp)
diff --git a/examples/sammie/ParamSammieFre.gf b/examples/sammie/ParamSammieFre.gf
index d38beb618..125dc992c 100644
--- a/examples/sammie/ParamSammieFre.gf
+++ b/examples/sammie/ParamSammieFre.gf
@@ -79,7 +79,7 @@ oper
 
   WhatName x = QuestIAdv how_IAdv (PredVP x (UseV (reflV (regV "appeler")))) ;
 
-  past = <TPres,AAnter> ;
+  past = <presentTense,anteriorAnt> ;
 
   imperative vp = variants { 
 ----      UttImpPol PPos (ImpVP vp) ; 
diff --git a/examples/sammie/ParamSammieGer.gf b/examples/sammie/ParamSammieGer.gf
index 8ac4805f6..cfa714499 100644
--- a/examples/sammie/ParamSammieGer.gf
+++ b/examples/sammie/ParamSammieGer.gf
@@ -78,7 +78,7 @@ oper
 
   WhatName x = mkQCl how_IAdv (mkCl x heißen_V) ;
 
-  past = <TPres,AAnter> ;
+  past = <presentTense,anteriorAnt> ;
 
   imperative vp = 
       mkUtt (mkImp (bitteVP vp)) 
diff --git a/examples/sammie/ParamSammieSpa.gf b/examples/sammie/ParamSammieSpa.gf
index be829df83..9d7b1b3f0 100644
--- a/examples/sammie/ParamSammieSpa.gf
+++ b/examples/sammie/ParamSammieSpa.gf
@@ -7,6 +7,7 @@ instance ParamSammieSpa of ParamSammie = open
   ParadigmsSpa,
   (M = MorphoSpa), ---
   ConstructX,
+  SyntaxSpa,
   Prelude 
 in {
 
@@ -53,14 +54,14 @@ oper
   please_PConj = mkPConj ["por favor"] ;
 
   mainmenu_NP = 
-    DetCN (DetSg (SgQuant DefArt) NoOrd) 
+    mkNP the_Det
       (AdjCN (PositA (regA "principal")) (UseN (regN "menú"))) ;
 
   goback_VP = UseV (regV "volver") ;
   shutup_VP = UseV (reflV (dirV2 (regV "callar"))) ; ---- silencio
   pause_VP  = 
     ComplV2 (dirV2 (hacer_V))
-      (DetCN (DetSg (SgQuant IndefArt) NoOrd) (UseN (regN "pausa"))) ; ---pausar
+      (mkNP a_Det (UseN (regN "pausa"))) ; ---pausar
   resume_VP = UseV (regV "continuar") ; --- reproducir
 
   whatever_Utt = mkUtt ["no importa cual"] ; --- cualquiera
@@ -68,14 +69,14 @@ oper
   typeWithGenre x genre =
 ---- CompoundCN genre x ;
     AdvCN x (PrepNP genitive 
-        (DetCN (DetSg MassDet NoOrd) genre)) ;
+        (MassNP genre)) ;
 
   name = regPN ;
 
   WhatName x = 
     QuestIAdv how_IAdv (PredVP x (UseV (reflV (regV "llamar")))) ;
 
-  past = <TPres,AAnter> ;
+  past = <presentTense,anteriorAnt> ;
 
   imperative vp = variants { 
 --      UttImpPol PPos (ImpVP vp) ;
@@ -90,10 +91,10 @@ oper
       } ;
 
   previous cn = 
-    DetCN (DetSg (SgQuant DefArt) NoOrd) 
+    mkNP the_Det
       (AdjCN (PositA (regA "previo")) cn) ;
 
-  next = DetCN (DetSg (SgQuant DefArt) next_Ord) ;
+  next = DetCN (mkDet the_Quant next_Ord) ;
 
   what_say = UttIAdv how_IAdv ;
 
@@ -102,8 +103,8 @@ oper
   artist_Prep = variants {by8agent_Prep ; genitive} ;
 
   this cn = variants {
-    DetCN (DetSg (SgQuant this_Quant) NoOrd) cn ;
-    DetCN (DetSg (SgQuant DefArt) NoOrd) 
+    mkNP this_Quant cn ;
+    mkNP the_Det 
       (AdjCN (PositA (regA "actual")) cn)
     } ;
 
diff --git a/examples/sammie/ParamSammieSwe.gf b/examples/sammie/ParamSammieSwe.gf
index b9259c7a9..23bd16edb 100644
--- a/examples/sammie/ParamSammieSwe.gf
+++ b/examples/sammie/ParamSammieSwe.gf
@@ -72,7 +72,8 @@ oper
   name = regPN ;
 
   WhatName x = mkQCl whatSg_IP x (dirV2 (mk2V "heta" "hette")) ;
-  past = <TPres,AAnter> ;
+
+  past = <pastTense,simultaneousAnt> ;
 
   imperative = SyntaxSwe.mkUtt ;