Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve 'bytes'/'binary' discrepancy #129

Merged
merged 4 commits into from
Nov 19, 2024
Merged

Resolve 'bytes'/'binary' discrepancy #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70e31cd
Resolve 'bytes'/'binary' discrepancy
popematt Nov 14, 2024
d1dbebd
Merge remote-tracking branch 'upstream/main' into bytes-binary
popematt Nov 14, 2024
faaaec3
Make the github workflow run for all branches
popematt Nov 14, 2024
94c50d0
Merge branch 'main' into bytes-binary
popematt Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions conformance/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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* ")"
Expand All @@ -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`
Expand Down
6 changes: 3 additions & 3 deletions conformance/core/empty_document.ion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Loading
Loading