TDL syntax updates (amazon-ion#845)

* Switches macro invocation syntax to `(.name)` * Switches variable expansion syntax to `(%name)` * Renames `void` macro to `none` * update ion-tests * removes tests from the 1.1 skip list
popematt · Oct 24, 2024 · f1f4435 · f1f4435
1 parent ec13464
commit f1f4435
Show file tree

Hide file tree

Showing 16 changed files with 455 additions and 333 deletions.
diff --git a/ion-tests b/ion-tests
diff --git a/src/lazy/binary/raw/v1_1/immutable_buffer.rs b/src/lazy/binary/raw/v1_1/immutable_buffer.rs
@@ -1280,7 +1280,7 @@ mod tests {
     fn read_eexp_with_one_arg() -> IonResult<()> {
         let macro_source = r#"
             (macro greet (name)
-                (make_string "Hello, " name "!")
+                (.make_string "Hello, " name "!")
             )
         "#;
 
@@ -1313,7 +1313,7 @@ mod tests {
     fn read_eexp_with_two_args() -> IonResult<()> {
         let macro_source = r#"
             (macro greet (name day)
-                (make_string "Hello, " name "! Have a pleasant " day ".")
+                (.make_string "Hello, " name "! Have a pleasant " day ".")
             )
         "#;
 
@@ -1451,7 +1451,7 @@ mod tests {
     #[test]
     fn read_eexp_with_star_parameter_arg_group_nested_eexp() -> IonResult<()> {
         let macro_source = r#"
-            (macro wrap_in_list (values*) ["first", values, "last"])
+            (macro wrap_in_list (values*) ["first", (%values), "last"])
         "#;
 
         let expected_text = r#"
@@ -1494,7 +1494,7 @@ mod tests {
     #[test]
     fn read_length_prefixed_eexp_with_star_parameter_arg_group_nested_eexp() -> IonResult<()> {
         let macro_source = r#"
-            (macro wrap_in_list (values*) ["first", values, "last"])
+            (macro wrap_in_list (values*) ["first", (%values), "last"])
         "#;
 
         let expected_text = r#"
@@ -1579,7 +1579,7 @@ mod tests {
     #[test]
     fn read_length_prefixed_eexp_with_star_parameter_empty() -> IonResult<()> {
         let macro_source = r#"
-            (macro wrap_in_list (values*) ["first", values, "last"])
+            (macro wrap_in_list (values*) ["first", (%values), "last"])
         "#;
 
         let expected_text = r#"

diff --git a/src/lazy/binary/raw/v1_1/struct.rs b/src/lazy/binary/raw/v1_1/struct.rs
@@ -339,7 +339,7 @@ mod tests {
                     (symbol_table $ion_encoding)
                     (macro_table
                         $ion_encoding
-                        (macro greet (name) (make_string "hello, " name))
+                        (macro greet (name) (.make_string "hello, " (%name)))
                     )
                 )
             "#,

diff --git a/src/lazy/expanded/compiler.rs b/src/lazy/expanded/compiler.rs
diff --git a/src/lazy/expanded/e_expression.rs b/src/lazy/expanded/e_expression.rs
@@ -113,7 +113,7 @@ impl<'top, D: Decoder> EExpression<'top, D> {
         // Initialize a `MacroExpansionKind` with the state necessary to evaluate the requested
         // macro.
         let expansion_kind = match invoked_macro.kind() {
-            MacroKind::Void => MacroExpansionKind::Void,
+            MacroKind::None => MacroExpansionKind::None,
             MacroKind::ExprGroup => {
                 MacroExpansionKind::ExprGroup(ExprGroupExpansion::new(arguments))
             }