check type during equality for or-types only

fastn-stack · Dec 9, 2023 · 14a6f03 · 14a6f03
1 parent 1dcf480
commit 14a6f03
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/ftd/src/interpreter/things/expression.rs b/ftd/src/interpreter/things/expression.rs
@@ -127,7 +127,9 @@ impl Expression {
                             let infer_from_value = result.get(&infer_from.value).unwrap();
 
                             match v {
-                                ftd::interpreter::StateWithThing::Thing(thing) => {
+                                ftd::interpreter::StateWithThing::Thing(thing)
+                                    if infer_from_value.kind().inner().is_or_type() =>
+                                {
                                     if thing.kind().inner().eq(&infer_from_value.kind().inner()) {
                                         ftd::interpreter::StateWithThing::new_thing(thing)
                                     } else {

diff --git a/ftd/t/js/31-advance-list.ftd b/ftd/t/js/31-advance-list.ftd
@@ -79,7 +79,7 @@ $on-input$: $ftd.set-integer($a = $form.ns.score, v = $VALUE)
 -- end: ftd.column
 
 -- ftd.text: Submit
-if: { !ftd.is_empty(form.ns.name) && !ftd.is_empty(form.ns.score) }
+if: { form.ns.name != ftd.empty && form.ns.score != ftd.empty }
 $on-click$: $insert($a = $name-scores, v = *$form.ns)
 background.solid: #4CAF50
 color: white

diff --git a/ftd/t/js/31-advance-list.html b/ftd/t/js/31-advance-list.html