more refinement

draft-marchan-kdl2.md

@@ -117,10 +117,11 @@ Being a node-oriented language means that the real core component of any KDL
 document is the "node". Every node must have a name, which must be a
 String ({{string}}).
 
-The name may be preceded by a Type Annotation ({{type-annotation}}) to further
+The name may be preceded by a Prefix Type Annotation
-clarify its type, particularly in relation to its parent node. (For example,
+({{prefix-type-annotation}}) to further clarify its type, particularly in
-clarifying that a particular `date` child node is for the _publication_ date,
+relation to its parent node. (For example, clarifying that a particular `date`
-rather than the last-modified date, with `(published)date`.)
+child node is for the _publication_ date, rather than the last-modified date,
+with `(published)date`.)
 
 Following the name are zero or more Arguments ({{argument}}) or
 Properties ({{property}}), separated by either whitespace ({{whitespace}}) or a
@@ -247,23 +248,42 @@ Values _MUST_ be either Arguments ({{argument}}) or values of
 Properties ({{property}}). Only String ({{string}}) values may be used as
 Node ({{node}}) names or Property ({{property}}) keys.
 
-Values (both as arguments and in properties) _MAY_ be prefixed by a single
+Values (both as arguments and in properties) _MAY_ include a single Type
-Type Annotation ({{type-annotation}}).
+Annotation ({{type-annotation}}).
 
 ## Type Annotation
 
-A type annotation is a prefix to any Node Name ({{node}}) or Value ({{value}}) that
+A type annotation is a String ({{string}}) value attached to any Node Name
-includes a _suggestion_ of what type the value is _intended_ to be treated as,
+({{node}}) or Value ({{value}}) that includes a _suggestion_ of what type the
-or as a _context-specific elaboration_ of the more generic type the node name
+value is _intended_ to be treated as, or as a _context-specific elaboration_ of
-indicates.
+the more generic type the node name indicates.
-
-Type annotations are written as a set of `(` and `)` with a single
-String ({{string}}) in it. It may contain Whitespace after the `(` and before
-the `)`, and may be separated from its target by Whitespace.
 
 KDL does not specify any restrictions on what implementations might do with
 these annotations. They are free to ignore them, or use them to make decisions
-about how to interpret a value.
+about how to interpret a value. That said, KDL does reserve certain well-known
+strings for what would be their intended purpose, for the sake of
+interoperability ({{reserved-type-annotations}}).
+
+There are two kinds of Type Annotation syntaxes in KDL: Prefix Type Annotations
+({{prefix-type-annotation}}) and Suffix Type Annotations
+({{suffix-type-annotation}}).
+
+### Examples
+
+~~~kdl
+node 123u8
+node 0#b 20b 50GiB
+node prop=(regex).*
+(published)date "1970-01-01"
+(contributor)person name="Foo McBar"
+~~~
+
+### Prefix Type Annotation
+
+Prefix Type Annotations are written as a set of `(` and `)` with a single String
+({{string}}) in it. It may contain Whitespace after the `(` and before the `)`,
+and may be separated from its target by Whitespace. Unlike the other annotation
+types, any String type may be used.
 
 ### Suffix Type Annotation
 
@@ -272,38 +292,38 @@ type annotation as a "suffix", instead of prepending it between `(` and `)`.
 This makes it possible to, for example, write `10px`, `10.5%`, `512GiB`, etc.,
 which are equivalent to `(px)10`, `(%)5`, and `(GiB)512`, respectively.
 
-There are two kinds of Suffix Type Annotations ({{suffix-type-annotation}})
-available: Bare Suffix Type Annotations ({{bare-suffix-type-annotation}})s and
-Explicit Suffix Type Annotations ({{explicit-suffix-type-annotation}}).
-
 Most suffixes can be appended directly to the number (a Bare Suffix Type
 Annotation ({{bare-suffix-type-annotation}})), as shown in the previous
 paragraph. To avoid parsing ambiguity, there are some restrictions on this; an
 Explicit Suffix Type Annotation ({{explicit-suffix-type-annotation}}) avoids all
 these restrictions by using an additional `#` to explicitly indicate it. For
-example, `10.0u8` is invalid, but `10.0#u8` is valid and equivalent to
+example, `0bytes` is invalid, but `0#bytes` is valid and equivalent to
-`(u8)10.0`. See Bare Suffix Type Annotation ({{bare-suffix-type-annotation}})
+`(bytes)0`. See Bare Suffix Type Annotation ({{bare-suffix-type-annotation}})
 for the full list of restrictions.
 
-An implementation that finds BOTH a parenthesized ({{type-annotation}}) and a
+An implementation that finds BOTH a parenthesized Prefix Type Annotation
-Suffix Type Annotation ({{suffix-type-annotation}}) on the same Number
+({{prefix-type-annotation}}) and a Suffix Type Annotation
-({{number}}) MUST yield a syntax error.
+({{suffix-type-annotation}}) on the same Number ({{number}}) MUST yield a syntax
+error.
 
 Suffixes MUST BE plain Identifier Strings ({{identifier-string}}). No other
 String ({{string}}) syntax is acceptable.
 
 #### Bare Suffix Type Annotation
 
-When a Value ({{value}}) is a decimal Number ({{number}}) WITHOUT exponential
+When a Value ({{value}}) is a Number ({{number}}) that meets certain criteria,
-syntax (`1e+5` etc) (and ONLY a decimal. That is, numbers which do NOT have a
+it's possible to append an Identifier String ({{identifier-string}}), and ONLY
-`0b`/`0o`/`0x` prefix with an optional sign), it's possible to append the type
+an Identifier String, as a suffix directly to the Number, as its Type Annotation
-annotation as a suffix directly to the number, without any additional syntax.
+({{type-annotation}}). The criteria are as follows:
 
