kapusta 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53512e4cdebbb07a50f1bff53338574994140e5b16ddc5c1fd05e27b8cbc8a20
-  data.tar.gz: c7907d4901ecfb193c4df0c0b09bca2869babab65f6327d542c59a88a9edff51
+  metadata.gz: ee9b062de9860ef3b9f3cfcbac8503e69c1549f0f09af35b41e5eb13303c1ddb
+  data.tar.gz: daa87e0b3b65dfc82f21ff47e88b41652d05f087e46320ca1c3f49bac2457b71
 SHA512:
-  metadata.gz: c185f6d33f64071522cef35498fb7310f47d4091d3873868361294ff40edb51e836cdb2c0168dac1f599bc9ccd7c230d34d276fa6ab1a3fca479a4a4c40b9025
-  data.tar.gz: dcf0acd60680784bb38685305f5454466e4c36358d08a2994e2ca988e5fa19d32fa6eafdb48bb1054681e5699daaddc4b9ebf73477f0450d8dc78482cfad0147
+  metadata.gz: 564c441ea9395cd4f28daaa631de6022e39125eede47032bf32bbc2a45f18979b7376f264b5302459b78403ef039ef8aca93e6f469cc0666b033f6e6717894a2
+  data.tar.gz: 38479cb8d38b81df15697a56c1a14e63d4dda7a0dd793db4e121e06126395339d9c7676a4bb14411a6b43398b64196f877ce3126990eb07d24f2a0c769a577e2

data/README.md

@@ -41,6 +41,36 @@ account = BankAccount.new('Ada', 100)
 
 See `examples/bank-account.kap` and `examples/use_bank_account.rb`.
 
