@balena/odata-parser 3.1.0 → 3.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/.versionbot/CHANGELOG.yml +19 -1
  2. package/CHANGELOG.md +6 -0
  3. package/odata-parser.js +476 -503
  4. package/odata-parser.pegjs +25 -16
  5. package/package.json +2 -2
  6. package/test/expand.js +27 -1
  7. package/test/resource_parsing.js +4 -0
package/odata-parser.js CHANGED
@@ -1,4 +1,4 @@
1
- // @generated by Peggy 4.0.3.
1
+ // @generated by Peggy 4.1.1.
2
2
  //
3
3
  // https://peggyjs.org/
4
4
 
@@ -253,150 +253,109 @@ function peg$parse(input, options) {
253
253
  var peg$startRuleFunctions = { Process: peg$parseProcess, ProcessRule: peg$parseProcessRule };
254
254
  var peg$startRuleFunction = peg$parseProcess;
255
255
 
256
- var peg$c0 = "tree";
257
- var peg$c1 = "model";
258
- var peg$c2 = "/$metadata";
259
- var peg$c3 = "/";
260
- var peg$c4 = "&";
261
- var peg$c5 = "options";
262
- var peg$c6 = "$";
263
- var peg$c7 = "%24";
264
- var peg$c8 = "@";
265
- var peg$c9 = "name";
266
- var peg$c10 = "=";
267
- var peg$c11 = "n";
268
- var peg$c12 = "b";
269
- var peg$c13 = "s";
270
- var peg$c14 = "value";
271
- var peg$c15 = "orderby=";
272
- var peg$c16 = ",";
273
- var peg$c17 = "properties";
274
- var peg$c18 = "property";
275
- var peg$c19 = "asc";
276
- var peg$c20 = "desc";
277
- var peg$c21 = "order";
278
- var peg$c22 = "top=";
279
- var peg$c23 = "skip=";
280
- var peg$c24 = "inlinecount=";
281
- var peg$c25 = "allpages";
282
- var peg$c26 = "none";
283
- var peg$c27 = "count=";
284
- var peg$c28 = "expand=";
285
- var peg$c29 = "select=";
286
- var peg$c30 = "*";
287
- var peg$c31 = "filter=";
288
- var peg$c32 = "expr";
289
- var peg$c33 = "+";
290
- var peg$c34 = "json";
291
- var peg$c35 = "atom";
292
- var peg$c36 = "xml";
293
- var peg$c37 = "format=";
294
- var peg$c38 = "type";
295
- var peg$c39 = ";";
296
- var peg$c40 = "odata.";
297
- var peg$c41 = "metadata=";
298
- var peg$c42 = "minimal";
299
- var peg$c43 = "full";
300
- var peg$c44 = "metadata";
301
- var peg$c45 = "minPrecedence";
302
- var peg$c46 = "x";
303
- var peg$c47 = "lhs";
304
- var peg$c48 = "op";
305
- var peg$c49 = "rhs";
306
- var peg$c50 = "in";
307
- var peg$c51 = "(";
308
- var peg$c52 = ")";
309
- var peg$c53 = "eq";
310
- var peg$c54 = "ne";
311
- var peg$c55 = "gt";
312
- var peg$c56 = "ge";
313
- var peg$c57 = "lt";
314
- var peg$c58 = "le";
315
- var peg$c59 = "and";
316
- var peg$c60 = "or";
317
- var peg$c61 = "sub";
318
- var peg$c62 = "add";
319
- var peg$c63 = "mod";
320
- var peg$c64 = "div";
321
- var peg$c65 = "mul";
322
- var peg$c66 = "not";
323
- var peg$c67 = "cast";
324
- var peg$c68 = "ceiling";
325
- var peg$c69 = "concat";
326
- var peg$c70 = "contains";
327
- var peg$c71 = "date";
328
- var peg$c72 = "day";
329
- var peg$c73 = "endswith";
330
- var peg$c74 = "floor";
331
- var peg$c75 = "fractionalseconds";
332
- var peg$c76 = "hour";
333
- var peg$c77 = "indexof";
334
- var peg$c78 = "isof";
335
- var peg$c79 = "length";
336
- var peg$c80 = "maxdatetime";
337
- var peg$c81 = "mindatetime";
338
- var peg$c82 = "minute";
339
- var peg$c83 = "month";
340
- var peg$c84 = "now";
341
- var peg$c85 = "replace";
342
- var peg$c86 = "round";
343
- var peg$c87 = "second";
344
- var peg$c88 = "startswith";
345
- var peg$c89 = "substringof";
346
- var peg$c90 = "substring";
347
- var peg$c91 = "time";
348
- var peg$c92 = "tolower";
349
- var peg$c93 = "totaloffsetminutes";
350
- var peg$c94 = "totalseconds";
351
- var peg$c95 = "toupper";
352
- var peg$c96 = "trim";
353
- var peg$c97 = "year";
354
- var peg$c98 = "methodName";
355
- var peg$c99 = "args";
356
- var peg$c100 = "any";
357
- var peg$c101 = "all";
358
- var peg$c102 = "identifier";
359
- var peg$c103 = ":";
360
- var peg$c104 = "expression";
361
- var peg$c105 = "resource";
362
- var peg$c106 = "/$count";
363
- var peg$c107 = "option";
364
- var peg$c108 = "optionsObj";
365
- var peg$c109 = "countOptions";
366
- var peg$c110 = "count";
367
- var peg$c111 = "next";
368
- var peg$c112 = "lambda";
369
- var peg$c113 = "method";
370
- var peg$c114 = "keyBinds";
371
- var peg$c115 = "/$links";
372
- var peg$c116 = "result";
373
- var peg$c117 = "key";
374
- var peg$c118 = "link";
375
- var peg$c119 = "?";
376
- var peg$c120 = "resourceName";
377
- var peg$c121 = "sign";
378
- var peg$c122 = ".";
379
- var peg$c123 = "d";
380
- var peg$c124 = "null";
381
- var peg$c125 = "true";
382
- var peg$c126 = "false";
383
- var peg$c127 = "duration";
384
- var peg$c128 = "P";
385
- var peg$c129 = "D";
386
- var peg$c130 = "T";
387
- var peg$c131 = "H";
388
- var peg$c132 = "M";
389
- var peg$c133 = "S";
390
- var peg$c134 = "text";
391
- var peg$c135 = "%2B";
392
- var peg$c136 = "-";
393
- var peg$c137 = "'";
394
- var peg$c138 = "%27";
395
- var peg$c139 = "param";
396
- var peg$c140 = "datetime";
397
- var peg$c141 = "t";
398
- var peg$c142 = " ";
399
- var peg$c143 = "%20";
256
+ var peg$c0 = "/$metadata";
257
+ var peg$c1 = "/";
258
+ var peg$c2 = "&";
259
+ var peg$c3 = "$";
260
+ var peg$c4 = "%24";
261
+ var peg$c5 = "@";
262
+ var peg$c6 = "=";
263
+ var peg$c7 = "orderby=";
264
+ var peg$c8 = ",";
265
+ var peg$c9 = "asc";
266
+ var peg$c10 = "desc";
267
+ var peg$c11 = "top=";
268
+ var peg$c12 = "skip=";
269
+ var peg$c13 = "inlinecount=";
270
+ var peg$c14 = "allpages";
271
+ var peg$c15 = "none";
272
+ var peg$c16 = "count=";
273
+ var peg$c17 = "expand=";
274
+ var peg$c18 = "select=";
275
+ var peg$c19 = "*";
276
+ var peg$c20 = "filter=";
277
+ var peg$c21 = "+";
278
+ var peg$c22 = "json";
279
+ var peg$c23 = "atom";
280
+ var peg$c24 = "xml";
281
+ var peg$c25 = "format=";
282
+ var peg$c26 = ";";
283
+ var peg$c27 = "odata.";
284
+ var peg$c28 = "metadata=";
285
+ var peg$c29 = "minimal";
286
+ var peg$c30 = "full";
287
+ var peg$c31 = "in";
288
+ var peg$c32 = "(";
289
+ var peg$c33 = ")";
290
+ var peg$c34 = "eq";
291
+ var peg$c35 = "ne";
292
+ var peg$c36 = "gt";
293
+ var peg$c37 = "ge";
294
+ var peg$c38 = "lt";
295
+ var peg$c39 = "le";
296
+ var peg$c40 = "and";
297
+ var peg$c41 = "or";
298
+ var peg$c42 = "sub";
299
+ var peg$c43 = "add";
300
+ var peg$c44 = "mod";
301
+ var peg$c45 = "div";
302
+ var peg$c46 = "mul";
303
+ var peg$c47 = "not";
304
+ var peg$c48 = "cast";
305
+ var peg$c49 = "ceiling";
306
+ var peg$c50 = "concat";
307
+ var peg$c51 = "contains";
308
+ var peg$c52 = "date";
309
+ var peg$c53 = "day";
310
+ var peg$c54 = "endswith";
311
+ var peg$c55 = "floor";
312
+ var peg$c56 = "fractionalseconds";
313
+ var peg$c57 = "hour";
314
+ var peg$c58 = "indexof";
315
+ var peg$c59 = "isof";
316
+ var peg$c60 = "length";
317
+ var peg$c61 = "maxdatetime";
318
+ var peg$c62 = "mindatetime";
319
+ var peg$c63 = "minute";
320
+ var peg$c64 = "month";
321
+ var peg$c65 = "now";
322
+ var peg$c66 = "replace";
323
+ var peg$c67 = "round";
324
+ var peg$c68 = "second";
325
+ var peg$c69 = "startswith";
326
+ var peg$c70 = "substringof";
327
+ var peg$c71 = "substring";
328
+ var peg$c72 = "time";
329
+ var peg$c73 = "tolower";
330
+ var peg$c74 = "totaloffsetminutes";
331
+ var peg$c75 = "totalseconds";
332
+ var peg$c76 = "toupper";
333
+ var peg$c77 = "trim";
334
+ var peg$c78 = "year";
335
+ var peg$c79 = "any";
336
+ var peg$c80 = "all";
337
+ var peg$c81 = ":";
338
+ var peg$c82 = "/$count";
339
+ var peg$c83 = "/$links";
340
+ var peg$c84 = "?";
341
+ var peg$c85 = ".";
342
+ var peg$c86 = "null";
343
+ var peg$c87 = "true";
344
+ var peg$c88 = "false";
345
+ var peg$c89 = "duration";
346
+ var peg$c90 = "P";
347
+ var peg$c91 = "D";
348
+ var peg$c92 = "T";
349
+ var peg$c93 = "H";
350
+ var peg$c94 = "M";
351
+ var peg$c95 = "S";
352
+ var peg$c96 = "%2B";
353
+ var peg$c97 = "-";
354
+ var peg$c98 = "'";
355
+ var peg$c99 = "%27";
356
+ var peg$c100 = "datetime";
357
+ var peg$c101 = " ";
358
+ var peg$c102 = "%20";
400
359
 
401
360
  var peg$r0 = /^[a-z]/i;
402
361
  var peg$r1 = /^[&;]/;
@@ -589,78 +548,81 @@ function peg$parse(input, options) {
589
548
  var peg$f39 = function(name, identifier, expression) { return { expression, identifier, method: name } };
590
549
  var peg$f40 = function(methodName) { return [] };
591
550
  var peg$f41 = function(methodName, args) { return [ 'call', { args, method: methodName } ] };
592
- var peg$f42 = function(resource, property, option) { return CollapseObjectArray([option]) };
593
- var peg$f43 = function(resource, property, optionsObj) { return { count: true, options: optionsObj } };
594
- var peg$f44 = function(resource, property, countOptions) { return { name: resource, property, ...countOptions } };
595
- var peg$f45 = function(resource) { return true };
596
- var peg$f46 = function(resource, count, options) { return CollapseObjectArray(options) };
597
- var peg$f47 = function(resource, count) { return {} };
598
- var peg$f48 = function(resource, count, optionsObj, next) { return { name: resource, property: next, count, options: optionsObj} };
599
- var peg$f49 = function(resource, next) { return { name: resource, property: next } };
600
- var peg$f50 = function(resource, lambda) { return { name: resource, lambda } };
601
- var peg$f51 = function(resource, method) { return { name: resource, method } };
602
- var peg$f52 = function(keyBinds) { return CollapseObjectArray(keyBinds) };
603
- var peg$f53 = function(name, value) { return { name, value }};
604
- var peg$f54 = function(resource) { return { resource } };
605
- var peg$f55 = function(result, key) { result.key = key };
606
- var peg$f56 = function(result, link) {result.link = link};
607
- var peg$f57 = function(result, property) {result.property = property};
608
- var peg$f58 = function(result) {result.count = true};
609
- var peg$f59 = function(result) { return result };
610
- var peg$f60 = function(result, link) {result.link = link};
611
- var peg$f61 = function(result, property) {result.property = property};
551
+ var peg$f42 = function(name) { return { name } };
552
+ var peg$f43 = function(result, property) { result.property = property };
553
+ var peg$f44 = function(result, option) { return CollapseObjectArray([option]) };
554
+ var peg$f45 = function(result, optionsObj) { result.count = true; result.options = optionsObj };
555
+ var peg$f46 = function(result) { return result };
556
+ var peg$f47 = function(name) { return { name } };
557
+ var peg$f48 = function(result) { result.count = true };
558
+ var peg$f49 = function(result, options) { result.options = CollapseObjectArray(options) };
559
+ var peg$f50 = function(result, next) { result.property = next };
560
+ var peg$f51 = function(result) { return result };
561
+ var peg$f52 = function(resource, next) { return { name: resource, property: next } };
562
+ var peg$f53 = function(resource, lambda) { return { name: resource, lambda } };
563
+ var peg$f54 = function(resource, method) { return { name: resource, method } };
564
+ var peg$f55 = function(keyBinds) { return CollapseObjectArray(keyBinds) };
565
+ var peg$f56 = function(name, value) { return { name, value }};
566
+ var peg$f57 = function(resource) { return { resource } };
567
+ var peg$f58 = function(result, key) { result.key = key };
568
+ var peg$f59 = function(result, link) {result.link = link};
569
+ var peg$f60 = function(result, property) {result.property = property};
570
+ var peg$f61 = function(result) {result.count = true};
612
571
  var peg$f62 = function(result) { return result };
613
- var peg$f63 = function(result, options) {result.options = options};
614
- var peg$f64 = function(result) { return result };
615
- var peg$f65 = function(resource) { return { resource } };
616
- var peg$f66 = function(result, key) { result.key = key };
617
- var peg$f67 = function(result, link) {result.link = link};
618
- var peg$f68 = function(result, property) {result.property = property};
619
- var peg$f69 = function(result) {result.count = true};
620
- var peg$f70 = function(result, options) {result.options = options};
621
- var peg$f71 = function(result) { return result };
622
- var peg$f72 = function(resourceName) { return decodeURIComponent(resourceName) };
623
- var peg$f73 = function(sign, d) { return Number(sign + d) };
624
- var peg$f74 = function(d) { return parseInt(d, 10) };
625
- var peg$f75 = function() { return null };
626
- var peg$f76 = function() { return true };
627
- var peg$f77 = function() { return false };
628
- var peg$f78 = function(sign, day, hour, minute, second) {return hour || minute || second};
629
- var peg$f79 = function(sign, day, hour, minute, second) {
572
+ var peg$f63 = function(result, link) {result.link = link};
573
+ var peg$f64 = function(result, property) {result.property = property};
574
+ var peg$f65 = function(result) { return result };
575
+ var peg$f66 = function(result, options) {result.options = options};
576
+ var peg$f67 = function(result) { return result };
577
+ var peg$f68 = function(resource) { return { resource } };
578
+ var peg$f69 = function(result, key) { result.key = key };
579
+ var peg$f70 = function(result, link) {result.link = link};
580
+ var peg$f71 = function(result, property) {result.property = property};
581
+ var peg$f72 = function(result) {result.count = true};
582
+ var peg$f73 = function(result, options) {result.options = options};
583
+ var peg$f74 = function(result) { return result };
584
+ var peg$f75 = function(resourceName) { return decodeURIComponent(resourceName) };
585
+ var peg$f76 = function(sign, d) { return Number(sign + d) };
586
+ var peg$f77 = function(d) { return parseInt(d, 10) };
587
+ var peg$f78 = function() { return null };
588
+ var peg$f79 = function() { return true };
589
+ var peg$f80 = function() { return false };
590
+ var peg$f81 = function(sign, day, hour, minute, second) {return hour || minute || second};
591
+ var peg$f82 = function(sign, day, hour, minute, second) {
630
592
  return {
631
593
  hour: hour || undefined,
632
594
  minute: minute || undefined,
633
595
  second: second || undefined
634
596
  }
635
597
  };
636
- var peg$f80 = function(sign, day, time) {return day || time};
637
- var peg$f81 = function(sign, day, time) { return {
598
+ var peg$f83 = function(sign, day, time) {return day || time};
599
+ var peg$f84 = function(sign, day, time) { return {
638
600
  negative: sign === '-',
639
601
  day: day || undefined,
640
602
  hour: time?.hour,
641
603
  minute: time?.minute,
642
604
  second: time?.second,
643
605
  } };
644
- var peg$f82 = function(d) { return Number(d) };
645
- var peg$f83 = function(text) { return decodeURIComponent(text) };
646
- var peg$f84 = function() { return '+' };
647
- var peg$f85 = function() { return '\'' };
648
- var peg$f86 = function(text) { return decodeURIComponent(text.join('')) };
649
- var peg$f87 = function(param) { return { bind: '@' + param } };
650
- var peg$f88 = function(n) { return Bind('Real', n) };
651
- var peg$f89 = function(n) { return Bind('Integer', n) };
652
- var peg$f90 = function() { return 'Date Time' };
653
- var peg$f91 = function() { return 'Date' };
654
- var peg$f92 = function(type, date) { return Date.parse(date) };
655
- var peg$f93 = function(type, date) { return isNaN(date) };
656
- var peg$f94 = function(type, date) { return [type, date] };
657
- var peg$f95 = function(d) { return Bind(d[0], d[1]) };
658
- var peg$f96 = function(b) { return Bind('Boolean', b) };
659
- var peg$f97 = function(resource) {
606
+ var peg$f85 = function(d) { return Number(d) };
607
+ var peg$f86 = function(text) { return decodeURIComponent(text) };
608
+ var peg$f87 = function() { return '+' };
609
+ var peg$f88 = function() { return '\'' };
610
+ var peg$f89 = function(text) { return decodeURIComponent(text.join('')) };
611
+ var peg$f90 = function(param) { return { bind: '@' + param } };
612
+ var peg$f91 = function(n) { return Bind('Real', n) };
613
+ var peg$f92 = function(n) { return Bind('Integer', n) };
614
+ var peg$f93 = function() { return 'Date Time' };
615
+ var peg$f94 = function() { return 'Date' };
616
+ var peg$f95 = function(type, date) { return Date.parse(date) };
617
+ var peg$f96 = function(type, date) { return isNaN(date) };
618
+ var peg$f97 = function(type, date) { return [type, date] };
619
+ var peg$f98 = function(d) { return Bind(d[0], d[1]) };
620
+ var peg$f99 = function(b) { return Bind('Boolean', b) };
621
+ var peg$f100 = function(resource) {
660
622
  const bind = Bind('ContentReference', resource)
661
623
  return { resource: bind, key: bind }
662
624
  };
663
- var peg$f98 = function(t) { return Bind('Text', t) };
625
+ var peg$f101 = function(t) { return Bind('Text', t) };
664
626
  var peg$currPos = options.peg$currPos | 0;
665
627
  var peg$savedPos = peg$currPos;
666
628
  var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -908,8 +870,8 @@ function peg$parse(input, options) {
908
870
  s0 = s1;
909
871
  if (s0 === peg$FAILED) {
910
872
  s0 = peg$currPos;
911
- if (input.substr(peg$currPos, 10) === peg$c2) {
912
- s1 = peg$c2;
873
+ if (input.substr(peg$currPos, 10) === peg$c0) {
874
+ s1 = peg$c0;
913
875
  peg$currPos += 10;
914
876
  } else {
915
877
  s1 = peg$FAILED;
@@ -923,7 +885,7 @@ function peg$parse(input, options) {
923
885
  if (s0 === peg$FAILED) {
924
886
  s0 = peg$currPos;
925
887
  if (input.charCodeAt(peg$currPos) === 47) {
926
- s1 = peg$c3;
888
+ s1 = peg$c1;
927
889
  peg$currPos++;
928
890
  } else {
929
891
  s1 = peg$FAILED;
@@ -962,7 +924,7 @@ function peg$parse(input, options) {
962
924
  s2.push(s3);
963
925
  s3 = peg$currPos;
964
926
  if (input.charCodeAt(peg$currPos) === 38) {
965
- s4 = peg$c4;
927
+ s4 = peg$c2;
966
928
  peg$currPos++;
967
929
  } else {
968
930
  s4 = peg$FAILED;
@@ -1073,15 +1035,15 @@ function peg$parse(input, options) {
1073
1035
 
1074
1036
  peg$silentFails++;
1075
1037
  if (input.charCodeAt(peg$currPos) === 36) {
1076
- s0 = peg$c6;
1038
+ s0 = peg$c3;
1077
1039
  peg$currPos++;
1078
1040
  } else {
1079
1041
  s0 = peg$FAILED;
1080
1042
  if (peg$silentFails === 0) { peg$fail(peg$e4); }
1081
1043
  }
1082
1044
  if (s0 === peg$FAILED) {
1083
- if (input.substr(peg$currPos, 3) === peg$c7) {
1084
- s0 = peg$c7;
1045
+ if (input.substr(peg$currPos, 3) === peg$c4) {
1046
+ s0 = peg$c4;
1085
1047
  peg$currPos += 3;
1086
1048
  } else {
1087
1049
  s0 = peg$FAILED;
@@ -1113,7 +1075,7 @@ function peg$parse(input, options) {
1113
1075
 
1114
1076
  s0 = peg$currPos;
1115
1077
  if (input.charCodeAt(peg$currPos) === 64) {
1116
- s1 = peg$c8;
1078
+ s1 = peg$c5;
1117
1079
  peg$currPos++;
1118
1080
  } else {
1119
1081
  s1 = peg$FAILED;
@@ -1122,7 +1084,7 @@ function peg$parse(input, options) {
1122
1084
  if (s1 !== peg$FAILED) {
1123
1085
  s2 = peg$parseText();
1124
1086
  if (input.charCodeAt(peg$currPos) === 61) {
1125
- s3 = peg$c10;
1087
+ s3 = peg$c6;
1126
1088
  peg$currPos++;
1127
1089
  } else {
1128
1090
  s3 = peg$FAILED;
@@ -1205,7 +1167,7 @@ function peg$parse(input, options) {
1205
1167
  s0 = peg$currPos;
1206
1168
  s1 = peg$parseText();
1207
1169
  if (input.charCodeAt(peg$currPos) === 61) {
1208
- s2 = peg$c10;
1170
+ s2 = peg$c6;
1209
1171
  peg$currPos++;
1210
1172
  } else {
1211
1173
  s2 = peg$FAILED;
@@ -1238,8 +1200,8 @@ function peg$parse(input, options) {
1238
1200
  }
1239
1201
 
1240
1202
  s0 = peg$currPos;
1241
- if (input.substr(peg$currPos, 8) === peg$c15) {
1242
- s1 = peg$c15;
1203
+ if (input.substr(peg$currPos, 8) === peg$c7) {
1204
+ s1 = peg$c7;
1243
1205
  peg$currPos += 8;
1244
1206
  } else {
1245
1207
  s1 = peg$FAILED;
@@ -1253,7 +1215,7 @@ function peg$parse(input, options) {
1253
1215
  s3.push(s4);
1254
1216
  s4 = peg$currPos;
1255
1217
  if (input.charCodeAt(peg$currPos) === 44) {
1256
- s5 = peg$c16;
1218
+ s5 = peg$c8;
1257
1219
  peg$currPos++;
1258
1220
  } else {
1259
1221
  s5 = peg$FAILED;
@@ -1312,16 +1274,16 @@ function peg$parse(input, options) {
1312
1274
  s2 = peg$currPos;
1313
1275
  s3 = peg$parseboundary();
1314
1276
  if (s3 !== peg$FAILED) {
1315
- if (input.substr(peg$currPos, 3) === peg$c19) {
1316
- s4 = peg$c19;
1277
+ if (input.substr(peg$currPos, 3) === peg$c9) {
1278
+ s4 = peg$c9;
1317
1279
  peg$currPos += 3;
1318
1280
  } else {
1319
1281
  s4 = peg$FAILED;
1320
1282
  if (peg$silentFails === 0) { peg$fail(peg$e10); }
1321
1283
  }
1322
1284
  if (s4 === peg$FAILED) {
1323
- if (input.substr(peg$currPos, 4) === peg$c20) {
1324
- s4 = peg$c20;
1285
+ if (input.substr(peg$currPos, 4) === peg$c10) {
1286
+ s4 = peg$c10;
1325
1287
  peg$currPos += 4;
1326
1288
  } else {
1327
1289
  s4 = peg$FAILED;
@@ -1375,8 +1337,8 @@ function peg$parse(input, options) {
1375
1337
  }
1376
1338
 
1377
1339
  s0 = peg$currPos;
1378
- if (input.substr(peg$currPos, 4) === peg$c22) {
1379
- s1 = peg$c22;
1340
+ if (input.substr(peg$currPos, 4) === peg$c11) {
1341
+ s1 = peg$c11;
1380
1342
  peg$currPos += 4;
1381
1343
  } else {
1382
1344
  s1 = peg$FAILED;
@@ -1414,8 +1376,8 @@ function peg$parse(input, options) {
1414
1376
  }
1415
1377
 
1416
1378
  s0 = peg$currPos;
1417
- if (input.substr(peg$currPos, 5) === peg$c23) {
1418
- s1 = peg$c23;
1379
+ if (input.substr(peg$currPos, 5) === peg$c12) {
1380
+ s1 = peg$c12;
1419
1381
  peg$currPos += 5;
1420
1382
  } else {
1421
1383
  s1 = peg$FAILED;
@@ -1453,24 +1415,24 @@ function peg$parse(input, options) {
1453
1415
  }
1454
1416
 
1455
1417
  s0 = peg$currPos;
1456
- if (input.substr(peg$currPos, 12) === peg$c24) {
1457
- s1 = peg$c24;
1418
+ if (input.substr(peg$currPos, 12) === peg$c13) {
1419
+ s1 = peg$c13;
1458
1420
  peg$currPos += 12;
1459
1421
  } else {
1460
1422
  s1 = peg$FAILED;
1461
1423
  if (peg$silentFails === 0) { peg$fail(peg$e14); }
1462
1424
  }
1463
1425
  if (s1 !== peg$FAILED) {
1464
- if (input.substr(peg$currPos, 8) === peg$c25) {
1465
- s2 = peg$c25;
1426
+ if (input.substr(peg$currPos, 8) === peg$c14) {
1427
+ s2 = peg$c14;
1466
1428
  peg$currPos += 8;
1467
1429
  } else {
1468
1430
  s2 = peg$FAILED;
1469
1431
  if (peg$silentFails === 0) { peg$fail(peg$e15); }
1470
1432
  }
1471
1433
  if (s2 === peg$FAILED) {
1472
- if (input.substr(peg$currPos, 4) === peg$c26) {
1473
- s2 = peg$c26;
1434
+ if (input.substr(peg$currPos, 4) === peg$c15) {
1435
+ s2 = peg$c15;
1474
1436
  peg$currPos += 4;
1475
1437
  } else {
1476
1438
  s2 = peg$FAILED;
@@ -1514,8 +1476,8 @@ function peg$parse(input, options) {
1514
1476
  }
1515
1477
 
1516
1478
  s0 = peg$currPos;
1517
- if (input.substr(peg$currPos, 6) === peg$c27) {
1518
- s1 = peg$c27;
1479
+ if (input.substr(peg$currPos, 6) === peg$c16) {
1480
+ s1 = peg$c16;
1519
1481
  peg$currPos += 6;
1520
1482
  } else {
1521
1483
  s1 = peg$FAILED;
@@ -1553,8 +1515,8 @@ function peg$parse(input, options) {
1553
1515
  }
1554
1516
 
1555
1517
  s0 = peg$currPos;
1556
- if (input.substr(peg$currPos, 7) === peg$c28) {
1557
- s1 = peg$c28;
1518
+ if (input.substr(peg$currPos, 7) === peg$c17) {
1519
+ s1 = peg$c17;
1558
1520
  peg$currPos += 7;
1559
1521
  } else {
1560
1522
  s1 = peg$FAILED;
@@ -1592,8 +1554,8 @@ function peg$parse(input, options) {
1592
1554
  }
1593
1555
 
1594
1556
  s0 = peg$currPos;
1595
- if (input.substr(peg$currPos, 7) === peg$c29) {
1596
- s1 = peg$c29;
1557
+ if (input.substr(peg$currPos, 7) === peg$c18) {
1558
+ s1 = peg$c18;
1597
1559
  peg$currPos += 7;
1598
1560
  } else {
1599
1561
  s1 = peg$FAILED;
@@ -1601,7 +1563,7 @@ function peg$parse(input, options) {
1601
1563
  }
1602
1564
  if (s1 !== peg$FAILED) {
1603
1565
  if (input.charCodeAt(peg$currPos) === 42) {
1604
- s2 = peg$c30;
1566
+ s2 = peg$c19;
1605
1567
  peg$currPos++;
1606
1568
  } else {
1607
1569
  s2 = peg$FAILED;
@@ -1646,8 +1608,8 @@ function peg$parse(input, options) {
1646
1608
  }
1647
1609
 
1648
1610
  s0 = peg$currPos;
1649
- if (input.substr(peg$currPos, 7) === peg$c31) {
1650
- s1 = peg$c31;
1611
+ if (input.substr(peg$currPos, 7) === peg$c20) {
1612
+ s1 = peg$c20;
1651
1613
  peg$currPos += 7;
1652
1614
  } else {
1653
1615
  s1 = peg$FAILED;
@@ -1710,7 +1672,7 @@ function peg$parse(input, options) {
1710
1672
  }
1711
1673
  if (s2 !== peg$FAILED) {
1712
1674
  if (input.charCodeAt(peg$currPos) === 47) {
1713
- s3 = peg$c3;
1675
+ s3 = peg$c1;
1714
1676
  peg$currPos++;
1715
1677
  } else {
1716
1678
  s3 = peg$FAILED;
@@ -1742,7 +1704,7 @@ function peg$parse(input, options) {
1742
1704
  if (s4 !== peg$FAILED) {
1743
1705
  s5 = peg$currPos;
1744
1706
  if (input.charCodeAt(peg$currPos) === 43) {
1745
- s6 = peg$c33;
1707
+ s6 = peg$c21;
1746
1708
  peg$currPos++;
1747
1709
  } else {
1748
1710
  s6 = peg$FAILED;
@@ -1800,24 +1762,24 @@ function peg$parse(input, options) {
1800
1762
  s1 = peg$FAILED;
1801
1763
  }
1802
1764
  if (s1 === peg$FAILED) {
1803
- if (input.substr(peg$currPos, 4) === peg$c34) {
1804
- s1 = peg$c34;
1765
+ if (input.substr(peg$currPos, 4) === peg$c22) {
1766
+ s1 = peg$c22;
1805
1767
  peg$currPos += 4;
1806
1768
  } else {
1807
1769
  s1 = peg$FAILED;
1808
1770
  if (peg$silentFails === 0) { peg$fail(peg$e24); }
1809
1771
  }
1810
1772
  if (s1 === peg$FAILED) {
1811
- if (input.substr(peg$currPos, 4) === peg$c35) {
1812
- s1 = peg$c35;
1773
+ if (input.substr(peg$currPos, 4) === peg$c23) {
1774
+ s1 = peg$c23;
1813
1775
  peg$currPos += 4;
1814
1776
  } else {
1815
1777
  s1 = peg$FAILED;
1816
1778
  if (peg$silentFails === 0) { peg$fail(peg$e25); }
1817
1779
  }
1818
1780
  if (s1 === peg$FAILED) {
1819
- if (input.substr(peg$currPos, 3) === peg$c36) {
1820
- s1 = peg$c36;
1781
+ if (input.substr(peg$currPos, 3) === peg$c24) {
1782
+ s1 = peg$c24;
1821
1783
  peg$currPos += 3;
1822
1784
  } else {
1823
1785
  s1 = peg$FAILED;
@@ -1850,8 +1812,8 @@ function peg$parse(input, options) {
1850
1812
  }
1851
1813
 
1852
1814
  s0 = peg$currPos;
1853
- if (input.substr(peg$currPos, 7) === peg$c37) {
1854
- s1 = peg$c37;
1815
+ if (input.substr(peg$currPos, 7) === peg$c25) {
1816
+ s1 = peg$c25;
1855
1817
  peg$currPos += 7;
1856
1818
  } else {
1857
1819
  s1 = peg$FAILED;
@@ -1862,15 +1824,15 @@ function peg$parse(input, options) {
1862
1824
  if (s2 !== peg$FAILED) {
1863
1825
  s3 = peg$currPos;
1864
1826
  if (input.charCodeAt(peg$currPos) === 59) {
1865
- s4 = peg$c39;
1827
+ s4 = peg$c26;
1866
1828
  peg$currPos++;
1867
1829
  } else {
1868
1830
  s4 = peg$FAILED;
1869
1831
  if (peg$silentFails === 0) { peg$fail(peg$e28); }
1870
1832
  }
1871
1833
  if (s4 !== peg$FAILED) {
1872
- if (input.substr(peg$currPos, 6) === peg$c40) {
1873
- s5 = peg$c40;
1834
+ if (input.substr(peg$currPos, 6) === peg$c27) {
1835
+ s5 = peg$c27;
1874
1836
  peg$currPos += 6;
1875
1837
  } else {
1876
1838
  s5 = peg$FAILED;
@@ -1879,32 +1841,32 @@ function peg$parse(input, options) {
1879
1841
  if (s5 === peg$FAILED) {
1880
1842
  s5 = null;
1881
1843
  }
1882
- if (input.substr(peg$currPos, 9) === peg$c41) {
1883
- s6 = peg$c41;
1844
+ if (input.substr(peg$currPos, 9) === peg$c28) {
1845
+ s6 = peg$c28;
1884
1846
  peg$currPos += 9;
1885
1847
  } else {
1886
1848
  s6 = peg$FAILED;
1887
1849
  if (peg$silentFails === 0) { peg$fail(peg$e30); }
1888
1850
  }
1889
1851
  if (s6 !== peg$FAILED) {
1890
- if (input.substr(peg$currPos, 4) === peg$c26) {
1891
- s7 = peg$c26;
1852
+ if (input.substr(peg$currPos, 4) === peg$c15) {
1853
+ s7 = peg$c15;
1892
1854
  peg$currPos += 4;
1893
1855
  } else {
1894
1856
  s7 = peg$FAILED;
1895
1857
  if (peg$silentFails === 0) { peg$fail(peg$e16); }
1896
1858
  }
1897
1859
  if (s7 === peg$FAILED) {
1898
- if (input.substr(peg$currPos, 7) === peg$c42) {
1899
- s7 = peg$c42;
1860
+ if (input.substr(peg$currPos, 7) === peg$c29) {
1861
+ s7 = peg$c29;
1900
1862
  peg$currPos += 7;
1901
1863
  } else {
1902
1864
  s7 = peg$FAILED;
1903
1865
  if (peg$silentFails === 0) { peg$fail(peg$e31); }
1904
1866
  }
1905
1867
  if (s7 === peg$FAILED) {
1906
- if (input.substr(peg$currPos, 4) === peg$c43) {
1907
- s7 = peg$c43;
1868
+ if (input.substr(peg$currPos, 4) === peg$c30) {
1869
+ s7 = peg$c30;
1908
1870
  peg$currPos += 4;
1909
1871
  } else {
1910
1872
  s7 = peg$FAILED;
@@ -2044,8 +2006,8 @@ function peg$parse(input, options) {
2044
2006
  s5 = peg$currPos;
2045
2007
  s6 = peg$parseboundary();
2046
2008
  if (s6 !== peg$FAILED) {
2047
- if (input.substr(peg$currPos, 2) === peg$c50) {
2048
- s7 = peg$c50;
2009
+ if (input.substr(peg$currPos, 2) === peg$c31) {
2010
+ s7 = peg$c31;
2049
2011
  peg$currPos += 2;
2050
2012
  } else {
2051
2013
  s7 = peg$FAILED;
@@ -2108,8 +2070,8 @@ function peg$parse(input, options) {
2108
2070
  s5 = peg$currPos;
2109
2071
  s6 = peg$parseboundary();
2110
2072
  if (s6 !== peg$FAILED) {
2111
- if (input.substr(peg$currPos, 2) === peg$c50) {
2112
- s7 = peg$c50;
2073
+ if (input.substr(peg$currPos, 2) === peg$c31) {
2074
+ s7 = peg$c31;
2113
2075
  peg$currPos += 2;
2114
2076
  } else {
2115
2077
  s7 = peg$FAILED;
@@ -2218,7 +2180,7 @@ function peg$parse(input, options) {
2218
2180
 
2219
2181
  s0 = peg$currPos;
2220
2182
  if (input.charCodeAt(peg$currPos) === 40) {
2221
- s1 = peg$c51;
2183
+ s1 = peg$c32;
2222
2184
  peg$currPos++;
2223
2185
  } else {
2224
2186
  s1 = peg$FAILED;
@@ -2230,7 +2192,7 @@ function peg$parse(input, options) {
2230
2192
  if (s3 !== peg$FAILED) {
2231
2193
  s4 = peg$parsespaces();
2232
2194
  if (input.charCodeAt(peg$currPos) === 41) {
2233
- s5 = peg$c52;
2195
+ s5 = peg$c33;
2234
2196
  peg$currPos++;
2235
2197
  } else {
2236
2198
  s5 = peg$FAILED;
@@ -2294,7 +2256,7 @@ function peg$parse(input, options) {
2294
2256
 
2295
2257
  s0 = peg$currPos;
2296
2258
  if (input.charCodeAt(peg$currPos) === 40) {
2297
- s1 = peg$c51;
2259
+ s1 = peg$c32;
2298
2260
  peg$currPos++;
2299
2261
  } else {
2300
2262
  s1 = peg$FAILED;
@@ -2306,7 +2268,7 @@ function peg$parse(input, options) {
2306
2268
  if (s3 !== peg$FAILED) {
2307
2269
  s4 = peg$parsespaces();
2308
2270
  if (input.charCodeAt(peg$currPos) === 41) {
2309
- s5 = peg$c52;
2271
+ s5 = peg$c33;
2310
2272
  peg$currPos++;
2311
2273
  } else {
2312
2274
  s5 = peg$FAILED;
@@ -2346,104 +2308,104 @@ function peg$parse(input, options) {
2346
2308
 
2347
2309
  s0 = peg$currPos;
2348
2310
  s1 = peg$parsespaces();
2349
- if (input.substr(peg$currPos, 2) === peg$c53) {
2350
- s2 = peg$c53;
2311
+ if (input.substr(peg$currPos, 2) === peg$c34) {
2312
+ s2 = peg$c34;
2351
2313
  peg$currPos += 2;
2352
2314
  } else {
2353
2315
  s2 = peg$FAILED;
2354
2316
  if (peg$silentFails === 0) { peg$fail(peg$e36); }
2355
2317
  }
2356
2318
  if (s2 === peg$FAILED) {
2357
- if (input.substr(peg$currPos, 2) === peg$c54) {
2358
- s2 = peg$c54;
2319
+ if (input.substr(peg$currPos, 2) === peg$c35) {
2320
+ s2 = peg$c35;
2359
2321
  peg$currPos += 2;
2360
2322
  } else {
2361
2323
  s2 = peg$FAILED;
2362
2324
  if (peg$silentFails === 0) { peg$fail(peg$e37); }
2363
2325
  }
2364
2326
  if (s2 === peg$FAILED) {
2365
- if (input.substr(peg$currPos, 2) === peg$c55) {
2366
- s2 = peg$c55;
2327
+ if (input.substr(peg$currPos, 2) === peg$c36) {
2328
+ s2 = peg$c36;
2367
2329
  peg$currPos += 2;
2368
2330
  } else {
2369
2331
  s2 = peg$FAILED;
2370
2332
  if (peg$silentFails === 0) { peg$fail(peg$e38); }
2371
2333
  }
2372
2334
  if (s2 === peg$FAILED) {
2373
- if (input.substr(peg$currPos, 2) === peg$c56) {
2374
- s2 = peg$c56;
2335
+ if (input.substr(peg$currPos, 2) === peg$c37) {
2336
+ s2 = peg$c37;
2375
2337
  peg$currPos += 2;
2376
2338
  } else {
2377
2339
  s2 = peg$FAILED;
2378
2340
  if (peg$silentFails === 0) { peg$fail(peg$e39); }
2379
2341
  }
2380
2342
  if (s2 === peg$FAILED) {
2381
- if (input.substr(peg$currPos, 2) === peg$c57) {
2382
- s2 = peg$c57;
2343
+ if (input.substr(peg$currPos, 2) === peg$c38) {
2344
+ s2 = peg$c38;
2383
2345
  peg$currPos += 2;
2384
2346
  } else {
2385
2347
  s2 = peg$FAILED;
2386
2348
  if (peg$silentFails === 0) { peg$fail(peg$e40); }
2387
2349
  }
2388
2350
  if (s2 === peg$FAILED) {
2389
- if (input.substr(peg$currPos, 2) === peg$c58) {
2390
- s2 = peg$c58;
2351
+ if (input.substr(peg$currPos, 2) === peg$c39) {
2352
+ s2 = peg$c39;
2391
2353
  peg$currPos += 2;
2392
2354
  } else {
2393
2355
  s2 = peg$FAILED;
2394
2356
  if (peg$silentFails === 0) { peg$fail(peg$e41); }
2395
2357
  }
2396
2358
  if (s2 === peg$FAILED) {
2397
- if (input.substr(peg$currPos, 3) === peg$c59) {
2398
- s2 = peg$c59;
2359
+ if (input.substr(peg$currPos, 3) === peg$c40) {
2360
+ s2 = peg$c40;
2399
2361
  peg$currPos += 3;
2400
2362
  } else {
2401
2363
  s2 = peg$FAILED;
2402
2364
  if (peg$silentFails === 0) { peg$fail(peg$e42); }
2403
2365
  }
2404
2366
  if (s2 === peg$FAILED) {
2405
- if (input.substr(peg$currPos, 2) === peg$c60) {
2406
- s2 = peg$c60;
2367
+ if (input.substr(peg$currPos, 2) === peg$c41) {
2368
+ s2 = peg$c41;
2407
2369
  peg$currPos += 2;
2408
2370
  } else {
2409
2371
  s2 = peg$FAILED;
2410
2372
  if (peg$silentFails === 0) { peg$fail(peg$e43); }
2411
2373
  }
2412
2374
  if (s2 === peg$FAILED) {
2413
- if (input.substr(peg$currPos, 3) === peg$c61) {
2414
- s2 = peg$c61;
2375
+ if (input.substr(peg$currPos, 3) === peg$c42) {
2376
+ s2 = peg$c42;
2415
2377
  peg$currPos += 3;
2416
2378
  } else {
2417
2379
  s2 = peg$FAILED;
2418
2380
  if (peg$silentFails === 0) { peg$fail(peg$e44); }
2419
2381
  }
2420
2382
  if (s2 === peg$FAILED) {
2421
- if (input.substr(peg$currPos, 3) === peg$c62) {
2422
- s2 = peg$c62;
2383
+ if (input.substr(peg$currPos, 3) === peg$c43) {
2384
+ s2 = peg$c43;
2423
2385
  peg$currPos += 3;
2424
2386
  } else {
2425
2387
  s2 = peg$FAILED;
2426
2388
  if (peg$silentFails === 0) { peg$fail(peg$e45); }
2427
2389
  }
2428
2390
  if (s2 === peg$FAILED) {
2429
- if (input.substr(peg$currPos, 3) === peg$c63) {
2430
- s2 = peg$c63;
2391
+ if (input.substr(peg$currPos, 3) === peg$c44) {
2392
+ s2 = peg$c44;
2431
2393
  peg$currPos += 3;
2432
2394
  } else {
2433
2395
  s2 = peg$FAILED;
2434
2396
  if (peg$silentFails === 0) { peg$fail(peg$e46); }
2435
2397
  }
2436
2398
  if (s2 === peg$FAILED) {
2437
- if (input.substr(peg$currPos, 3) === peg$c64) {
2438
- s2 = peg$c64;
2399
+ if (input.substr(peg$currPos, 3) === peg$c45) {
2400
+ s2 = peg$c45;
2439
2401
  peg$currPos += 3;
2440
2402
  } else {
2441
2403
  s2 = peg$FAILED;
2442
2404
  if (peg$silentFails === 0) { peg$fail(peg$e47); }
2443
2405
  }
2444
2406
  if (s2 === peg$FAILED) {
2445
- if (input.substr(peg$currPos, 3) === peg$c65) {
2446
- s2 = peg$c65;
2407
+ if (input.substr(peg$currPos, 3) === peg$c46) {
2408
+ s2 = peg$c46;
2447
2409
  peg$currPos += 3;
2448
2410
  } else {
2449
2411
  s2 = peg$FAILED;
@@ -2493,8 +2455,8 @@ function peg$parse(input, options) {
2493
2455
 
2494
2456
  s0 = peg$currPos;
2495
2457
  s1 = peg$parsespaces();
2496
- if (input.substr(peg$currPos, 3) === peg$c66) {
2497
- s2 = peg$c66;
2458
+ if (input.substr(peg$currPos, 3) === peg$c47) {
2459
+ s2 = peg$c47;
2498
2460
  peg$currPos += 3;
2499
2461
  } else {
2500
2462
  s2 = peg$FAILED;
@@ -2507,7 +2469,7 @@ function peg$parse(input, options) {
2507
2469
  if (s4 === peg$FAILED) {
2508
2470
  s4 = peg$currPos;
2509
2471
  if (input.charCodeAt(peg$currPos) === 40) {
2510
- s5 = peg$c51;
2472
+ s5 = peg$c32;
2511
2473
  peg$currPos++;
2512
2474
  } else {
2513
2475
  s5 = peg$FAILED;
@@ -2519,7 +2481,7 @@ function peg$parse(input, options) {
2519
2481
  if (s7 !== peg$FAILED) {
2520
2482
  s8 = peg$parsespaces();
2521
2483
  if (input.charCodeAt(peg$currPos) === 41) {
2522
- s9 = peg$c52;
2484
+ s9 = peg$c33;
2523
2485
  peg$currPos++;
2524
2486
  } else {
2525
2487
  s9 = peg$FAILED;
@@ -2574,7 +2536,7 @@ function peg$parse(input, options) {
2574
2536
 
2575
2537
  s0 = peg$currPos;
2576
2538
  if (input.charCodeAt(peg$currPos) === 40) {
2577
- s1 = peg$c51;
2539
+ s1 = peg$c32;
2578
2540
  peg$currPos++;
2579
2541
  } else {
2580
2542
  s1 = peg$FAILED;
@@ -2590,7 +2552,7 @@ function peg$parse(input, options) {
2590
2552
  s5 = peg$currPos;
2591
2553
  s6 = peg$currPos;
2592
2554
  if (input.charCodeAt(peg$currPos) === 44) {
2593
- s7 = peg$c16;
2555
+ s7 = peg$c8;
2594
2556
  peg$currPos++;
2595
2557
  } else {
2596
2558
  s7 = peg$FAILED;
@@ -2624,7 +2586,7 @@ function peg$parse(input, options) {
2624
2586
  }
2625
2587
  if (s3 !== peg$FAILED) {
2626
2588
  if (input.charCodeAt(peg$currPos) === 41) {
2627
- s4 = peg$c52;
2589
+ s4 = peg$c33;
2628
2590
  peg$currPos++;
2629
2591
  } else {
2630
2592
  s4 = peg$FAILED;
@@ -2663,248 +2625,248 @@ function peg$parse(input, options) {
2663
2625
  }
2664
2626
 
2665
2627
  s0 = peg$currPos;
2666
- if (input.substr(peg$currPos, 4) === peg$c67) {
2667
- s1 = peg$c67;
2628
+ if (input.substr(peg$currPos, 4) === peg$c48) {
2629
+ s1 = peg$c48;
2668
2630
  peg$currPos += 4;
2669
2631
  } else {
2670
2632
  s1 = peg$FAILED;
2671
2633
  if (peg$silentFails === 0) { peg$fail(peg$e50); }
2672
2634
  }
2673
2635
  if (s1 === peg$FAILED) {
2674
- if (input.substr(peg$currPos, 7) === peg$c68) {
2675
- s1 = peg$c68;
2636
+ if (input.substr(peg$currPos, 7) === peg$c49) {
2637
+ s1 = peg$c49;
2676
2638
  peg$currPos += 7;
2677
2639
  } else {
2678
2640
  s1 = peg$FAILED;
2679
2641
  if (peg$silentFails === 0) { peg$fail(peg$e51); }
2680
2642
  }
2681
2643
  if (s1 === peg$FAILED) {
2682
- if (input.substr(peg$currPos, 6) === peg$c69) {
2683
- s1 = peg$c69;
2644
+ if (input.substr(peg$currPos, 6) === peg$c50) {
2645
+ s1 = peg$c50;
2684
2646
  peg$currPos += 6;
2685
2647
  } else {
2686
2648
  s1 = peg$FAILED;
2687
2649
  if (peg$silentFails === 0) { peg$fail(peg$e52); }
2688
2650
  }
2689
2651
  if (s1 === peg$FAILED) {
2690
- if (input.substr(peg$currPos, 8) === peg$c70) {
2691
- s1 = peg$c70;
2652
+ if (input.substr(peg$currPos, 8) === peg$c51) {
2653
+ s1 = peg$c51;
2692
2654
  peg$currPos += 8;
2693
2655
  } else {
2694
2656
  s1 = peg$FAILED;
2695
2657
  if (peg$silentFails === 0) { peg$fail(peg$e53); }
2696
2658
  }
2697
2659
  if (s1 === peg$FAILED) {
2698
- if (input.substr(peg$currPos, 4) === peg$c71) {
2699
- s1 = peg$c71;
2660
+ if (input.substr(peg$currPos, 4) === peg$c52) {
2661
+ s1 = peg$c52;
2700
2662
  peg$currPos += 4;
2701
2663
  } else {
2702
2664
  s1 = peg$FAILED;
2703
2665
  if (peg$silentFails === 0) { peg$fail(peg$e54); }
2704
2666
  }
2705
2667
  if (s1 === peg$FAILED) {
2706
- if (input.substr(peg$currPos, 3) === peg$c72) {
2707
- s1 = peg$c72;
2668
+ if (input.substr(peg$currPos, 3) === peg$c53) {
2669
+ s1 = peg$c53;
2708
2670
  peg$currPos += 3;
2709
2671
  } else {
2710
2672
  s1 = peg$FAILED;
2711
2673
  if (peg$silentFails === 0) { peg$fail(peg$e55); }
2712
2674
  }
2713
2675
  if (s1 === peg$FAILED) {
2714
- if (input.substr(peg$currPos, 8) === peg$c73) {
2715
- s1 = peg$c73;
2676
+ if (input.substr(peg$currPos, 8) === peg$c54) {
2677
+ s1 = peg$c54;
2716
2678
  peg$currPos += 8;
2717
2679
  } else {
2718
2680
  s1 = peg$FAILED;
2719
2681
  if (peg$silentFails === 0) { peg$fail(peg$e56); }
2720
2682
  }
2721
2683
  if (s1 === peg$FAILED) {
2722
- if (input.substr(peg$currPos, 5) === peg$c74) {
2723
- s1 = peg$c74;
2684
+ if (input.substr(peg$currPos, 5) === peg$c55) {
2685
+ s1 = peg$c55;
2724
2686
  peg$currPos += 5;
2725
2687
  } else {
2726
2688
  s1 = peg$FAILED;
2727
2689
  if (peg$silentFails === 0) { peg$fail(peg$e57); }
2728
2690
  }
2729
2691
  if (s1 === peg$FAILED) {
2730
- if (input.substr(peg$currPos, 17) === peg$c75) {
2731
- s1 = peg$c75;
2692
+ if (input.substr(peg$currPos, 17) === peg$c56) {
2693
+ s1 = peg$c56;
2732
2694
  peg$currPos += 17;
2733
2695
  } else {
2734
2696
  s1 = peg$FAILED;
2735
2697
  if (peg$silentFails === 0) { peg$fail(peg$e58); }
2736
2698
  }
2737
2699
  if (s1 === peg$FAILED) {
2738
- if (input.substr(peg$currPos, 4) === peg$c76) {
2739
- s1 = peg$c76;
2700
+ if (input.substr(peg$currPos, 4) === peg$c57) {
2701
+ s1 = peg$c57;
2740
2702
  peg$currPos += 4;
2741
2703
  } else {
2742
2704
  s1 = peg$FAILED;
2743
2705
  if (peg$silentFails === 0) { peg$fail(peg$e59); }
2744
2706
  }
2745
2707
  if (s1 === peg$FAILED) {
2746
- if (input.substr(peg$currPos, 7) === peg$c77) {
2747
- s1 = peg$c77;
2708
+ if (input.substr(peg$currPos, 7) === peg$c58) {
2709
+ s1 = peg$c58;
2748
2710
  peg$currPos += 7;
2749
2711
  } else {
2750
2712
  s1 = peg$FAILED;
2751
2713
  if (peg$silentFails === 0) { peg$fail(peg$e60); }
2752
2714
  }
2753
2715
  if (s1 === peg$FAILED) {
2754
- if (input.substr(peg$currPos, 4) === peg$c78) {
2755
- s1 = peg$c78;
2716
+ if (input.substr(peg$currPos, 4) === peg$c59) {
2717
+ s1 = peg$c59;
2756
2718
  peg$currPos += 4;
2757
2719
  } else {
2758
2720
  s1 = peg$FAILED;
2759
2721
  if (peg$silentFails === 0) { peg$fail(peg$e61); }
2760
2722
  }
2761
2723
  if (s1 === peg$FAILED) {
2762
- if (input.substr(peg$currPos, 6) === peg$c79) {
2763
- s1 = peg$c79;
2724
+ if (input.substr(peg$currPos, 6) === peg$c60) {
2725
+ s1 = peg$c60;
2764
2726
  peg$currPos += 6;
2765
2727
  } else {
2766
2728
  s1 = peg$FAILED;
2767
2729
  if (peg$silentFails === 0) { peg$fail(peg$e62); }
2768
2730
  }
2769
2731
  if (s1 === peg$FAILED) {
2770
- if (input.substr(peg$currPos, 11) === peg$c80) {
2771
- s1 = peg$c80;
2732
+ if (input.substr(peg$currPos, 11) === peg$c61) {
2733
+ s1 = peg$c61;
2772
2734
  peg$currPos += 11;
2773
2735
  } else {
2774
2736
  s1 = peg$FAILED;
2775
2737
  if (peg$silentFails === 0) { peg$fail(peg$e63); }
2776
2738
  }
2777
2739
  if (s1 === peg$FAILED) {
2778
- if (input.substr(peg$currPos, 11) === peg$c81) {
2779
- s1 = peg$c81;
2740
+ if (input.substr(peg$currPos, 11) === peg$c62) {
2741
+ s1 = peg$c62;
2780
2742
  peg$currPos += 11;
2781
2743
  } else {
2782
2744
  s1 = peg$FAILED;
2783
2745
  if (peg$silentFails === 0) { peg$fail(peg$e64); }
2784
2746
  }
2785
2747
  if (s1 === peg$FAILED) {
2786
- if (input.substr(peg$currPos, 6) === peg$c82) {
2787
- s1 = peg$c82;
2748
+ if (input.substr(peg$currPos, 6) === peg$c63) {
2749
+ s1 = peg$c63;
2788
2750
  peg$currPos += 6;
2789
2751
  } else {
2790
2752
  s1 = peg$FAILED;
2791
2753
  if (peg$silentFails === 0) { peg$fail(peg$e65); }
2792
2754
  }
2793
2755
  if (s1 === peg$FAILED) {
2794
- if (input.substr(peg$currPos, 5) === peg$c83) {
2795
- s1 = peg$c83;
2756
+ if (input.substr(peg$currPos, 5) === peg$c64) {
2757
+ s1 = peg$c64;
2796
2758
  peg$currPos += 5;
2797
2759
  } else {
2798
2760
  s1 = peg$FAILED;
2799
2761
  if (peg$silentFails === 0) { peg$fail(peg$e66); }
2800
2762
  }
2801
2763
  if (s1 === peg$FAILED) {
2802
- if (input.substr(peg$currPos, 3) === peg$c84) {
2803
- s1 = peg$c84;
2764
+ if (input.substr(peg$currPos, 3) === peg$c65) {
2765
+ s1 = peg$c65;
2804
2766
  peg$currPos += 3;
2805
2767
  } else {
2806
2768
  s1 = peg$FAILED;
2807
2769
  if (peg$silentFails === 0) { peg$fail(peg$e67); }
2808
2770
  }
2809
2771
  if (s1 === peg$FAILED) {
2810
- if (input.substr(peg$currPos, 7) === peg$c85) {
2811
- s1 = peg$c85;
2772
+ if (input.substr(peg$currPos, 7) === peg$c66) {
2773
+ s1 = peg$c66;
2812
2774
  peg$currPos += 7;
2813
2775
  } else {
2814
2776
  s1 = peg$FAILED;
2815
2777
  if (peg$silentFails === 0) { peg$fail(peg$e68); }
2816
2778
  }
2817
2779
  if (s1 === peg$FAILED) {
2818
- if (input.substr(peg$currPos, 5) === peg$c86) {
2819
- s1 = peg$c86;
2780
+ if (input.substr(peg$currPos, 5) === peg$c67) {
2781
+ s1 = peg$c67;
2820
2782
  peg$currPos += 5;
2821
2783
  } else {
2822
2784
  s1 = peg$FAILED;
2823
2785
  if (peg$silentFails === 0) { peg$fail(peg$e69); }
2824
2786
  }
2825
2787
  if (s1 === peg$FAILED) {
2826
- if (input.substr(peg$currPos, 6) === peg$c87) {
2827
- s1 = peg$c87;
2788
+ if (input.substr(peg$currPos, 6) === peg$c68) {
2789
+ s1 = peg$c68;
2828
2790
  peg$currPos += 6;
2829
2791
  } else {
2830
2792
  s1 = peg$FAILED;
2831
2793
  if (peg$silentFails === 0) { peg$fail(peg$e70); }
2832
2794
  }
2833
2795
  if (s1 === peg$FAILED) {
2834
- if (input.substr(peg$currPos, 10) === peg$c88) {
2835
- s1 = peg$c88;
2796
+ if (input.substr(peg$currPos, 10) === peg$c69) {
2797
+ s1 = peg$c69;
2836
2798
  peg$currPos += 10;
2837
2799
  } else {
2838
2800
  s1 = peg$FAILED;
2839
2801
  if (peg$silentFails === 0) { peg$fail(peg$e71); }
2840
2802
  }
2841
2803
  if (s1 === peg$FAILED) {
2842
- if (input.substr(peg$currPos, 11) === peg$c89) {
2843
- s1 = peg$c89;
2804
+ if (input.substr(peg$currPos, 11) === peg$c70) {
2805
+ s1 = peg$c70;
2844
2806
  peg$currPos += 11;
2845
2807
  } else {
2846
2808
  s1 = peg$FAILED;
2847
2809
  if (peg$silentFails === 0) { peg$fail(peg$e72); }
2848
2810
  }
2849
2811
  if (s1 === peg$FAILED) {
2850
- if (input.substr(peg$currPos, 9) === peg$c90) {
2851
- s1 = peg$c90;
2812
+ if (input.substr(peg$currPos, 9) === peg$c71) {
2813
+ s1 = peg$c71;
2852
2814
  peg$currPos += 9;
2853
2815
  } else {
2854
2816
  s1 = peg$FAILED;
2855
2817
  if (peg$silentFails === 0) { peg$fail(peg$e73); }
2856
2818
  }
2857
2819
  if (s1 === peg$FAILED) {
2858
- if (input.substr(peg$currPos, 4) === peg$c91) {
2859
- s1 = peg$c91;
2820
+ if (input.substr(peg$currPos, 4) === peg$c72) {
2821
+ s1 = peg$c72;
2860
2822
  peg$currPos += 4;
2861
2823
  } else {
2862
2824
  s1 = peg$FAILED;
2863
2825
  if (peg$silentFails === 0) { peg$fail(peg$e74); }
2864
2826
  }
2865
2827
  if (s1 === peg$FAILED) {
2866
- if (input.substr(peg$currPos, 7) === peg$c92) {
2867
- s1 = peg$c92;
2828
+ if (input.substr(peg$currPos, 7) === peg$c73) {
2829
+ s1 = peg$c73;
2868
2830
  peg$currPos += 7;
2869
2831
  } else {
2870
2832
  s1 = peg$FAILED;
2871
2833
  if (peg$silentFails === 0) { peg$fail(peg$e75); }
2872
2834
  }
2873
2835
  if (s1 === peg$FAILED) {
2874
- if (input.substr(peg$currPos, 18) === peg$c93) {
2875
- s1 = peg$c93;
2836
+ if (input.substr(peg$currPos, 18) === peg$c74) {
2837
+ s1 = peg$c74;
2876
2838
  peg$currPos += 18;
2877
2839
  } else {
2878
2840
  s1 = peg$FAILED;
2879
2841
  if (peg$silentFails === 0) { peg$fail(peg$e76); }
2880
2842
  }
2881
2843
  if (s1 === peg$FAILED) {
2882
- if (input.substr(peg$currPos, 12) === peg$c94) {
2883
- s1 = peg$c94;
2844
+ if (input.substr(peg$currPos, 12) === peg$c75) {
2845
+ s1 = peg$c75;
2884
2846
  peg$currPos += 12;
2885
2847
  } else {
2886
2848
  s1 = peg$FAILED;
2887
2849
  if (peg$silentFails === 0) { peg$fail(peg$e77); }
2888
2850
  }
2889
2851
  if (s1 === peg$FAILED) {
2890
- if (input.substr(peg$currPos, 7) === peg$c95) {
2891
- s1 = peg$c95;
2852
+ if (input.substr(peg$currPos, 7) === peg$c76) {
2853
+ s1 = peg$c76;
2892
2854
  peg$currPos += 7;
2893
2855
  } else {
2894
2856
  s1 = peg$FAILED;
2895
2857
  if (peg$silentFails === 0) { peg$fail(peg$e78); }
2896
2858
  }
2897
2859
  if (s1 === peg$FAILED) {
2898
- if (input.substr(peg$currPos, 4) === peg$c96) {
2899
- s1 = peg$c96;
2860
+ if (input.substr(peg$currPos, 4) === peg$c77) {
2861
+ s1 = peg$c77;
2900
2862
  peg$currPos += 4;
2901
2863
  } else {
2902
2864
  s1 = peg$FAILED;
2903
2865
  if (peg$silentFails === 0) { peg$fail(peg$e79); }
2904
2866
  }
2905
2867
  if (s1 === peg$FAILED) {
2906
- if (input.substr(peg$currPos, 4) === peg$c97) {
2907
- s1 = peg$c97;
2868
+ if (input.substr(peg$currPos, 4) === peg$c78) {
2869
+ s1 = peg$c78;
2908
2870
  peg$currPos += 4;
2909
2871
  } else {
2910
2872
  s1 = peg$FAILED;
@@ -2942,7 +2904,7 @@ function peg$parse(input, options) {
2942
2904
  }
2943
2905
  if (s1 !== peg$FAILED) {
2944
2906
  if (input.charCodeAt(peg$currPos) === 40) {
2945
- s2 = peg$c51;
2907
+ s2 = peg$c32;
2946
2908
  peg$currPos++;
2947
2909
  } else {
2948
2910
  s2 = peg$FAILED;
@@ -2960,7 +2922,7 @@ function peg$parse(input, options) {
2960
2922
  s8 = peg$currPos;
2961
2923
  s9 = peg$parsespaces();
2962
2924
  if (input.charCodeAt(peg$currPos) === 44) {
2963
- s10 = peg$c16;
2925
+ s10 = peg$c8;
2964
2926
  peg$currPos++;
2965
2927
  } else {
2966
2928
  s10 = peg$FAILED;
@@ -3016,7 +2978,7 @@ function peg$parse(input, options) {
3016
2978
  }
3017
2979
  if (s5 !== peg$FAILED) {
3018
2980
  if (input.charCodeAt(peg$currPos) === 41) {
3019
- s6 = peg$c52;
2981
+ s6 = peg$c33;
3020
2982
  peg$currPos++;
3021
2983
  } else {
3022
2984
  s6 = peg$FAILED;
@@ -3064,16 +3026,16 @@ function peg$parse(input, options) {
3064
3026
  }
3065
3027
 
3066
3028
  s0 = peg$currPos;
3067
- if (input.substr(peg$currPos, 3) === peg$c100) {
3068
- s1 = peg$c100;
3029
+ if (input.substr(peg$currPos, 3) === peg$c79) {
3030
+ s1 = peg$c79;
3069
3031
  peg$currPos += 3;
3070
3032
  } else {
3071
3033
  s1 = peg$FAILED;
3072
3034
  if (peg$silentFails === 0) { peg$fail(peg$e81); }
3073
3035
  }
3074
3036
  if (s1 === peg$FAILED) {
3075
- if (input.substr(peg$currPos, 3) === peg$c101) {
3076
- s1 = peg$c101;
3037
+ if (input.substr(peg$currPos, 3) === peg$c80) {
3038
+ s1 = peg$c80;
3077
3039
  peg$currPos += 3;
3078
3040
  } else {
3079
3041
  s1 = peg$FAILED;
@@ -3082,7 +3044,7 @@ function peg$parse(input, options) {
3082
3044
  }
3083
3045
  if (s1 !== peg$FAILED) {
3084
3046
  if (input.charCodeAt(peg$currPos) === 40) {
3085
- s2 = peg$c51;
3047
+ s2 = peg$c32;
3086
3048
  peg$currPos++;
3087
3049
  } else {
3088
3050
  s2 = peg$FAILED;
@@ -3093,7 +3055,7 @@ function peg$parse(input, options) {
3093
3055
  s4 = peg$parseResourceName();
3094
3056
  if (s4 !== peg$FAILED) {
3095
3057
  if (input.charCodeAt(peg$currPos) === 58) {
3096
- s5 = peg$c103;
3058
+ s5 = peg$c81;
3097
3059
  peg$currPos++;
3098
3060
  } else {
3099
3061
  s5 = peg$FAILED;
@@ -3104,7 +3066,7 @@ function peg$parse(input, options) {
3104
3066
  if (s6 !== peg$FAILED) {
3105
3067
  s7 = peg$parsespaces();
3106
3068
  if (input.charCodeAt(peg$currPos) === 41) {
3107
- s8 = peg$c52;
3069
+ s8 = peg$c33;
3108
3070
  peg$currPos++;
3109
3071
  } else {
3110
3072
  s8 = peg$FAILED;
@@ -3159,7 +3121,7 @@ function peg$parse(input, options) {
3159
3121
  s1 = peg$parseResourceName();
3160
3122
  if (s1 !== peg$FAILED) {
3161
3123
  if (input.charCodeAt(peg$currPos) === 40) {
3162
- s2 = peg$c51;
3124
+ s2 = peg$c32;
3163
3125
  peg$currPos++;
3164
3126
  } else {
3165
3127
  s2 = peg$FAILED;
@@ -3177,7 +3139,7 @@ function peg$parse(input, options) {
3177
3139
  s8 = peg$currPos;
3178
3140
  s9 = peg$parsespaces();
3179
3141
  if (input.charCodeAt(peg$currPos) === 44) {
3180
- s10 = peg$c16;
3142
+ s10 = peg$c8;
3181
3143
  peg$currPos++;
3182
3144
  } else {
3183
3145
  s10 = peg$FAILED;
@@ -3225,7 +3187,7 @@ function peg$parse(input, options) {
3225
3187
  }
3226
3188
  if (s4 !== peg$FAILED) {
3227
3189
  if (input.charCodeAt(peg$currPos) === 41) {
3228
- s5 = peg$c52;
3190
+ s5 = peg$c33;
3229
3191
  peg$currPos++;
3230
3192
  } else {
3231
3193
  s5 = peg$FAILED;
@@ -3275,7 +3237,7 @@ function peg$parse(input, options) {
3275
3237
  s1.push(s2);
3276
3238
  s2 = peg$currPos;
3277
3239
  if (input.charCodeAt(peg$currPos) === 44) {
3278
- s3 = peg$c16;
3240
+ s3 = peg$c8;
3279
3241
  peg$currPos++;
3280
3242
  } else {
3281
3243
  s3 = peg$FAILED;
@@ -3318,11 +3280,17 @@ function peg$parse(input, options) {
3318
3280
  }
3319
3281
 
3320
3282
  s0 = peg$currPos;
3321
- s1 = peg$parseResourceName();
3283
+ s1 = peg$currPos;
3284
+ s2 = peg$parseResourceName();
3285
+ if (s2 !== peg$FAILED) {
3286
+ peg$savedPos = s1;
3287
+ s2 = peg$f42(s2);
3288
+ }
3289
+ s1 = s2;
3322
3290
  if (s1 !== peg$FAILED) {
3323
3291
  s2 = peg$currPos;
3324
3292
  if (input.charCodeAt(peg$currPos) === 47) {
3325
- s3 = peg$c3;
3293
+ s3 = peg$c1;
3326
3294
  peg$currPos++;
3327
3295
  } else {
3328
3296
  s3 = peg$FAILED;
@@ -3331,7 +3299,8 @@ function peg$parse(input, options) {
3331
3299
  if (s3 !== peg$FAILED) {
3332
3300
  s4 = peg$parsePropertyPath();
3333
3301
  if (s4 !== peg$FAILED) {
3334
- s2 = s4;
3302
+ peg$savedPos = s2;
3303
+ s2 = peg$f43(s1, s4);
3335
3304
  } else {
3336
3305
  peg$currPos = s2;
3337
3306
  s2 = peg$FAILED;
@@ -3344,8 +3313,8 @@ function peg$parse(input, options) {
3344
3313
  s2 = null;
3345
3314
  }
3346
3315
  s3 = peg$currPos;
3347
- if (input.substr(peg$currPos, 7) === peg$c106) {
3348
- s4 = peg$c106;
3316
+ if (input.substr(peg$currPos, 7) === peg$c82) {
3317
+ s4 = peg$c82;
3349
3318
  peg$currPos += 7;
3350
3319
  } else {
3351
3320
  s4 = peg$FAILED;
@@ -3354,7 +3323,7 @@ function peg$parse(input, options) {
3354
3323
  if (s4 !== peg$FAILED) {
3355
3324
  s5 = peg$currPos;
3356
3325
  if (input.charCodeAt(peg$currPos) === 40) {
3357
- s6 = peg$c51;
3326
+ s6 = peg$c32;
3358
3327
  peg$currPos++;
3359
3328
  } else {
3360
3329
  s6 = peg$FAILED;
@@ -3367,7 +3336,7 @@ function peg$parse(input, options) {
3367
3336
  s9 = peg$parseFilterByOption();
3368
3337
  if (s9 !== peg$FAILED) {
3369
3338
  peg$savedPos = s7;
3370
- s7 = peg$f42(s1, s2, s9);
3339
+ s7 = peg$f44(s1, s9);
3371
3340
  } else {
3372
3341
  peg$currPos = s7;
3373
3342
  s7 = peg$FAILED;
@@ -3378,7 +3347,7 @@ function peg$parse(input, options) {
3378
3347
  }
3379
3348
  if (s7 !== peg$FAILED) {
3380
3349
  if (input.charCodeAt(peg$currPos) === 41) {
3381
- s8 = peg$c52;
3350
+ s8 = peg$c33;
3382
3351
  peg$currPos++;
3383
3352
  } else {
3384
3353
  s8 = peg$FAILED;
@@ -3402,7 +3371,7 @@ function peg$parse(input, options) {
3402
3371
  s5 = null;
3403
3372
  }
3404
3373
  peg$savedPos = s3;
3405
- s3 = peg$f43(s1, s2, s5);
3374
+ s3 = peg$f45(s1, s5);
3406
3375
  } else {
3407
3376
  peg$currPos = s3;
3408
3377
  s3 = peg$FAILED;
@@ -3411,7 +3380,7 @@ function peg$parse(input, options) {
3411
3380
  s3 = null;
3412
3381
  }
3413
3382
  peg$savedPos = s0;
3414
- s0 = peg$f44(s1, s2, s3);
3383
+ s0 = peg$f46(s1);
3415
3384
  } else {
3416
3385
  peg$currPos = s0;
3417
3386
  s0 = peg$FAILED;
@@ -3441,7 +3410,7 @@ function peg$parse(input, options) {
3441
3410
  s1.push(s2);
3442
3411
  s2 = peg$currPos;
3443
3412
  if (input.charCodeAt(peg$currPos) === 44) {
3444
- s3 = peg$c16;
3413
+ s3 = peg$c8;
3445
3414
  peg$currPos++;
3446
3415
  } else {
3447
3416
  s3 = peg$FAILED;
@@ -3484,11 +3453,17 @@ function peg$parse(input, options) {
3484
3453
  }
3485
3454
 
3486
3455
  s0 = peg$currPos;
3487
- s1 = peg$parseResourceName();
3456
+ s1 = peg$currPos;
3457
+ s2 = peg$parseResourceName();
3458
+ if (s2 !== peg$FAILED) {
3459
+ peg$savedPos = s1;
3460
+ s2 = peg$f47(s2);
3461
+ }
3462
+ s1 = s2;
3488
3463
  if (s1 !== peg$FAILED) {
3489
3464
  s2 = peg$currPos;
3490
- if (input.substr(peg$currPos, 7) === peg$c106) {
3491
- s3 = peg$c106;
3465
+ if (input.substr(peg$currPos, 7) === peg$c82) {
3466
+ s3 = peg$c82;
3492
3467
  peg$currPos += 7;
3493
3468
  } else {
3494
3469
  s3 = peg$FAILED;
@@ -3496,7 +3471,7 @@ function peg$parse(input, options) {
3496
3471
  }
3497
3472
  if (s3 !== peg$FAILED) {
3498
3473
  peg$savedPos = s2;
3499
- s3 = peg$f45(s1);
3474
+ s3 = peg$f48(s1);
3500
3475
  }
3501
3476
  s2 = s3;
3502
3477
  if (s2 === peg$FAILED) {
@@ -3504,7 +3479,7 @@ function peg$parse(input, options) {
3504
3479
  }
3505
3480
  s3 = peg$currPos;
3506
3481
  if (input.charCodeAt(peg$currPos) === 40) {
3507
- s4 = peg$c51;
3482
+ s4 = peg$c32;
3508
3483
  peg$currPos++;
3509
3484
  } else {
3510
3485
  s4 = peg$FAILED;
@@ -3545,26 +3520,23 @@ function peg$parse(input, options) {
3545
3520
  }
3546
3521
  if (s6 !== peg$FAILED) {
3547
3522
  peg$savedPos = s5;
3548
- s6 = peg$f46(s1, s2, s6);
3523
+ s6 = peg$f49(s1, s6);
3549
3524
  }
3550
3525
  s5 = s6;
3551
3526
  if (s5 === peg$FAILED) {
3552
- s5 = peg$currPos;
3553
- s6 = '';
3554
- peg$savedPos = s5;
3555
- s6 = peg$f47(s1, s2);
3556
- s5 = s6;
3527
+ s5 = '';
3557
3528
  }
3558
3529
  if (s5 !== peg$FAILED) {
3559
3530
  if (input.charCodeAt(peg$currPos) === 41) {
3560
- s6 = peg$c52;
3531
+ s6 = peg$c33;
3561
3532
  peg$currPos++;
3562
3533
  } else {
3563
3534
  s6 = peg$FAILED;
3564
3535
  if (peg$silentFails === 0) { peg$fail(peg$e35); }
3565
3536
  }
3566
3537
  if (s6 !== peg$FAILED) {
3567
- s3 = s5;
3538
+ s4 = [s4, s5, s6];
3539
+ s3 = s4;
3568
3540
  } else {
3569
3541
  peg$currPos = s3;
3570
3542
  s3 = peg$FAILED;
@@ -3582,7 +3554,7 @@ function peg$parse(input, options) {
3582
3554
  }
3583
3555
  s4 = peg$currPos;
3584
3556
  if (input.charCodeAt(peg$currPos) === 47) {
3585
- s5 = peg$c3;
3557
+ s5 = peg$c1;
3586
3558
  peg$currPos++;
3587
3559
  } else {
3588
3560
  s5 = peg$FAILED;
@@ -3591,7 +3563,8 @@ function peg$parse(input, options) {
3591
3563
  if (s5 !== peg$FAILED) {
3592
3564
  s6 = peg$parsePropertyPath();
3593
3565
  if (s6 !== peg$FAILED) {
3594
- s4 = s6;
3566
+ peg$savedPos = s4;
3567
+ s4 = peg$f50(s1, s6);
3595
3568
  } else {
3596
3569
  peg$currPos = s4;
3597
3570
  s4 = peg$FAILED;
@@ -3604,7 +3577,7 @@ function peg$parse(input, options) {
3604
3577
  s4 = null;
3605
3578
  }
3606
3579
  peg$savedPos = s0;
3607
- s0 = peg$f48(s1, s2, s3, s4);
3580
+ s0 = peg$f51(s1);
3608
3581
  } else {
3609
3582
  peg$currPos = s0;
3610
3583
  s0 = peg$FAILED;
@@ -3631,7 +3604,7 @@ function peg$parse(input, options) {
3631
3604
  s1 = peg$parseResourceName();
3632
3605
  if (s1 !== peg$FAILED) {
3633
3606
  if (input.charCodeAt(peg$currPos) === 47) {
3634
- s2 = peg$c3;
3607
+ s2 = peg$c1;
3635
3608
  peg$currPos++;
3636
3609
  } else {
3637
3610
  s2 = peg$FAILED;
@@ -3642,7 +3615,7 @@ function peg$parse(input, options) {
3642
3615
  s4 = peg$parseLambdaPropertyPath();
3643
3616
  if (s4 !== peg$FAILED) {
3644
3617
  peg$savedPos = s3;
3645
- s4 = peg$f49(s1, s4);
3618
+ s4 = peg$f52(s1, s4);
3646
3619
  }
3647
3620
  s3 = s4;
3648
3621
  if (s3 === peg$FAILED) {
@@ -3650,7 +3623,7 @@ function peg$parse(input, options) {
3650
3623
  s4 = peg$parseLambdaMethodCall();
3651
3624
  if (s4 !== peg$FAILED) {
3652
3625
  peg$savedPos = s3;
3653
- s4 = peg$f50(s1, s4);
3626
+ s4 = peg$f53(s1, s4);
3654
3627
  }
3655
3628
  s3 = s4;
3656
3629
  if (s3 === peg$FAILED) {
@@ -3658,7 +3631,7 @@ function peg$parse(input, options) {
3658
3631
  s4 = peg$parseResourceMethodCall();
3659
3632
  if (s4 !== peg$FAILED) {
3660
3633
  peg$savedPos = s3;
3661
- s4 = peg$f51(s1, s4);
3634
+ s4 = peg$f54(s1, s4);
3662
3635
  }
3663
3636
  s3 = s4;
3664
3637
  }
@@ -3697,7 +3670,7 @@ function peg$parse(input, options) {
3697
3670
 
3698
3671
  s0 = peg$currPos;
3699
3672
  if (input.charCodeAt(peg$currPos) === 40) {
3700
- s1 = peg$c51;
3673
+ s1 = peg$c32;
3701
3674
  peg$currPos++;
3702
3675
  } else {
3703
3676
  s1 = peg$FAILED;
@@ -3714,7 +3687,7 @@ function peg$parse(input, options) {
3714
3687
  s4.push(s5);
3715
3688
  s5 = peg$currPos;
3716
3689
  if (input.charCodeAt(peg$currPos) === 44) {
3717
- s6 = peg$c16;
3690
+ s6 = peg$c8;
3718
3691
  peg$currPos++;
3719
3692
  } else {
3720
3693
  s6 = peg$FAILED;
@@ -3740,13 +3713,13 @@ function peg$parse(input, options) {
3740
3713
  }
3741
3714
  if (s3 !== peg$FAILED) {
3742
3715
  peg$savedPos = s2;
3743
- s3 = peg$f52(s3);
3716
+ s3 = peg$f55(s3);
3744
3717
  }
3745
3718
  s2 = s3;
3746
3719
  }
3747
3720
  if (s2 !== peg$FAILED) {
3748
3721
  if (input.charCodeAt(peg$currPos) === 41) {
3749
- s3 = peg$c52;
3722
+ s3 = peg$c33;
3750
3723
  peg$currPos++;
3751
3724
  } else {
3752
3725
  s3 = peg$FAILED;
@@ -3788,7 +3761,7 @@ function peg$parse(input, options) {
3788
3761
  s1 = peg$parseResourceName();
3789
3762
  if (s1 !== peg$FAILED) {
3790
3763
  if (input.charCodeAt(peg$currPos) === 61) {
3791
- s2 = peg$c10;
3764
+ s2 = peg$c6;
3792
3765
  peg$currPos++;
3793
3766
  } else {
3794
3767
  s2 = peg$FAILED;
@@ -3798,7 +3771,7 @@ function peg$parse(input, options) {
3798
3771
  s3 = peg$parseKeyBind();
3799
3772
  if (s3 !== peg$FAILED) {
3800
3773
  peg$savedPos = s0;
3801
- s0 = peg$f53(s1, s3);
3774
+ s0 = peg$f56(s1, s3);
3802
3775
  } else {
3803
3776
  peg$currPos = s0;
3804
3777
  s0 = peg$FAILED;
@@ -3855,8 +3828,8 @@ function peg$parse(input, options) {
3855
3828
  }
3856
3829
 
3857
3830
  s0 = peg$currPos;
3858
- if (input.substr(peg$currPos, 7) === peg$c115) {
3859
- s1 = peg$c115;
3831
+ if (input.substr(peg$currPos, 7) === peg$c83) {
3832
+ s1 = peg$c83;
3860
3833
  peg$currPos += 7;
3861
3834
  } else {
3862
3835
  s1 = peg$FAILED;
@@ -3895,7 +3868,7 @@ function peg$parse(input, options) {
3895
3868
  s0 = peg$currPos;
3896
3869
  s1 = peg$currPos;
3897
3870
  if (input.charCodeAt(peg$currPos) === 47) {
3898
- s2 = peg$c3;
3871
+ s2 = peg$c1;
3899
3872
  peg$currPos++;
3900
3873
  } else {
3901
3874
  s2 = peg$FAILED;
@@ -3906,7 +3879,7 @@ function peg$parse(input, options) {
3906
3879
  s4 = peg$parseResourceName();
3907
3880
  if (s4 !== peg$FAILED) {
3908
3881
  peg$savedPos = s3;
3909
- s4 = peg$f54(s4);
3882
+ s4 = peg$f57(s4);
3910
3883
  }
3911
3884
  s3 = s4;
3912
3885
  if (s3 !== peg$FAILED) {
@@ -3915,7 +3888,7 @@ function peg$parse(input, options) {
3915
3888
  s6 = peg$parseKey();
3916
3889
  if (s6 !== peg$FAILED) {
3917
3890
  peg$savedPos = s5;
3918
- s6 = peg$f55(s3, s6);
3891
+ s6 = peg$f58(s3, s6);
3919
3892
  }
3920
3893
  s5 = s6;
3921
3894
  if (s5 !== peg$FAILED) {
@@ -3923,7 +3896,7 @@ function peg$parse(input, options) {
3923
3896
  s7 = peg$parseLinks();
3924
3897
  if (s7 !== peg$FAILED) {
3925
3898
  peg$savedPos = s6;
3926
- s7 = peg$f56(s3, s7);
3899
+ s7 = peg$f59(s3, s7);
3927
3900
  }
3928
3901
  s6 = s7;
3929
3902
  if (s6 === peg$FAILED) {
@@ -3931,7 +3904,7 @@ function peg$parse(input, options) {
3931
3904
  s7 = peg$parseSubPathSegment();
3932
3905
  if (s7 !== peg$FAILED) {
3933
3906
  peg$savedPos = s6;
3934
- s7 = peg$f57(s3, s7);
3907
+ s7 = peg$f60(s3, s7);
3935
3908
  }
3936
3909
  s6 = s7;
3937
3910
  }
@@ -3946,8 +3919,8 @@ function peg$parse(input, options) {
3946
3919
  }
3947
3920
  if (s4 === peg$FAILED) {
3948
3921
  s4 = peg$currPos;
3949
- if (input.substr(peg$currPos, 7) === peg$c106) {
3950
- s5 = peg$c106;
3922
+ if (input.substr(peg$currPos, 7) === peg$c82) {
3923
+ s5 = peg$c82;
3951
3924
  peg$currPos += 7;
3952
3925
  } else {
3953
3926
  s5 = peg$FAILED;
@@ -3955,7 +3928,7 @@ function peg$parse(input, options) {
3955
3928
  }
3956
3929
  if (s5 !== peg$FAILED) {
3957
3930
  peg$savedPos = s4;
3958
- s5 = peg$f58(s3);
3931
+ s5 = peg$f61(s3);
3959
3932
  }
3960
3933
  s4 = s5;
3961
3934
  }
@@ -3963,7 +3936,7 @@ function peg$parse(input, options) {
3963
3936
  s4 = null;
3964
3937
  }
3965
3938
  peg$savedPos = s1;
3966
- s1 = peg$f59(s3);
3939
+ s1 = peg$f62(s3);
3967
3940
  } else {
3968
3941
  peg$currPos = s1;
3969
3942
  s1 = peg$FAILED;
@@ -3980,7 +3953,7 @@ function peg$parse(input, options) {
3980
3953
  s4 = peg$parseLinks();
3981
3954
  if (s4 !== peg$FAILED) {
3982
3955
  peg$savedPos = s3;
3983
- s4 = peg$f60(s2, s4);
3956
+ s4 = peg$f63(s2, s4);
3984
3957
  }
3985
3958
  s3 = s4;
3986
3959
  if (s3 === peg$FAILED) {
@@ -3988,7 +3961,7 @@ function peg$parse(input, options) {
3988
3961
  s4 = peg$parseSubPathSegment();
3989
3962
  if (s4 !== peg$FAILED) {
3990
3963
  peg$savedPos = s3;
3991
- s4 = peg$f61(s2, s4);
3964
+ s4 = peg$f64(s2, s4);
3992
3965
  }
3993
3966
  s3 = s4;
3994
3967
  }
@@ -3996,7 +3969,7 @@ function peg$parse(input, options) {
3996
3969
  s3 = null;
3997
3970
  }
3998
3971
  peg$savedPos = s1;
3999
- s1 = peg$f62(s2);
3972
+ s1 = peg$f65(s2);
4000
3973
  } else {
4001
3974
  peg$currPos = s1;
4002
3975
  s1 = peg$FAILED;
@@ -4005,7 +3978,7 @@ function peg$parse(input, options) {
4005
3978
  if (s1 !== peg$FAILED) {
4006
3979
  s2 = peg$currPos;
4007
3980
  if (input.charCodeAt(peg$currPos) === 63) {
4008
- s3 = peg$c119;
3981
+ s3 = peg$c84;
4009
3982
  peg$currPos++;
4010
3983
  } else {
4011
3984
  s3 = peg$FAILED;
@@ -4016,7 +3989,7 @@ function peg$parse(input, options) {
4016
3989
  s5 = peg$parseQueryOptions();
4017
3990
  if (s5 !== peg$FAILED) {
4018
3991
  peg$savedPos = s4;
4019
- s5 = peg$f63(s1, s5);
3992
+ s5 = peg$f66(s1, s5);
4020
3993
  }
4021
3994
  s4 = s5;
4022
3995
  if (s4 === peg$FAILED) {
@@ -4032,7 +4005,7 @@ function peg$parse(input, options) {
4032
4005
  s2 = null;
4033
4006
  }
4034
4007
  peg$savedPos = s0;
4035
- s0 = peg$f64(s1);
4008
+ s0 = peg$f67(s1);
4036
4009
  } else {
4037
4010
  peg$currPos = s0;
4038
4011
  s0 = peg$FAILED;
@@ -4057,7 +4030,7 @@ function peg$parse(input, options) {
4057
4030
 
4058
4031
  s0 = peg$currPos;
4059
4032
  if (input.charCodeAt(peg$currPos) === 47) {
4060
- s1 = peg$c3;
4033
+ s1 = peg$c1;
4061
4034
  peg$currPos++;
4062
4035
  } else {
4063
4036
  s1 = peg$FAILED;
@@ -4068,7 +4041,7 @@ function peg$parse(input, options) {
4068
4041
  s3 = peg$parseResourceName();
4069
4042
  if (s3 !== peg$FAILED) {
4070
4043
  peg$savedPos = s2;
4071
- s3 = peg$f65(s3);
4044
+ s3 = peg$f68(s3);
4072
4045
  }
4073
4046
  s2 = s3;
4074
4047
  if (s2 !== peg$FAILED) {
@@ -4076,15 +4049,15 @@ function peg$parse(input, options) {
4076
4049
  s4 = peg$parseKey();
4077
4050
  if (s4 !== peg$FAILED) {
4078
4051
  peg$savedPos = s3;
4079
- s4 = peg$f66(s2, s4);
4052
+ s4 = peg$f69(s2, s4);
4080
4053
  }
4081
4054
  s3 = s4;
4082
4055
  if (s3 === peg$FAILED) {
4083
4056
  s3 = null;
4084
4057
  }
4085
4058
  s4 = peg$currPos;
4086
- if (input.substr(peg$currPos, 7) === peg$c115) {
4087
- s5 = peg$c115;
4059
+ if (input.substr(peg$currPos, 7) === peg$c83) {
4060
+ s5 = peg$c83;
4088
4061
  peg$currPos += 7;
4089
4062
  } else {
4090
4063
  s5 = peg$FAILED;
@@ -4094,7 +4067,7 @@ function peg$parse(input, options) {
4094
4067
  s6 = peg$parseSubPathSegment();
4095
4068
  if (s6 !== peg$FAILED) {
4096
4069
  peg$savedPos = s4;
4097
- s4 = peg$f67(s2, s6);
4070
+ s4 = peg$f70(s2, s6);
4098
4071
  } else {
4099
4072
  peg$currPos = s4;
4100
4073
  s4 = peg$FAILED;
@@ -4108,7 +4081,7 @@ function peg$parse(input, options) {
4108
4081
  s5 = peg$parseSubPathSegment();
4109
4082
  if (s5 !== peg$FAILED) {
4110
4083
  peg$savedPos = s4;
4111
- s5 = peg$f68(s2, s5);
4084
+ s5 = peg$f71(s2, s5);
4112
4085
  }
4113
4086
  s4 = s5;
4114
4087
  }
@@ -4116,8 +4089,8 @@ function peg$parse(input, options) {
4116
4089
  s4 = null;
4117
4090
  }
4118
4091
  s5 = peg$currPos;
4119
- if (input.substr(peg$currPos, 7) === peg$c106) {
4120
- s6 = peg$c106;
4092
+ if (input.substr(peg$currPos, 7) === peg$c82) {
4093
+ s6 = peg$c82;
4121
4094
  peg$currPos += 7;
4122
4095
  } else {
4123
4096
  s6 = peg$FAILED;
@@ -4125,7 +4098,7 @@ function peg$parse(input, options) {
4125
4098
  }
4126
4099
  if (s6 !== peg$FAILED) {
4127
4100
  peg$savedPos = s5;
4128
- s6 = peg$f69(s2);
4101
+ s6 = peg$f72(s2);
4129
4102
  }
4130
4103
  s5 = s6;
4131
4104
  if (s5 === peg$FAILED) {
@@ -4133,7 +4106,7 @@ function peg$parse(input, options) {
4133
4106
  }
4134
4107
  s6 = peg$currPos;
4135
4108
  if (input.charCodeAt(peg$currPos) === 63) {
4136
- s7 = peg$c119;
4109
+ s7 = peg$c84;
4137
4110
  peg$currPos++;
4138
4111
  } else {
4139
4112
  s7 = peg$FAILED;
@@ -4144,7 +4117,7 @@ function peg$parse(input, options) {
4144
4117
  s9 = peg$parseQueryOptions();
4145
4118
  if (s9 !== peg$FAILED) {
4146
4119
  peg$savedPos = s8;
4147
- s9 = peg$f70(s2, s9);
4120
+ s9 = peg$f73(s2, s9);
4148
4121
  }
4149
4122
  s8 = s9;
4150
4123
  if (s8 === peg$FAILED) {
@@ -4160,7 +4133,7 @@ function peg$parse(input, options) {
4160
4133
  s6 = null;
4161
4134
  }
4162
4135
  peg$savedPos = s0;
4163
- s0 = peg$f71(s2);
4136
+ s0 = peg$f74(s2);
4164
4137
  } else {
4165
4138
  peg$currPos = s0;
4166
4139
  s0 = peg$FAILED;
@@ -4218,7 +4191,7 @@ function peg$parse(input, options) {
4218
4191
  }
4219
4192
  if (s1 !== peg$FAILED) {
4220
4193
  peg$savedPos = s0;
4221
- s1 = peg$f72(s1);
4194
+ s1 = peg$f75(s1);
4222
4195
  }
4223
4196
  s0 = s1;
4224
4197
 
@@ -4269,7 +4242,7 @@ function peg$parse(input, options) {
4269
4242
  if (s4 !== peg$FAILED) {
4270
4243
  s5 = peg$currPos;
4271
4244
  if (input.charCodeAt(peg$currPos) === 46) {
4272
- s6 = peg$c122;
4245
+ s6 = peg$c85;
4273
4246
  peg$currPos++;
4274
4247
  } else {
4275
4248
  s6 = peg$FAILED;
@@ -4325,7 +4298,7 @@ function peg$parse(input, options) {
4325
4298
  }
4326
4299
  if (s2 !== peg$FAILED) {
4327
4300
  peg$savedPos = s0;
4328
- s0 = peg$f73(s1, s2);
4301
+ s0 = peg$f76(s1, s2);
4329
4302
  } else {
4330
4303
  peg$currPos = s0;
4331
4304
  s0 = peg$FAILED;
@@ -4383,7 +4356,7 @@ function peg$parse(input, options) {
4383
4356
  }
4384
4357
  if (s1 !== peg$FAILED) {
4385
4358
  peg$savedPos = s0;
4386
- s1 = peg$f74(s1);
4359
+ s1 = peg$f77(s1);
4387
4360
  }
4388
4361
  s0 = s1;
4389
4362
 
@@ -4405,8 +4378,8 @@ function peg$parse(input, options) {
4405
4378
  }
4406
4379
 
4407
4380
  s0 = peg$currPos;
4408
- if (input.substr(peg$currPos, 4) === peg$c124) {
4409
- s1 = peg$c124;
4381
+ if (input.substr(peg$currPos, 4) === peg$c86) {
4382
+ s1 = peg$c86;
4410
4383
  peg$currPos += 4;
4411
4384
  } else {
4412
4385
  s1 = peg$FAILED;
@@ -4414,7 +4387,7 @@ function peg$parse(input, options) {
4414
4387
  }
4415
4388
  if (s1 !== peg$FAILED) {
4416
4389
  peg$savedPos = s0;
4417
- s1 = peg$f75();
4390
+ s1 = peg$f78();
4418
4391
  }
4419
4392
  s0 = s1;
4420
4393
 
@@ -4436,8 +4409,8 @@ function peg$parse(input, options) {
4436
4409
  }
4437
4410
 
4438
4411
  s0 = peg$currPos;
4439
- if (input.substr(peg$currPos, 4) === peg$c125) {
4440
- s1 = peg$c125;
4412
+ if (input.substr(peg$currPos, 4) === peg$c87) {
4413
+ s1 = peg$c87;
4441
4414
  peg$currPos += 4;
4442
4415
  } else {
4443
4416
  s1 = peg$FAILED;
@@ -4445,13 +4418,13 @@ function peg$parse(input, options) {
4445
4418
  }
4446
4419
  if (s1 !== peg$FAILED) {
4447
4420
  peg$savedPos = s0;
4448
- s1 = peg$f76();
4421
+ s1 = peg$f79();
4449
4422
  }
4450
4423
  s0 = s1;
4451
4424
  if (s0 === peg$FAILED) {
4452
4425
  s0 = peg$currPos;
4453
- if (input.substr(peg$currPos, 5) === peg$c126) {
4454
- s1 = peg$c126;
4426
+ if (input.substr(peg$currPos, 5) === peg$c88) {
4427
+ s1 = peg$c88;
4455
4428
  peg$currPos += 5;
4456
4429
  } else {
4457
4430
  s1 = peg$FAILED;
@@ -4459,7 +4432,7 @@ function peg$parse(input, options) {
4459
4432
  }
4460
4433
  if (s1 !== peg$FAILED) {
4461
4434
  peg$savedPos = s0;
4462
- s1 = peg$f77();
4435
+ s1 = peg$f80();
4463
4436
  }
4464
4437
  s0 = s1;
4465
4438
  }
@@ -4482,8 +4455,8 @@ function peg$parse(input, options) {
4482
4455
  }
4483
4456
 
4484
4457
  s0 = peg$currPos;
4485
- if (input.substr(peg$currPos, 8) === peg$c127) {
4486
- s1 = peg$c127;
4458
+ if (input.substr(peg$currPos, 8) === peg$c89) {
4459
+ s1 = peg$c89;
4487
4460
  peg$currPos += 8;
4488
4461
  } else {
4489
4462
  s1 = peg$FAILED;
@@ -4495,7 +4468,7 @@ function peg$parse(input, options) {
4495
4468
  s3 = peg$parseSign();
4496
4469
  if (s3 !== peg$FAILED) {
4497
4470
  if (input.charCodeAt(peg$currPos) === 80) {
4498
- s4 = peg$c128;
4471
+ s4 = peg$c90;
4499
4472
  peg$currPos++;
4500
4473
  } else {
4501
4474
  s4 = peg$FAILED;
@@ -4506,7 +4479,7 @@ function peg$parse(input, options) {
4506
4479
  s6 = peg$parseUnsignedInteger();
4507
4480
  if (s6 !== peg$FAILED) {
4508
4481
  if (input.charCodeAt(peg$currPos) === 68) {
4509
- s7 = peg$c129;
4482
+ s7 = peg$c91;
4510
4483
  peg$currPos++;
4511
4484
  } else {
4512
4485
  s7 = peg$FAILED;
@@ -4527,7 +4500,7 @@ function peg$parse(input, options) {
4527
4500
  }
4528
4501
  s6 = peg$currPos;
4529
4502
  if (input.charCodeAt(peg$currPos) === 84) {
4530
- s7 = peg$c130;
4503
+ s7 = peg$c92;
4531
4504
  peg$currPos++;
4532
4505
  } else {
4533
4506
  s7 = peg$FAILED;
@@ -4538,7 +4511,7 @@ function peg$parse(input, options) {
4538
4511
  s9 = peg$parseUnsignedInteger();
4539
4512
  if (s9 !== peg$FAILED) {
4540
4513
  if (input.charCodeAt(peg$currPos) === 72) {
4541
- s10 = peg$c131;
4514
+ s10 = peg$c93;
4542
4515
  peg$currPos++;
4543
4516
  } else {
4544
4517
  s10 = peg$FAILED;
@@ -4561,7 +4534,7 @@ function peg$parse(input, options) {
4561
4534
  s10 = peg$parseUnsignedInteger();
4562
4535
  if (s10 !== peg$FAILED) {
4563
4536
  if (input.charCodeAt(peg$currPos) === 77) {
4564
- s11 = peg$c132;
4537
+ s11 = peg$c94;
4565
4538
  peg$currPos++;
4566
4539
  } else {
4567
4540
  s11 = peg$FAILED;
@@ -4584,7 +4557,7 @@ function peg$parse(input, options) {
4584
4557
  s11 = peg$parseDurationNumber();
4585
4558
  if (s11 !== peg$FAILED) {
4586
4559
  if (input.charCodeAt(peg$currPos) === 83) {
4587
- s12 = peg$c133;
4560
+ s12 = peg$c95;
4588
4561
  peg$currPos++;
4589
4562
  } else {
4590
4563
  s12 = peg$FAILED;
@@ -4604,7 +4577,7 @@ function peg$parse(input, options) {
4604
4577
  s10 = null;
4605
4578
  }
4606
4579
  peg$savedPos = peg$currPos;
4607
- s11 = peg$f78(s3, s5, s8, s9, s10);
4580
+ s11 = peg$f81(s3, s5, s8, s9, s10);
4608
4581
  if (s11) {
4609
4582
  s11 = undefined;
4610
4583
  } else {
@@ -4612,7 +4585,7 @@ function peg$parse(input, options) {
4612
4585
  }
4613
4586
  if (s11 !== peg$FAILED) {
4614
4587
  peg$savedPos = s6;
4615
- s6 = peg$f79(s3, s5, s8, s9, s10);
4588
+ s6 = peg$f82(s3, s5, s8, s9, s10);
4616
4589
  } else {
4617
4590
  peg$currPos = s6;
4618
4591
  s6 = peg$FAILED;
@@ -4625,7 +4598,7 @@ function peg$parse(input, options) {
4625
4598
  s6 = null;
4626
4599
  }
4627
4600
  peg$savedPos = peg$currPos;
4628
- s7 = peg$f80(s3, s5, s6);
4601
+ s7 = peg$f83(s3, s5, s6);
4629
4602
  if (s7) {
4630
4603
  s7 = undefined;
4631
4604
  } else {
@@ -4635,7 +4608,7 @@ function peg$parse(input, options) {
4635
4608
  s8 = peg$parseApostrophe();
4636
4609
  if (s8 !== peg$FAILED) {
4637
4610
  peg$savedPos = s0;
4638
- s0 = peg$f81(s3, s5, s6);
4611
+ s0 = peg$f84(s3, s5, s6);
4639
4612
  } else {
4640
4613
  peg$currPos = s0;
4641
4614
  s0 = peg$FAILED;
@@ -4705,7 +4678,7 @@ function peg$parse(input, options) {
4705
4678
  }
4706
4679
  if (s3 !== peg$FAILED) {
4707
4680
  if (input.charCodeAt(peg$currPos) === 46) {
4708
- s4 = peg$c122;
4681
+ s4 = peg$c85;
4709
4682
  peg$currPos++;
4710
4683
  } else {
4711
4684
  s4 = peg$FAILED;
@@ -4756,7 +4729,7 @@ function peg$parse(input, options) {
4756
4729
  }
4757
4730
  if (s1 !== peg$FAILED) {
4758
4731
  peg$savedPos = s0;
4759
- s1 = peg$f82(s1);
4732
+ s1 = peg$f85(s1);
4760
4733
  }
4761
4734
  s0 = s1;
4762
4735
  if (s0 === peg$FAILED) {
@@ -4802,7 +4775,7 @@ function peg$parse(input, options) {
4802
4775
  }
4803
4776
  s1 = input.substring(s1, peg$currPos);
4804
4777
  peg$savedPos = s0;
4805
- s1 = peg$f83(s1);
4778
+ s1 = peg$f86(s1);
4806
4779
  s0 = s1;
4807
4780
 
4808
4781
  peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
@@ -4823,7 +4796,7 @@ function peg$parse(input, options) {
4823
4796
  }
4824
4797
 
4825
4798
  if (input.charCodeAt(peg$currPos) === 43) {
4826
- s0 = peg$c33;
4799
+ s0 = peg$c21;
4827
4800
  peg$currPos++;
4828
4801
  } else {
4829
4802
  s0 = peg$FAILED;
@@ -4831,8 +4804,8 @@ function peg$parse(input, options) {
4831
4804
  }
4832
4805
  if (s0 === peg$FAILED) {
4833
4806
  s0 = peg$currPos;
4834
- if (input.substr(peg$currPos, 3) === peg$c135) {
4835
- s1 = peg$c135;
4807
+ if (input.substr(peg$currPos, 3) === peg$c96) {
4808
+ s1 = peg$c96;
4836
4809
  peg$currPos += 3;
4837
4810
  } else {
4838
4811
  s1 = peg$FAILED;
@@ -4840,12 +4813,12 @@ function peg$parse(input, options) {
4840
4813
  }
4841
4814
  if (s1 !== peg$FAILED) {
4842
4815
  peg$savedPos = s0;
4843
- s1 = peg$f84();
4816
+ s1 = peg$f87();
4844
4817
  }
4845
4818
  s0 = s1;
4846
4819
  if (s0 === peg$FAILED) {
4847
4820
  if (input.charCodeAt(peg$currPos) === 45) {
4848
- s0 = peg$c136;
4821
+ s0 = peg$c97;
4849
4822
  peg$currPos++;
4850
4823
  } else {
4851
4824
  s0 = peg$FAILED;
@@ -4875,7 +4848,7 @@ function peg$parse(input, options) {
4875
4848
  }
4876
4849
 
4877
4850
  if (input.charCodeAt(peg$currPos) === 39) {
4878
- s0 = peg$c137;
4851
+ s0 = peg$c98;
4879
4852
  peg$currPos++;
4880
4853
  } else {
4881
4854
  s0 = peg$FAILED;
@@ -4883,8 +4856,8 @@ function peg$parse(input, options) {
4883
4856
  }
4884
4857
  if (s0 === peg$FAILED) {
4885
4858
  s0 = peg$currPos;
4886
- if (input.substr(peg$currPos, 3) === peg$c138) {
4887
- s1 = peg$c138;
4859
+ if (input.substr(peg$currPos, 3) === peg$c99) {
4860
+ s1 = peg$c99;
4888
4861
  peg$currPos += 3;
4889
4862
  } else {
4890
4863
  s1 = peg$FAILED;
@@ -4892,7 +4865,7 @@ function peg$parse(input, options) {
4892
4865
  }
4893
4866
  if (s1 !== peg$FAILED) {
4894
4867
  peg$savedPos = s0;
4895
- s1 = peg$f85();
4868
+ s1 = peg$f88();
4896
4869
  }
4897
4870
  s0 = s1;
4898
4871
  }
@@ -5014,7 +4987,7 @@ function peg$parse(input, options) {
5014
4987
  s3 = peg$parseApostrophe();
5015
4988
  if (s3 !== peg$FAILED) {
5016
4989
  peg$savedPos = s0;
5017
- s0 = peg$f86(s2);
4990
+ s0 = peg$f89(s2);
5018
4991
  } else {
5019
4992
  peg$currPos = s0;
5020
4993
  s0 = peg$FAILED;
@@ -5043,7 +5016,7 @@ function peg$parse(input, options) {
5043
5016
 
5044
5017
  s0 = peg$currPos;
5045
5018
  if (input.charCodeAt(peg$currPos) === 64) {
5046
- s1 = peg$c8;
5019
+ s1 = peg$c5;
5047
5020
  peg$currPos++;
5048
5021
  } else {
5049
5022
  s1 = peg$FAILED;
@@ -5053,7 +5026,7 @@ function peg$parse(input, options) {
5053
5026
  s2 = peg$parseResourceName();
5054
5027
  if (s2 !== peg$FAILED) {
5055
5028
  peg$savedPos = s0;
5056
- s0 = peg$f87(s2);
5029
+ s0 = peg$f90(s2);
5057
5030
  } else {
5058
5031
  peg$currPos = s0;
5059
5032
  s0 = peg$FAILED;
@@ -5084,7 +5057,7 @@ function peg$parse(input, options) {
5084
5057
  s1 = peg$parseNumber();
5085
5058
  if (s1 !== peg$FAILED) {
5086
5059
  peg$savedPos = s0;
5087
- s1 = peg$f88(s1);
5060
+ s1 = peg$f91(s1);
5088
5061
  }
5089
5062
  s0 = s1;
5090
5063
 
@@ -5109,7 +5082,7 @@ function peg$parse(input, options) {
5109
5082
  s1 = peg$parseUnsignedInteger();
5110
5083
  if (s1 !== peg$FAILED) {
5111
5084
  peg$savedPos = s0;
5112
- s1 = peg$f89(s1);
5085
+ s1 = peg$f92(s1);
5113
5086
  }
5114
5087
  s0 = s1;
5115
5088
 
@@ -5132,8 +5105,8 @@ function peg$parse(input, options) {
5132
5105
 
5133
5106
  s0 = peg$currPos;
5134
5107
  s1 = peg$currPos;
5135
- if (input.substr(peg$currPos, 8) === peg$c140) {
5136
- s2 = peg$c140;
5108
+ if (input.substr(peg$currPos, 8) === peg$c100) {
5109
+ s2 = peg$c100;
5137
5110
  peg$currPos += 8;
5138
5111
  } else {
5139
5112
  s2 = peg$FAILED;
@@ -5141,13 +5114,13 @@ function peg$parse(input, options) {
5141
5114
  }
5142
5115
  if (s2 !== peg$FAILED) {
5143
5116
  peg$savedPos = s1;
5144
- s2 = peg$f90();
5117
+ s2 = peg$f93();
5145
5118
  }
5146
5119
  s1 = s2;
5147
5120
  if (s1 === peg$FAILED) {
5148
5121
  s1 = peg$currPos;
5149
- if (input.substr(peg$currPos, 4) === peg$c71) {
5150
- s2 = peg$c71;
5122
+ if (input.substr(peg$currPos, 4) === peg$c52) {
5123
+ s2 = peg$c52;
5151
5124
  peg$currPos += 4;
5152
5125
  } else {
5153
5126
  s2 = peg$FAILED;
@@ -5155,7 +5128,7 @@ function peg$parse(input, options) {
5155
5128
  }
5156
5129
  if (s2 !== peg$FAILED) {
5157
5130
  peg$savedPos = s1;
5158
- s2 = peg$f91();
5131
+ s2 = peg$f94();
5159
5132
  }
5160
5133
  s1 = s2;
5161
5134
  }
@@ -5164,12 +5137,12 @@ function peg$parse(input, options) {
5164
5137
  s3 = peg$parseQuotedText();
5165
5138
  if (s3 !== peg$FAILED) {
5166
5139
  peg$savedPos = s2;
5167
- s3 = peg$f92(s1, s3);
5140
+ s3 = peg$f95(s1, s3);
5168
5141
  }
5169
5142
  s2 = s3;
5170
5143
  if (s2 !== peg$FAILED) {
5171
5144
  peg$savedPos = peg$currPos;
5172
- s3 = peg$f93(s1, s2);
5145
+ s3 = peg$f96(s1, s2);
5173
5146
  if (s3) {
5174
5147
  s3 = peg$FAILED;
5175
5148
  } else {
@@ -5177,7 +5150,7 @@ function peg$parse(input, options) {
5177
5150
  }
5178
5151
  if (s3 !== peg$FAILED) {
5179
5152
  peg$savedPos = s0;
5180
- s0 = peg$f94(s1, s2);
5153
+ s0 = peg$f97(s1, s2);
5181
5154
  } else {
5182
5155
  peg$currPos = s0;
5183
5156
  s0 = peg$FAILED;
@@ -5212,7 +5185,7 @@ function peg$parse(input, options) {
5212
5185
  s1 = peg$parseDate();
5213
5186
  if (s1 !== peg$FAILED) {
5214
5187
  peg$savedPos = s0;
5215
- s1 = peg$f95(s1);
5188
+ s1 = peg$f98(s1);
5216
5189
  }
5217
5190
  s0 = s1;
5218
5191
 
@@ -5237,7 +5210,7 @@ function peg$parse(input, options) {
5237
5210
  s1 = peg$parseBoolean();
5238
5211
  if (s1 !== peg$FAILED) {
5239
5212
  peg$savedPos = s0;
5240
- s1 = peg$f96(s1);
5213
+ s1 = peg$f99(s1);
5241
5214
  }
5242
5215
  s0 = s1;
5243
5216
 
@@ -5260,7 +5233,7 @@ function peg$parse(input, options) {
5260
5233
 
5261
5234
  s0 = peg$currPos;
5262
5235
  if (input.charCodeAt(peg$currPos) === 36) {
5263
- s1 = peg$c6;
5236
+ s1 = peg$c3;
5264
5237
  peg$currPos++;
5265
5238
  } else {
5266
5239
  s1 = peg$FAILED;
@@ -5270,7 +5243,7 @@ function peg$parse(input, options) {
5270
5243
  s2 = peg$parseResourceName();
5271
5244
  if (s2 !== peg$FAILED) {
5272
5245
  peg$savedPos = s0;
5273
- s0 = peg$f97(s2);
5246
+ s0 = peg$f100(s2);
5274
5247
  } else {
5275
5248
  peg$currPos = s0;
5276
5249
  s0 = peg$FAILED;
@@ -5301,7 +5274,7 @@ function peg$parse(input, options) {
5301
5274
  s1 = peg$parseQuotedText();
5302
5275
  if (s1 !== peg$FAILED) {
5303
5276
  peg$savedPos = s0;
5304
- s1 = peg$f98(s1);
5277
+ s1 = peg$f101(s1);
5305
5278
  }
5306
5279
  s0 = s1;
5307
5280
 
@@ -5325,7 +5298,7 @@ function peg$parse(input, options) {
5325
5298
  s0 = peg$currPos;
5326
5299
  peg$silentFails++;
5327
5300
  if (input.charCodeAt(peg$currPos) === 40) {
5328
- s1 = peg$c51;
5301
+ s1 = peg$c32;
5329
5302
  peg$currPos++;
5330
5303
  } else {
5331
5304
  s1 = peg$FAILED;
@@ -5393,15 +5366,15 @@ function peg$parse(input, options) {
5393
5366
  }
5394
5367
 
5395
5368
  if (input.charCodeAt(peg$currPos) === 32) {
5396
- s0 = peg$c142;
5369
+ s0 = peg$c101;
5397
5370
  peg$currPos++;
5398
5371
  } else {
5399
5372
  s0 = peg$FAILED;
5400
5373
  if (peg$silentFails === 0) { peg$fail(peg$e108); }
5401
5374
  }
5402
5375
  if (s0 === peg$FAILED) {
5403
- if (input.substr(peg$currPos, 3) === peg$c143) {
5404
- s0 = peg$c143;
5376
+ if (input.substr(peg$currPos, 3) === peg$c102) {
5377
+ s0 = peg$c102;
5405
5378
  peg$currPos += 3;
5406
5379
  } else {
5407
5380
  s0 = peg$FAILED;
@@ -5409,7 +5382,7 @@ function peg$parse(input, options) {
5409
5382
  }
5410
5383
  if (s0 === peg$FAILED) {
5411
5384
  if (input.charCodeAt(peg$currPos) === 43) {
5412
- s0 = peg$c33;
5385
+ s0 = peg$c21;
5413
5386
  peg$currPos++;
5414
5387
  } else {
5415
5388
  s0 = peg$FAILED;