commit 8a11e1d16e90d93287570d5d5dc4df8e10406918 from: Vidar Hokstad date: Sat Jan 28 05:34:43 2017 UTC Refactoring commit - 98c5986aa73a3b9a022f626c08a47555f66e9fa8 commit + 8a11e1d16e90d93287570d5d5dc4df8e10406918 blob - c7b34cadcb1735b4e4f7c109dc744eff1c0730f3 blob + aa0ac33958369f9051b949ec7a7eceafcb41f317 --- src/sam.c +++ src/sam.c @@ -236,26 +236,21 @@ void CopyStress() { unsigned char Y; while((Y = phonemeindex[pos]) != 255) { // if CONSONANT_FLAG set, skip - only vowels get stress - if ((flags[Y] & 64) == 0) {pos++; continue;} - Y = phonemeindex[pos+1]; - if (Y == 255) //prevent buffer overflow - { - pos++; continue; - } - // if the following phoneme is a vowel, skip - if ((flags[Y] & 128) == 0) {pos++; continue;} + if (flags[Y] & 64) { + Y = phonemeindex[pos+1]; - // get the stress value at the next position - Y = stress[pos+1]; + // if the following phoneme is the end, or a vowel, skip + if (Y != 255 && (flags[Y] & 128) != 0) { + // get the stress value at the next position + Y = stress[pos+1]; + if (Y && !(Y&128)) { + // if next phoneme is stressed, and a VOWEL OR ER + // copy stress from next phoneme to this one + stress[pos] = Y+1; + } + } + } - // if next phoneme is not stressed, skip - if (Y == 0) {pos++; continue;} - // if next phoneme is not a VOWEL OR ER, skip - if ((Y & 128) != 0) {pos++; continue;} - - // copy stress from prior phoneme to this one - stress[pos] = Y+1; - ++pos; } }