Skip to content

Commit ff0991b

Browse files
committed
Tweaked csv and json examples
1 parent 7e8ecd6 commit ff0991b

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

examples/arithmetic/src/pegged/examples/arithmetic.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ unittest
167167

168168
unittest
169169
{
170-
// Some addituional test borrowed from simple_arithmetic
170+
// Some additional test borrowed from simple_arithmetic
171171
float interpreter(string expr)
172172
{
173173
auto p = ArithmeticNoVar(expr);

examples/csv/src/pegged/examples/csv.d

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ unittest
4242
4, 5, 6,,
4343
7");
4444

45-
assert(p1.children[0].children.length == 3); // 3 lines
46-
assert(p1.children[0].children[0].matches == ["1", "2", "3"]);
47-
assert(p1.children[0].children[1].matches == ["4","5","6","",""]);
48-
assert(p1.children[0].children[2].matches == ["7"]);
45+
assert(p1[0].children.length == 3); // 3 lines
46+
assert(p1[0][0].matches == ["1", "2", "3"]);
47+
assert(p1[0][1].matches == ["4","5","6","",""]);
48+
assert(p1[0][2].matches == ["7"]);
4949

5050
assert(CSV("1,
5151
2,

examples/json/src/pegged/examples/json.d

+14-8
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ JSON:
3131
Digit <- [0-9]
3232
Hex <- [0-9A-Fa-f]
3333
`));
34-
enum example2 = `
34+
35+
unittest
3536
{
37+
enum example2 = `
38+
{
3639
"Number": 42,
3740
"Decimal": 123.456,
3841
"String": "abc",
@@ -45,10 +48,16 @@ enum example2 = `
4548
"False" : false,
4649
"Null" : null,
4750
"Empty" : {}
48-
}`;
51+
}`;
4952

50-
enum example3 =
51-
`{
53+
auto example2Tree = JSON(example2);
54+
assert(example2Tree.successful);
55+
assert(example2Tree[0].children.length == 12);
56+
assert(example2Tree[0][0][0].matches == ["Number"]);
57+
assert(example2Tree[0][0][1].matches == ["42"]);
58+
59+
enum example3 =
60+
`{
5261
"glossary": {
5362
"title": "example glossary",
5463
"GlossDiv": {
@@ -71,7 +80,7 @@ enum example3 =
7180
}
7281
}`;
7382

74-
enum example4 =
83+
enum example4 =
7584
`{"web-app": {
7685
"servlet": [
7786
{
@@ -162,9 +171,6 @@ enum example4 =
162171
"taglib-location": "/WEB-INF/tlds/cofax.tld"}}}
163172
`;
164173

165-
unittest
166-
{
167-
assert(JSON(example2).successful);
168174
assert(JSON(example3).successful);
169175
assert(JSON(example4).successful);
170176
}

pegged/peg.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ struct ParseTree
352352
return children;
353353
}
354354
355-
size_t opDollar(size_t pos)()
355+
size_t opDollar(size_t pos)() const
356356
{
357357
return children.length;
358358
}

0 commit comments

Comments
 (0)