From 1a338ea034fecaee06627feff2939358fd230c86 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Mon, 7 May 2018 16:30:20 +0200 Subject: [PATCH] (Dut) Replace "," with bindComma in several places --- src/dutch/NounDut.gf | 2 +- src/dutch/PhraseDut.gf | 2 +- src/dutch/SentenceDut.gf | 6 +++--- src/dutch/SymbolDut.gf | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dutch/NounDut.gf b/src/dutch/NounDut.gf index c38998e8..ad1f04f1 100644 --- a/src/dutch/NounDut.gf +++ b/src/dutch/NounDut.gf @@ -178,7 +178,7 @@ concrete NounDut of Noun = CatDut ** open ResDut, Prelude in { } ; RelNP np rs = heavyNP { - s = \\c => np.s ! c ++ "," ++ rs.s ! np.a.g ! np.a.n ; + s = \\c => np.s ! c ++ embedInCommas (rs.s ! np.a.g ! np.a.n) ; a = np.a } ; diff --git a/src/dutch/PhraseDut.gf b/src/dutch/PhraseDut.gf index c1519f63..9ab4647d 100644 --- a/src/dutch/PhraseDut.gf +++ b/src/dutch/PhraseDut.gf @@ -29,6 +29,6 @@ concrete PhraseDut of Phrase = CatDut ** open Prelude, ResDut in PConjConj conj = ss (conj.s2) ; NoVoc = {s = []} ; - VocNP np = {s = "," ++ np.s ! NPNom} ; + VocNP np = {s = bindComma ++ np.s ! NPNom} ; } diff --git a/src/dutch/SentenceDut.gf b/src/dutch/SentenceDut.gf index c2e704aa..2da54f6d 100644 --- a/src/dutch/SentenceDut.gf +++ b/src/dutch/SentenceDut.gf @@ -68,10 +68,10 @@ concrete SentenceDut of Sentence = CatDut ** open ResDut, Prelude in { } ; AdvS a s = {s = \\o => a.s ++ s.s ! Inv} ; - ExtAdvS a s = {s = \\o => a.s ++ "," ++ s.s ! Inv} ; + ExtAdvS a s = {s = \\o => a.s ++ bindComma ++ s.s ! Inv} ; - RelS s r = {s = \\o => s.s ! o ++ "," ++ r.s ! Neutr ! Sg} ; + RelS s r = {s = \\o => s.s ! o ++ bindComma ++ r.s ! Neutr ! Sg} ; - SSubjS a s b = {s = \\o => a.s ! o ++ "," ++ s.s ++ b.s ! Sub} ; + SSubjS a s b = {s = \\o => a.s ! o ++ bindComma ++ s.s ++ b.s ! Sub} ; } diff --git a/src/dutch/SymbolDut.gf b/src/dutch/SymbolDut.gf index 339dc078..2b1b95db 100644 --- a/src/dutch/SymbolDut.gf +++ b/src/dutch/SymbolDut.gf @@ -41,7 +41,7 @@ lin MkSymb s = s ; BaseSymb = infixSS "en" ; - ConsSymb = infixSS "," ; + ConsSymb = infixSS bindComma ; oper artDef : Number -> Gender -> Str = \n,g -> case of { => "het" ; _ => "de"} ;