Rewriting with interface to resource.

1 files changed, 1 insertions, 44 deletions

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) ;