Resolve 'bytes'/'binary' discrepancy (#129)

amazon-ion · Nov 19, 2024 · 0b5d57a · 0b5d57a
1 parent a0acfb4
commit 0b5d57a
Show file tree

Hide file tree

Showing 5 changed files with 184 additions and 173 deletions.
diff --git a/conformance/README.md b/conformance/README.md
@@ -660,7 +660,7 @@ test ::=  "("  "document" name-string?  fragment*  continuation  ")"
 
 name-string ::= string
 
-fragment ::=  "("  "text"      string*  ")"
+fragment ::=  "("  "text"      text_input*  ")"
            |  "("  "binary"    bytes*   ")"
            |  "("  "ivm"       int int  ")"
            |  "("  "toplevel"  ast*     ")"
@@ -680,8 +680,11 @@ extension    ::=  "("  "then"  name-string?  fragment*  continuation  ")"
 
 each-branch  ::=  name-string?  fragment
 
-bytes  ::=  int      // In the range 0..255
-         |  string   // Containing hexadecimal digit pairs with optional whitespace
+text_input   ::=  int      // In the range 0..255
+               |  string
+
+bytes        ::=  int      // In the range 0..255
+               |  string   // Containing hexadecimal digit pairs with optional whitespace
 ```
 
 TODO: Explain `ast`

diff --git a/conformance/core/empty_document.ion b/conformance/core/empty_document.ion
@@ -56,9 +56,9 @@
 
 // With empty fragments
 
-(ion_1_0 (bytes) (produces))
-(ion_1_1 (bytes) (produces))
-(ion_1_x (bytes) (produces))
+(ion_1_0 (binary) (produces))
+(ion_1_1 (binary) (produces))
+(ion_1_x (binary) (produces))
 
 (document (text) (produces))
 (ion_1_0 (text) (produces))