yruby 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7ea42800360e25a4e07044414522e6db405ac3a49c638de709682a37e179e4a
-  data.tar.gz: '06669269c7f3bdddd63984276ef5e0efd88cbcd704e47881e79936c2496ab937'
+  metadata.gz: acc6d7a62450c4b7c552c9b1e7d12d796fcf4bde1bad72a920c1b30a782c158e
+  data.tar.gz: 4ddf85286c286227289aa947a4ca6af499305e3b1855beb318998de69c676114
 SHA512:
-  metadata.gz: 3f301b9319a04cf8fb011d170b35c791e980a4b613e8a67a32d1469c50aef0b78d1f18570ef1af98d03cb584bfb9ddd424bfc7bb25cc101fddaf7e89a744b016
-  data.tar.gz: 4b97d1b57a82adc478e482b27e18c9ba4dd4d6bb80f8105efd0a8bb717075f7f16cf4917b7298c5aeb78f2a69c833478b8f901abfa830c76b7e888aebb1e8d59
+  metadata.gz: 7c4a5abaee620ef6456d66c08123ef66810fe0873cf39200d44b988f6fca23d70a6e4d2d263d45690155c98369544a12802d789fe1bd921a502c5b467ba7f8bc
+  data.tar.gz: 4d98deed29752910093463e7778f028c66704e64b468ce29c369c6bb66c486032cebe47c858b39081239c0492892e70f0c5969f7ae1fe3119057c4c806cdf7a2

data/README.md

@@ -133,6 +133,7 @@ puts iseq.disasm
 | Integer literals              | `42`, `0`, `-1`                              |
 | Boolean / nil literals        | `true`, `false`, `nil`                       |
 | Arithmetic operators          | `a + b`, `a - b`, `a * b`, `a / b`          |
+| Comparison operators          | `a == b`, `a != b`, `a < b`, `a <= b`, `a > b`, `a >= b` |
 | Local variable read/write     | `a = 1; a`                                   |
 | `if` / `else` / `elsif`       | `if cond; ...; elsif ...; else; ...; end`    |
 | `if` as expression            | `x = if true; 1; else; 2; end`              |
@@ -156,6 +157,12 @@ YRuby implements the following YARV-like instructions:
 | `opt_minus`              | —           | Pop two values and push their difference      |
 | `opt_mult`               | —           | Pop two values and push their product         |
 | `opt_div`                | —           | Pop two values and push their quotient        |
+| `opt_eq`                 | —           | Pop two values and push equality result       |
+| `opt_neq`                | —           | Pop two values and push inequality result     |
+| `opt_lt`                 | —           | Pop two values and push less-than result      |
+| `opt_le`                 | —           | Pop two values and push less-than-or-equal result |
+| `opt_gt`                 | —           | Pop two values and push greater-than result   |
+| `opt_ge`                 | —           | Pop two values and push greater-than-or-equal result |
 | `branchunless`           | `offset`    | Jump if the popped value is falsy             |
 | `jump`                   | `offset`    | Unconditional jump                            |
 | `definemethod`           | `mid, iseq` | Register a method on the current object       |

data/lib/yruby/compile.rb

@@ -72,25 +72,30 @@ class YRuby
     def compile_call_node(iseq, node)
       if node.receiver.nil?
         iseq.emit(YRuby::Insns::Putself)
-        argc = 0
-        if node.arguments
-          compile_node(iseq, node.arguments)
-          argc = node.arguments.arguments.size
-        end
-        cd = CallData.new(mid: node.name, argc:)
-        iseq.emit(YRuby::Insns::OptSendWithoutBlock, cd)
       else
         compile_node(iseq, node.receiver)
+      end
+
+      argc = 0
+      if node.arguments
         compile_node(iseq, node.arguments)
+        argc = node.arguments.arguments.size
+      end
 
-        case node.name
-        when :+; iseq.emit(YRuby::Insns::OptPlus)
-        when :-; iseq.emit(YRuby::Insns::OptMinus)
-        when :*; iseq.emit(YRuby::Insns::OptMult)
-        when :/; iseq.emit(YRuby::Insns::OptDiv)
-        else
-          raise "Unknown operator: #{node.name}"
-        end
+      case node.name
+      when :+; iseq.emit(YRuby::Insns::OptPlus)
+      when :-; iseq.emit(YRuby::Insns::OptMinus)
+      when :*; iseq.emit(YRuby::Insns::OptMult)
+      when :/; iseq.emit(YRuby::Insns::OptDiv)
+      when :==; iseq.emit(YRuby::Insns::OptEq)
+      when :!=; iseq.emit(YRuby::Insns::OptNeq)
+      when :<; iseq.emit(YRuby::Insns::OptLt)
+      when :<=; iseq.emit(YRuby::Insns::OptLe)
+      when :>; iseq.emit(YRuby::Insns::OptGt)
+      when :>=; iseq.emit(YRuby::Insns::OptGe)
+      else
+        cd = CallData.new(mid: node.name, argc:)
+        iseq.emit(YRuby::Insns::OptSendWithoutBlock, cd)
       end
     end
 

