changed animals so that it compiles, after manual removal of duplicated api functions (to be fixed in ToAPI)

5 files changed, 26 insertions, 25 deletions

diff --git a/examples/animals/AnimalsEng.gf b/examples/animals/AnimalsEng.gf
index 22942b735..dcebdd315 100644
--- a/examples/animals/AnimalsEng.gf
+++ b/examples/animals/AnimalsEng.gf
@@ -1,16 +1,15 @@
---# -path=.:present:prelude
---resource/english:resource/abstract:resource/../prelude
+--# -path=.:present
 
 concrete AnimalsEng of Animals = QuestionsEng **
-  open LangEng, ParadigmsEng, IrregEng in {
+  open SyntaxEng, ParadigmsEng, IrregEng in {
 
   lin
-    Dog = regN "dog" ;
-    Cat = regN "cat" ;
-    Mouse = mk2N "mouse" "mice" ;
-    Lion = regN "lion" ;
-    Zebra = regN "zebra" ;
-    Chase = dirV2 (regV "chase") ;
-    Eat = dirV2 eat_V ;
-    See = dirV2 see_V ;
+    Dog = mkN "dog" ;
+    Cat = mkN "cat" ;
+    Mouse = mkN "mouse" "mice" ;
+    Lion = mkN "lion" ;
+    Zebra = mkN "zebra" ;
+    Chase = mkV2 "chase" ;
+    Eat = mkV2 eat_V ;
+    See = mkV2 see_V ;
 }
diff --git a/examples/animals/AnimalsFre.gf b/examples/animals/AnimalsFre.gf
index 7a8ec0c25..8d8f66c7a 100644
--- a/examples/animals/AnimalsFre.gf
+++ b/examples/animals/AnimalsFre.gf
@@ -1,15 +1,15 @@
---# -path=.:present:prelude
+--# -path=.:present
 
 concrete AnimalsFre of Animals = QuestionsFre **
-  open LangFre, ParadigmsFre, IrregFre in {
+  open SyntaxFre, ParadigmsFre, IrregFre in {
 
   lin
-    Dog   = regN "chien" ;
-    Cat   = regN "chat" ;
-    Mouse = regGenN "souris" feminine ;
+    Dog   = mkN "chien" ;
+    Cat   = mkN "chat" ;
+    Mouse = mkN "souris" feminine ;
     Lion  = mkN "lion" masculine ;
-    Zebra = regGenN "zèbre" masculine ;
-    Chase = dirV2 (regV "chasser") ;
-    Eat   = dirV2 (regV "manger") ;
+    Zebra = mkN "zèbre" masculine ;
+    Chase = mkV2 (mkV "chasser") ;
+    Eat   = mkV2 (mkV "manger") ;
     See   = voir_V2 ;
 }
diff --git a/examples/animals/QuestionsFre.gf b/examples/animals/QuestionsFre.gf
index dab23b2ba..eb23829d3 100644
--- a/examples/animals/QuestionsFre.gf
+++ b/examples/animals/QuestionsFre.gf
@@ -1,2 +1,2 @@
 concrete QuestionsFre of Questions = QuestionsI with 
-  (Lang = LangFre) ;
+  (Syntax = SyntaxFre) ;
diff --git a/examples/animals/QuestionsI.gf b/examples/animals/QuestionsI.gf
index eb7c2f697..8da5aa678 100644
--- a/examples/animals/QuestionsI.gf
+++ b/examples/animals/QuestionsI.gf
@@ -1,4 +1,5 @@
--- to compile: echo "eb -probs=probs -api -file=QuestionsI.gfe" | gf $GF_LIB_PATH/present/LangEng.gfo
+-- to compile: 
+-- echo "eb -probs=probs -api -file=QuestionsI.gfe" | gf $GF_LIB_PATH/present/LangEng.gfo
 -- or use directly gf <mkAnimals.gfs
 
 incomplete concrete QuestionsI of Questions = open Syntax in {
@@ -9,18 +10,18 @@ incomplete concrete QuestionsI of Questions = open Syntax in {
 
   lin 
     Who  love_V2 man_N           = (
-mkUtt (mkQCl    (mkQCl whoSg_IP (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N))))  -- 4.548068040131532e-11
+mkUtt ((mkQCl whoSg_IP (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N))))  -- 4.548068040131532e-11
 )
  ;
     Whom man_N love_V2           = (
 --- WARNING: ambiguous example whom does the man love
-mkUtt (mkQCl    (mkQCl whoPl_IP (mkClSlash (mkNP the_Art  man_N) (mkVPSlash love_V2))))  -- 2.8425425250822075e-11
+mkUtt (mkQCl whoPl_IP (mkClSlash (mkNP the_Art  man_N) (mkVPSlash love_V2)))  -- 2.8425425250822075e-11
   --- mkUtt (mkQCl    (mkQCl whoSg_IP (mkClSlash (mkNP the_Art  man_N) (mkVPSlash love_V2))))  -- 2.8425425250822075e-11
 )
  ;
     Answer woman_N love_V2 man_N = (
 --- WARNING: ambiguous example the woman loves men
-mkUtt (mkCl    (mkCl (mkNP the_Art  woman_N) (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N))))  -- 3.273034657650043e-14
+mkUtt (mkCl    (mkNP the_Art  woman_N) (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N)))  -- 3.273034657650043e-14
   --- mkUtt (mkNP the_Art  (mkCN (mkCN (mkCN woman_N) (mkNP a_Art plNum love_N)) (mkNP a_Art plNum man_N)))  -- 1.6623594622841657e-20
   --- mkUtt (mkNP the_Art  (mkCN (mkCN woman_N) (mkNP a_Art plNum (mkCN (mkCN love_N) (mkNP a_Art plNum man_N)))))  -- 1.6623594622841657e-20
 )
diff --git a/examples/animals/QuestionsI.gfe b/examples/animals/QuestionsI.gfe
index 7f847dfc7..ea8515c25 100644
--- a/examples/animals/QuestionsI.gfe
+++ b/examples/animals/QuestionsI.gfe
@@ -1,4 +1,5 @@
--- to compile: echo "eb -probs=probs -api -file=QuestionsI.gfe" | gf $GF_LIB_PATH/present/LangEng.gfo
+-- to compile: 
+-- echo "eb -probs=probs -api -file=QuestionsI.gfe" | gf $GF_LIB_PATH/present/LangEng.gfo
 -- or use directly gf <mkAnimals.gfs
 
 incomplete concrete QuestionsI of Questions = open Syntax in {