From a22de1a9f6b084189583797a84adc4dc4a624572 Mon Sep 17 00:00:00 2001
From: bringert <bringert@cs.chalmers.se>
Date: Wed, 27 Jun 2007 12:50:42 +0000
Subject: Cleaned up names and paths in toy0 grammars.

---
 examples/regulus/toy0/Toy0.gf                   | 22 ++++++++++------------
 examples/regulus/toy0/example-based/Toy0.gf     | 15 +++++++++++++++
 examples/regulus/toy0/example-based/Toy0Ger.gf  |  6 ++++++
 examples/regulus/toy0/example-based/Toy0GerE.gf |  6 ------
 examples/regulus/toy0/example-based/Toy0I.gfe   | 23 +++++++++++++++++++++++
 examples/regulus/toy0/example-based/Toy0IE.gfe  | 23 -----------------------
 examples/regulus/toy0/no-functor/Toy0.gf        | 15 +++++++++++++++
 examples/regulus/toy0/no-functor/Toy0Eng.gf     |  2 +-
 examples/regulus/toy0/no-functor/Toy0Fin.gf     | 16 ++++++++++++++++
 examples/regulus/toy0/no-functor/Toy0Fin0.gf    | 16 ----------------
 examples/regulus/toy0/no-resource/Toy0.gf       | 15 +++++++++++++++
 examples/regulus/toy0/no-resource/Toy0Eng.gf    |  1 -
 examples/regulus/toy0/no-resource/Toy0Fre.gf    |  1 -
 examples/regulus/toy0/no-resource/Toy0Ger.gf    |  4 +---
 14 files changed, 102 insertions(+), 63 deletions(-)
 create mode 100644 examples/regulus/toy0/example-based/Toy0.gf
 create mode 100644 examples/regulus/toy0/example-based/Toy0Ger.gf
 delete mode 100644 examples/regulus/toy0/example-based/Toy0GerE.gf
 create mode 100644 examples/regulus/toy0/example-based/Toy0I.gfe
 delete mode 100644 examples/regulus/toy0/example-based/Toy0IE.gfe
 create mode 100644 examples/regulus/toy0/no-functor/Toy0.gf
 create mode 100644 examples/regulus/toy0/no-functor/Toy0Fin.gf
 delete mode 100644 examples/regulus/toy0/no-functor/Toy0Fin0.gf
 create mode 100644 examples/regulus/toy0/no-resource/Toy0.gf

(limited to 'examples')

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/Toy0I.gfe b/examples/regulus/toy0/example-based/Toy0I.gfe
new file mode 100644
index 000000000..4589bf4b6
--- /dev/null
+++ b/examples/regulus/toy0/example-based/Toy0I.gfe
@@ -0,0 +1,23 @@
+--# -resource=present/LangEng.gfc
+--# -path=.:present:prelude
+
+-- to compile: gf -examples Toy0I.gfe
+
+incomplete concrete Toy0I of Toy0 = open Grammar, Lexicon in {
+
+lincat
+  Spec = Det ;
+  Noun = N ;
+  NP   = Utt ;
+
+lin
+  SpecNoun every_Det house_N = in Utt "every house" ;
+
+  One = in Det "one" ;
+  Two = in Det "two" ;
+
+  Felis = in N "cat" ;
+  Canis = in N "dog" ;
+
+}
+
diff --git a/examples/regulus/toy0/example-based/Toy0IE.gfe b/examples/regulus/toy0/example-based/Toy0IE.gfe
deleted file mode 100644
index 03313efd5..000000000
--- a/examples/regulus/toy0/example-based/Toy0IE.gfe
+++ /dev/null
@@ -1,23 +0,0 @@
---# -resource=present/LangEng.gfc
---# -path=..:present:prelude
-
--- to compile: gf -examples Toy0IE.gfe
-
-incomplete concrete Toy0IE of Toy0 = open Grammar, Lexicon in {
-
-lincat
-  Spec = Det ;
-  Noun = N ;
-  NP   = Utt ;
-
-lin
-  SpecNoun every_Det house_N = in Utt "every house" ;
-
-  One = in Det "one" ;
-  Two = in Det "two" ;
-
-  Felis = in N "cat" ;
-  Canis = in N "dog" ;
-
-}
-
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/Toy0Fin.gf b/examples/regulus/toy0/no-functor/Toy0Fin.gf
new file mode 100644
index 000000000..4ebbf6f36
--- /dev/null
+++ b/examples/regulus/toy0/no-functor/Toy0Fin.gf
@@ -0,0 +1,16 @@
+--# -path=.:present:prelude
+
+concrete Toy0Fin of Toy0 = open SyntaxFin, ParadigmsFin in {
+
+lincat
+  Spec = Det ;
+  Noun = N ;
+  NP   = Utt ;
+lin
+  SpecNoun spec noun = mkUtt (SyntaxFin.mkNP spec noun) ;
+
+  One = mkDet one_Quant ;
+  Two = mkDet (mkNum n2_Numeral) ;
+  Felis = mkN "kissa" ;
+  Canis = mkN "koira" ;
+}
diff --git a/examples/regulus/toy0/no-functor/Toy0Fin0.gf b/examples/regulus/toy0/no-functor/Toy0Fin0.gf
deleted file mode 100644
index 9a1875124..000000000
--- a/examples/regulus/toy0/no-functor/Toy0Fin0.gf
+++ /dev/null
@@ -1,16 +0,0 @@
---# -path=..:present:prelude
-
-concrete Toy0Fin0 of Toy0 = open SyntaxFin, ParadigmsFin in {
-
-lincat
-  Spec = Det ;
-  Noun = N ;
-  NP   = Utt ;
-lin
-  SpecNoun spec noun = mkUtt (SyntaxFin.mkNP spec noun) ;
-
-  One = mkDet one_Quant ;
-  Two = mkDet (mkNum n2_Numeral) ;
-  Felis = mkN "kissa" ;
-  Canis = mkN "koira" ;
-}
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} ;
-- 
cgit v1.2.3