Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
yaml-cpp
Commits
8d0ee05d
Commit
8d0ee05d
authored
Jan 21, 2012
by
beder
Browse files
Renamed append -> push_back (to play nice with STL algorithms
parent
56477115
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
18 deletions
+18
-18
include/yaml-cpp/node/convert.h
include/yaml-cpp/node/convert.h
+2
-2
include/yaml-cpp/node/detail/node.h
include/yaml-cpp/node/detail/node.h
+2
-2
include/yaml-cpp/node/detail/node_data.h
include/yaml-cpp/node/detail/node_data.h
+1
-1
include/yaml-cpp/node/detail/node_ref.h
include/yaml-cpp/node/detail/node_ref.h
+1
-1
include/yaml-cpp/node/impl.h
include/yaml-cpp/node/impl.h
+4
-4
include/yaml-cpp/node/node.h
include/yaml-cpp/node/node.h
+2
-2
src/node_data.cpp
src/node_data.cpp
+2
-2
src/nodebuilder.cpp
src/nodebuilder.cpp
+1
-1
test/new-api/nodetests.cpp
test/new-api/nodetests.cpp
+3
-3
No files found.
include/yaml-cpp/node/convert.h
View file @
8d0ee05d
...
@@ -149,7 +149,7 @@ namespace YAML
...
@@ -149,7 +149,7 @@ namespace YAML
static
Node
encode
(
const
std
::
vector
<
T
>&
rhs
)
{
static
Node
encode
(
const
std
::
vector
<
T
>&
rhs
)
{
Node
node
(
NodeType
::
Sequence
);
Node
node
(
NodeType
::
Sequence
);
for
(
typename
std
::
vector
<
T
>::
const_iterator
it
=
rhs
.
begin
();
it
!=
rhs
.
end
();
++
it
)
for
(
typename
std
::
vector
<
T
>::
const_iterator
it
=
rhs
.
begin
();
it
!=
rhs
.
end
();
++
it
)
node
.
append
(
*
it
);
node
.
push_back
(
*
it
);
return
node
;
return
node
;
}
}
...
@@ -170,7 +170,7 @@ namespace YAML
...
@@ -170,7 +170,7 @@ namespace YAML
static
Node
encode
(
const
std
::
list
<
T
>&
rhs
)
{
static
Node
encode
(
const
std
::
list
<
T
>&
rhs
)
{
Node
node
(
NodeType
::
Sequence
);
Node
node
(
NodeType
::
Sequence
);
for
(
typename
std
::
list
<
T
>::
const_iterator
it
=
rhs
.
begin
();
it
!=
rhs
.
end
();
++
it
)
for
(
typename
std
::
list
<
T
>::
const_iterator
it
=
rhs
.
begin
();
it
!=
rhs
.
end
();
++
it
)
node
.
append
(
*
it
);
node
.
push_back
(
*
it
);
return
node
;
return
node
;
}
}
...
...
include/yaml-cpp/node/detail/node.h
View file @
8d0ee05d
...
@@ -87,8 +87,8 @@ namespace YAML
...
@@ -87,8 +87,8 @@ namespace YAML
node_iterator
end
()
{
return
m_pRef
->
end
();
}
node_iterator
end
()
{
return
m_pRef
->
end
();
}
// sequence
// sequence
void
append
(
node
&
node
,
shared_memory_holder
pMemory
)
{
void
push_back
(
node
&
node
,
shared_memory_holder
pMemory
)
{
m_pRef
->
append
(
node
,
pMemory
);
m_pRef
->
push_back
(
node
,
pMemory
);
node
.
add_dependency
(
*
this
);
node
.
add_dependency
(
*
this
);
}
}
void
insert
(
node
&
key
,
node
&
value
,
shared_memory_holder
pMemory
)
{
void
insert
(
node
&
key
,
node
&
value
,
shared_memory_holder
pMemory
)
{
...
...
include/yaml-cpp/node/detail/node_data.h
View file @
8d0ee05d
...
@@ -45,7 +45,7 @@ namespace YAML
...
@@ -45,7 +45,7 @@ namespace YAML
node_iterator
end
();
node_iterator
end
();
// sequence
// sequence
void
append
(
node
&
node
,
shared_memory_holder
pMemory
);
void
push_back
(
node
&
node
,
shared_memory_holder
pMemory
);
void
insert
(
node
&
key
,
node
&
value
,
shared_memory_holder
pMemory
);
void
insert
(
node
&
key
,
node
&
value
,
shared_memory_holder
pMemory
);
// indexing
// indexing
...
...
include/yaml-cpp/node/detail/node_ref.h
View file @
8d0ee05d
...
@@ -44,7 +44,7 @@ namespace YAML
...
@@ -44,7 +44,7 @@ namespace YAML
node_iterator
end
()
{
return
m_pData
->
end
();
}
node_iterator
end
()
{
return
m_pData
->
end
();
}
// sequence
// sequence
void
append
(
node
&
node
,
shared_memory_holder
pMemory
)
{
m_pData
->
append
(
node
,
pMemory
);
}
void
push_back
(
node
&
node
,
shared_memory_holder
pMemory
)
{
m_pData
->
push_back
(
node
,
pMemory
);
}
void
insert
(
node
&
key
,
node
&
value
,
shared_memory_holder
pMemory
)
{
m_pData
->
insert
(
key
,
value
,
pMemory
);
}
void
insert
(
node
&
key
,
node
&
value
,
shared_memory_holder
pMemory
)
{
m_pData
->
insert
(
key
,
value
,
pMemory
);
}
// indexing
// indexing
...
...
include/yaml-cpp/node/impl.h
View file @
8d0ee05d
...
@@ -252,17 +252,17 @@ namespace YAML
...
@@ -252,17 +252,17 @@ namespace YAML
// sequence
// sequence
template
<
typename
T
>
template
<
typename
T
>
inline
void
Node
::
append
(
const
T
&
rhs
)
inline
void
Node
::
push_back
(
const
T
&
rhs
)
{
{
append
(
Node
(
rhs
));
push_back
(
Node
(
rhs
));
}
}
inline
void
Node
::
append
(
const
Node
&
rhs
)
inline
void
Node
::
push_back
(
const
Node
&
rhs
)
{
{
EnsureNodeExists
();
EnsureNodeExists
();
rhs
.
EnsureNodeExists
();
rhs
.
EnsureNodeExists
();
m_pNode
->
append
(
*
rhs
.
m_pNode
,
m_pMemory
);
m_pNode
->
push_back
(
*
rhs
.
m_pNode
,
m_pMemory
);
m_pMemory
->
merge
(
*
rhs
.
m_pMemory
);
m_pMemory
->
merge
(
*
rhs
.
m_pMemory
);
}
}
...
...
include/yaml-cpp/node/node.h
View file @
8d0ee05d
...
@@ -64,8 +64,8 @@ namespace YAML
...
@@ -64,8 +64,8 @@ namespace YAML
iterator
end
();
iterator
end
();
// sequence
// sequence
template
<
typename
T
>
void
append
(
const
T
&
rhs
);
template
<
typename
T
>
void
push_back
(
const
T
&
rhs
);
void
append
(
const
Node
&
rhs
);
void
push_back
(
const
Node
&
rhs
);
// indexing
// indexing
template
<
typename
Key
>
const
Node
operator
[](
const
Key
&
key
)
const
;
template
<
typename
Key
>
const
Node
operator
[](
const
Key
&
key
)
const
;
...
...
src/node_data.cpp
View file @
8d0ee05d
...
@@ -153,7 +153,7 @@ namespace YAML
...
@@ -153,7 +153,7 @@ namespace YAML
}
}
// sequence
// sequence
void
node_data
::
append
(
node
&
node
,
shared_memory_holder
/* pMemory */
)
void
node_data
::
push_back
(
node
&
node
,
shared_memory_holder
/* pMemory */
)
{
{
if
(
m_type
==
NodeType
::
Undefined
||
m_type
==
NodeType
::
Null
)
{
if
(
m_type
==
NodeType
::
Undefined
||
m_type
==
NodeType
::
Null
)
{
m_type
=
NodeType
::
Sequence
;
m_type
=
NodeType
::
Sequence
;
...
@@ -161,7 +161,7 @@ namespace YAML
...
@@ -161,7 +161,7 @@ namespace YAML
}
}
if
(
m_type
!=
NodeType
::
Sequence
)
if
(
m_type
!=
NodeType
::
Sequence
)
throw
std
::
runtime_error
(
"Can't
append
to a non-sequence node"
);
throw
std
::
runtime_error
(
"Can't
push_back
to a non-sequence node"
);
m_sequence
.
push_back
(
&
node
);
m_sequence
.
push_back
(
&
node
);
}
}
...
...
src/nodebuilder.cpp
View file @
8d0ee05d
...
@@ -112,7 +112,7 @@ namespace YAML
...
@@ -112,7 +112,7 @@ namespace YAML
detail
::
node
&
collection
=
*
m_stack
.
back
();
detail
::
node
&
collection
=
*
m_stack
.
back
();
if
(
collection
.
type
()
==
NodeType
::
Sequence
)
{
if
(
collection
.
type
()
==
NodeType
::
Sequence
)
{
collection
.
append
(
node
,
m_pMemory
);
collection
.
push_back
(
node
,
m_pMemory
);
}
else
if
(
collection
.
type
()
==
NodeType
::
Map
)
{
}
else
if
(
collection
.
type
()
==
NodeType
::
Map
)
{
assert
(
!
m_keys
.
empty
());
assert
(
!
m_keys
.
empty
());
PushedKey
&
key
=
m_keys
.
back
();
PushedKey
&
key
=
m_keys
.
back
();
...
...
test/new-api/nodetests.cpp
View file @
8d0ee05d
...
@@ -40,9 +40,9 @@ namespace Test
...
@@ -40,9 +40,9 @@ namespace Test
TEST
SimpleAppendSequence
()
TEST
SimpleAppendSequence
()
{
{
YAML
::
Node
node
;
YAML
::
Node
node
;
node
.
append
(
10
);
node
.
push_back
(
10
);
node
.
append
(
"foo"
);
node
.
push_back
(
"foo"
);
node
.
append
(
"monkey"
);
node
.
push_back
(
"monkey"
);
YAML_ASSERT
(
node
.
IsSequence
());
YAML_ASSERT
(
node
.
IsSequence
());
YAML_ASSERT
(
node
.
size
()
==
3
);
YAML_ASSERT
(
node
.
size
()
==
3
);
YAML_ASSERT
(
node
[
0
].
as
<
int
>
()
==
10
);
YAML_ASSERT
(
node
[
0
].
as
<
int
>
()
==
10
);
...
...
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