From e8d082fb82f7912bc51ea8e2b3d9430e24388f3b Mon Sep 17 00:00:00 2001
From: bringert <unknown>
Date: Thu, 10 Mar 2005 13:29:47 +0000
Subject: [PATCH] Disabled stoneage conjunction. Added optimize=share to
 stoneage grammars.

---
 examples/stoneage/Stoneage.gf    | 4 ++--
 examples/stoneage/StoneageEng.gf | 6 +++---
 examples/stoneage/StoneageSwe.gf | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/stoneage/Stoneage.gf b/examples/stoneage/Stoneage.gf
index decf9e71b..b735e4e8e 100644
--- a/examples/stoneage/Stoneage.gf
+++ b/examples/stoneage/Stoneage.gf
@@ -9,11 +9,11 @@ fun
 
   -- Sentence conjunction
 
-  AndS : S -> S -> S ;
+--  AndS : S -> S -> S ;
 
   -- NP conjunction
 
-  AndNP : NP -> NP -> NP ;
+--  AndNP : NP -> NP -> NP ;
 
   -- Actions with an object
 
diff --git a/examples/stoneage/StoneageEng.gf b/examples/stoneage/StoneageEng.gf
index 18d28dce3..225eb096a 100644
--- a/examples/stoneage/StoneageEng.gf
+++ b/examples/stoneage/StoneageEng.gf
@@ -4,7 +4,7 @@ concrete StoneageEng of Stoneage
   StoneageResEng in {
 
 flags
-  startcat=S;
+  startcat=S; optimize=share;
 
 lincat
   S = Phr ;
@@ -16,11 +16,11 @@ lin
 
   -- Sentence conjunction
 
-  AndS s1 s2 = { s = s1.s ++ and_Conj.s ++ s2.s } ** { lock_Phr = <> } ;
+--  AndS s1 s2 = { s = s1.s ++ and_Conj.s ++ s2.s } ** { lock_Phr = <> } ;
 
   -- NP conjunction
 
-  AndNP n1 n2 = ConjNP and_Conj (TwoNP n1 n2);
+--  AndNP n1 n2 = ConjNP and_Conj (TwoNP n1 n2);
 
 
   Drink = PresV2 (dirV2 drink_V) ;
diff --git a/examples/stoneage/StoneageSwe.gf b/examples/stoneage/StoneageSwe.gf
index 8fa50cf6b..fe082b052 100644
--- a/examples/stoneage/StoneageSwe.gf
+++ b/examples/stoneage/StoneageSwe.gf
@@ -3,7 +3,7 @@ concrete StoneageSwe of Stoneage
   = open SyntaxSwe, ResourceSwe, ParadigmsSwe, VerbsSwe, SwadeshLexSwe, StoneageResSwe in {
 
 flags
-  startcat=S;
+  startcat=S; optimize=share;
 
 lincat
   S = Phr ;
@@ -15,11 +15,11 @@ lin
 
   -- Sentence conjunction
 
-  AndS s1 s2 = { s = s1.s ++ and_Conj.s ++ s2.s } ** { lock_Phr = <> } ;
+--  AndS s1 s2 = { s = s1.s ++ and_Conj.s ++ s2.s } ** { lock_Phr = <> } ;
 
   -- NP conjunction
 
-  AndNP n1 n2 = ConjNP and_Conj (TwoNP n1 n2);
+--  AndNP n1 n2 = ConjNP and_Conj (TwoNP n1 n2);
 
   Drink = PresVasV2 drink_V ;
   Eat = PresVasV2 eat_V ;