-To remove further ambiguity, on top of not being available for non-decimal
+* The Number MUST be a Decimal (that is, it MUST NOT start with `0b`, `0o`, or
-prefixes, and for decimals with exponent parts, the suffix Identifier String
+  `0x`). Additionally, the tokens `0b`, `0o`, and `0x` MUST be treated as syntax
-({{identifier-string}}) itself MUST NOT start with any of `.`, `,`, or `_`, as
+  errors (incomplete non-decimal numbers).
-well as `[eE][-+]?[0-9]?` as part of the exponential restriction above. Note the
+* It MUST NOT have an exponent part (e.g. `5.2e+3`).
-optional digit, which is added to prevent typo ambiguity.
+* The Identifier String used for the type itself MUST NOT start with either `.` or `,`.
+* As part of the exponential restriction, the suffix MUST NOT match
+  `[eE]([-+]|[0-9])` (e.g. `5.2e+` SHOULD be considered a "bad exponential", and
+  MUST NOT parse as `(e+)5.2`).
 
 For example, the following are all illegal:
 
@@ -312,17 +332,19 @@ For example, the following are all illegal:
 * `0xyz` (starts with reserved hexadecimal prefix)
 * `0b` (starts with reserved binary prefix)
 * `5e+oops` (looks too close to an exponential)
+* `1.2.3-abc` (suffix would start with `.` AND Identifier Strings can't start
+  with `.<digit>`)
 
 Whereas the following are all legal:
 
-* `0u8` (aka `(u8)0`)
+* `0u8` = `(u8)0`
-* `5em` (aka `(em)5`. The `e` is not followed by a digit.)
+* `5em` = `(em)5`, the `e` is not followed by a digit.
-* `1xyz` (aka `(xyz)1`. No longer starts with `0` as above.)
+* `1xyz` = `(xyz)1`, no longer starts with `0` as above.
-* `20b` (aka `(b)20`, "20 bytes". No longer starts with just `0` as above.)
+* `20b` = `(b)20`, "20 bytes", no longer starts with just `0` as above.
 
-If the desired suffix would violate any of the above rules, either regular
+If the desired suffix would violate any of the above rules, either Prefix Type
-parenthetical Type Annotations ({{type-annotation}}) or Explicit Suffix Type
+Annotations ({{prefix-type-annotation}}) or Explicit Suffix Type Annotations
-Annotations ({{explicit-suffix-type-annotation}}) may be used.
+({{explicit-suffix-type-annotation}}) may be used.
 
 #### Explicit Suffix Type Annotation
 
@@ -338,7 +360,9 @@ Note that, unlike Bare Suffix Type Annotations
 ({{number}}) formats (hexadecimal, decimal, octal, and binary). For example,
 `0x1234#u32` is valid.
 
-### Reserved Type Annotations for Numbers Without Decimal Parts
+### Reserved Type Annotations
+
+#### For Numbers Without Decimal Parts
 
 Additionally, the following type annotations MAY be recognized by KDL parsers
 and, if used, SHOULD interpret these types as follows.
@@ -364,7 +388,7 @@ Platform-dependent integer types, both signed and unsigned:
 - `isize`
 - `usize`
 
-### Reserved Type Annotations for Numbers With Decimal Parts
+#### For Numbers With Decimal Parts
 
 IEEE 754 floating point numbers, both single (32) and double (64) precision:
 
@@ -376,7 +400,7 @@ IEEE 754-2008 decimal floating point numbers
 - `decimal64`
 - `decimal128`
 
-### Reserved Type Annotations for Strings
+#### For Strings
 
 - `date-time`: ISO8601 date/time format.
 - `time`: "Time" section of ISO8601.
@@ -404,16 +428,6 @@ IEEE 754-2008 decimal floating point numbers
 - `base64`: A Base64-encoded string, denoting arbitrary binary data.
 - `base85`: An [Ascii85](https://en.wikipedia.org/wiki/Ascii85)-encoded string, denoting arbitrary binary data.
 
-### Examples
-
-~~~kdl
-node 123u8
-node 0#b 20b 50GiB
-node prop=(regex).*
-(published)date "1970-01-01"
-(contributor)person name="Foo McBar"
-~~~
-
 ## String
 
 Strings in KDL represent textual UTF-8 Values ({{value}}). A String is either an
@@ -1105,8 +1119,8 @@ sign := '+' | '-'
 
 bare-type-suffix := bare-type-suffix-initial identifier-char*
 bare-type-suffix-initial := identifier-char
-    - '.' - ',' - '_'
+    - '.' - ','
-    - (('e' | 'E') sign? digit)
+    - (('e' | 'E') (sign | digit))
 explicit-type-suffix := '#' identifier-string
 
 hex := sign? '0x' hex-digit (hex-digit | '_')*

tests/test_cases/expected_kdl/suffix_type_bare_underscore.kdl

@@ -0,0 +1 @@
+node (abc)123

tests/test_cases/input/bare_ident_numeric_fail.kdl

@@ -1 +0,0 @@
-node 0n

tests/test_cases/input/bare_ident_numeric_sign_fail.kdl

@@ -1 +0,0 @@
-node +0n

tests/test_cases/input/exponent_no_digit_fail.kdl

@@ -0,0 +1 @@
+node 1.0e-