msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

corrected conjunction of APs

Browse Source
This commit is contained in:
lizazim
2020-02-17 17:24:59 +02:00
committed by GitHub
parent 5353b8082b
commit 7b1587a735
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/japanese/ConjunctionJpn.gf
View File

@@ -328,6 +328,21 @@ concrete ConjunctionJpn of Conjunction = CatJpn ** open ResJpn, Prelude in {
prepositive = \\st => x.prepositive ! st ++ y.prepositive ! st prepositive = \\st => x.prepositive ! st ++ y.prepositive ! st
} ; } ;
ConsAP x xs = {
s1and = x.te ;
s1or = \\st => table {
Pos => x.dropNaEnging ! st ++ "か" ;
Neg => x.pred ! Plain ! TPres ! Neg ++ "か"
} ;
s2pred = \\st,t,p => xs.s1and ! st ! p ++ xs.s2pred ! st ! t ! p ;
s2attr = \\st => xs.s1and ! st ! Pos ++ xs.s2attr ! st ;
s2te = \\st,p => xs.s1and ! st ! p ++ xs.s2te ! st ! p ;
s2ba = \\st,p => xs.s1and ! st ! p ++ xs.s2ba ! st ! p ;
s2adv = \\st => xs.s1and ! st ! Pos ++ xs.s2adv ! st ;
s2dropNaEnging = xs.s2dropNaEnging ;
prepositive = \\st => x.prepositive ! st ++ xs.prepositive ! st
} ;
{-
ConsAP x xs = { ConsAP x xs = {
s1and = \\st,p => xs.s1and ! st ! p ++ xs.s2te ! st ! p ; s1and = \\st,p => xs.s1and ! st ! p ++ xs.s2te ! st ! p ;
s1or = \\st => table { s1or = \\st => table {
@@ -342,7 +357,7 @@ concrete ConjunctionJpn of Conjunction = CatJpn ** open ResJpn, Prelude in {
s2dropNaEnging = x.dropNaEnging ; s2dropNaEnging = x.dropNaEnging ;
prepositive = \\st => x.prepositive ! st ++ xs.prepositive ! st prepositive = \\st => x.prepositive ! st ++ xs.prepositive ! st
} ; } ;
-}
BaseIAdv x y = { BaseIAdv x y = {
s = \\st => x.s ! st ++ x.particle ++ y.s ! st ; s = \\st => x.s ! st ++ x.particle ++ y.s ! st ;
particle = y.particle ; particle = y.particle ;