resources and new instantiation syntax

lib/resource/danish/MorphoDan.gf

@@ -72,12 +72,12 @@ oper
   mkVerb : (_,_,_,_,_,_ : Str) -> Verbum = 
     \spise,spiser,spises,spiste,spist,spis -> {s = table {
        VI (Inf v)       => mkVoice v spise ;
-       VF (Pres m Act)  => spiser ;
-       VF (Pres m Pass) => spises ;
-       VF (Pret m v)    => mkVoice v spiste ;
+       VF (Pres Act)    => spiser ;
+       VF (Pres Pass)   => spises ;
+       VF (Pret v)      => mkVoice v spiste ;
        VI (Supin v)     => mkVoice v spist ;
-       VI (PtPret c)    => mkCase spist ! c ;
-       VF Imper         => spis
+       VI (PtPret _ c)  => mkCase spist ! c ; ---- GenNum
+       VF (Imper v)     => mkVoice v spis
        }
      } ;
 

lib/resource/danish/RulesDan.gf

@@ -1,4 +1,4 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
-concrete RulesDan of Rules =
+concrete RulesDan of Rules = CategoriesDan **
   RulesScand with (SyntaxScand=SyntaxDan) ;

lib/resource/danish/SyntaxDan.gf

@@ -14,7 +14,6 @@ instance SyntaxDan of SyntaxScand = TypesDan **
   npMan : NounPhrase = nameNounPhrase (mkProperName "man" NUtr) ;
   npDet : NounPhrase = nameNounPhrase (mkProperName "det" NNeutr) ;
 
-
   mkAdjForm : Species -> Number -> NounGender -> AdjFormPos = \b,n,g -> 
     case <b,n> of {
       <Indef,Sg> => Strong (ASg (genNoun g)) ;
@@ -22,17 +21,6 @@ instance SyntaxDan of SyntaxScand = TypesDan **
       <Def,  _>  => Weak
       } ;
 
-  deponentVerb : Verb -> Verb = \finna -> {
-    s = table {
-      VF (Pres m _) => finna.s ! VF (Pres m Pass) ;
-      VF (Pret m _) => finna.s ! VF (Pret m Pass) ;
-      VI (Inf _)    => finna.s ! VI (Inf Pass) ;
-      VI (Supin _)  => finna.s ! VI (Supin Pass) ;
-      v             => finna.s ! v --- Imper !
-      } ;
-    s1 = finna.s1
-    } ;
-
   verbFinnas : Verb = 
     deponentVerb (mkVerb "finde" "finder" "findes" "fandt" "fundet" "find" ** {s1 = []}) ;
   verbVara = mkVerb "være" "er" nonExist "var" "været" "vær" ** {s1 = []} ;
@@ -112,10 +100,6 @@ instance SyntaxDan of SyntaxScand = TypesDan **
   mkDeterminerSgGender3 : Str -> Str -> Str -> SpeciesP -> Determiner = \en,_,ett -> 
     mkDeterminerSgGender (table {Utr => en ; Neutr => ett}) ;
 
-  adjPastPart : Verb -> Adjective = \verb -> {
-    s = \\af,c => verb.s1 ++ verb.s ! VI (PtPret c) ---- af
-    } ;
-
   reflPron : Number -> Person -> Str = \n,p -> case <n,p> of {
     <Sg,P1> => "mig" ;
     <Sg,P2> => "dig" ;

lib/resource/danish/TestResourceDan.gf

@@ -1,6 +1,6 @@
 --# -path=.:../scandinavian:../abstract:../../prelude
 
-concrete TestResourceDan of TestResource = RulesDan, StructuralDan ** 
+concrete TestResourceDan of TestResource = RulesDan, ClauseDan, StructuralDan ** 
   open Prelude, MorphoDan, SyntaxDan in {
 
 flags startcat=Phr ; lexer=text ; unlexer=text ;

lib/resource/danish/TypesDan.gf

@@ -23,14 +23,4 @@ oper
 param
   AdjFormPos = Strong GenNum | Weak ;
 
-  VFin = 
-   Pres Mode Voice
- | Pret Mode Voice
- | Imper ;         --- no passive
- 
-  VInf =
-   Inf Voice
- | Supin Voice
- | PtPret Case ;  ---- number and gender
-
 }