From 14fc5cdb632c0ee31fbaaf9a32a6ad877ac70015 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 7 Nov 2022 23:18:43 +0100 Subject: [PATCH] dictionary: Fix failure to look back Firstly, a ~ match is supposed to match even if there's nothing left. Also, when p doesn't match, we should not return immediately, but skip to the next group. Fixes #1507 --- src/libespeak-ng/dictionary.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libespeak-ng/dictionary.c b/src/libespeak-ng/dictionary.c index 56471e89..17c3580e 100644 --- a/src/libespeak-ng/dictionary.c +++ b/src/libespeak-ng/dictionary.c @@ -695,6 +695,10 @@ static int IsLetterGroup(Translator *tr, char *word, int group, int pre) return -1; while (*p != RULE_GROUP_END) { + // If '~' (no character) is allowed in group, return 0. + if (*p == '~') + return 0; + if (pre) { len = strlen(p); w = word; @@ -702,16 +706,12 @@ static int IsLetterGroup(Translator *tr, char *word, int group, int pre) { w--; if (*w == 0) - // Not found - return -1; + // Not found, skip the rest of this group. + goto skip; } } else w = word; - // If '~' (no character) is allowed in group, return 0. - if (*p == '~') - return 0; - // Check current group while ((*p == *w) && (*w != 0)) { w++; @@ -724,6 +724,7 @@ static int IsLetterGroup(Translator *tr, char *word, int group, int pre) } // No match, so skip the rest of this group. +skip: while (*p++ != 0) ; }