Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
boolinq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
boolinq
Commits
4441f82d
Commit
4441f82d
authored
Jul 01, 2019
by
Anton Bukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set gtest 1.8.0 and fix bug
parent
c9a4440f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
32 deletions
+37
-32
CMakeLists.txt
CMakeLists.txt
+5
-4
gtest
externals/gtest
+1
-1
boolinq.h
include/boolinq/boolinq.h
+31
-27
No files found.
CMakeLists.txt
View file @
4441f82d
# Common variables.
# Common variables.
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 3.0
)
PROJECT
(
boolinq
)
if
(
POLICY CMP0048
)
SET
(
boolinq_VERSION_MAJOR 2
)
cmake_policy
(
SET CMP0048 NEW
)
SET
(
boolinq_VERSION_MINOR 0
)
endif
()
PROJECT
(
boolinq VERSION 3.0.0 LANGUAGES CXX
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS
}
-O0 -ggdb3 -DDEBUG"
)
SET
(
CMAKE_CXX_FLAGS_DEBUG
"
${
CMAKE_CXX_FLAGS
}
-O0 -ggdb3 -DDEBUG"
)
...
...
gtest
@
ec44c6c1
Subproject commit
437e1008c97b6bf595fec85da42c6925babd96b2
Subproject commit
ec44c6c1675c25b9827aacd08c02433cccde7780
include/boolinq/boolinq.h
View file @
4441f82d
...
@@ -330,24 +330,26 @@ namespace boolinq {
...
@@ -330,24 +330,26 @@ namespace boolinq {
return
distinct
([](
T
value
)
{
return
value
;
});
return
distinct
([](
T
value
)
{
return
value
;
});
}
}
template
<
typename
F
,
typename
_TIter
=
typename
std
::
vector
<
T
>::
iterator
>
template
<
typename
F
,
typename
_TIter
=
typename
std
::
vector
<
T
>::
const_
iterator
>
Linq
<
std
::
tuple
<
std
::
vector
<
T
>
,
_TIter
>
,
T
>
orderBy
(
F
transform
)
const
Linq
<
std
::
tuple
<
std
::
vector
<
T
>
,
_TIter
,
bool
>
,
T
>
orderBy
(
F
transform
)
const
{
{
std
::
vector
<
T
>
items
=
toStdVector
();
std
::
vector
<
T
>
items
=
toStdVector
();
std
::
sort
(
items
.
begin
(),
items
.
end
(),
[
transform
](
const
T
&
a
,
const
T
&
b
)
{
std
::
sort
(
items
.
begin
(),
items
.
end
(),
[
transform
](
const
T
&
a
,
const
T
&
b
)
{
return
transform
(
a
)
<
transform
(
b
);
return
transform
(
a
)
<
transform
(
b
);
});
});
return
Linq
<
std
::
tuple
<
std
::
vector
<
T
>
,
_TIter
>
,
T
>
(
return
Linq
<
std
::
tuple
<
std
::
vector
<
T
>
,
_TIter
,
bool
>
,
T
>
(
std
::
make_tuple
(
items
,
_TIter
()),
std
::
make_tuple
(
items
,
_TIter
()
,
false
),
[](
std
::
tuple
<
std
::
vector
<
T
>
,
_TIter
>
&
tuple
)
{
[](
std
::
tuple
<
std
::
vector
<
T
>
,
_TIter
,
bool
>
&
tuple
)
{
std
::
vector
<
T
>
&
vec
=
std
::
get
<
0
>
(
tuple
);
std
::
vector
<
T
>
&
vec
=
std
::
get
<
0
>
(
tuple
);
_TIter
&
it
=
std
::
get
<
1
>
(
tuple
);
_TIter
&
it
=
std
::
get
<
1
>
(
tuple
);
bool
&
flag
=
std
::
get
<
2
>
(
tuple
);
if
(
it
==
_TIter
())
{
if
(
!
flag
)
{
it
=
vec
.
begin
();
flag
=
true
;
it
=
vec
.
cbegin
();
}
}
if
(
it
==
vec
.
end
())
{
if
(
it
==
vec
.
c
end
())
{
throw
LinqEndException
();
throw
LinqEndException
();
}
}
return
*
(
it
++
);
return
*
(
it
++
);
...
@@ -355,24 +357,26 @@ namespace boolinq {
...
@@ -355,24 +357,26 @@ namespace boolinq {
);
);
}
}
Linq
<
std
::
tuple
<
std
::
vector
<
T
>
,
typename
std
::
vector
<
T
>::
iterator
>
,
T
>
orderBy
()
const
Linq
<
std
::
tuple
<
std
::
vector
<
T
>
,
typename
std
::
vector
<
T
>::
const_iterator
,
bool
>
,
T
>
orderBy
()
const
{
{
return
orderBy
([](
T
value
)
{
return
value
;
});
return
orderBy
([](
T
value
)
{
return
value
;
});
}
}
template
<
typename
_TIter
=
typename
std
::
list
<
T
>::
reverse_iterator
>
template
<
typename
_TIter
=
typename
std
::
list
<
T
>::
const_
reverse_iterator
>
Linq
<
std
::
tuple
<
std
::
list
<
T
>
,
_TIter
>
,
T
>
reverse
()
const
Linq
<
std
::
tuple
<
std
::
list
<
T
>
,
_TIter
,
bool
>
,
T
>
reverse
()
const
{
{
return
Linq
<
std
::
tuple
<
std
::
list
<
T
>
,
_TIter
>
,
T
>
(
return
Linq
<
std
::
tuple
<
std
::
list
<
T
>
,
_TIter
,
bool
>
,
T
>
(
std
::
make_tuple
(
toStdList
(),
_TIter
()),
std
::
make_tuple
(
toStdList
(),
_TIter
()
,
false
),
[](
std
::
tuple
<
std
::
list
<
T
>
,
_TIter
>
&
tuple
)
{
[](
std
::
tuple
<
std
::
list
<
T
>
,
_TIter
,
bool
>
&
tuple
)
{
std
::
list
<
T
>
&
list
=
std
::
get
<
0
>
(
tuple
);
std
::
list
<
T
>
&
list
=
std
::
get
<
0
>
(
tuple
);
_TIter
&
it
=
std
::
get
<
1
>
(
tuple
);
_TIter
&
it
=
std
::
get
<
1
>
(
tuple
);
bool
&
flag
=
std
::
get
<
2
>
(
tuple
);
if
(
it
==
_TIter
())
{
if
(
!
flag
)
{
it
=
list
.
rbegin
();
flag
=
true
;
it
=
list
.
crbegin
();
}
}
if
(
it
==
list
.
rend
())
{
if
(
it
==
list
.
c
rend
())
{
throw
LinqEndException
();
throw
LinqEndException
();
}
}
return
*
(
it
++
);
return
*
(
it
++
);
...
@@ -805,41 +809,41 @@ namespace boolinq {
...
@@ -805,41 +809,41 @@ namespace boolinq {
template
<
template
<
class
>
class
TV
,
typename
TT
>
template
<
template
<
class
>
class
TV
,
typename
TT
>
auto
from
(
const
TV
<
TT
>
&
container
)
auto
from
(
const
TV
<
TT
>
&
container
)
->
decltype
(
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
)))
->
decltype
(
from
(
container
.
cbegin
(),
container
.
cend
(
)))
{
{
return
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
));
return
from
(
container
.
cbegin
(),
container
.
cend
(
));
}
}
// std::list, std::vector, std::dequeue
// std::list, std::vector, std::dequeue
template
<
template
<
class
,
class
>
class
TV
,
typename
TT
,
typename
TU
>
template
<
template
<
class
,
class
>
class
TV
,
typename
TT
,
typename
TU
>
auto
from
(
const
TV
<
TT
,
TU
>
&
container
)
auto
from
(
const
TV
<
TT
,
TU
>
&
container
)
->
decltype
(
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
)))
->
decltype
(
from
(
container
.
cbegin
(),
container
.
cend
(
)))
{
{
return
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
));
return
from
(
container
.
cbegin
(),
container
.
cend
(
));
}
}
// std::set
// std::set
template
<
template
<
class
,
class
,
class
>
class
TV
,
typename
TT
,
typename
TS
,
typename
TU
>
template
<
template
<
class
,
class
,
class
>
class
TV
,
typename
TT
,
typename
TS
,
typename
TU
>
auto
from
(
const
TV
<
TT
,
TS
,
TU
>
&
container
)
auto
from
(
const
TV
<
TT
,
TS
,
TU
>
&
container
)
->
decltype
(
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
)))
->
decltype
(
from
(
container
.
cbegin
(),
container
.
cend
(
)))
{
{
return
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
));
return
from
(
container
.
cbegin
(),
container
.
cend
(
));
}
}
// std::map
// std::map
template
<
template
<
class
,
class
,
class
,
class
>
class
TV
,
typename
TK
,
typename
TT
,
typename
TS
,
typename
TU
>
template
<
template
<
class
,
class
,
class
,
class
>
class
TV
,
typename
TK
,
typename
TT
,
typename
TS
,
typename
TU
>
auto
from
(
const
TV
<
TK
,
TT
,
TS
,
TU
>
&
container
)
auto
from
(
const
TV
<
TK
,
TT
,
TS
,
TU
>
&
container
)
->
decltype
(
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
)))
->
decltype
(
from
(
container
.
cbegin
(),
container
.
cend
(
)))
{
{
return
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
));
return
from
(
container
.
cbegin
(),
container
.
cend
(
));
}
}
// std::array
// std::array
template
<
template
<
class
,
size_t
>
class
TV
,
typename
TT
,
size_t
TL
>
template
<
template
<
class
,
size_t
>
class
TV
,
typename
TT
,
size_t
TL
>
auto
from
(
const
TV
<
TT
,
TL
>
&
container
)
auto
from
(
const
TV
<
TT
,
TL
>
&
container
)
->
decltype
(
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
)))
->
decltype
(
from
(
container
.
cbegin
(),
container
.
cend
(
)))
{
{
return
from
(
std
::
cbegin
(
container
),
std
::
cend
(
container
));
return
from
(
container
.
cbegin
(),
container
.
cend
(
));
}
}
template
<
typename
T
>
template
<
typename
T
>
...
...
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