From c364cc5c101d16d6a89734361db9ac1d80918293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20R=C3=B6thlisberger?= Date: Mon, 30 Nov 2015 10:59:09 +0000 Subject: [PATCH] doc: Minor corrections to tutorial2 ``spaces`` is deprecated in favour of ``ws`` since 1.1.0. The statement about ``spaces`` in the ``pair`` rule was confusing; whitespace is actually handled in the ``value`` rule a few paragraphs below. --- doc/tutorial2.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/tutorial2.rst b/doc/tutorial2.rst index 7a22a98..92fbf29 100644 --- a/doc/tutorial2.rst +++ b/doc/tutorial2.rst @@ -25,8 +25,7 @@ inside an object expression. | -> [] This handles the three cases for object contents: one, multiple, or -zero pairs. A name/value pair is separated by a colon. We use the -builtin rule ``spaces`` to consume any whitespace after the colon:: +zero pairs. A name/value pair is separated by a colon:: pair = ws string:k ws ':' value:v -> (k, v) @@ -98,8 +97,8 @@ floating-point. :: - number = spaces ('-' | -> ''):sign (intPart:ds (floatPart(sign ds) - | -> int(sign + ds))) + number = ws ('-' | -> ''):sign (intPart:ds (floatPart(sign ds) + | -> int(sign + ds))) Here we vary from the json.org description a little and move sign handling up into the ``number`` rule. We match either an ``intPart``