akaza 0.2.0 → 0.3.0

data/lib/akaza/ruby2ws/prelude.rb

@@ -0,0 +1,80 @@
+class Array
+  def first
+    self[0]
+  end
+
+  def last
+    self[size-1]
+  end
+
+  def empty?
+    size == 0
+  end
+
+  def zip(other)
+    res = []
+    idx = 0
+    while idx < size
+      res.push(idx < other.size ? [self[idx], other[idx]] : [self[idx], nil])
+      idx = idx + 1
+    end
+    res
+  end
+end
+
+class Integer
+  def <(right)
+    (self <=> right) == -1
+  end
+
+  def >(right)
+    (self <=> right) == 1
+  end
+
+  def <=(right)
+    (self <=> right) < 1
+  end
+
+  def >=(right)
+    (self <=> right) > -1
+  end
+end
+
+def p(obj)
+  if obj.is_a?(Integer)
+    put_as_number obj
+  elsif obj.is_a?(Array)
+    size = obj.size
+    idx = 0
+    put_as_char '['
+    while idx < size
+      p obj[idx]
+      idx = idx + 1
+      if idx != size
+        put_as_char ','
+        put_as_char ' '
+      end
+    end
+    put_as_char ']'
+  elsif obj.is_a?(Hash)
+    raise "p(Hash) does not supported yet."
+  elsif obj == nil
+    put_as_char 'n'
+    put_as_char 'i'
+    put_as_char 'l'
+  elsif obj == true
+    put_as_char 't'
+    put_as_char 'r'
+    put_as_char 'u'
+    put_as_char 'e'
+  elsif obj == false
+    put_as_char 'f'
+    put_as_char 'a'
+    put_as_char 'l'
+    put_as_char 's'
+    put_as_char 'e'
+  else
+    raise "Unknown"
+  end
+  obj
+end

data/lib/akaza/version.rb

@@ -1,3 +1,3 @@
 module Akaza
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/akaza/vm.rb

@@ -15,67 +15,67 @@ module Akaza
 
     def eval
       while true
+        # p @stack
+        # p @heap
+        # puts '-' * 100
+        # p @commands[@index]
         case @commands[@index]
-        in [:stack, :push, number]
+        in [:stack_push, number]
           @stack.push number
-        in [:stack, :dup]
+        in [:stack_dup]
           @stack.push @stack.last
-        in [:stack, :swap]
+        in [:stack_swap]
           @stack[-1], @stack[-2] = @stack[-2], @stack[-1]
-        in [:stack, :pop]
+        in [:stack_pop]
           @stack.pop
-        in [:calc, :add]
-          r = @stack.pop
-          l = @stack.pop
-          @stack.push l + r
-        in [:calc, :sub]
-          r = @stack.pop
-          l = @stack.pop
-          @stack.push l - r
-        in [:calc, :multi]
-          r = @stack.pop
-          l = @stack.pop
-          @stack.push l * r
-        in [:calc, :div]
-          r = @stack.pop
-          l = @stack.pop
-          @stack.push l / r
-        in [:calc, :mod]
-          r = @stack.pop
-          l = @stack.pop
-          @stack.push l % r
-        in [:heap, :save]
+        in [:calc_add]
+          @stack[-2] = @stack[-2] + @stack[-1]
+          @stack.pop
+        in [:calc_sub]
+          @stack[-2] = @stack[-2] - @stack[-1]
+          @stack.pop
+        in [:calc_multi]
+          @stack[-2] = @stack[-2] * @stack[-1]
+          @stack.pop
+        in [:calc_div]
+          @stack[-2] = @stack[-2] / @stack[-1]
+          @stack.pop
+        in [:calc_mod]
+          @stack[-2] = @stack[-2] % @stack[-1]
+          @stack.pop
+        in [:heap_save]
           val = @stack.pop
           addr = @stack.pop
           @heap[addr] = val
-        in [:heap, :load]
-          addr = @stack.pop
-          @stack.push @heap[addr]
-        in [:flow, :def, label]
+        in [:heap_load]
+          val = @heap[@stack[-1]]
+          raise "Heap #{addr} is not initialized" unless val
+          @stack[-1] = val
+        in [:flow_def, label]
           # skip
-        in [:flow, :call, label]
+        in [:flow_call, label]
           raise "unknwon label:#{label.inspect}" unless @labels.key?(label)
           @call_stack.push @index
           @index = @labels[label]
-        in [:flow, :jump, label]
+        in [:flow_jump, label]
           raise "unknwon label:#{label.inspect}" unless @labels.key?(label)
           @index = @labels[label]
-        in [:flow, :jump_if_zero, label]
+        in [:flow_jump_if_zero, label]
           @index = @labels[label] if @stack.pop == 0
-        in [:flow, :jump_if_neg, label]
+        in [:flow_jump_if_neg, label]
           @index = @labels[label] if @stack.pop < 0
-        in [:flow, :end]
+        in [:flow_end]
           @index = @call_stack.pop
-        in [:flow, :exit]
+        in [:flow_exit]
           return
-        in [:io, :write_char]
+        in [:io_write_char]
           @output.write @stack.pop.chr
-        in [:io, :write_num]
+        in [:io_write_num]
           @output.write @stack.pop.to_s
-        in [:io, :read_char]
+        in [:io_read_char]
           addr = @stack.pop
           @heap[addr] = @input.read(1).ord
-        in [:io, :read_num]
+        in [:io_read_num]
           addr = @stack.pop
           @heap[addr] = @input.readline.to_i
         end
@@ -86,7 +86,7 @@ module Akaza
     def prepare_label
       @commands.each.with_index do |command, index|
         case command
-        in [:flow, :def, label]
+        in [:flow_def, label]
           @labels[label] = index
         else
           # skip

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akaza
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,10 +52,25 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - kuwabara@pocke.me
-executables: []
+executables:
+- akaza
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,11 +82,14 @@ files:
 - bin/console
 - bin/setup
 - bin/str_to_ws.rb
+- doc/ruby2ws.md
+- exe/akaza
 - lib/akaza.rb
 - lib/akaza/annotation.rb
 - lib/akaza/ast_ext.rb
 - lib/akaza/parser.rb
 - lib/akaza/ruby2ws.rb
+- lib/akaza/ruby2ws/prelude.rb
 - lib/akaza/version.rb
 - lib/akaza/vm.rb
 homepage: https://github.com/pocke/akaza