Rewriting with interface to resource.

4 files changed, 45 insertions, 96 deletions

diff --git a/grammars/database/DatabaseEng.gf b/grammars/database/DatabaseEng.gf
index 47c4a9261..20cf408eb 100644
--- a/grammars/database/DatabaseEng.gf
+++ b/grammars/database/DatabaseEng.gf
@@ -1,43 +1,3 @@
 --# -path=.:../newresource/abstract:../newresource/english:../prelude
 
-concrete DatabaseEng of Database = open Prelude, ResourceEng in {
-
-flags lexer=text ; unlexer=text ;
-
-lincat 
-  Query      = Phr ;
-  Subject    = NP ;
-  Category   = CN ;  
-  Property   = AP ;
-  Comparison = AdjDeg ;
-  Relation   = Adj2 ;
-  Feature    = Fun ;
-  Value      = NP ;
-  Name       = PN ;
-
-lin
-  WhichAre A B = QuestPhrase (IntVP (NounIPMany A) (PosVG (PredAP B))) ;
-  IsThere A = QuestPhrase (IsThereNP (IndefOneNP A)) ;
-  AreThere A = QuestPhrase (IsThereNP (IndefManyNP NoNum A)) ;
-  WhatIs val = QuestPhrase (IntVP WhatOne (PosVG (PredNP val))) ;
-  IsIt Q A = QuestPhrase (QuestVP Q (PosVG (PredAP A))) ;
-
-  MoreThan   = ComparAdjP ;
-  TheMost    = SuperlNP ;
-  Relatively C _ = PositAdjP C ; 
-
-  RelatedTo  = ComplAdj ;
-
-  FeatureOf f x = DefOneNP (AppFun f x) ;
-  ValueOf f x = DefOneNP (AppFun f (UsePN x)) ;
-
-  WithProperty A B = ModAdj B A ;
-
-  Individual = UsePN ;
-
-  AllN = DetNP (AllsDet NoNum) ;
-  MostN = DetNP MostsDet ;
-  EveryN = DetNP EveryDet ;
-  Any = DetNP (AnysDet NoNum) ;
-
-} ;
+concrete DatabaseEng of Database = DatabaseI with (Resource=ResourceEng) ;
diff --git a/grammars/database/DatabaseEngRes.gf b/grammars/database/DatabaseEngRes.gf
deleted file mode 100644
index e00501a47..000000000
--- a/grammars/database/DatabaseEngRes.gf
+++ /dev/null
@@ -1,11 +0,0 @@
-resource DatabaseEngRes = open Prelude in {
-oper
-  mkSent : SS -> SS -> SS1 Bool = \long, short -> 
-    {s = table {b => if_then_else Str b long.s short.s}} ;
-
-  mkSentPrel : Str -> SS -> SS1 Bool = \prel, matter -> 
-    mkSent (ss (prel ++ matter.s)) matter ;
-
-  mkSentSame : SS -> SS1 Bool = \s -> 
-    mkSent s s ;
-} ;
diff --git a/grammars/database/DatabaseI.gf b/grammars/database/DatabaseI.gf
new file mode 100644
index 000000000..5afeda711
--- /dev/null
+++ b/grammars/database/DatabaseI.gf
@@ -0,0 +1,43 @@
+--# -path=.:../newresource/abstract:../prelude
+
+incomplete concrete DatabaseI of Database = open Prelude, Resource in {
+
+flags lexer=text ; unlexer=text ;
+
+lincat 
+  Query      = Phr ;
+  Subject    = NP ;
+  Category   = CN ;  
+  Property   = AP ;
+  Comparison = AdjDeg ;
+  Relation   = Adj2 ;
+  Feature    = Fun ;
+  Value      = NP ;
+  Name       = PN ;
+
+lin
+  WhichAre A B = QuestPhrase (IntVP (NounIPMany A) (PosVG (PredAP B))) ;
+  IsThere A = QuestPhrase (IsThereNP (IndefOneNP A)) ;
+  AreThere A = QuestPhrase (IsThereNP (IndefManyNP NoNum A)) ;
+  WhatIs val = QuestPhrase (IntVP WhatOne (PosVG (PredNP val))) ;
+  IsIt Q A = QuestPhrase (QuestVP Q (PosVG (PredAP A))) ;
+
+  MoreThan   = ComparAdjP ;
+  TheMost    = SuperlNP ;
+  Relatively C _ = PositAdjP C ; 
+
+  RelatedTo  = ComplAdj ;
+
+  FeatureOf f x = DefOneNP (AppFun f x) ;
+  ValueOf f x = DefOneNP (AppFun f (UsePN x)) ;
+
+  WithProperty A B = ModAdj B A ;
+
+  Individual = UsePN ;
+
+  AllN = DetNP (AllsDet NoNum) ;
+  MostN = DetNP MostsDet ;
+  EveryN = DetNP EveryDet ;
+  Any = DetNP (AnysDet NoNum) ;
+
+} ;
diff --git a/grammars/database/DatabaseSwe.gf b/grammars/database/DatabaseSwe.gf
index d872d14dd..618b9022b 100644
--- a/grammars/database/DatabaseSwe.gf
+++ b/grammars/database/DatabaseSwe.gf
@@ -1,46 +1,3 @@
 --# -path=.:../newresource/abstract:../newresource/swedish:../prelude
 
---- This is actually the same set of definitions as in DatabaseEng. So
---- we could use an interface instead of ResourceSwe.
-
-concrete DatabaseSwe of Database = open Prelude, ResourceSwe in {
-
-flags lexer=text ; unlexer=text ;
-
-lincat 
-  Query      = Phr ;
-  Subject    = NP ;
-  Category   = CN ;  
-  Property   = AP ;
-  Comparison = AdjDeg ;
-  Relation   = Adj2 ;
-  Feature    = Fun ;
-  Value      = NP ;
-  Name       = PN ;
-
-lin
-  WhichAre A B = QuestPhrase (IntVP (NounIPMany A) (PosVG (PredAP B))) ;
-  IsThere A = QuestPhrase (IsThereNP (IndefOneNP A)) ;
-  AreThere A = QuestPhrase (IsThereNP (IndefManyNP NoNum A)) ;
-  WhatIs val = QuestPhrase (IntVP WhatOne (PosVG (PredNP val))) ;
-  IsIt Q A = QuestPhrase (QuestVP Q (PosVG (PredAP A))) ;
-
-  MoreThan   = ComparAdjP ;
-  TheMost    = SuperlNP ;
-  Relatively C _ = PositAdjP C ; 
-
-  RelatedTo  = ComplAdj ;
-
-  FeatureOf f x = DefOneNP (AppFun f x) ;
-  ValueOf f x = DefOneNP (AppFun f (UsePN x)) ;
-
-  WithProperty A B = ModAdj B A ;
-
-  Individual = UsePN ;
-
-  AllN = DetNP (AllsDet NoNum) ;
-  MostN = DetNP MostsDet ;
-  EveryN = DetNP EveryDet ;
-  Any = DetNP (AnysDet NoNum) ;
-
-} ;
+concrete DatabaseSwe of Database = DatabaseI with (Resource=ResourceSwe) ;