remove extra into() and cover xo_functionColor

paxdotdev · Oct 27, 2023 · 1dd95c4 · 1dd95c4
1 parent 95c69e5
commit 1dd95c4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pax-compiler/src/parsing.rs b/pax-compiler/src/parsing.rs
@@ -112,6 +112,11 @@ fn recurse_pratt_parse_to_string<'a>(
                 let mut pairs = primary.clone().into_inner();
                 let mut output = "".to_string();
                 let mut next_pair = pairs.next().unwrap();
+                let mut add_into = false;
+                // This helps us transform `Color` into `Fill` in the cases of `{Color::rgb(...)}`
+                if next_pair.as_str() == "Color" {
+                    add_into = true;
+                }
                 match next_pair.as_rule() {
                     Rule::literal_color => {
                         return recurse_pratt_parse_to_string(primary.into_inner(), pratt_parser, Rc::clone(&symbolic_ids));
@@ -137,6 +142,9 @@ fn recurse_pratt_parse_to_string<'a>(
                     output = output + "(" + &recurse_pratt_parse_to_string(next_pair.into_inner(), pratt_parser, Rc::clone(&symbolic_ids)) + "),"
                 }
                 output = output + ")";
+                if add_into {
+                    output = output + ".into()"
+                }
 
                 output
             },

diff --git a/pax-compiler/templates/cartridge-lib.tera b/pax-compiler/templates/cartridge-lib.tera
@@ -81,7 +81,7 @@ pub fn instantiate_expression_table<R: 'static + RenderContext>() -> HashMap<usi
         {% endif %}
 
         TypesCoproduct::{{ expression_spec.pascalized_return_type }}(
-            {{ expression_spec.output_statement }}.into()
+            {{ expression_spec.output_statement }}
         )
     }));
     {% endfor %}