data/lib/yruby/insnhelper.rb

@@ -47,7 +47,10 @@ class YRuby
     end
 
     # Control Frame
-    def push_frame(iseq:, type: FRAME_TYPE_TOP, self_value: nil, sp:)
+    def push_frame(iseq:, type: FRAME_TYPE_TOP, self_value: nil, sp:, local_size:)
+      local_start = sp + iseq.local_table_size - local_size
+      local_size.times { |i| stack[local_start + i] = nil }
+
       sp = sp + iseq.local_table_size
       ep = sp - 1
 
@@ -86,13 +89,9 @@ class YRuby
         iseq: method_iseq,
         type: FRAME_TYPE_METHOD,
         self_value: recv,
-        sp: argv_index
+        sp: argv_index,
+        local_size: method_iseq.local_table_size - method_iseq.argc
       )
-
-      local_only_size = method_iseq.local_table_size - method_iseq.argc
-      local_only_size.times do |i|
-        env_write(-i, nil)
-      end
     end
 
     def sendish(cd)

data/lib/yruby/insns/opt_eq.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class YRuby
+  module Insns
+    class OptEq < Base
+      def self.call(vm)
+        recv = vm.topn(2)
+        arg = vm.topn(1)
+        vm.pop
+        vm.pop
+        vm.push(recv == arg)
+      end
+    end
+  end
+end

data/lib/yruby/insns/opt_ge.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class YRuby
+  module Insns
+    class OptGe < Base
+      def self.call(vm)
+        recv = vm.topn(2)
+        arg = vm.topn(1)
+        vm.pop
+        vm.pop
+        vm.push(recv >= arg)
+      end
+    end
+  end
+end

data/lib/yruby/insns/opt_gt.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class YRuby
+  module Insns
+    class OptGt < Base
+      def self.call(vm)
+        recv = vm.topn(2)
+        arg = vm.topn(1)
+        vm.pop
+        vm.pop
+        vm.push(recv > arg)
+      end
+    end
+  end
+end

data/lib/yruby/insns/opt_le.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class YRuby
+  module Insns
+    class OptLe < Base
+      def self.call(vm)
+        recv = vm.topn(2)
+        arg = vm.topn(1)
+        vm.pop
+        vm.pop
+        vm.push(recv <= arg)
+      end
+    end
+  end
+end

data/lib/yruby/insns/opt_lt.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class YRuby
+  module Insns
+    class OptLt < Base
+      def self.call(vm)
+        recv = vm.topn(2)
+        arg = vm.topn(1)
+        vm.pop
+        vm.pop
+        vm.push(recv < arg)
+      end
+    end
+  end
+end

data/lib/yruby/insns/opt_neq.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class YRuby
+  module Insns
+    class OptNeq < Base
+      def self.call(vm)
+        recv = vm.topn(2)
+        arg = vm.topn(1)
+        vm.pop
+        vm.pop
+        vm.push(recv != arg)
+      end
+    end
+  end
+end

data/lib/yruby/insns.rb

@@ -8,6 +8,12 @@ require_relative 'insns/opt_plus'
 require_relative 'insns/opt_minus'
 require_relative 'insns/opt_mult'
 require_relative 'insns/opt_div'
+require_relative 'insns/opt_eq'
+require_relative 'insns/opt_lt'
+require_relative 'insns/opt_le'
+require_relative 'insns/opt_gt'
+require_relative 'insns/opt_ge'
+require_relative 'insns/opt_neq'
 require_relative 'insns/getlocal'
 require_relative 'insns/setlocal'
 require_relative 'insns/dup'

data/lib/yruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class YRuby
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/yruby.rb

@@ -35,7 +35,7 @@ class YRuby
   end
 
   def exec_core(iseq)
-    push_frame(iseq:, type: FRAME_TYPE_TOP, self_value: @top_self, sp: 0)
+    push_frame(iseq:, type: FRAME_TYPE_TOP, self_value: @top_self, sp: 0, local_size: iseq.local_table_size)
 
     catch(:finish) do
       loop do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yruby
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuhi-Sato
@@ -72,8 +72,14 @@ files:
 - lib/yruby/insns/jump.rb
 - lib/yruby/insns/leave.rb
 - lib/yruby/insns/opt_div.rb
+- lib/yruby/insns/opt_eq.rb
+- lib/yruby/insns/opt_ge.rb
+- lib/yruby/insns/opt_gt.rb
+- lib/yruby/insns/opt_le.rb
+- lib/yruby/insns/opt_lt.rb
 - lib/yruby/insns/opt_minus.rb
 - lib/yruby/insns/opt_mult.rb
+- lib/yruby/insns/opt_neq.rb
 - lib/yruby/insns/opt_plus.rb
 - lib/yruby/insns/opt_send_without_block.rb
 - lib/yruby/insns/putnil.rb
@@ -103,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Yet Another Ruby VM - a YARV-based Ruby virtual machine implementation
 test_files: []