mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-05 17:22:51 -06:00
fixes in Dut infinitive/extraposed word order. Not quite clear yet.
This commit is contained in:
@@ -63,7 +63,10 @@ concrete NounDut of Noun = CatDut ** open ResDut, Prelude in {
|
|||||||
a = quant.a
|
a = quant.a
|
||||||
in {
|
in {
|
||||||
s = \\g => quant.s ! num.isNum ! n ! g ++ num.s ;
|
s = \\g => quant.s ! num.isNum ! n ! g ++ num.s ;
|
||||||
sp = \\g => quant.sp ! n ! g ++ num.s ;
|
sp = \\g => case num.isNum of {
|
||||||
|
False => quant.sp ! n ! g ++ num.s ;
|
||||||
|
True => quant.s ! True ! n ! g ++ num.s
|
||||||
|
} ;
|
||||||
n = n ;
|
n = n ;
|
||||||
a = a
|
a = a
|
||||||
} ;
|
} ;
|
||||||
|
|||||||
@@ -659,7 +659,7 @@ param
|
|||||||
|
|
||||||
useInfVP : Bool -> VP -> Str = \isAux,vp ->
|
useInfVP : Bool -> VP -> Str = \isAux,vp ->
|
||||||
let vpi = infVP isAux vp in
|
let vpi = infVP isAux vp in
|
||||||
vpi.p1 ! agrP3 Sg ++ vpi.p3 ++ vpi.p2 ; -- TODO
|
vpi.p1 ! agrP3 Sg ++ vpi.p2 ++ vpi.p3 ; -- TODO
|
||||||
|
|
||||||
reflPron : Agr => Str = table {
|
reflPron : Agr => Str = table {
|
||||||
{n = Sg ; p = P1} => "me" ;
|
{n = Sg ; p = P1} => "me" ;
|
||||||
|
|||||||
@@ -7,13 +7,18 @@ concrete VerbDut of Verb = CatDut ** open Prelude, ResDut in {
|
|||||||
|
|
||||||
ComplVV v vp =
|
ComplVV v vp =
|
||||||
let
|
let
|
||||||
vpi = infVP v.isAux vp
|
vpv = predVGen v.isAux vp.negPos (v2v v) ;
|
||||||
|
vpi = infVP v.isAux vp ;
|
||||||
in
|
in
|
||||||
insertExtrapos vpi.p3 (
|
vpv ** {n2 = vpi.p1 ; inf = <vpi.p2, True> ; ext = vpi.p3} ; ----
|
||||||
|
|
||||||
|
{-
|
||||||
|
in
|
||||||
|
insertInf vpi.p3 (
|
||||||
insertInf vpi.p2 (
|
insertInf vpi.p2 (
|
||||||
insertObj vpi.p1 (
|
insertObj vpi.p1 (
|
||||||
predVGen v.isAux vp.negPos (v2v v)))) ; ---- subtyp
|
predVGen v.isAux vp.negPos (v2v v)))) ; ---- subtyp
|
||||||
|
-}
|
||||||
ComplVS v s =
|
ComplVS v s =
|
||||||
insertExtrapos (conjThat ++ s.s ! Sub) (predV v) ;
|
insertExtrapos (conjThat ++ s.s ! Sub) (predV v) ;
|
||||||
ComplVQ v q =
|
ComplVQ v q =
|
||||||
|
|||||||
Reference in New Issue
Block a user