From 3b7feb88841d7b75392536a411fdd13e2c631578 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Sat, 14 Jun 2014 22:23:14 +0200
Subject: [PATCH] fix character label
---
alib2/src/label/LabelBase.cpp | 9 +++++++++
alib2/src/label/LabelBase.h | 4 ++++
alib2/src/label/LabelToStringComposer.cpp | 2 +-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/alib2/src/label/LabelBase.cpp b/alib2/src/label/LabelBase.cpp
index fffd790b9b..17db046d99 100644
--- a/alib2/src/label/LabelBase.cpp
+++ b/alib2/src/label/LabelBase.cpp
@@ -10,6 +10,7 @@
#include "StringLabel.h"
#include "IntegerLabel.h"
+#include "CharacterLabel.h"
namespace label {
@@ -25,6 +26,10 @@ bool LabelBase::operator<(const IntegerLabel& other) const {
return typeid(*this).before(typeid(other));
}
+bool LabelBase::operator<(const CharacterLabel& other) const {
+ return typeid(*this).before(typeid(other));
+}
+
bool LabelBase::operator>=(const LabelBase& other) const {
return !(*this < other);
}
@@ -45,6 +50,10 @@ bool LabelBase::operator==(const IntegerLabel&) const {
return false;
}
+bool LabelBase::operator==(const CharacterLabel&) const {
+ return false;
+}
+
std::ostream& operator<<(std::ostream& os, const LabelBase& label) {
label >> os;
return os;
diff --git a/alib2/src/label/LabelBase.h b/alib2/src/label/LabelBase.h
index 1246f79159..0ffa8f44c8 100644
--- a/alib2/src/label/LabelBase.h
+++ b/alib2/src/label/LabelBase.h
@@ -34,6 +34,8 @@ public:
virtual bool operator<(const IntegerLabel& other) const;
+ virtual bool operator<(const CharacterLabel& other) const;
+
virtual bool operator>(const LabelBase& other) const = 0;
@@ -50,6 +52,8 @@ public:
virtual bool operator==(const IntegerLabel& other) const;
+ virtual bool operator==(const CharacterLabel& other) const;
+
friend std::ostream& operator<<(std::ostream& os, const LabelBase& label);
virtual void operator>>(std::ostream&) const = 0;
diff --git a/alib2/src/label/LabelToStringComposer.cpp b/alib2/src/label/LabelToStringComposer.cpp
index dfb00fbb9d..0480d50a2f 100644
--- a/alib2/src/label/LabelToStringComposer.cpp
+++ b/alib2/src/label/LabelToStringComposer.cpp
@@ -26,7 +26,7 @@ void LabelToStringComposer::Visit(void* userData, const label::StringLabel& labe
std::string tmp = label.getData();
replace(tmp, "'", "\\'" );
- out << tmp;
+ out << '\'' << tmp << '\'';
}
void LabelToStringComposer::Visit(void* userData, const CharacterLabel& symbol) {
--
GitLab