reflexive and deponent as verb features added

lib/resource-1.0/scandinavian/DiffScand.gf

@@ -25,8 +25,8 @@ interface DiffScand = open ResScand, Prelude in {
 
     artIndef : Gender => Str ;
 
-    verbHave : {s : VForm => Str} ;
-    verbBe   : {s : VForm => Str} ;
+    verbHave : {s : VForm => Str ; vtype : VType} ;
+    verbBe   : {s : VForm => Str ; vtype : VType} ;
 
     auxFut : Str ;
     auxCond : Str ;
@@ -67,9 +67,13 @@ interface DiffScand = open ResScand, Prelude in {
 
    predV : Verb -> VP = \verb -> 
     let
-      vfin : Tense -> Str = \t -> verb.s ! vFin t Act ;
-      vsup = verb.s ! VI (VSupin Act) ;  
-      vinf = verb.s ! VI (VInfin Act) ;
+      diath = case verb.vtype of {
+        VPass => Pass ;
+        _ => Act
+        } ;
+      vfin : Tense -> Str = \t -> verb.s ! vFin t diath ;
+      vsup = verb.s ! VI (VSupin diath) ;  
+      vinf = verb.s ! VI (VInfin diath) ;
 
       har : Tense -> Str = \t -> verbHave.s ! vFin t Act ;
       ha  : Str = verbHave.s ! VI (VInfin Act) ;
@@ -90,16 +94,20 @@ interface DiffScand = open ResScand, Prelude in {
         Fut  => vf auxFut (ha ++ vsup) ;
         Cond => vf auxCond (ha ++ vsup) 
         } ;
-      VPImperat => vf (verb.s ! VF (VImper Act)) [] ;
+      VPImperat => vf (verb.s ! VF (VImper diath)) [] ;
       VPInfinit Simul => vf [] vinf ;
       VPInfinit Anter => vf [] (ha ++ vsup)
       } ;
     a1  : Polarity => Str = negation ;
-    n2  : Agr  => Str = \\_ => [] ;
+    n2  : Agr  => Str = \\a => case verb.vtype of {
+      VRefl => reflPron a ;
+      _ => []
+      } ;
     a2  : Str = [] ;
     ext : Str = [] ;
     en2,ea2,eext : Bool = False   -- indicate if the field exists
     } ;
 
+reflPron : Agr -> Str ;
 
 }

lib/resource-1.0/scandinavian/ParamScand.gf

@@ -42,6 +42,8 @@ param
    | VPImperat
    | VPInfinit Anteriority ;
 
+  VType = VAct | VPass | VRefl ;
+
   NPForm = NPNom | NPAcc | NPPoss GenNum ;
 ---  AdjPronForm = APron GenNum Case ;
 ---  AuxVerbForm = AuxInf | AuxPres | AuxPret | AuxSup ;

lib/resource-1.0/scandinavian/ResScand.gf

@@ -38,7 +38,7 @@ resource ResScand = ParamScand ** open Prelude in {
       } 
     } ;
 
-  mkVerb : (x1,_,_,_,_,_,_,x8 : Str) -> {s : VForm => Str} = 
+  mkVerb : (x1,_,_,_,_,_,_,x8 : Str) -> {s : VForm => Str ; vtype : VType} = 
    \finna,finner,finn,fann,funnit,funnen,funnet,funna -> {
    s = table {
     VF (VPres Act)  => finner ;
@@ -48,7 +48,8 @@ resource ResScand = ParamScand ** open Prelude in {
     VI (VInfin v)   => mkVoice v finna ;
     VI (VSupin v)   => mkVoice v funnit ;
     VI (VPtPret a c)=> mkCase c (mkAdjPos a funnen funnet funna funna)
-    }
+    } ;
+   vtype = VAct
    } ;
 
 -- These are useful auxiliaries.
@@ -81,29 +82,6 @@ resource ResScand = ParamScand ** open Prelude in {
       }
     } ;
 
