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
f72e325c
Commit
f72e325c
authored
May 21, 2012
by
Jesse Beder
Browse files
Renamed begin/end scalar/group to started/ended scalar/group
parent
07e88a78
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
21 deletions
+21
-21
src/emitter.cpp
src/emitter.cpp
+11
-11
src/emitterstate.cpp
src/emitterstate.cpp
+6
-6
src/emitterstate.h
src/emitterstate.h
+4
-4
No files found.
src/emitter.cpp
View file @
f72e325c
...
...
@@ -212,7 +212,7 @@ namespace YAML
PrepareNode
(
m_pState
->
NextGroupType
(
GroupType
::
Seq
));
m_pState
->
Begin
Group
(
GroupType
::
Seq
);
m_pState
->
Started
Group
(
GroupType
::
Seq
);
}
// EmitEndSeq
...
...
@@ -221,7 +221,7 @@ namespace YAML
if
(
!
good
())
return
;
m_pState
->
EndGroup
(
GroupType
::
Seq
);
m_pState
->
End
ed
Group
(
GroupType
::
Seq
);
}
// EmitBeginMap
...
...
@@ -232,7 +232,7 @@ namespace YAML
PrepareNode
(
m_pState
->
NextGroupType
(
GroupType
::
Map
));
m_pState
->
Begin
Group
(
GroupType
::
Map
);
m_pState
->
Started
Group
(
GroupType
::
Map
);
}
// EmitEndMap
...
...
@@ -241,7 +241,7 @@ namespace YAML
if
(
!
good
())
return
;
m_pState
->
EndGroup
(
GroupType
::
Map
);
m_pState
->
End
ed
Group
(
GroupType
::
Map
);
}
// EmitNewline
...
...
@@ -438,7 +438,7 @@ namespace YAML
break
;
}
m_pState
->
Begin
Scalar
();
m_pState
->
Started
Scalar
();
return
*
this
;
}
...
...
@@ -493,7 +493,7 @@ namespace YAML
if
(
!
good
())
return
*
this
;
m_pState
->
Begin
Scalar
();
m_pState
->
Started
Scalar
();
return
*
this
;
}
...
...
@@ -503,7 +503,7 @@ namespace YAML
if
(
!
good
())
return
*
this
;
m_pState
->
Begin
Scalar
();
m_pState
->
Started
Scalar
();
return
*
this
;
}
...
...
@@ -525,7 +525,7 @@ namespace YAML
return
*
this
;
}
m_pState
->
Begin
Scalar
();
m_pState
->
Started
Scalar
();
return
*
this
;
}
...
...
@@ -592,7 +592,7 @@ namespace YAML
if
(
!
good
())
return
*
this
;
m_pState
->
Begin
Scalar
();
m_pState
->
Started
Scalar
();
return
*
this
;
}
...
...
@@ -602,7 +602,7 @@ namespace YAML
if
(
!
good
())
return
*
this
;
m_pState
->
Begin
Scalar
();
m_pState
->
Started
Scalar
();
return
*
this
;
}
...
...
@@ -614,7 +614,7 @@ namespace YAML
if
(
!
good
())
return
*
this
;
m_pState
->
Begin
Scalar
();
m_pState
->
Started
Scalar
();
return
*
this
;
}
...
...
src/emitterstate.cpp
View file @
f72e325c
...
...
@@ -58,7 +58,7 @@ namespace YAML
m_hasNonContent
=
true
;
}
void
EmitterState
::
Begin
Node
()
void
EmitterState
::
Started
Node
()
{
if
(
!
m_groups
.
empty
())
m_groups
.
top
().
childCount
++
;
...
...
@@ -87,14 +87,14 @@ namespace YAML
return
EmitterNodeType
::
None
;
}
void
EmitterState
::
Begin
Scalar
()
void
EmitterState
::
Started
Scalar
()
{
Begin
Node
();
Started
Node
();
}
void
EmitterState
::
Begin
Group
(
GroupType
::
value
type
)
void
EmitterState
::
Started
Group
(
GroupType
::
value
type
)
{
Begin
Node
();
Started
Node
();
const
int
lastGroupIndent
=
(
m_groups
.
empty
()
?
0
:
m_groups
.
top
().
indent
);
m_curIndent
+=
lastGroupIndent
;
...
...
@@ -114,7 +114,7 @@ namespace YAML
m_groups
.
push
(
pGroup
);
}
void
EmitterState
::
EndGroup
(
GroupType
::
value
type
)
void
EmitterState
::
End
ed
Group
(
GroupType
::
value
type
)
{
if
(
m_groups
.
empty
())
return
SetError
(
ErrorMsg
::
UNMATCHED_GROUP_TAG
);
...
...
src/emitterstate.h
View file @
f72e325c
...
...
@@ -37,9 +37,9 @@ namespace YAML
void
SetAnchor
();
void
SetTag
();
void
SetNonContent
();
void
Begin
Scalar
();
void
Begin
Group
(
GroupType
::
value
type
);
void
EndGroup
(
GroupType
::
value
type
);
void
Started
Scalar
();
void
Started
Group
(
GroupType
::
value
type
);
void
End
ed
Group
(
GroupType
::
value
type
);
EmitterNodeType
::
value
NextGroupType
(
GroupType
::
value
type
)
const
;
EmitterNodeType
::
value
CurGroupNodeType
()
const
;
...
...
@@ -100,7 +100,7 @@ namespace YAML
template
<
typename
T
>
void
_Set
(
Setting
<
T
>&
fmt
,
T
value
,
FmtScope
::
value
scope
);
void
Begin
Node
();
void
Started
Node
();
private:
// basic state ok?
...
...
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