Skip to content

Commit d555a8a

Browse files
sea5kgsea5kg
committed
Fixed todo: Renamed WsjcppYamlItem to WsjcppYamlNode
1 parent 8d8bfd5 commit d555a8a

10 files changed

+110
-110
lines changed

‎src/wsjcpp_yaml.cpp‎

Lines changed: 67 additions & 67 deletions
Large diffs are not rendered by default.

‎src/wsjcpp_yaml.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ enum WsjcppYamlQuotes {
5858
Basic class for yaml tree
5959
*/
6060

61-
class WsjcppYamlItem { // TODO: rename to node
61+
class WsjcppYamlNode {
6262
public:
63-
WsjcppYamlItem(
64-
WsjcppYamlItem *pParent,
63+
WsjcppYamlNode(
64+
WsjcppYamlNode *pParent,
6565
const WsjcppYamlPlaceInFile &placeInFile,
6666
WsjcppYamlNodeType nItemType
6767
);
68-
~WsjcppYamlItem();
69-
WsjcppYamlItem *getParent();
68+
~WsjcppYamlNode();
69+
WsjcppYamlNode *getParent();
7070

7171
WsjcppYamlPlaceInFile getPlaceInFile();
7272
void setPlaceInFile(const WsjcppYamlPlaceInFile &placeInFile);
@@ -88,8 +88,8 @@ class WsjcppYamlItem { // TODO: rename to node
8888

8989
bool isMap();
9090
bool hasElement(const std::string &sName);
91-
WsjcppYamlItem *getElement(const std::string &sName);
92-
bool setElement(const std::string &sName, WsjcppYamlItem *pItem);
91+
WsjcppYamlNode *getElement(const std::string &sName);
92+
bool setElement(const std::string &sName, WsjcppYamlNode *pItem);
9393
bool removeElement(const std::string &sName);
9494
std::vector<std::string> getKeys();
9595

@@ -100,13 +100,13 @@ class WsjcppYamlItem { // TODO: rename to node
100100
);
101101

102102
bool createElementMap(const std::string &sName, WsjcppYamlQuotes nNameQuotes);
103-
WsjcppYamlItem *createElementMap();
103+
WsjcppYamlNode *createElementMap();
104104
bool createElementArray(const std::string &sName, WsjcppYamlQuotes nNameQuotes);
105105

106106
bool isArray();
107107
int getLength();
108-
WsjcppYamlItem *getElement(int i);
109-
bool appendElement(WsjcppYamlItem *pItem);
108+
WsjcppYamlNode *getElement(int i);
109+
bool appendElement(WsjcppYamlNode *pItem);
110110
bool appendElementValue(const std::string &sValue, WsjcppYamlQuotes nValueQuotes = WSJCPP_YAML_QUOTES_NONE);
111111
bool removeElement(int i);
112112

@@ -124,10 +124,10 @@ class WsjcppYamlItem { // TODO: rename to node
124124

125125
private:
126126
std::string TAG;
127-
WsjcppYamlItem *m_pParent;
127+
WsjcppYamlNode *m_pParent;
128128
WsjcppYamlPlaceInFile m_placeInFile;
129129
WsjcppYamlNodeType m_nItemType;
130-
std::vector<WsjcppYamlItem *> m_vObjects;
130+
std::vector<WsjcppYamlNode *> m_vObjects;
131131
std::string m_sValue; // if it is not array or map
132132
WsjcppYamlQuotes m_nValueQuotes;
133133
std::string m_sName;
@@ -184,7 +184,7 @@ class WsjcppYamlParsebleLine {
184184
class WsjcppYamlParserStatus {
185185
public:
186186
int nIntent;
187-
WsjcppYamlItem *pCurItem;
187+
WsjcppYamlNode *pCurItem;
188188
WsjcppYamlParsebleLine line;
189189
WsjcppYamlPlaceInFile placeInFile;
190190
void logUnknownLine(const std::string &sPrefix);
@@ -195,7 +195,7 @@ class WsjcppYamlParserStatus {
195195

196196
class WsjcppYamlCursor {
197197
public:
198-
WsjcppYamlCursor(WsjcppYamlItem *pCurrentNode);
198+
WsjcppYamlCursor(WsjcppYamlNode *pCurrentNode);
199199
WsjcppYamlCursor();
200200
~WsjcppYamlCursor();
201201

@@ -244,7 +244,7 @@ class WsjcppYamlCursor {
244244

245245
private:
246246
std::string TAG;
247-
WsjcppYamlItem *m_pCurrentNode;
247+
WsjcppYamlNode *m_pCurrentNode;
248248
};
249249

250250

@@ -259,7 +259,7 @@ class WsjcppYaml {
259259
bool saveToFile(const std::string &sFileName);
260260
bool loadFromString(const std::string &sBufferName, const std::string &sBuffer, std::string &sError);
261261
bool saveToString(std::string &sBuffer);
262-
WsjcppYamlItem *getRoot();
262+
WsjcppYamlNode *getRoot();
263263

264264
WsjcppYamlCursor getCursor() const;
265265
WsjcppYamlCursor operator[](int idx) const;
@@ -281,7 +281,7 @@ class WsjcppYaml {
281281
void process_sameIntent_emptyName_emptyValue_noArrayItem(WsjcppYamlParserStatus &st);
282282

283283
std::vector<std::string> m_sLines;
284-
WsjcppYamlItem *m_pRoot;
284+
WsjcppYamlNode *m_pRoot;
285285
};
286286

287287
#endif // WSJCPP_YAML_H

‎unit-tests.wsjcpp/src/unit_test_read_yaml.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void UnitTestReadYaml::executeTest() {
4646
compare("has services is map", yaml.getRoot()->getElement("services")->isMap(), true);
4747

4848

49-
WsjcppYamlItem *pServices = yaml.getRoot()->getElement("services");
49+
WsjcppYamlNode *pServices = yaml.getRoot()->getElement("services");
5050

5151
compare("has services.vote", pServices->hasElement("vote"), true);
5252
compare("has services.vote is map", pServices->getElement("vote")->isMap(), true);
@@ -79,20 +79,20 @@ void UnitTestReadYaml::executeTest() {
7979
compare("services.result is map", pServices->getElement("result")->isMap(), true);
8080
compare("services.result keys size 5", pServices->getElement("result")->getKeys().size(), 5);
8181

82-
WsjcppYamlItem *pResult = pServices->getElement("result");
82+
WsjcppYamlNode *pResult = pServices->getElement("result");
8383

84-
WsjcppYamlItem *pResultVolumes = pResult->getElement("volumes");
84+
WsjcppYamlNode *pResultVolumes = pResult->getElement("volumes");
8585
compare("services.result.volumes is array", pResultVolumes->isArray(), true);
8686
compare("services.result.volumes size 1", pResultVolumes->getLength(), 1);
8787
compare("services.result.volumes val 0", pResultVolumes->getElement(0)->getValue(), "./result:/app");
8888

89-
WsjcppYamlItem *pResultPorts = pResult->getElement("ports");
89+
WsjcppYamlNode *pResultPorts = pResult->getElement("ports");
9090
compare("services.result.ports is array", pResultPorts->isArray(), true);
9191
compare("services.result.ports size 2", pResultPorts->getLength(), 2);
9292
compare("services.result.ports val 0", pResultPorts->getElement(0)->getValue(), "5001:80");
9393
compare("services.result.ports val 1", pResultPorts->getElement(1)->getValue(), "5858:5858");
9494

95-
WsjcppYamlItem *pResultNetworks = pResult->getElement("networks");
95+
WsjcppYamlNode *pResultNetworks = pResult->getElement("networks");
9696
compare("services.result.networks size 2", pResultNetworks->getLength(), 2);
9797
compare("services.result.networks val 0", pResultNetworks->getElement(0)->getValue(), "front-tier");
9898
compare("services.result.networks val 1", pResultNetworks->getElement(1)->getValue(), "back-tier");
@@ -103,25 +103,25 @@ void UnitTestReadYaml::executeTest() {
103103
compare("has services.worker", pServices->hasElement("worker"), true);
104104
compare("has services.worker is map", pServices->getElement("worker")->isMap(), true);
105105
compare("services.worker keys size 3", pServices->getElement("worker")->getKeys().size(), 3);
106-
WsjcppYamlItem *pWorker = pServices->getElement("worker");
106+
WsjcppYamlNode *pWorker = pServices->getElement("worker");
107107

108108
compare("has services.worker.build", pWorker->hasElement("build"), true);
109109

110110
compare("has services.worker.depends_on", pWorker->hasElement("depends_on"), true);
111111
compare("has services.worker.networks", pWorker->hasElement("networks"), true);
112112

113-
WsjcppYamlItem *pWorkerBuild = pWorker->getElement("build");
113+
WsjcppYamlNode *pWorkerBuild = pWorker->getElement("build");
114114
compare("services.worker.build is map", pWorkerBuild->isMap(), true);
115115
compare("has services.worker.build.context", pWorkerBuild->hasElement("context"), true);
116116
compare("services.worker.build.context val", pWorkerBuild->getElement("context")->getValue(), "./worker");
117117

118-
WsjcppYamlItem *pWorkerDependsOn = pWorker->getElement("depends_on");
118+
WsjcppYamlNode *pWorkerDependsOn = pWorker->getElement("depends_on");
119119
compare("has services.worker.depends_on", pWorkerDependsOn->isArray(), true);
120120
compare("services.worker.depends_on size 2", pWorkerDependsOn->getLength(), 2);
121121
compare("services.worker.depends_on val 0", pWorkerDependsOn->getElement(0)->getValue(), "redis");
122122
compare("services.worker.depends_on val 1", pWorkerDependsOn->getElement(1)->getValue(), "db");
123123

124-
WsjcppYamlItem *pWorkerNetworks = pWorker->getElement("networks");
124+
WsjcppYamlNode *pWorkerNetworks = pWorker->getElement("networks");
125125
compare("services.worker.networks size 1", pWorkerNetworks->getLength(), 1);
126126
compare("services.worker.networks val 0", pWorkerNetworks->getElement(0)->getValue(), "back-tier");
127127
}
@@ -132,7 +132,7 @@ void UnitTestReadYaml::executeTest() {
132132
compare("services.redis is map", pServices->getElement("redis")->isMap(), true);
133133
compare("services.redis keys size 4", pServices->getElement("redis")->getKeys().size(), 4);
134134

135-
WsjcppYamlItem *pRedis = pServices->getElement("redis");
135+
WsjcppYamlNode *pRedis = pServices->getElement("redis");
136136
compare("has services.redis.image", pRedis->hasElement("image"), true);
137137
compare("has services.redis.container_name", pRedis->hasElement("container_name"), true);
138138
compare("has services.redis.ports", pRedis->hasElement("ports"), true);
@@ -141,12 +141,12 @@ void UnitTestReadYaml::executeTest() {
141141
compare("services.redis.image value", pRedis->getElement("image")->getValue(), "redis:alpine");
142142
compare("services.redis.container_name", pRedis->getElement("container_name")->getValue(), "redis");
143143

144-
WsjcppYamlItem *pRedisPorts = pRedis->getElement("ports");
144+
WsjcppYamlNode *pRedisPorts = pRedis->getElement("ports");
145145
// TODO bug #17
146146
compare("services.redis.ports is value", pRedisPorts->isValue(), true);
147147
compare("services.redis.ports value", pRedisPorts->getValue(), "[\"6379\"]");
148148

149-
WsjcppYamlItem *pRedisNetworks = pRedis->getElement("networks");
149+
WsjcppYamlNode *pRedisNetworks = pRedis->getElement("networks");
150150
compare("services.redis.networks size 1", pRedisNetworks->getLength(), 1);
151151
compare("services.redis.networks val 0", pRedisNetworks->getElement(0)->getValue(), "back-tier");
152152
}
@@ -157,7 +157,7 @@ void UnitTestReadYaml::executeTest() {
157157
compare("has services.db is map", pServices->getElement("db")->isMap(), true);
158158
compare("services.db keys size 5", pServices->getElement("db")->getKeys().size(), 5);
159159

160-
WsjcppYamlItem *pServicesDb = pServices->getElement("db");
160+
WsjcppYamlNode *pServicesDb = pServices->getElement("db");
161161

162162
compare("has services.db.image", pServicesDb->hasElement("image"), true);
163163
compare("services.db.image value", pServicesDb->getElement("image")->getValue(), "postgres:9.4");
@@ -166,7 +166,7 @@ void UnitTestReadYaml::executeTest() {
166166
compare("has services.db.environment", pServicesDb->hasElement("environment"), true);
167167
compare("services.db.environment is map", pServicesDb->getElement("environment")->isMap(), true);
168168

169-
WsjcppYamlItem *pDbEnvironment = pServicesDb->getElement("environment");
169+
WsjcppYamlNode *pDbEnvironment = pServicesDb->getElement("environment");
170170

171171
compare("has services.db.environment.POSTGRES_USER", pDbEnvironment->hasElement("POSTGRES_USER"), true);
172172
compare("services.db.environment.POSTGRES_USER", pDbEnvironment->getElement("POSTGRES_USER")->getValue(), "postgres");
@@ -177,14 +177,14 @@ void UnitTestReadYaml::executeTest() {
177177
compare("has services.db.volumes", pServicesDb->hasElement("volumes"), true);
178178
compare("services.db.volumes is array", pServicesDb->getElement("volumes")->isArray(), true);
179179

180-
WsjcppYamlItem *pDbVolumes = pServicesDb->getElement("volumes");
180+
WsjcppYamlNode *pDbVolumes = pServicesDb->getElement("volumes");
181181
compare("services.db.volumes size 1", pDbVolumes->getLength(), 1);
182182
compare("services.db.volumes val 0", pDbVolumes->getElement(0)->getValue(), "db-data:/var/lib/postgresql/data");
183183

184184
compare("has services.db.networks", pServicesDb->hasElement("networks"), true);
185185
compare("services.db.networks is array", pServicesDb->getElement("networks")->isArray(), true);
186186

187-
WsjcppYamlItem *pDbNetworks = pServicesDb->getElement("networks");
187+
WsjcppYamlNode *pDbNetworks = pServicesDb->getElement("networks");
188188
compare("services.db.networks size 1", pDbNetworks->getLength(), 1);
189189
compare("services.db.networks val 0", pDbNetworks->getElement(0)->getValue(), "back-tier");
190190
}
@@ -194,7 +194,7 @@ void UnitTestReadYaml::executeTest() {
194194
compare("has volumes", yaml.getRoot()->hasElement("volumes"), true);
195195
compare("has volumes is map", yaml.getRoot()->getElement("volumes")->isMap(), true);
196196

197-
WsjcppYamlItem *pVolumes = yaml.getRoot()->getElement("volumes");
197+
WsjcppYamlNode *pVolumes = yaml.getRoot()->getElement("volumes");
198198

199199
compare("has volumes.db-data", pVolumes->hasElement("db-data"), true);
200200
compare("has volumes.db-data is undefined", pVolumes->getElement("db-data")->isUndefined(), true);
@@ -206,7 +206,7 @@ void UnitTestReadYaml::executeTest() {
206206
compare("has networks", yaml.getRoot()->hasElement("networks"), true);
207207
compare("has networks is map", yaml.getRoot()->getElement("networks")->isMap(), true);
208208

209-
WsjcppYamlItem *pNeworks = yaml.getRoot()->getElement("networks");
209+
WsjcppYamlNode *pNeworks = yaml.getRoot()->getElement("networks");
210210
compare("has networks keys size 2", pNeworks->getKeys().size(), 2);
211211

212212
compare("has networks.front-tier", pNeworks->hasElement("front-tier"), true);

‎unit-tests.wsjcpp/src/unit_test_remove_element_for_map.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ void UnitTestRemoveElementForMap::executeTest() {
6060
return;
6161
}
6262

63-
WsjcppYamlItem *pMap1 = yaml.getRoot()->getElement("map1");
64-
WsjcppYamlItem *pMap11 = pMap1->getElement("map11");
63+
WsjcppYamlNode *pMap1 = yaml.getRoot()->getElement("map1");
64+
WsjcppYamlNode *pMap11 = pMap1->getElement("map11");
6565

6666
compare("has map111", pMap11->hasElement("map111"), true);
6767
compare("has map112", pMap11->hasElement("map112"), true);

‎unit-tests.wsjcpp/src/unit_test_remove_element_in_array.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void UnitTestRemoveElementInArray::executeTest() {
5050
}
5151

5252

53-
WsjcppYamlItem *pArr1 = yaml.getRoot()->getElement("arr1");
53+
WsjcppYamlNode *pArr1 = yaml.getRoot()->getElement("arr1");
5454
compare("arr1 len", pArr1->getLength(), 3);
5555
compare("arr1 name0 ", pArr1->getElement(0)->getElement("name")->getValue(), "i1");
5656
compare("arr1 name1 ", pArr1->getElement(1)->getElement("name")->getValue(), "i2");

‎unit-tests.wsjcpp/src/unit_test_yaml_parser_all.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void UnitTestYamlParserAll::executeTest() {
7171
return;
7272
}
7373

74-
WsjcppYamlItem *pItem = nullptr;
74+
WsjcppYamlNode *pItem = nullptr;
7575
compare("test10", yaml.getRoot()->getElement("test10")->getValue(), "one");
7676
compare("test20", yaml.getRoot()->getElement("test20")->getValue(), "two");
7777

‎unit-tests.wsjcpp/src/unit_test_yaml_parser_array_included_map.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void UnitTestYamlParserArrayIncludedMap::executeTest() {
5555
return;
5656
}
5757

58-
WsjcppYamlItem *pItem = nullptr;
58+
WsjcppYamlNode *pItem = nullptr;
5959

6060
compare("param1-value", yaml.getRoot()->getElement("param1")->getValue(), "none value1");
6161
compare("param1-line", yaml.getRoot()->getElement("param1")->getPlaceInFile().getLine(), "param1: none value1 # it's value for something # olala ");

‎unit-tests.wsjcpp/src/unit_test_yaml_parser_hierarchical_map.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void UnitTestYamlParserHierarchicalMap::executeTest() {
6262
return;
6363
}
6464

65-
WsjcppYamlItem *pItem = nullptr;
65+
WsjcppYamlNode *pItem = nullptr;
6666

6767
pItem = yaml.getRoot()->getElement("map1")->getElement("map11")->getElement("map111");
6868
compare("param1111", pItem->getElement("param1111")->getValue(), "v1111");

‎unit-tests.wsjcpp/src/unit_test_yaml_parser_simple_array.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void UnitTestYamlParserSimpleArray::executeTest() {
5454
return;
5555
}
5656

57-
WsjcppYamlItem *pItem = nullptr;
57+
WsjcppYamlNode *pItem = nullptr;
5858

5959
compare("param1-value", yaml.getRoot()->getElement("param1")->getValue(), "none value1");
6060
compare("param1-line", yaml.getRoot()->getElement("param1")->getPlaceInFile().getLine(), "param1: none value1 # it's value for something # olala ");

‎unit-tests.wsjcpp/src/unit_test_yaml_parser_simple_map.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void UnitTestYamlParserSimpleMap::executeTest() {
4646
return;
4747
}
4848

49-
WsjcppYamlItem *pItem = nullptr;
49+
WsjcppYamlNode *pItem = nullptr;
5050
compare("param1", yaml.getRoot()->getElement("param1")->getValue(), "value1");
5151
compare("param2", yaml.getRoot()->getElement("param2")->getValue(), "value2");
5252
compare("param2", yaml.getRoot()->getElement("param2")->getComment(), "some comment 2");

0 commit comments

Comments
 (0)