resource using exx revised

12 files changed, 129 insertions, 5 deletions

diff --git a/examples/tutorial/foods/Foods.gf b/examples/tutorial/foods/Foods.gf
index 210db69d4..35779a76d 100644
--- a/examples/tutorial/foods/Foods.gf
+++ b/examples/tutorial/foods/Foods.gf
@@ -1,12 +1,12 @@
 abstract Foods = {
 
-  flags startcat=Phr ;
+  flags startcat=Phrase ;
 
   cat
-    Phr ; Item ; Kind ; Quality ;
+    Phrase ; Item ; Kind ; Quality ;
 
   fun
-    Is : Item -> Quality -> Phr ;
+    Is : Item -> Quality -> Phrase ;
     This, That, These, Those : Kind -> Item ;
     QKind : Quality -> Kind -> Kind ;
     Wine, Cheese, Fish, Pizza : Kind ;
diff --git a/examples/tutorial/foods/FoodsEng.gf b/examples/tutorial/foods/FoodsEng.gf
index 8ea5e6079..69a427006 100644
--- a/examples/tutorial/foods/FoodsEng.gf
+++ b/examples/tutorial/foods/FoodsEng.gf
@@ -3,7 +3,7 @@
 concrete FoodsEng of Foods = open Prelude in {
 
   lincat
-    Phr, Quality = SS ; 
+    Phrase, Quality = SS ; 
     Kind = {s : Number => Str} ; 
     Item = {s : Str ; n : Number} ; 
 
diff --git a/examples/tutorial/foods/FoodsIta.gf b/examples/tutorial/foods/FoodsIta.gf
index d46bf469d..0099058d0 100644
--- a/examples/tutorial/foods/FoodsIta.gf
+++ b/examples/tutorial/foods/FoodsIta.gf
@@ -3,7 +3,7 @@
 concrete FoodsIta of Foods = open Prelude in {
 
   lincat
-    Phr = SS ; 
+    Phrase = SS ; 
     Quality = {s : Gender => Number => Str} ; 
     Kind = {s : Number => Str ; g : Gender} ; 
     Item = {s : Str ; g : Gender ; n : Number} ; 
diff --git a/examples/tutorial/resource-foods/FoodsEng.gf b/examples/tutorial/resource-foods/FoodsEng.gf
new file mode 100644
index 000000000..3756b8189
--- /dev/null
+++ b/examples/tutorial/resource-foods/FoodsEng.gf
@@ -0,0 +1,27 @@
+--# -path=.:../foods:present:prelude
+
+concrete FoodsEng of Foods = open SyntaxEng,ParadigmsEng in {
+  lincat
+    Phrase = Utt ; 
+    Item = NP ;
+    Kind = CN ;
+    Quality = AP ;
+  lin
+    Is item quality = mkUtt (mkCl item quality) ;
+    This kind = mkNP (mkDet this_Quant) kind ;
+    That kind = mkNP (mkDet that_Quant) kind ;
+    These kind = mkNP (mkDet (mkQuantPl this_Quant)) kind ;
+    Those kind = mkNP (mkDet (mkQuantPl that_Quant)) kind ;
+    QKind quality kind = mkCN quality kind ;
+    Wine = mkCN (mkN "wine") ;
+    Pizza = mkCN (mkN "pizza") ;
+    Cheese = mkCN (mkN "cheese") ;
+    Fish = mkCN (mkN "fish" "fish") ;
+    Very quality = mkAP very_AdA quality ;
+    Fresh = mkAP (mkA "fresh") ;
+    Warm = mkAP (mkA "warm") ;
+    Italian = mkAP (mkA "Italian") ;
+    Expensive = mkAP (mkA "expensive") ;
+    Delicious = mkAP (mkA "delicious") ;
+    Boring = mkAP (mkA "boring") ;
+}
diff --git a/examples/tutorial/resource-foods/FoodsFin.gf b/examples/tutorial/resource-foods/FoodsFin.gf
new file mode 100644
index 000000000..2c76ee4a0
--- /dev/null
+++ b/examples/tutorial/resource-foods/FoodsFin.gf
@@ -0,0 +1,5 @@
+--# -path=.:../foods:present:prelude
+
+concrete FoodsFin of Foods = FoodsI with 
+  (Syntax = SyntaxFin),
+  (LexFoods = LexFoodsFin) ;
diff --git a/examples/tutorial/resource-foods/FoodsFre.gf b/examples/tutorial/resource-foods/FoodsFre.gf
new file mode 100644
index 000000000..f10a60e63
--- /dev/null
+++ b/examples/tutorial/resource-foods/FoodsFre.gf
@@ -0,0 +1,5 @@
+--# -path=.:../foods:present:prelude
+
+concrete FoodsFre of Foods = FoodsI with 
+  (Syntax = SyntaxFre),
+  (LexFoods = LexFoodsFre) ;
diff --git a/examples/tutorial/resource-foods/FoodsGer.gf b/examples/tutorial/resource-foods/FoodsGer.gf
new file mode 100644
index 000000000..1c5090ff6
--- /dev/null
+++ b/examples/tutorial/resource-foods/FoodsGer.gf
@@ -0,0 +1,5 @@
+--# -path=.:../foods:present:prelude
+
+concrete FoodsGer of Foods = FoodsI with 
+    (Syntax = SyntaxGer),
+    (LexFoods = LexFoodsGer) ;
diff --git a/examples/tutorial/resource-foods/FoodsI.gf b/examples/tutorial/resource-foods/FoodsI.gf
new file mode 100644
index 000000000..da6cb9366
--- /dev/null
+++ b/examples/tutorial/resource-foods/FoodsI.gf
@@ -0,0 +1,28 @@
+--# -path=.:../foods:present:prelude
+
+incomplete concrete FoodsI of Foods = open Syntax, LexFoods in {
+  lincat
+    Phrase = Utt ; 
+    Item = NP ;
+    Kind = CN ;
+    Quality = AP ;
+  lin
+    Is item quality = mkUtt (mkCl item quality) ;
+    This kind = mkNP (mkDet this_Quant) kind ;
+    That kind = mkNP (mkDet that_Quant) kind ;
+    These kind = mkNP (mkDet (mkQuantPl this_Quant)) kind ;
+    Those kind = mkNP (mkDet (mkQuantPl that_Quant)) kind ;
+    QKind quality kind = mkCN quality kind ;
+    Very quality = mkAP very_AdA quality ;
+
+    Wine = mkCN wine_N ;
+    Pizza = mkCN pizza_N ;
+    Cheese = mkCN cheese_N ;
+    Fish = mkCN fish_N ;
+    Fresh = mkAP fresh_A ;
+    Warm = mkAP warm_A ;
+    Italian = mkAP italian_A ;
+    Expensive = mkAP expensive_A ;
+    Delicious = mkAP delicious_A ;
+    Boring = mkAP boring_A ;
+}
diff --git a/examples/tutorial/resource-foods/LexFoods.gf b/examples/tutorial/resource-foods/LexFoods.gf
new file mode 100644
index 000000000..0c88eaa8a
--- /dev/null
+++ b/examples/tutorial/resource-foods/LexFoods.gf
@@ -0,0 +1,13 @@
+interface LexFoods = open Syntax in {
+  oper
+    wine_N : N ;
+    pizza_N : N ;
+    cheese_N : N ;
+    fish_N : N ;
+    fresh_A : A ;
+    warm_A : A ;
+    italian_A : A ;
+    expensive_A : A ;
+    delicious_A : A ;
+    boring_A : A ;
+}
diff --git a/examples/tutorial/resource-foods/LexFoodsFin.gf b/examples/tutorial/resource-foods/LexFoodsFin.gf
new file mode 100644
index 000000000..dc29709a0
--- /dev/null
+++ b/examples/tutorial/resource-foods/LexFoodsFin.gf
@@ -0,0 +1,13 @@
+instance LexFoodsFin of LexFoods = open SyntaxFin, ParadigmsFin in {
+  oper
+    wine_N = mkN "viini" ;
+    pizza_N = mkN "pizza" ;
+    cheese_N = mkN "juusto" ;
+    fish_N = mkN "kala" ;
+    fresh_A = mkA "tuore" ;
+    warm_A = mkA "lämmin" ;
+    italian_A = mkA "italialainen" ;
+    expensive_A = mkA "kallis" ;
+    delicious_A = mkA "herkullinen" ;
+    boring_A = mkA "tylsä" ;
+}
diff --git a/examples/tutorial/resource-foods/LexFoodsFre.gf b/examples/tutorial/resource-foods/LexFoodsFre.gf
new file mode 100644
index 000000000..b83a8ddf9
--- /dev/null
+++ b/examples/tutorial/resource-foods/LexFoodsFre.gf
@@ -0,0 +1,15 @@
+--# -path=.:../foods:present:prelude
+
+instance LexFoodsFre of LexFoods = open SyntaxFre,ParadigmsFre in {
+  oper
+    wine_N = mkN "vin" ;
+    pizza_N = mkN "pizza" feminine ;
+    cheese_N = mkN "fromage" masculine ;
+    fish_N = mkN "poisson" ;
+    fresh_A = mkA "frais" "fraîche" ;
+    warm_A = mkA "chaud" ;
+    italian_A = mkA "italien" ;
+    expensive_A = mkA "cher" ;
+    delicious_A = mkA "délicieux" ;
+    boring_A = mkA "ennuyeux" ;
+}
diff --git a/examples/tutorial/resource-foods/LexFoodsGer.gf b/examples/tutorial/resource-foods/LexFoodsGer.gf
new file mode 100644
index 000000000..f3d7ff5c1
--- /dev/null
+++ b/examples/tutorial/resource-foods/LexFoodsGer.gf
@@ -0,0 +1,13 @@
+instance LexFoodsGer of LexFoods = open SyntaxGer, ParadigmsGer in {
+  oper
+    wine_N = mkN "Wein" ;
+    pizza_N = mkN "Pizza" "Pizzen" feminine ;
+    cheese_N = mkN "Käse" "Käsen" masculine ;
+    fish_N = mkN "Fisch" ;
+    fresh_A = mkA "frisch" ;
+    warm_A = mkA "warm" "wärmer" "wärmste" ;
+    italian_A = mkA "italienisch" ;
+    expensive_A = mkA "teuer" ;
+    delicious_A = mkA "köstlich" ;
+    boring_A = mkA "langweilig" ;
+}