From 07748169215780349465f38be394fa53a2800d09 Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Wed, 1 Apr 2020 12:23:18 +0200
Subject: [PATCH] Fixed bug in Transition splitword where we used a non
utf8string
---
reading_machine/include/Action.hpp | 2 +-
reading_machine/src/Action.cpp | 2 +-
reading_machine/src/Transition.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/reading_machine/include/Action.hpp b/reading_machine/include/Action.hpp
index f2435e6..012af61 100644
--- a/reading_machine/include/Action.hpp
+++ b/reading_machine/include/Action.hpp
@@ -62,7 +62,7 @@ class Action
static Action attach(Object governorObject, int governorIndex, Object dependentObject, int dependentIndex);
static Action addCurCharToCurWord();
static Action ignoreCurrentCharacter();
- static Action consumeCharacterIndex(std::string consumed);
+ static Action consumeCharacterIndex(util::utf8string consumed);
static Action setMultiwordIds(int multiwordSize);
};
diff --git a/reading_machine/src/Action.cpp b/reading_machine/src/Action.cpp
index 47c5d20..e425740 100644
--- a/reading_machine/src/Action.cpp
+++ b/reading_machine/src/Action.cpp
@@ -72,7 +72,7 @@ Action Action::setMultiwordIds(int multiwordSize)
return {Type::Write, apply, undo, appliable};
}
-Action Action::consumeCharacterIndex(std::string consumed)
+Action Action::consumeCharacterIndex(util::utf8string consumed)
{
auto apply = [consumed](Config & config, Action &)
{
diff --git a/reading_machine/src/Transition.cpp b/reading_machine/src/Transition.cpp
index a8d3b33..0a9bb89 100644
--- a/reading_machine/src/Transition.cpp
+++ b/reading_machine/src/Transition.cpp
@@ -190,7 +190,7 @@ void Transition::initAddCharToWord()
void Transition::initSplitWord(std::vector<std::string> words)
{
- auto & consumedWord = words[0];
+ auto consumedWord = util::splitAsUtf8(words[0]);
sequence.emplace_back(Action::assertIsEmpty(Config::idColName));
sequence.emplace_back(Action::assertIsEmpty("FORM"));
sequence.emplace_back(Action::addLinesIfNeeded(words.size()));
--
GitLab