1
0
forked from GitHub/gf-core

some bug fixes in Scand and Fin

This commit is contained in:
aarne
2013-11-03 11:37:08 +00:00
parent a0380013ba
commit 01a98d9a39
4 changed files with 9 additions and 8 deletions

View File

@@ -12,7 +12,7 @@ concrete SentenceFin of Sentence = CatFin ** open Prelude, ResFin, StemFin in {
s = \\pol,agr =>
let
verb = vp.s ! VIImper ! Simul ! pol ! agr ;
compl = vp.s2 ! False ! pol ! agr ++ vp.ext --- False = like inf (osta auto)
compl = vp.s2 ! False ! pol ! agr ++ vp.adv ! pol ++ vp.ext --- False = like inf (osta auto)
in
verb.fin ++ verb.inf ++ compl ;
} ;

View File

@@ -15,10 +15,10 @@ incomplete concrete VerbScand of Verb = CatScand ** open CommonScand, ResScand,
c2 = v.c2
} ;
ComplVV v vp = insertObj (\\a => v.c2.s ++ infVP vp a) (predV v) ;
ComplVS v s = insertObj (\\_ => conjThat ++ s.s ! Sub) (predV v) ;
ComplVQ v q = insertObj (\\_ => q.s ! QIndir) (predV v) ;
ComplVA v ap = insertObj (\\a => ap.s ! agrAdjNP a DIndef) (predV v) ;
ComplVV v vp = insertObjPost (\\a => v.c2.s ++ infVP vp a) (predV v) ;
ComplVS v s = insertObjPost (\\_ => conjThat ++ s.s ! Sub) (predV v) ;
ComplVQ v q = insertObjPost (\\_ => q.s ! QIndir) (predV v) ;
ComplVA v ap = insertObjPost (\\a => ap.s ! agrAdjNP a DIndef) (predV v) ;
SlashV2V v vp = predV v ** {
n3 = \\a => v.c3.s ++ infVP vp a ;

View File

@@ -3,6 +3,7 @@
concrete DictEngSwe of DictEngAbs = CatSwe
** open ParadigmsSwe, (L = LexiconSwe), (M = MakeStructuralSwe), DictSwe, (S = SyntaxSwe) in {
flags coding = utf8 ;
lin aardvark_N = jordsvin_nn_1_N ; -- status=guess
lin aback_Adv = mkAdv "bakåt" | mkAdv "back: baxna" | mkAdv "häpna" ; -- status=guess status=guess status=guess
@@ -12444,8 +12445,8 @@ lin leap_out_at_V2 = hoppa_oever_vbm_1_1_V2 ; -- comment=2
lin leap_upon_V2 = hoppa_oever_vbm_1_1_V2 ; -- comment=2
lin learn_V = erfara_vb_1_V ; -- comment=2
lin learn_V2 = L.learn_V2 ; -- comment=CHECKED
lin learn_VS = mkVS (mkV (mkV "lära") "sig") ; -- status=guess, src=wikt
lin learn_VV = mkVV (mkV (mkV "lära") "sig") ; -- status=guess, src=wikt
lin learn_VS = mkVS (lin V L.learn_V2) ; -- comment=CHECKED
lin learn_VV = mkVV (lin V L.learn_V2) ; -- comment=CHECKED
lin learning_N = laerdom_nn_1_1_N ; -- comment=2
lin lease_N = hyra_nn_1_N ; -- comment=6
lin leasehold_N = arrende_nn_1_N ; -- comment=1

View File

@@ -82,7 +82,7 @@ lin
(predVc v) ;
-}
ComplVV v ant pol vp = insertObj (\\a => v.c2.s ++ ant.s ++ pol.s ++ infVPPlus vp a ant.a pol.p) (predV v) ;
ComplVV v ant pol vp = insertObjPost (\\a => v.c2.s ++ ant.s ++ pol.s ++ infVPPlus vp a ant.a pol.p) (predV v) ;
{-