Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
3bcc4695
Commit
3bcc4695
authored
Dec 03, 2015
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid double-escaping strings in deep_to_string
parent
88210301
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
71 additions
and
26 deletions
+71
-26
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+1
-0
libcaf_core/caf/deep_to_string.hpp
libcaf_core/caf/deep_to_string.hpp
+2
-26
libcaf_core/src/deep_to_string.cpp
libcaf_core/src/deep_to_string.cpp
+68
-0
No files found.
libcaf_core/CMakeLists.txt
View file @
3bcc4695
...
...
@@ -37,6 +37,7 @@ set (LIBCAF_CORE_SRCS
src/concatenated_tuple.cpp
src/continue_helper.cpp
src/decorated_tuple.cpp
src/deep_to_string.cpp
src/default_attachable.cpp
src/deserializer.cpp
src/detached_threads.cpp
...
...
libcaf_core/caf/deep_to_string.hpp
View file @
3bcc4695
...
...
@@ -38,26 +38,7 @@ public:
// nop
}
inline
std
::
string
operator
()(
const
char
*
cstr
)
const
{
if
(
cstr
==
nullptr
||
*
cstr
==
'\0'
)
return
"
\"\"
"
;
std
::
string
result
=
"
\"
"
;
char
c
;
while
((
c
=
*
cstr
++
)
!=
'\0'
)
{
switch
(
c
)
{
case
'\\'
:
result
+=
"
\\\\
"
;
break
;
case
'"'
:
result
+=
"
\\\"
"
;
break
;
default:
result
+=
c
;
}
}
result
+=
"
\"
"
;
return
result
;
}
std
::
string
operator
()(
const
char
*
cstr
)
const
;
inline
std
::
string
operator
()(
char
*
cstr
)
const
{
return
(
*
this
)(
const_cast
<
const
char
*>
(
cstr
));
...
...
@@ -67,12 +48,7 @@ public:
return
(
*
this
)(
str
.
c_str
());
}
inline
std
::
string
operator
()(
const
atom_value
&
x
)
const
{
std
::
string
result
=
"'"
;
result
+=
to_string
(
x
);
result
+=
"'"
;
return
result
;
}
std
::
string
operator
()(
const
atom_value
&
x
)
const
;
constexpr
const
char
*
operator
()(
const
bool
&
x
)
const
{
return
x
?
"true"
:
"false"
;
...
...
libcaf_core/src/deep_to_string.cpp
0 → 100644
View file @
3bcc4695
/******************************************************************************
* ____ _ _____ *
* / ___| / \ | ___| C++ *
* | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework *
* \____/_/ \_|_| *
* *
* Copyright (C) 2011 - 2015 *
* Dominik Charousset <dominik.charousset (at) haw-hamburg.de> *
* *
* Distributed under the terms and conditions of the BSD 3-Clause License or *
* (at your option) under the terms and conditions of the Boost Software *
* License 1.0. See accompanying files LICENSE and LICENSE_ALTERNATIVE. *
* *
* If you did not receive a copy of the license files, see *
* http://opensource.org/licenses/BSD-3-Clause and *
* http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/
#include "caf/deep_to_string.hpp"
namespace
caf
{
namespace
{
bool
is_escaped
(
const
char
*
cstr
)
{
if
(
*
cstr
!=
'"'
)
return
false
;
char
last_char
=
*
cstr
++
;
for
(
auto
c
=
*
cstr
;
c
!=
'\0'
;
++
cstr
)
if
(
c
==
'"'
&&
last_char
!=
'\\'
)
return
false
;
return
last_char
==
'"'
;
}
}
// namespace <anonymous>
std
::
string
deep_to_string_t
::
operator
()(
const
char
*
cstr
)
const
{
if
(
cstr
==
nullptr
||
*
cstr
==
'\0'
)
return
"
\"\"
"
;
if
(
is_escaped
(
cstr
))
return
cstr
;
std
::
string
result
=
"
\"
"
;
char
c
;
while
((
c
=
*
cstr
++
)
!=
'\0'
)
{
switch
(
c
)
{
case
'\\'
:
result
+=
"
\\\\
"
;
break
;
case
'"'
:
result
+=
"
\\\"
"
;
break
;
default:
result
+=
c
;
}
}
result
+=
"
\"
"
;
return
result
;
}
std
::
string
deep_to_string_t
::
operator
()(
const
atom_value
&
x
)
const
{
std
::
string
result
=
"'"
;
result
+=
to_string
(
x
);
result
+=
"'"
;
return
result
;
}
}
// namespace caf
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment