better optimizations

Author: tjdevries

crates/vim9-gen/src/lib.rs

@@ -867,7 +867,7 @@ fn identifier_list(state: &mut State, unpacked: &UnpackIdentifier) -> String {
         .collect()
 }
 
-fn guess_type_of_expr(_: &State, expr: &Expression) -> Type {
+fn guess_type_of_expr(state: &State, expr: &Expression) -> Type {
     match expr {
         Expression::Number(_) => Type::Number,
         Expression::String(_) => Type::String,
@@ -886,16 +886,21 @@ fn guess_type_of_expr(_: &State, expr: &Expression) -> Type {
         Expression::Infix(infix) => {
             if infix.operator.is_comparison() {
                 return Type::Bool;
-            } else if matches!(infix.operator, Operator::And | Operator::Or) {
-                // if guess_type_of_expr(infix.left) {}
-                Type::Any
-                // todo!()
-            } else {
-                Type::Any
             }
+
+            if matches!(infix.operator, Operator::And | Operator::Or) {
+                if guess_type_of_expr(state, infix.left.as_ref()) == Type::Bool
+                    && guess_type_of_expr(state, infix.right.as_ref())
+                        == Type::Bool
+                {
+                    return Type::Bool;
+                }
+            }
+
+            Type::Any
         }
+        Expression::Grouped(g) => guess_type_of_expr(state, g.expr.as_ref()),
         _ => Type::Any,
-        // Expression::Grouped(_) => todo!(),
         // Expression::Index(_) => todo!(),
         // Expression::Slice(_) => todo!(),
         // Expression::Array(_) => todo!(),

crates/vim9-gen/testdata/output/busted_multiline.lua

@@ -11,7 +11,7 @@ describe("filename", function()
     vim.v.errors = {}
 
     -- Actual test
-    local x = NVIM9.convert.decl_bool(NVIM9.ops["And"](true, false))
+    local x = NVIM9.convert.decl_bool(true and false)
 
     NVIM9.fn["assert_equal"](x, false)
 
@@ -24,7 +24,7 @@ describe("filename", function()
     vim.v.errors = {}
 
     -- Actual test
-    local y = NVIM9.convert.decl_bool(NVIM9.ops["And"](true, false))
+    local y = NVIM9.convert.decl_bool(true and false)
 
     NVIM9.fn["assert_equal"](y, false)
 
@@ -37,7 +37,7 @@ describe("filename", function()
     vim.v.errors = {}
 
     -- Actual test
-    local z = NVIM9.ops["Or"](true, false)
+    local z = true or false
 
     NVIM9.fn["assert_equal"](z, true)
 

crates/vim9-gen/testdata/output/vim9_gen__test__cfilter.snap

@@ -1,6 +1,6 @@
 ---
 source: crates/vim9-gen/src/lib.rs
-assertion_line: 1537
+assertion_line: 1542
 expression: "generate(contents, false).unwrap()"
 ---
 local NVIM9 = require("vim9script")
@@ -82,14 +82,7 @@ Qf_filter = function(qf, searchpat, bang)
 
   firstchar = NVIM9.index(searchpat, 0)
   lastchar = NVIM9.slice(searchpat, -1, nil)
-  if
-    NVIM9.bool(
-      NVIM9.ops["And"](
-        firstchar == lastchar,
-        (NVIM9.ops["Or"](NVIM9.ops["Or"](firstchar == "/", firstchar == '"'), firstchar == "'"))
-      )
-    )
-  then
+  if NVIM9.bool(firstchar == lastchar and (firstchar == "/" or firstchar == '"' or firstchar == "'")) then
     pat = NVIM9.slice(searchpat, 1, -2)
     if NVIM9.bool(pat == "") then
       -- # Use the last search pattern
@@ -105,17 +98,13 @@ Qf_filter = function(qf, searchpat, bang)
 
   if NVIM9.bool(bang == "!") then
     Cond = function(_, val)
-      return NVIM9.ops["And"](
-        NVIM9.ops["NotRegexpMatches"](val["text"], pat),
-        NVIM9.ops["NotRegexpMatches"](NVIM9.fn["bufname"](val["bufnr"]), pat)
-      )
+      return NVIM9.ops["NotRegexpMatches"](val["text"], pat)
+        and NVIM9.ops["NotRegexpMatches"](NVIM9.fn["bufname"](val["bufnr"]), pat)
     end
   else
     Cond = function(_, val)
-      return NVIM9.ops["Or"](
-        NVIM9.ops["RegexpMatches"](val["text"], pat),
-        NVIM9.ops["RegexpMatches"](NVIM9.fn["bufname"](val["bufnr"]), pat)
-      )
+      return NVIM9.ops["RegexpMatches"](val["text"], pat)
+        or NVIM9.ops["RegexpMatches"](NVIM9.fn["bufname"](val["bufnr"]), pat)
     end
   end