+## Examples
+
+See [`examples/`](https://github.com/evmorov/kapusta/tree/main/examples).
+
+```fennel
+(fn ack [m n]
+  (if (= m 0) (+ n 1)
+      (= n 0) (ack (- m 1) 1)
+      (ack (- m 1) (ack m (- n 1)))))
+
+(print (ack 2 3))
+(print (ack 3 3))
+```
+
+Compiles to:
+
+```ruby
+def ack(m, n)
+  if m == 0
+    n + 1
+  elsif n == 0
+    ack(m - 1, 1)
+  else
+    ack(m - 1, ack(m, n - 1))
+  end
+end
+p(ack(2, 3))
+p(ack(3, 3))
+```
+
 ## Comparison with Fennel
 
 Kapusta keeps most core Fennel forms. The main differences come from Ruby's runtime and object model.
@@ -65,10 +95,6 @@ Kapusta-specific additions:
 - a trailing symbol-keyed hash is emitted as Ruby keyword arguments
 - a final function literal argument is emitted as a Ruby block
 
-## Examples
-
-See `examples/`.
-
 ## Formatting
 
 ```

data/examples/best-time-to-buy-sell-stock.kap

@@ -0,0 +1,12 @@
+(fn max-profit [prices]
+  (var min-price (. prices 0))
+  (var best 0)
+  (for [i 1 (- (length prices) 1)]
+    (let [p (. prices i)]
+      (when (< p min-price) (set min-price p))
+      (when (> (- p min-price) best) (set best (- p min-price)))))
+  best)
+
+(print (max-profit [7 1 5 3 6 4]))
+(print (max-profit [7 6 4 3 1]))
+(print (max-profit [2 4 1]))

data/examples/majority-element.kap

@@ -0,0 +1,11 @@
+(fn majority [nums]
+  (var candidate nil)
+  (var count 0)
+  (each [n nums]
+    (when (= count 0) (set candidate n))
+    (if (= n candidate) (set count (+ count 1)) (set count (- count 1))))
+  candidate)
+
+(print (majority [3 2 3]))
+(print (majority [2 2 1 1 1 2 2]))
+(print (majority [1]))

data/examples/plus-one.kap

@@ -0,0 +1,14 @@
+(fn plus-one [digits]
+  (var i (- (length digits) 1))
+  (var carry 1)
+  (while (and (>= i 0) (> carry 0))
+    (let [total (+ (. digits i) carry)]
+      (tset digits i (% total 10))
+      (set carry (: (/ total 10) :floor)))
+    (set i (- i 1)))
+  (if (> carry 0) (: digits :unshift carry) digits))
+
+(print (plus-one [1 2 3]))
+(print (plus-one [4 3 2 1]))
+(print (plus-one [9]))
+(print (plus-one [9 9]))

data/examples/reverse-integer.kap

@@ -0,0 +1,13 @@
+(fn reverse-integer [x]
+  (let [sign (if (< x 0) -1 1)]
+    (var remaining (* x sign))
+    (var result 0)
+    (while (> remaining 0)
+      (set result (+ (* result 10) (% remaining 10)))
+      (set remaining (: (/ remaining 10) :floor)))
+    (* result sign)))
+
+(print (reverse-integer 123))
+(print (reverse-integer -123))
+(print (reverse-integer 120))
+(print (reverse-integer 0))

data/examples/roman-to-integer.kap

@@ -0,0 +1,17 @@
+(fn roman-to-integer [s]
+  (let [values {"I" 1 "V" 5 "X" 10 "L" 50 "C" 100 "D" 500 "M" 1000}
+        chars (s.chars)
+        n (length chars)]
+    (var total 0)
+    (var i 0)
+    (while (< i n)
+      (let [curr (. values (. chars i))
+            ahead (if (< (+ i 1) n) (. values (. chars (+ i 1))) 0)
+            subtract? (< curr ahead)]
+        (set total (+ total (if subtract? (- ahead curr) curr)))
+        (set i (+ i (if subtract? 2 1)))))
+    total))
+
+(print (roman-to-integer "III"))
+(print (roman-to-integer "LVIII"))
+(print (roman-to-integer "MCMXCIV"))

data/examples/zoo-animal-1.kap

@@ -0,0 +1,5 @@
+(class Zoo.Animal
+  (fn initialize [name] (set (ivar name) name))
+  (fn name [] (ivar name))
+  (fn kingdom [] "animalia")
+  (fn label [] (.. (self.name) " the animal")))

data/examples/zoo-animal-inheritance-2.kap

@@ -0,0 +1,8 @@
+(require "./zoo-animal-1")
+
+(class Zoo.Dog [Zoo.Animal]
+  (fn label [] (.. (self.name) " the dog"))
+  (fn bark [] "woof"))
+
+(let [dog (Zoo.Dog.new "Poppy")]
+  (print (= Zoo.Dog.superclass Zoo.Animal) (dog.kingdom) (dog.label) (dog.bark)))

data/lib/kapusta/compiler/emitter/control_flow.rb

@@ -15,7 +15,7 @@ module Kapusta
           return emit_expr(args[0], env, current_scope) if args.length == 1
 
           cond = emit_expr(args[0], env, current_scope)
-          truthy = emit_expr(args[1], env, current_scope)
+          truthy = emit_if_branch(args[1], env, current_scope)
           lines = ["if #{cond}", indent(truthy)]
           append_else_lines(lines, args[2..], env, current_scope)
           lines << 'end'
@@ -31,7 +31,7 @@ module Kapusta
             append_elsif_lines(lines, args, env, current_scope)
           else
             lines << 'else'
-            lines << indent(emit_expr(args[0], env, current_scope))
+            lines << indent(emit_if_branch(args[0], env, current_scope))
           end
         end
 
@@ -39,10 +39,18 @@ module Kapusta
           return append_else_lines(lines, args, env, current_scope) if args.length < 2
 
           lines << "elsif #{emit_expr(args[0], env, current_scope)}"
-          lines << indent(emit_expr(args[1], env, current_scope))
+          lines << indent(emit_if_branch(args[1], env, current_scope))
           append_else_lines(lines, args[2..], env, current_scope)
         end
 
+        def emit_if_branch(form, env, current_scope)
+          return emit_expr(form, env, current_scope) unless do_form?(form)
+
+          emit_sequence(form.rest, env, current_scope,
+                        allow_method_definitions: false,
+                        result: true).first
+        end
+
         def if_form?(form)
           form.is_a?(List) && form.head.is_a?(Sym) && form.head.name == 'if'
         end

data/lib/kapusta/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kapusta
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/examples_spec.rb

@@ -239,8 +239,12 @@ RSpec.describe 'examples' do
     expect(run_example('hashfn.kap')).to eq("5\n21\n")
   end
 
-  it 'inheritance.kap' do
-    expect(run_example('inheritance.kap')).to eq(<<~OUT)
+  it 'zoo-animal-1.kap' do
+    expect(run_example('zoo-animal-1.kap')).to eq('')
+  end
+
+  it 'zoo-animal-inheritance-2.kap' do
+    expect(run_example('zoo-animal-inheritance-2.kap')).to eq(<<~OUT)
       true
       "animalia"
       "Poppy the dog"
@@ -455,4 +459,29 @@ RSpec.describe 'examples' do
       "draw"
     OUT
   end
+
+  it 'reverse-integer.kap' do
+    expect(run_example('reverse-integer.kap')).to eq("321\n-321\n21\n0\n")
+  end
+
+  it 'roman-to-integer.kap' do
+    expect(run_example('roman-to-integer.kap')).to eq("3\n58\n1994\n")
+  end
+
+  it 'best-time-to-buy-sell-stock.kap' do
+    expect(run_example('best-time-to-buy-sell-stock.kap')).to eq("5\n0\n2\n")
+  end
+
+  it 'majority-element.kap' do
+    expect(run_example('majority-element.kap')).to eq("3\n2\n1\n")
+  end
+
+  it 'plus-one.kap' do
+    expect(run_example('plus-one.kap')).to eq(<<~OUT)
+      [1, 2, 4]
+      [4, 3, 2, 2]
+      [1, 0]
+      [1, 0, 0]
+    OUT
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kapusta
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Evgenii Morozov
@@ -29,6 +29,7 @@ files:
 - examples/anonymous-greeter.kap
 - examples/bank-account.kap
 - examples/baseball-game.kap
+- examples/best-time-to-buy-sell-stock.kap
 - examples/binary-search.kap
 - examples/binary-to-decimal.kap
 - examples/block-sort.kap
@@ -52,10 +53,10 @@ files:
 - examples/greet.kap
 - examples/happy-number.kap
 - examples/hashfn.kap
-- examples/inheritance.kap
 - examples/kwargs.kap
 - examples/leap-year.kap
 - examples/length-of-last-word.kap
+- examples/majority-element.kap
 - examples/match.kap
 - examples/maximum-subarray.kap
 - examples/min-max.kap
@@ -67,11 +68,14 @@ files:
 - examples/pangram.kap
 - examples/pcall.kap
 - examples/pipeline.kap
+- examples/plus-one.kap
 - examples/points.kap
 - examples/primes.kap
 - examples/raindrops.kap
 - examples/record.kap
 - examples/regex.kap
+- examples/reverse-integer.kap
+- examples/roman-to-integer.kap
 - examples/ruby-eval.kap
 - examples/safe-lookup.kap
 - examples/scopes.kap
@@ -88,6 +92,8 @@ files:
 - examples/use_bank_account.rb
 - examples/valid-parentheses-1.kap
 - examples/valid-parentheses-2.kap
+- examples/zoo-animal-1.kap
+- examples/zoo-animal-inheritance-2.kap
 - exe/kapfmt
 - exe/kapusta
 - kapusta.gemspec

data/examples/inheritance.kap

@@ -1,13 +0,0 @@
-(let [animal-class (class Zoo.Animal
-                     (fn initialize [name] (set (ivar name) name))
-                     (fn name [] (ivar name))
-                     (fn kingdom [] "animalia")
-                     (fn label [] (.. (self.name) " the animal")))
-      dog-class (class Zoo.Dog [Zoo.Animal]
-                  (fn label [] (.. (self.name) " the dog"))
-                  (fn bark [] "woof"))
-      dog (dog-class.new "Poppy")]
-  (print (= dog-class.superclass animal-class)
-    (dog.kingdom)
-    (dog.label)
-    (dog.bark)))