---    mkAdjective : (_,_,_,_ : Str) -> {s : AForm => Str} = 
---      \good,better,best,well -> {
---      s = table {
---        AAdj Posit  => good ;
---        AAdj Compar => better ;
---        AAdj Superl => best ;
---        AAdv        => well
---        }
---      } ;
---
---    mkVerb : (_,_,_,_,_ : Str) -> {s : VForm => Str} = 
---      \go,goes,went,gone,going -> {
---      s = table {
---        VInf   => go ;
---        VPres  => goes ;
---        VPast  => went ;
---        VPPart => gone ;
---        VPresPart => going
---        }
---      } ;
---
---    mkIP : (i,me,my : Str) -> Number -> {s : Case => Str ; n : Number} =
---     \i,me,my,n -> let who = mkNP i me my n P3 in {s = who.s ; n = n} ;
 
 -- For $Noun$.
 
@@ -137,7 +115,8 @@ resource ResScand = ParamScand ** open Prelude in {
 -- For $Verb$.
 
   Verb : Type = {
-    s : VForm => Str
+    s : VForm => Str ;
+    vtype : VType
     } ;
 
   VP = {
@@ -187,51 +166,9 @@ resource ResScand = ParamScand ** open Prelude in {
     eext = vp.eext
     } ;
 
---  presVerb : {s : VForm => Str} -> Agr -> Str = \verb -> 
---    agrVerb (verb.s ! VPres) (verb.s ! VInf) ;
-
   infVP : VP -> Agr -> Str = \vp,a -> 
     (vp.s ! VPInfinit Simul).inf ++ vp.n2 ! a ++ vp.a2 ++ vp.ext ; --- a1
 
---  agrVerb : Str -> Str -> Agr -> Str = \has,have,agr -> 
---    case agr of {
---      {n = Sg ; p = P3} => has ;
---      _                 => have
---      } ;
---
---  have   = agrVerb "has"     "have" ;
---  havent = agrVerb "hasn't"  "haven't" ;
---  does   = agrVerb "does"    "do" ;
---  doesnt = agrVerb "doesn't" "don't" ;
---
---  Aux = {pres,past : Polarity => Agr => Str ; inf,ppart : Str} ;
---
---  auxBe : Aux = {
---    pres = \\b,a => case <b,a> of {
---      <Pos,{n = Sg ; p = P1}> => "am" ; 
---      <Neg,{n = Sg ; p = P1}> => ["am not"] ; --- am not I
---      _ => agrVerb (posneg b "is")  (posneg b "are") a
---      } ;
---    past = \\b,a => agrVerb (posneg b "was") (posneg b "were") a ;
---    inf  = "be" ;
---    ppart = "been"
---    } ;
---
---  posneg : Polarity -> Str -> Str = \p,s -> case p of {
---    Pos => s ;
---    Neg => s + "n't"
---    } ;
---
---  conjThat : Str = "that" ;
---
---  reflPron : Agr => Str = table {
---    {n = Sg ; p = P1} => "myself" ;
---    {n = Sg ; p = P2} => "yourself" ;
---    {n = Sg ; p = P3} => "itself" ; ----
---    {n = Pl ; p = P1} => "ourselves" ;
---    {n = Pl ; p = P2} => "yourselves" ;
---    {n = Pl ; p = P3} => "themselves"
---    } ;
 
 -- For $Sentence$.
 
@@ -253,7 +190,6 @@ resource ResScand = ParamScand ** open Prelude in {
           }
     } ;
 
---
 ---- For $Numeral$.
 --
 --  mkNum : Str -> Str -> Str -> Str -> {s : DForm => CardOrd => Str} = 

lib/resource-1.0/scandinavian/VerbScand.gf

@@ -35,6 +35,6 @@ incomplete concrete VerbScand of Verb = CatScand ** open DiffScand, ResScand in
     PassV2 v = {s = \\_ => v.s ! VPPart} ;
 -}
 
-    UseVS, UseVQ = \vv -> {s = vv.s ; c2 = []} ;
+    UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; vtype = vv.vtype} ;
 
 }