-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into binary-eexp
- Loading branch information
Showing
13 changed files
with
324 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| (ion_1_1 "a macro that can create a monomorphized variant of the values macro" | ||
| (mactab (macro tiny_decimal (int8::a int8::b) (.make_decimal a b)) | ||
| (macro tagless_values (mod_or_type type?) | ||
| (macro | ||
| // Macro name | ||
| (.$ion::make_symbol (.. (%mod_or_type) (.$ion::if_some (%type) "_") (%type) "_values")) | ||
| // Signature | ||
| ((.$ion::annotate (.. (%mod_or_type) (%type)) vals) *) | ||
| // Body | ||
| ((.$ion::values %) vals)) | ||
| )) | ||
| (then "for a built-in encoding type" | ||
| (toplevel ('#$:$ion::add_macros' ('#$:tagless_values' uint8))) | ||
| (then "when invoked in Ion text" | ||
| (text "(:uint8_values 1 2 3 4 5)") | ||
| (produces 1 2 3 4 5)) | ||
| (then "when invoked in Ion binary" | ||
| // Invoke our new "uint8_values" macro | ||
| (binary "02 02 0B 01 02 03 04 05") | ||
| (produces 1 2 3 4 5))) | ||
| (then "for a macro-shape" | ||
| (toplevel ('#$:$ion::add_macros' ('#$:tagless_values' tiny_decimal))) | ||
| // TODO: Add case demoing binary | ||
| (then "when invoked in Ion text" | ||
| (text "(:tiny_decimal_values (1 2) (3 4))") | ||
| (produces 1d2 3d4))) | ||
| (then "for a qualified type name" | ||
| (toplevel ('#$:$ion::add_macros' ('#$:tagless_values' $ion make_decimal))) | ||
| // TODO: Add case demoing binary | ||
| (then "when invoked in Ion text" | ||
| (text "(:$ion_make_decimal_values (1 2) (3 4))") | ||
| (produces 1d2 3d4)))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,95 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| // Test Cases: | ||
| // annotate can be invoked using any type of macro reference. | ||
| // annotate adds annotations to a value | ||
| // if the value has existing annotations, they are preserved and annotate prepends annotations to the existing annotations of the value | ||
| // the first argument must be zero or more non-null text values ($0 is allowed) | ||
| // the second argument must be a single expression that also expands to a single expression | ||
| (ion_1_1 "annotate can be invoked" | ||
| (each "in text with an unqualified macro name" | ||
| (text " (:annotate (::) 0) ") | ||
| "in text with an unqualified macro address" | ||
| (text " (:2 (::) 0) ") | ||
| "in text with a qualified macro name" | ||
| (text " (:$ion::annotate (::) 0) ") | ||
| "in text using qualified system macro address 2" | ||
| (text " (:$ion::2 (::) 0) ") | ||
| "in binary using system macro address 2" | ||
| (binary "EF 02 00 60") | ||
| "in binary with a user macro address" | ||
| (binary "02 00 60") | ||
| (produces 0))) | ||
|
|
||
| (ion_1_1 "annotate can add" | ||
| (each "0 annotations" | ||
| (text " (:annotate (::) a::b::c::d::e::0) ") | ||
| "1 annotations" | ||
| (text " (:annotate (:: a) b::c::d::e::0) ") | ||
| "2 annotations" | ||
| (text " (:annotate (:: a b) c::d::e::0) ") | ||
| "3 annotations" | ||
| (text " (:annotate (:: a b c) d::e::0) ") | ||
| "4 annotations" | ||
| (text " (:annotate (:: a b c d) e::0) ") | ||
| "5 annotations" | ||
| (text " (:annotate (:: a b c d e) 0) ") | ||
| (produces a::b::c::d::e::0))) | ||
|
|
||
| (ion_1_1 "annotate can add annotations to" | ||
| (then "null" (text "(:annotate (:: a) null )") (produces a::null)) | ||
| (then "bool" (text "(:annotate (:: a) true )") (produces a::true)) | ||
| (then "int" (text "(:annotate (:: a) 2 )") (produces a::2)) | ||
| (then "float" (text "(:annotate (:: a) 3e0 )") (produces a::3e0)) | ||
| (then "decimal" (text "(:annotate (:: a) 4d0 )") (produces a::4d0)) | ||
| (then "timestamp" (text "(:annotate (:: a) 2024T )") (produces a::2024T)) | ||
| (then "string" (text "(:annotate (:: a) '''abc''' )") (produces a::"abc")) | ||
| (then "symbol" (text "(:annotate (:: a) abc )") (produces a::abc)) | ||
| (then "clob" (text "(:annotate (:: a) {{'''abc'''}} )") (produces a::{{"abc"}})) | ||
| (then "blob" (text "(:annotate (:: a) {{+AB/}} )") (produces a::{{ +AB/ }})) | ||
| (then "list" (text "(:annotate (:: a) [0, 1, 2] )") (produces a::[0, 1, 2])) | ||
| (then "sexp" (text "(:annotate (:: a) (0 1 2) )") (produces a::(0 1 2))) | ||
| (then "struct" (text "(:annotate (:: a) {a:1} )") (produces a::{a:1})) | ||
| (then "the result of an e-expression" | ||
| (text " (:annotate (:: a) (:values 123))") | ||
| (produces a::123)) | ||
| (then "the result of a tdl macro invocation" | ||
| (mactab (macro foo () (.annotate (.. "a") (.values "b")))) | ||
| (text "(:foo)") | ||
| (produces a::"b")) | ||
| (then "the value of a tdl variable" | ||
| (mactab (macro foo (x) (.annotate (.. "a") (%x)))) | ||
| (text "(:foo 10)") | ||
| (produces a::10))) | ||
|
|
||
| (ion_1_1 "the value to annotate cannot be" | ||
| (each "nothing" | ||
| (text "(:text (:: a) (:values))") | ||
| "more than one value" | ||
| (text "(:text (:: a) (:values 1 2))") | ||
| (signals "invalid argument"))) | ||
|
|
||
| (ion_1_1 "the annotations argument" | ||
| (then "may be" | ||
| (then "an empty expression group" | ||
| (text "(:annotate (::) 0)") | ||
| (produces 0)) | ||
| (then "a symbol with unknown text" | ||
| (text "(:annotate (:: $0) true)") | ||
| // Could be (produces $0::true), but some implementations don't support $0 nicely. | ||
| (denotes (annot true 0))) | ||
| (each "a string" | ||
| (text "(:annotate (:: '''a''') 0)") | ||
| "a symbol" | ||
| (text "(:annotate (:: 'a') 0)") | ||
| "an expression that produces a text value" | ||
| (text "(:annotate (:: (:values a)) 0)") | ||
| (produces a::0)) | ||
| (each "an expression group with multiple text values" | ||
| (text "(:annotate (:: a b) 0)") | ||
| "an expression that produces multiple text values" | ||
| (text "(:annotate (:: (:values a b)) 0)") | ||
| (produces a::b::0))) | ||
| (then "may not be" | ||
| (each "any null" | ||
| (text "(:annotate (:: null) 0)") | ||
| (text "(:annotate (:: null.string) 0)") | ||
| (text "(:annotate (:: null.symbol) 0)") | ||
| "a non-text value" | ||
| (text "(:annotate (:: 1) 0)") | ||
| (signals "invalid argument")))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,62 @@ | ||
| // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| // Test Cases: | ||
| // flatten can be invoked using any type of macro reference. | ||
| // the argument values may be zero or more non-null lists and s-expressions | ||
| // flatten expands to a stream whose elements are the concatenated elements of all its arguments | ||
| // annotations on the argument (list and sexp) values are silently dropped | ||
| (ion_1_1 "flatten can be invoked" | ||
| (each "in text with an unqualified macro name" | ||
| (text " (:flatten (::)) ") | ||
| "in text with an unqualified macro address" | ||
| (text " (:19 (::)) ") | ||
| "in text with a qualified macro name" | ||
| (text " (:$ion::flatten (::)) ") | ||
| "in text using qualified system macro address 19" | ||
| (text " (:$ion::19 (::)) ") | ||
| "in binary using system macro address 19" | ||
| (binary "EF 13 00") | ||
| "in binary with a user macro address" | ||
| (binary "13 00") | ||
| (produces /*nothing*/))) | ||
|
|
||
| (ion_1_1 "flatten creates a flat sequence of values from" | ||
| (then "0 values" | ||
| (text "(:flatten)") | ||
| (produces /*nothing*/)) | ||
| (each "one list" | ||
| (text "(:flatten [1, 2, 3])") | ||
| "multiple lists" | ||
| (text "(:flatten [1, 2] [3])") | ||
| (text "(:flatten [1] [2] [3])") | ||
| (text "(:flatten [] [1, 2, 3] [])") | ||
| (text "(:flatten [] [1] [] [2] [] [3] [])") | ||
| "one sexp" | ||
| (text "(:flatten (1 2 3))") | ||
| "multiple sexps" | ||
| (text "(:flatten (1 2) (3))") | ||
| (text "(:flatten (1) (2) (3))") | ||
| (text "(:flatten () (1 2 3) ())") | ||
| (text "(:flatten () (1) () (2) () (3) ())") | ||
| "a mix of lists and sexps" | ||
| (text "(:flatten () [1] (2) [3])") | ||
| (text "(:flatten (1) [2, 3] ())") | ||
| "annotated sequence values" | ||
| // Argument annotations are silently dropped. | ||
| (text "(:flatten a::() b::[1] c::(2) d::[3])") | ||
| (produces 1 2 3))) | ||
|
|
||
| (ion_1_1 "the argument cannot be" | ||
| (each "null" | ||
| (text "(:flatten null)") | ||
| (text "(:flatten (1) null (2))") | ||
| "null.list" | ||
| (text "(:flatten null.list)") | ||
| (text "(:flatten (1) null.list (2))") | ||
| "null.sexp" | ||
| (text "(:flatten null.sexp)") | ||
| (text "(:flatten (1) null.sexp (2))") | ||
| "a non-sequence value" | ||
| (text "(:flatten {{ '''abc''' }})") | ||
| (text "(:flatten (1) {{ '''abc''' }} (2))") | ||
| (text "(:flatten 123)") | ||
| (text "(:flatten (1) 123 (2))") | ||
| (text "(:flatten { a: 1 })") | ||
| (text "(:flatten (1) { a: 1 } (2))") | ||
| (signals "invalid argument"))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.