Cleaned up names and paths in toy0 grammars.

12 files changed, 68 insertions, 29 deletions

diff --git a/examples/regulus/toy0/Toy0.gf b/examples/regulus/toy0/Toy0.gf
index 00c7ed0a4..b1e2d6a40 100644
--- a/examples/regulus/toy0/Toy0.gf
+++ b/examples/regulus/toy0/Toy0.gf
@@ -1,17 +1,15 @@
+-- toy0 grammar from Chapter 2 of the Regulus book
 abstract Toy0 = {
 
--- grammar from Chapter 2 of the Regulus book
+  flags startcat=NP ;
 
-flags startcat=NP ;
-
-cat 
-  NP ; Noun ; Spec ;
-
-fun
-  SpecNoun : Spec -> Noun -> NP ;
-
-  One, Two : Spec ;
-  Felis, Canis : Noun ;
+  cat 
+    NP ; 
+    Noun ; 
+    Spec ;
 
+  fun  
+    SpecNoun      : Spec -> Noun -> NP ;
+    One, Two      : Spec ;
+    Felis, Canis  : Noun ;
 }
-
diff --git a/examples/regulus/toy0/example-based/Toy0.gf b/examples/regulus/toy0/example-based/Toy0.gf
new file mode 100644
index 000000000..b1e2d6a40
--- /dev/null
+++ b/examples/regulus/toy0/example-based/Toy0.gf
@@ -0,0 +1,15 @@
+-- toy0 grammar from Chapter 2 of the Regulus book
+abstract Toy0 = {
+
+  flags startcat=NP ;
+
+  cat 
+    NP ; 
+    Noun ; 
+    Spec ;
+
+  fun  
+    SpecNoun      : Spec -> Noun -> NP ;
+    One, Two      : Spec ;
+    Felis, Canis  : Noun ;
+}
diff --git a/examples/regulus/toy0/example-based/Toy0Ger.gf b/examples/regulus/toy0/example-based/Toy0Ger.gf
new file mode 100644
index 000000000..7355cbfac
--- /dev/null
+++ b/examples/regulus/toy0/example-based/Toy0Ger.gf
@@ -0,0 +1,6 @@
+--# -path=.:present:prelude
+
+concrete Toy0Ger of Toy0 = Toy0I with
+  (Grammar = GrammarGer),
+  (Lexicon = LexiconGer) ;
+
diff --git a/examples/regulus/toy0/example-based/Toy0GerE.gf b/examples/regulus/toy0/example-based/Toy0GerE.gf
deleted file mode 100644
index f87eceb31..000000000
--- a/examples/regulus/toy0/example-based/Toy0GerE.gf
+++ /dev/null
@@ -1,6 +0,0 @@
---# -path=..:present:prelude
-
-concrete Toy0GerE of Toy0 = Toy0IE with
-  (Grammar = GrammarGer),
-  (Lexicon = LexiconGer) ;
-
diff --git a/examples/regulus/toy0/example-based/Toy0IE.gfe b/examples/regulus/toy0/example-based/Toy0I.gfe
index 03313efd5..4589bf4b6 100644
--- a/examples/regulus/toy0/example-based/Toy0IE.gfe
+++ b/examples/regulus/toy0/example-based/Toy0I.gfe
@@ -1,9 +1,9 @@
 --# -resource=present/LangEng.gfc
---# -path=..:present:prelude
+--# -path=.:present:prelude
 
--- to compile: gf -examples Toy0IE.gfe
+-- to compile: gf -examples Toy0I.gfe
 
