Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pistache
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
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
Libraries
pistache
Commits
9767cd99
Unverified
Commit
9767cd99
authored
Nov 22, 2018
by
Dennis Jenkins
Committed by
GitHub
Nov 22, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #360 from knowledge4igor/fix_string_view_find_and_rfind
Make string_view find and rfind methods really noexcept
parents
cd8a771d
90c6e688
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
89 additions
and
13 deletions
+89
-13
include/pistache/string_view.h
include/pistache/string_view.h
+37
-13
tests/string_view_test.cc
tests/string_view_test.cc
+52
-0
No files found.
include/pistache/string_view.h
View file @
9767cd99
...
...
@@ -11,7 +11,7 @@
# undef CUSTOM_STRING_VIEW
# include <experimental/string_view>
namespace
std
{
typedef
experimental
::
string_view
string_view
;
using
string_view
=
experimental
::
string_view
;
}
# endif
# endif
...
...
@@ -25,7 +25,7 @@
#include <stdexcept>
#include <cstring>
typedef
std
::
size_t
size_type
;
using
size_type
=
std
::
size_t
;
namespace
std
{
...
...
@@ -83,12 +83,25 @@ namespace std {
operator
=
(
const
string_view
&
view
)
noexcept
=
default
;
size_type
find
(
string_view
v
,
size_type
pos
=
0
)
const
noexcept
{
for
(;
size_
-
pos
>=
v
.
size_
;
pos
++
)
{
string_view
compare
=
substr
(
pos
,
v
.
size_
);
if
(
v
==
compare
)
{
if
(
size_
<
pos
)
return
npos
;
if
((
size_
-
pos
)
<
v
.
size_
)
return
npos
;
for
(;
pos
<=
(
size_
-
v
.
size_
);
++
pos
)
{
bool
found
=
true
;
for
(
size_type
i
=
0
;
i
<
v
.
size_
;
++
i
)
{
if
(
data_
[
pos
+
i
]
!=
v
.
data_
[
i
])
{
found
=
false
;
break
;
}
}
if
(
found
)
{
return
pos
;
}
}
return
npos
;
}
...
...
@@ -105,16 +118,27 @@ namespace std {
}
size_type
rfind
(
string_view
v
,
size_type
pos
=
npos
)
const
noexcept
{
if
(
pos
>=
size_
)
{
pos
=
size_
-
v
.
size_
;
}
for
(;
pos
!=
npos
;
pos
--
)
{
string_view
compare
=
substr
(
pos
,
v
.
size_
);
if
(
v
==
compare
)
{
return
pos
;
if
(
v
.
size_
>
size_
)
return
npos
;
if
(
pos
>
size_
)
pos
=
size_
;
size_t
start
=
size_
-
v
.
size_
;
if
(
pos
!=
npos
)
start
=
pos
;
for
(
size_t
offset
=
0
;
offset
<=
pos
;
++
offset
,
--
start
)
{
bool
found
=
true
;
for
(
size_t
j
=
0
;
j
<
v
.
size_
;
++
j
)
{
if
(
data_
[
start
+
j
]
!=
v
.
data_
[
j
])
{
found
=
false
;
break
;
}
}
if
(
found
)
{
return
start
;
}
}
return
npos
;
}
...
...
tests/string_view_test.cc
View file @
9767cd99
#include "gtest/gtest.h"
#include <pistache/string_view.h>
#include <string>
TEST
(
string_view_test
,
substr_test
)
{
std
::
string_view
orig
(
"test"
);
std
::
string_view
targ
(
"est"
);
...
...
@@ -36,6 +38,24 @@ TEST(string_view_test, find_test) {
ASSERT_EQ
(
orig
.
find
(
"est"
,
2
,
2
),
std
::
size_t
(
-
1
));
}
TEST
(
string_view_test
,
find_test_2
)
{
std
::
string_view
orig1
(
"test"
);
std
::
string_view
find1
(
"est"
);
ASSERT_EQ
(
orig1
.
find
(
find1
,
std
::
size_t
(
-
1
)),
std
::
size_t
(
-
1
));
ASSERT_EQ
(
orig1
.
find
(
find1
,
std
::
size_t
(
-
1
)
-
2
),
std
::
size_t
(
-
1
));
std
::
string_view
orig2
(
"test"
);
std
::
string_view
find2
(
""
);
ASSERT_EQ
(
orig2
.
find
(
find2
,
std
::
size_t
(
6
)),
std
::
size_t
(
-
1
));
ASSERT_EQ
(
orig2
.
find
(
find2
,
std
::
size_t
(
2
)),
std
::
size_t
(
2
));
ASSERT_EQ
(
orig2
.
find
(
find2
,
std
::
size_t
(
-
1
)),
std
::
size_t
(
-
1
));
std
::
string_view
orig3
(
""
);
std
::
string_view
find3
(
""
);
ASSERT_EQ
(
orig3
.
find
(
find3
,
std
::
size_t
(
0
)),
std
::
size_t
(
0
));
ASSERT_EQ
(
orig3
.
find
(
find3
,
std
::
size_t
(
6
)),
std
::
size_t
(
-
1
));
}
TEST
(
string_view_test
,
rfind_test
)
{
std
::
string_view
orig
(
"test"
);
std
::
string_view
find
(
"est"
);
...
...
@@ -53,6 +73,38 @@ TEST(string_view_test, rfind_test) {
ASSERT_EQ
(
orig
.
rfind
(
"set"
),
std
::
size_t
(
-
1
));
}
TEST
(
string_view_test
,
rfind_test_2
)
{
std
::
string_view
orig1
(
"e"
);
std
::
string_view
find1
(
"e"
);
ASSERT_EQ
(
orig1
.
rfind
(
find1
),
std
::
size_t
(
0
));
ASSERT_EQ
(
orig1
.
rfind
(
find1
,
1
),
std
::
size_t
(
0
));
std
::
string_view
orig2
(
"e"
);
std
::
string_view
find2
(
""
);
ASSERT_EQ
(
orig2
.
rfind
(
find2
),
std
::
size_t
(
1
));
ASSERT_EQ
(
orig2
.
rfind
(
find2
,
1
),
std
::
size_t
(
1
));
std
::
string_view
orig3
(
""
);
std
::
string_view
find3
(
"e"
);
ASSERT_EQ
(
orig3
.
rfind
(
find3
),
std
::
size_t
(
-
1
));
ASSERT_EQ
(
orig3
.
rfind
(
find3
,
1
),
std
::
size_t
(
-
1
));
std
::
string_view
orig4
(
""
);
std
::
string_view
find4
(
""
);
ASSERT_EQ
(
orig4
.
rfind
(
find4
),
std
::
size_t
(
0
));
ASSERT_EQ
(
orig4
.
rfind
(
find4
,
1
),
std
::
size_t
(
0
));
std
::
string_view
orig5
(
"a"
);
std
::
string_view
find5
(
"b"
);
ASSERT_EQ
(
orig5
.
rfind
(
find5
),
std
::
size_t
(
-
1
));
ASSERT_EQ
(
orig5
.
rfind
(
find5
,
4
),
std
::
size_t
(
-
1
));
}
TEST
(
string_view_test
,
emptiness
)
{
std
::
string_view
e1
;
std
::
string_view
e2
(
""
);
...
...
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