From 6eaee8e4c1a7543c3ddefe73d4af902825558f6d Mon Sep 17 00:00:00 2001 From: Krasimir Angelov Date: Mon, 2 Jul 2018 11:55:13 +0200 Subject: [PATCH] remove the ResBul.comma and use Prelude.bindComma --- src/bulgarian/ExtendBul.gf | 4 ++-- src/bulgarian/ExtraBul.gf | 4 ++-- src/bulgarian/NounBul.gf | 2 +- src/bulgarian/PhraseBul.gf | 2 +- src/bulgarian/ResBul.gf | 1 - src/bulgarian/SentenceBul.gf | 6 +++--- src/bulgarian/SymbolBul.gf | 2 +- src/bulgarian/VerbBul.gf | 4 ++-- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/bulgarian/ExtendBul.gf b/src/bulgarian/ExtendBul.gf index c4d32114c..2797f4fcd 100644 --- a/src/bulgarian/ExtendBul.gf +++ b/src/bulgarian/ExtendBul.gf @@ -115,7 +115,7 @@ lincat lin 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} ; @@ -182,7 +182,7 @@ 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 = { s = \\role => let s = det.s ! False ! (AMasc Human) ! role diff --git a/src/bulgarian/ExtraBul.gf b/src/bulgarian/ExtraBul.gf index 6d68164c9..ed26dc68a 100644 --- a/src/bulgarian/ExtraBul.gf +++ b/src/bulgarian/ExtraBul.gf @@ -62,7 +62,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul ** lin 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} ; ConjVPI conj vpi = { @@ -77,7 +77,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul ** lin 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} ; diff --git a/src/bulgarian/NounBul.gf b/src/bulgarian/NounBul.gf index 5da36978d..9aecbfe0b 100644 --- a/src/bulgarian/NounBul.gf +++ b/src/bulgarian/NounBul.gf @@ -80,7 +80,7 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in { } ; ExtAdvNP np adv = { - s = \\c => np.s ! c ++ comma ++ adv.s ; + s = \\c => np.s ! c ++ bindComma ++ adv.s ; a = np.a ; p = np.p } ; diff --git a/src/bulgarian/PhraseBul.gf b/src/bulgarian/PhraseBul.gf index d621eac59..cd0722695 100644 --- a/src/bulgarian/PhraseBul.gf +++ b/src/bulgarian/PhraseBul.gf @@ -26,5 +26,5 @@ concrete PhraseBul of Phrase = CatBul ** open Prelude, ResBul in { PConjConj conj = {s = conj.s ++ linCoord!conj.conj} ; NoVoc = {s = []} ; - VocNP np = {s = comma ++ np.s ! RVoc} ; + VocNP np = {s = bindComma ++ np.s ! RVoc} ; } diff --git a/src/bulgarian/ResBul.gf b/src/bulgarian/ResBul.gf index cae9fc9e3..cbe42c4e4 100644 --- a/src/bulgarian/ResBul.gf +++ b/src/bulgarian/ResBul.gf @@ -792,7 +792,6 @@ resource ResBul = ParamX ** open Prelude, Predef in { linCoordSep : Str -> Bool => Ints 3 => Str ; linCoordSep s = table {True => linCoord; False=> \\_ => s} ; - comma : Str = SOFT_BIND ++ "," ; hyphen : Str = SOFT_BIND ++ "-" ++ SOFT_BIND ; reflPron : AForm => Str = diff --git a/src/bulgarian/SentenceBul.gf b/src/bulgarian/SentenceBul.gf index 169740481..3514e4cb9 100644 --- a/src/bulgarian/SentenceBul.gf +++ b/src/bulgarian/SentenceBul.gf @@ -70,10 +70,10 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in { 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} ; - 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}} ; } diff --git a/src/bulgarian/SymbolBul.gf b/src/bulgarian/SymbolBul.gf index 274a67c44..89ce5d193 100644 --- a/src/bulgarian/SymbolBul.gf +++ b/src/bulgarian/SymbolBul.gf @@ -53,6 +53,6 @@ lin MkSymb s = s ; BaseSymb = infixSS "è" ; - ConsSymb = infixSS comma ; + ConsSymb = infixSS bindComma ; } diff --git a/src/bulgarian/VerbBul.gf b/src/bulgarian/VerbBul.gf index 14b67f269..e8d549bc8 100644 --- a/src/bulgarian/VerbBul.gf +++ b/src/bulgarian/VerbBul.gf @@ -23,7 +23,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in { }) vp.p (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) ; 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) ; -- 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 SlashV2Q v q = insertSlashObj2 (\\_ => q.s ! QDir) Pos (slashV v v.c2 False) ;