-incomplete concrete Toy0IE of Toy0 = open Grammar, Lexicon in {
+incomplete concrete Toy0I of Toy0 = open Grammar, Lexicon in {
 
 lincat
   Spec = Det ;
diff --git a/examples/regulus/toy0/no-functor/Toy0.gf b/examples/regulus/toy0/no-functor/Toy0.gf
new file mode 100644
index 000000000..b1e2d6a40
--- /dev/null
+++ b/examples/regulus/toy0/no-functor/Toy0.gf
@@ -0,0 +1,15 @@
+-- toy0 grammar from Chapter 2 of the Regulus book
+abstract Toy0 = {
+
+  flags startcat=NP ;
+
+  cat 
+    NP ; 
+    Noun ; 
+    Spec ;
+
+  fun  
+    SpecNoun      : Spec -> Noun -> NP ;
+    One, Two      : Spec ;
+    Felis, Canis  : Noun ;
+}
diff --git a/examples/regulus/toy0/no-functor/Toy0Eng.gf b/examples/regulus/toy0/no-functor/Toy0Eng.gf
index 856da31c4..adc2068e1 100644
--- a/examples/regulus/toy0/no-functor/Toy0Eng.gf
+++ b/examples/regulus/toy0/no-functor/Toy0Eng.gf
@@ -1,4 +1,4 @@
---# -path=..:present:api:prelude
+--# -path=.:present:api:prelude
 concrete Toy0Eng of Toy0 = 
     open SyntaxEng, ParadigmsEng in {
 
diff --git a/examples/regulus/toy0/no-functor/Toy0Fin0.gf b/examples/regulus/toy0/no-functor/Toy0Fin.gf
index 9a1875124..4ebbf6f36 100644
--- a/examples/regulus/toy0/no-functor/Toy0Fin0.gf
+++ b/examples/regulus/toy0/no-functor/Toy0Fin.gf
@@ -1,6 +1,6 @@
---# -path=..:present:prelude
+--# -path=.:present:prelude
 
-concrete Toy0Fin0 of Toy0 = open SyntaxFin, ParadigmsFin in {
+concrete Toy0Fin of Toy0 = open SyntaxFin, ParadigmsFin in {
 
 lincat
   Spec = Det ;
diff --git a/examples/regulus/toy0/no-resource/Toy0.gf b/examples/regulus/toy0/no-resource/Toy0.gf
new file mode 100644
index 000000000..b1e2d6a40
--- /dev/null
+++ b/examples/regulus/toy0/no-resource/Toy0.gf
@@ -0,0 +1,15 @@
+-- toy0 grammar from Chapter 2 of the Regulus book
+abstract Toy0 = {
+
+  flags startcat=NP ;
+
+  cat 
+    NP ; 
+    Noun ; 
+    Spec ;
+
+  fun  
+    SpecNoun      : Spec -> Noun -> NP ;
+    One, Two      : Spec ;
+    Felis, Canis  : Noun ;
+}
diff --git a/examples/regulus/toy0/no-resource/Toy0Eng.gf b/examples/regulus/toy0/no-resource/Toy0Eng.gf
index e6fa01b8d..977fb09c5 100644
--- a/examples/regulus/toy0/no-resource/Toy0Eng.gf
+++ b/examples/regulus/toy0/no-resource/Toy0Eng.gf
@@ -1,4 +1,3 @@
---# -path=..
 concrete Toy0Eng of Toy0 = {
 
 param
diff --git a/examples/regulus/toy0/no-resource/Toy0Fre.gf b/examples/regulus/toy0/no-resource/Toy0Fre.gf
index 1077058e0..c5267ae18 100644
--- a/examples/regulus/toy0/no-resource/Toy0Fre.gf
+++ b/examples/regulus/toy0/no-resource/Toy0Fre.gf
@@ -1,4 +1,3 @@
---# -path=..
 concrete Toy0Fre of Toy0 = {
 
 param
diff --git a/examples/regulus/toy0/no-resource/Toy0Ger.gf b/examples/regulus/toy0/no-resource/Toy0Ger.gf
index eee5df823..091790f94 100644
--- a/examples/regulus/toy0/no-resource/Toy0Ger.gf
+++ b/examples/regulus/toy0/no-resource/Toy0Ger.gf
@@ -1,4 +1,3 @@
---# -path=..
 concrete Toy0Ger of Toy0 = {
 
 param
@@ -8,10 +7,9 @@ param
 lincat
   Spec = {s : Gender => Str ; n : Number} ;
   Noun = {s : Number => Str ; g : Gender} ;
-  MAIN,NP = {s : Str} ;
+  NP = {s : Str} ;
 
 lin
-  Main np = np ;
   SpecNoun spec noun = {s = spec.s ! noun.g ++ noun.s ! spec.n} ;
 
   One = {s = table {Fem => "eine" ; _ => "ein"} ; n = Sg} ;