scand questions

lib/resource-1.0/scandinavian/SentenceScand.gf

@@ -4,35 +4,36 @@ incomplete concrete SentenceScand of Sentence =
   flags optimize=all_subs ;
 
   lin
-    PredVP np vp = mkS (np.s ! nominative) np.a vp.s vp.a1 vp.n2 ;
+    PredVP np vp = mkClause (np.s ! nominative) np.a vp ;
+
+    PredSCVP sc vp = mkClause sc.s (agrP3 neutrum Sg) vp ;
+
+    ImpVP vp = {
+      s = \\pol,n => 
+        let 
+          agr   = {gn = gennum utrum n ; p = P2} ;
+          verb  = vp.s ! VPImperat ;
+        in
+        verb.fin ++ vp.a1 ! pol ++ verb.inf ++ vp.n2 ! agr ++ vp.a2 ++ vp.ext
+    } ;
+
+    SlashV2 np v2 = 
+      mkClause 
+        (np.s ! nominative) np.a 
+        (predV v2) **
+      {c2 = v2.c2} ;
+
+    SlashVVV2 np vv v2 = 
+      mkClause
+        (np.s ! nominative) np.a 
+        (insertObj (\\_ => vv.c2 ++ infVP (predV v2) np.a) (predV vv)) ** 
+      {c2 = v2.c2} ;
+
+    AdvSlash slash adv = {
+      s  = \\t,a,b,o => slash.s ! t ! a ! b ! o ++ adv.s ;
+      c2 = slash.c2
+    } ;
+
+    SlashPrep cl prep = cl ** {c2 = prep.s} ;
 
---    PredSCVP sc vp = mkS sc.s (agrP3 Sg) vp.s vp.s2 ;
---
---    ImpVP vp = {
---      s = \\pol,n => 
---        let 
---          agr   = {n = n ; p = P2} ;
---          verb  = infVP vp agr ;
---          dont  = case pol of {
---            Neg => "don't" ;
---            _ => []
---            }
---        in
---        dont ++ verb
---    } ;
---
---    SlashV2 np v2 = mkS (np.s ! Nom) np.a (predV v2).s (\\_ => []) **
---      {c2 = v2.c2} ;
---
---    SlashVVV2 np vv v2 = 
---      mkS (np.s ! Nom) np.a (predV vv).s (\\_ => "to" ++ v2.s ! VInf) **
---      {c2 = v2.c2} ;
---
---    AdvSlash slash adv = {
---      s  = \\t,a,b,o => slash.s ! t ! a ! b ! o ++ adv.s ;
---      c2 = slash.c2
---    } ;
---
---    SlashPrep cl prep = cl ** {c2 = prep.s} ;
---
 }