refactoring

y2k · Mar 6, 2024 · 3785314 · 3785314
1 parent 8b2e506
commit 3785314
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/clj2js/lib/kt_target.ml b/clj2js/lib/kt_target.ml
@@ -31,6 +31,8 @@ let rec compile_ (context : context) (node : cljexp) : context * string =
       |> Printf.sprintf "(%s)" |> withContext
   | RBList [ Atom (_, "="); a; b ] ->
       compile a ^ " == " ^ compile b |> withContext
+  | RBList [ Atom (_, "not="); a; b ] ->
+      compile a ^ " != " ^ compile b |> withContext
   | RBList [ Atom (_, "get"); target; index ] ->
       Printf.sprintf "geta(%s, %s)" (compile target) (compile index)
       |> withContext
@@ -98,9 +100,17 @@ let rec compile_ (context : context) (node : cljexp) : context * string =
                       | n -> fail_node [ n ])
                  |> List.reduce (Printf.sprintf "%s\n%s")
              | n -> fail_node [ n ])
-        |> List.reduce (Printf.sprintf "%s\n%s")
+        |> List.fold_left (Printf.sprintf "%s\n%s") ""
       in
-      Printf.sprintf "package %s\n%s\n" name imports |> withContext
+      Printf.sprintf "package %s;%s\n" name imports |> withContext
+  | RBList (Atom (_, "and") :: xs) ->
+      xs |> List.map compile
+      |> List.reduce (Printf.sprintf "%s && %s")
+      |> Printf.sprintf "(%s)" |> withContext
+  | RBList (Atom (_, "or") :: xs) ->
+      xs |> List.map compile
+      |> List.reduce (Printf.sprintf "%s || %s")
+      |> Printf.sprintf "(%s)" |> withContext
   | RBList (Atom (_, "+") :: args) ->
       args |> List.map compile
       |> List.reduce (Printf.sprintf "%s, %s")

diff --git a/clj2js/test/test_kt.ml b/clj2js/test/test_kt.ml
@@ -18,6 +18,7 @@ prelude.minus(a, b) };|};
   assert_ {|(defn foo [xs] (let [[a b] (foo 1 2)] (bar a b)))|}
     {|fun foo(xs:Any?) = run { val p__4 = foo(1, 2); val a = geta(p__4, 0); val b = geta(p__4, 1); bar(a, b) };|};
   assert_ {|(= a b)|} {|a == b|};
+  assert_ {|(not= a b)|} {|a != b|};
   assert_ {|(get xs 1)|} {|geta(xs, 1)|};
   assert_ {|(:foo bar)|} {|getm(bar, "foo")|};
   assert_ {|(def foo 1)|} {|val foo = 1;|};
@@ -33,4 +34,13 @@ prelude.minus(a, b) };|};
   assert_ {|(spread (.toTypedArray a))|} {|*a.toTypedArray()|};
   assert_ {|(class android.app.AlarmManager)|}
     {|android.app.AlarmManager::class.java|};
+  assert_
+    {|(ns im.y2k.chargetimer (:import [android.app Activity NotificationChannel]))|}
+    {|package im.y2k.chargetimer;
+import android.app.Activity;
+import android.app.NotificationChannel;|};
+  assert_ {|(ns prelude)|} {|package prelude;|};
+  assert_ "(and (= a 1) b)" "(a == 1 && b)";
+  assert_ "(or (= a 1) b)" "(a == 1 || b)";
+  assert_ "(.play r)" "r.play()";
   ()