1
0
forked from GitHub/gf-rgl

remove the ResBul.comma and use Prelude.bindComma

This commit is contained in:
Krasimir Angelov
2018-07-02 11:55:13 +02:00
parent d7f9d9e828
commit 6eaee8e4c1
8 changed files with 12 additions and 13 deletions

View File

@@ -115,7 +115,7 @@ lincat
lin lin
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ; BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
ConsVPS x xs = {s = \\d,t,a=>x.s!a++(linCoordSep ResBul.comma)!d!t++xs.s!d!t!a} ; ConsVPS x xs = {s = \\d,t,a=>x.s!a++(linCoordSep bindComma)!d!t++xs.s!d!t!a} ;
PredVPS np vps = {s = np.s ! RSubj ++ vps.s ! np.a} ; PredVPS np vps = {s = np.s ! RSubj ++ vps.s ! np.a} ;
@@ -182,7 +182,7 @@ lin
} ; } ;
lin lin
ApposNP np1 np2 = {s = \\role => np1.s ! role ++ comma ++ np2.s ! role; a = np1.a; p = np1.p} ; ApposNP np1 np2 = {s = \\role => np1.s ! role ++ bindComma ++ np2.s ! role; a = np1.a; p = np1.p} ;
DetNPMasc det = { DetNPMasc det = {
s = \\role => let s = det.s ! False ! (AMasc Human) ! role s = \\role => let s = det.s ! False ! (AMasc Human) ! role

View File

@@ -62,7 +62,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
lin lin
BaseVPI x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ; BaseVPI x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
ConsVPI x xs = {s = \\d,t,a=>x.s!a++(linCoordSep ResBul.comma)!d!t++xs.s!d!t!a} ; ConsVPI x xs = {s = \\d,t,a=>x.s!a++(linCoordSep bindComma)!d!t++xs.s!d!t!a} ;
MkVPI vp = {s = daComplex Simul Pos vp ! Perf} ; MkVPI vp = {s = daComplex Simul Pos vp ! Perf} ;
ConjVPI conj vpi = { ConjVPI conj vpi = {
@@ -77,7 +77,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
lin lin
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ; BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
ConsVPS x xs = {s = \\d,t,a=>x.s!a++(linCoordSep ResBul.comma)!d!t++xs.s!d!t!a} ; ConsVPS x xs = {s = \\d,t,a=>x.s!a++(linCoordSep bindComma)!d!t++xs.s!d!t!a} ;
PredVPS np vps = {s = np.s ! RSubj ++ vps.s ! np.a} ; PredVPS np vps = {s = np.s ! RSubj ++ vps.s ! np.a} ;

View File

@@ -80,7 +80,7 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
} ; } ;
ExtAdvNP np adv = { ExtAdvNP np adv = {
s = \\c => np.s ! c ++ comma ++ adv.s ; s = \\c => np.s ! c ++ bindComma ++ adv.s ;
a = np.a ; a = np.a ;
p = np.p p = np.p
} ; } ;

View File

@@ -26,5 +26,5 @@ concrete PhraseBul of Phrase = CatBul ** open Prelude, ResBul in {
PConjConj conj = {s = conj.s ++ linCoord!conj.conj} ; PConjConj conj = {s = conj.s ++ linCoord!conj.conj} ;
NoVoc = {s = []} ; NoVoc = {s = []} ;
VocNP np = {s = comma ++ np.s ! RVoc} ; VocNP np = {s = bindComma ++ np.s ! RVoc} ;
} }

View File

@@ -792,7 +792,6 @@ resource ResBul = ParamX ** open Prelude, Predef in {
linCoordSep : Str -> Bool => Ints 3 => Str ; linCoordSep : Str -> Bool => Ints 3 => Str ;
linCoordSep s = table {True => linCoord; False=> \\_ => s} ; linCoordSep s = table {True => linCoord; False=> \\_ => s} ;
comma : Str = SOFT_BIND ++ "," ;
hyphen : Str = SOFT_BIND ++ "-" ++ SOFT_BIND ; hyphen : Str = SOFT_BIND ++ "-" ++ SOFT_BIND ;
reflPron : AForm => Str = reflPron : AForm => Str =

View File

@@ -70,10 +70,10 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
c2 = cl.c2 c2 = cl.c2
} ; } ;
ExtAdvS a s = {s = a.s ++ comma ++ s.s} ; ExtAdvS a s = {s = a.s ++ bindComma ++ s.s} ;
AdvS a s = {s = a.s ++ s.s} ; AdvS a s = {s = a.s ++ s.s} ;
SSubjS a s b = {s = a.s ++ comma ++ s.s ++ b.s} ; SSubjS a s b = {s = a.s ++ bindComma ++ s.s ++ b.s} ;
RelS s r = {s = s.s ++ comma ++ r.s ! {gn=gennum ANeut Sg; p=P3}} ; RelS s r = {s = s.s ++ bindComma ++ r.s ! {gn=gennum ANeut Sg; p=P3}} ;
} }

View File

@@ -53,6 +53,6 @@ lin
MkSymb s = s ; MkSymb s = s ;
BaseSymb = infixSS "è" ; BaseSymb = infixSS "è" ;
ConsSymb = infixSS comma ; ConsSymb = infixSS bindComma ;
} }

View File

@@ -23,7 +23,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
}) vp.p }) vp.p
(predV vv) ; (predV vv) ;
ComplVS v s = insertObj (\\_ => comma ++ "֌" ++ s.s) Pos (predV v) ; ComplVS v s = insertObj (\\_ => bindComma ++ "֌" ++ s.s) Pos (predV v) ;
ComplVQ v q = insertObj (\\_ => q.s ! QDir) Pos (predV v) ; ComplVQ v q = insertObj (\\_ => q.s ! QDir) Pos (predV v) ;
ComplVA v ap = ComplVA v ap =
@@ -34,7 +34,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
insertSlashObj2 (\\a => v.c3.s ++ ap.s ! aform a.gn Indef (RObj Acc) ! a.p) Pos (slashV v v.c2 v.subjCtrl) ; insertSlashObj2 (\\a => v.c3.s ++ ap.s ! aform a.gn Indef (RObj Acc) ! a.p) Pos (slashV v v.c2 v.subjCtrl) ;
-- test: I saw a boy to whom she said that they are here -- test: I saw a boy to whom she said that they are here
SlashV2S v s = insertSlashObj2 (\\_ => comma ++ "֌" ++ s.s) Pos (slashV v v.c2 False) ; SlashV2S v s = insertSlashObj2 (\\_ => bindComma ++ "֌" ++ s.s) Pos (slashV v v.c2 False) ;
-- test: I saw a boy whom she asked who is here -- test: I saw a boy whom she asked who is here
SlashV2Q v q = insertSlashObj2 (\\_ => q.s ! QDir) Pos (slashV v v.c2 False) ; SlashV2Q v q = insertSlashObj2 (\\_ => q.s ! QDir) Pos (slashV v v.c2 False) ;