asmrb 0.0.2.6.2.0 → 0.0.2.6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79a3be83135d9b7accc927496c57331b8000503f
-  data.tar.gz: 3552bee762676c442b75cc34c07b4357a1273c2f
+  metadata.gz: c1efa63d1755144b58eaf04c1080f10adcbe553d
+  data.tar.gz: 5c0d8d57c3a6381621cb5364092b9bed60a41b42
 SHA512:
-  metadata.gz: dae555426663211d7f2e90eee12552d7463d3869e30292a9dbea3654313ec669ed8b6097b881af890320740a698037a38cd4e09ba22dbcf5d2c37b82a3051da4
-  data.tar.gz: ea5b941af24650381ae07ee1f38e8b4e9a546e6693c77f41849fcbaf8f4dada9c61623f23e7568de5bd4c2c744caa41cbdb5080241ce3279f2f7d5cf532eda87
+  metadata.gz: 80a48ffe33a30e325e8c1b51fb0d27da0a0253c1cc16c682ac891026addc1eecd394cb87633aebb26034209c8eeb74469431698fceb428d4dbcd9141d6347071
+  data.tar.gz: 447314ecf0c95a76529dc7d6c8c58dfcd5cf4eb3d60c7e74fb79d27b6c8b4db897626885c5f8c05b0111198f6f5a0fa053349c8819365fb91816a0dadf80855a

data/lib/asmrb.rb

@@ -10,7 +10,7 @@ class Asmrb
   # Sample with recursion:
   #
   # Asmrb.new do
-  #   defn :rec_print     # define a function, also a label to jump.
+  #   fun :rec_print      # define a function, also a label to jump.
   #   arg arr             # arguments
   #   push 0              # get value to l variable
   #   len arr             # get length of arr as array
@@ -36,7 +36,7 @@ class Asmrb
   # => rec_print [1,2,3]
   #
 
-  attr_reader :variables, :stack, :source, :name, :result, :params,:is_debug
+  attr_reader :variables, :stack, :source, :ruby_source, :name, :result, :params, :is_debug, :extension
   attr_writer :is_debug
 
   def initialize &block
@@ -45,7 +45,7 @@ class Asmrb
   end
 
   def compiled?
-    !@source.nil?
+    !@ruby_source.nil?
   end
 
   def invoke *args
@@ -57,13 +57,14 @@ class Asmrb
     # need parititioning first..
     partition
     unless @partitions.empty?
-      @source = Array.new
+      @compile_stack = Array.new
+      @ruby_source = Array.new
       block_labels = @partitions.map &:first
       @entry_point = @partitions.first.first 
       @partitions.each.with_index do |partition, index|  
       define_block partition, index, block_labels
       end
-      @source = @source.join "\n"
+      @ruby_source = @ruby_source.join "\n"
     end
   end
 
@@ -73,7 +74,7 @@ class Asmrb
     end
   end
 
-  def all_opcodes
+  def implementation_status
     puts "[OPCODES] check:".green
     OPS.map do |k, v|
       check = OPCODES.include?(k.to_sym) ? :implemented : :not_yet
@@ -89,24 +90,53 @@ class Asmrb
     puts "-------------------------".green
   end
 
+  def new_instruction key, block
+    @extension[key] = block
+  end
+
+  def extend_program &block
+    self.instance_exec &block
+  end
+
+  def patch_line number, block=[]
+    @source.insert number, block
+    puts "patched at line #{number}: #{block}".light_green
+    rebuild_source
+  end
+
+  def remove_line line_number
+    puts "remove line #{line_number}: #{@source[line_number]}".light_yellow
+    @source.delete_at line_number
+    rebuild_source
+  end
+
+  def rebuild_source
+    @source.each do |statement|
+      build_statement statement.first, statement.last
+    end
+  end
+
   private
   def new_scope
-    @variables = {}
-    @source = []
-    @program = []
+    @variables = Hash.new
+    @source = Array.new
+    @ruby_source = Array.new
+    @program = Array.new
     @params = 0
     @name = "it"
-    @labels = {}
-    @stack = []
+    @labels = Hash.new
+    @stack = Array.new
     @pc = 0
     @result = nil
     @is_debug = false
     @compile_stack = Array.new
+    @extension = Hash.new
   end
 
   def define_block partition, index, block_labels
     func = partition.first
     body = partition.last
+    
     args = body.first.first.to_sym == :arg ? body.first.last.join(', ') : "" 
     
     block = Array.new
@@ -135,8 +165,10 @@ class Asmrb
     if index != block_labels.length-1 && ![:rec, :ret, :exi].include?(body.last[0].to_sym)
       func = block_labels[index+1] 
       body = @partitions[func].first
+
       #binding.pry
-      if body.first.to_sym == :arg
+
+      if body.first == :arg
         args = "#{body.last.join(', ')}"
         block << "  #{func} #{args}"
       else
@@ -147,12 +179,9 @@ class Asmrb
 
   def finalize_block block
     block << "end\n"
-    @source << block.join("\n")
+    @ruby_source << block.join("\n")
     
-    if @is_debug
-      puts @source.last.light_yellow 
-      puts "-------------------" 
-    end
+    puts "-------------------" if @is_debug
   end
 
   def refvar val
@@ -169,116 +198,128 @@ class Asmrb
   end
 
   OPS = {
-    "los" => lambda { | args |
-                args = @variables[args] if @variables.include?(args) 
-                args.reverse.each {|arg| @stack.push arg}
+    :slp => lambda { |amount| sleep amount},
+    :los => lambda { | *args |
+                args = args.collect do |arg|
+                  if @variables.include? arg
+                    @variables[arg] 
+                  else
+                    arg
+                  end
+                end
+                args.reverse.each do |arg|
+                  @stack.push arg
+                end
               },
 
-    "lea" => lambda { | name |
+    :lea => lambda { | name |
                 @variables[name] = @stack.pop
               },
 
-    "len" => lambda { | lst |
+    :len => lambda { | lst |
                 @stack.push @variables[lst].length
               },
 
-    "cdr" => lambda { | lst |
+    :cdr => lambda { | lst |
                 @stack.push @variables[lst].drop 1
               },
 
-    "car" => lambda { | lst |
+    :car => lambda { | lst |
                 @stack.push @variables[lst].first
               },
 
-    "map" => lambda { | ops |
+    :map => lambda { | ops |
                 eval "@stack.map(&:#{ops})"
               },
 
-    "red" => lambda { | ops |
+    :red => lambda { | ops |
                 e = eval "@stack.reduce(:#{ops})"
                 @stack.clear
                 @stack.push e
               },
 
-    "dpl" => lambda {
+    :dpl => lambda {
                 @stack.push @stack.last
               },
 
-    "add" => lambda {
-                @stack.push @stack.pop + @stack.pop
-              },
+    :add => lambda { @stack.push @stack.pop + @stack.pop },
+    :sub => lambda { @stack.push @stack.pop - @stack.pop },
+    :mul => lambda { @stack.push @stack.pop * @stack.pop },
+    :div => lambda { @stack.push @stack.pop / @stack.pop },
 
-    "sub" => lambda {
-                @stack.push @stack.pop - @stack.pop
-              },
-
-    "mul" => lambda {
-                @stack.push @stack.pop * @stack.pop
-              },
-
-    "div" => lambda {
-                @stack.push @stack.pop / @stack.pop
-              },
-
-    "icr" => lambda { |dest, incval = 1|
-                @variables[dest] += incval
-              },
+    :icr => lambda { |dest, val = 1|  @variables[dest] += val },
+    :dcr => lambda { |dest, val = 1| @variables[dest] -= val },
 
-    "dcr" => lambda { |dest, decrval = 1|
-                @variables[dest] -= decrval
-              },
-
-    "mov" => lambda { | src , dest |
+    :mov => lambda { | src , dest |
                 @variables[dest] =
                   src.is_a?(Symbol) ?
                       @variables[src] : src
               },
 
-    "jnl" => lambda { | name |
+    :jnl => lambda { | name |
                 req_args "jnl", 1
-                @pc = @labels[name] if @stack.pop.nil?
+                if @stack.pop.nil?
+                  @pc = @labels[name] 
+                  new_title "[#{name}]" if @is_debug
+                end
               },
 
-    "jz" => lambda { | name |
+    :jz => lambda { | name |
                 req_args "jz", 1
-                @pc = @labels[name] if @stack.pop == 0
+                if @stack.pop == 0
+                  @pc = @labels[name] 
+                  new_title "[#{name}]" if @is_debug
+                end
               },
 
-    "jnz" => lambda { | name |
+    :jnz => lambda { | name |
                 req_args "jnz", 1
-                @pc = @labels[name] if @stack.pop != 0
+                if @stack.pop != 0
+                  @pc = @labels[name] 
+                  new_title "[#{name}]" if @is_debug
+                end
               },
 
-    "jge" => lambda { |name|
+    :jge => lambda { |name|
                 req_args "jge", 2
-                @pc = @labels[name] if @stack.pop > @stack.pop
+                if @stack.pop > @stack.pop
+                  @pc = @labels[name] 
+                  new_title "[#{name}]" if @is_debug
+                end
               },
 
-    "jlt" => lambda { |name|
+    :jlt => lambda { |name|
                 req_args "jlt", 2
-                @pc = @labels[name] if @stack.pop < @stack.pop
+                if @stack.pop < @stack.pop
+                  @pc = @labels[name] 
+                  new_title "[#{name}]" if @is_debug
+                end
+
               },
 
-    "jeq" => lambda { |name|
+    :jeq => lambda { |name|
                 req_args "jeq", 2
-                @pc = @labels[name] if @stack.pop == @stack.pop
+                if @stack.pop == @stack.pop
+                  @pc = @labels[name] 
+                  new_title "[#{name}]" if @is_debug
+                end
               },
 
-    "jmp" => lambda { |name|
+    :jmp => lambda { |name|
                 @pc = @labels[name]
                 new_title "[#{name}]" if @is_debug
               },
 
-    "pop"  => lambda {|val|
+    :pop => lambda {|val|
                 @stack.pop
               },
 
-    "psh" => lambda {|src|
+    :psh => lambda {|src|
                 @stack.push(
                   src.is_a?(Symbol) ? @variables[src] : src )
               },
 
-    "arg" => lambda { |*args|
+    :arg => lambda { |*args|
                 if @stack.length < args.length
                   raise Exception.new "require (#{args.join(', ')}) on stack: #{@stack}"
                 else
@@ -288,16 +329,16 @@ class Asmrb
                 end
               },
 
-    "req"  => lambda {|amount|
+    :req => lambda {|amount|
                 raise Exception.new "require #{amount} arg." if @stack.length < amount
               },
 
-    "dbg" => lambda {
+    :dbg => lambda {
                 puts "#{@stack} > #{@program[@pc][0]}".light_green
                 binding.pry if @is_debug
               },
 
-    "inv" => lambda { |obj, f|
+    :inv => lambda { |obj, f|
                 args = Array.new
                 @stack.each { args << @stack.pop } if @stack.length > 0
                 if args.length > 0
@@ -307,7 +348,7 @@ class Asmrb
                 end
               },
 
-    "cal" => lambda {|fname|
+    :cal => lambda {|fname|
                 _method = method fname
                 if _method && _method.parameters.length > 0
                   args = Array.new
@@ -320,15 +361,16 @@ class Asmrb
                 end
                 @stack.push invoke if !invoke.nil?
               },
-    "rec" => lambda {
+    :rec => lambda {
                 @pc = -1
+                new_title "[#{@name}]" if @is_debug
               },
 
-    "ret"   => lambda {
+    :ret => lambda {
                 @pc = @program.length-1
               },
 
-    "exi"  => lambda {
+    :exi => lambda {
                 exit
               }
   }
@@ -338,24 +380,28 @@ class Asmrb
     puts "#{@label[blo]}: #{blo}".purple if @is_debug
   end
 
-  def method_missing(name, *args)
+  def method_missing name, *args
+    build_statement name, *args
+  end
+
+  def build_statement name, *args
     # save source
     @source << [name, args]
 
-    # :name => "name"
-    sname = name.to_s.gsub "_", ""
+    # :_name => :name
+    name = name.to_s.gsub("_", "").to_sym
 
-    if OPS.keys.include? sname
-      @program << [sname, args]
+    if OPS.keys.include? name
+      @program << [name, args]
       # get parameter amount:
-      @params = args.length if sname == "arg"
+      @params = args.length if name == :arg
     else
-      case sname
+      case name
 
-      when "blo"
+      when :blo
         create_label args.first
 
-      when "fun"
+      when :fun
         @name = args.first
         create_label @name
 
@@ -365,26 +411,24 @@ class Asmrb
     end
   end
 
-  def load_program &block
-    self.instance_exec &block
-  end
-
   def execute debug=false
     new_line if debug
     puts "#{@stack} > #{@name}".yellow  if debug
     begin
       @pc = 0
+      @variables = Hash.new
       until @pc == @program.length
-        # get instruction:
+        
         instr = @program[@pc]
+
         puts "#{@pc}: #{instr[0]} #{instr[1].join " "}".light_green if debug
-        # execute proc: arg ,  proc
+        
         self.instance_exec *instr[1], &OPS[instr[0]]
+        
         @pc += 1
       end
-      #binding.pry
       @result = @stack.last
-      clear
+      @stack.clear
     rescue Exception => e
       debug e, instr
     end
@@ -392,20 +436,6 @@ class Asmrb
     @result
   end
 
-  def fast_execute *args
-    arguments args
-    @pc = 0
-    until @pc == @program.length
-      # execute proc:
-      self.instance_exec *@program[@pc].last,
-                         &OPS[@program[@pc].first]
-      @pc += 1
-    end
-    @result = @stack.last
-    clear
-    @result
-  end
-
   def new_title title
     puts "\n::#{title}"
   end
@@ -427,6 +457,7 @@ class Asmrb
     (scope_begin..scope_end).each do | i |
       instr = @program[i]
       color = i != @pc ?  :light_green : :magenta
+      binding.pry
       puts "#{i}: #{instr[0]} #{instr[1]}".colorize color
     end
     unless instr.nil?
@@ -438,6 +469,7 @@ class Asmrb
   end
 
   def ops_info name
+    return if OPS[name].nil?
     parameters = Array.new
     OPS[name].parameters.each do |pair|
       parameters << pair.last
@@ -451,14 +483,8 @@ class Asmrb
     end
   end
 
-  def clear
-    @pc = 0
-    @variables = { }
-    @stack = []
-  end
-
   def assemble &block
-    load_program &block
+    extend_program &block
     eval "$#{@name} = self.clone"
     eval "$#{@name}"
   end
@@ -509,7 +535,16 @@ class Asmrb
   end
   
   def patched_arg label
-    "#{label} #{@labels_arg[label].join(', ') if @labels_arg.include?(label)}"
+    patched = ""
+    if @labels_arg.include? label
+      patched = "#{label}(#{@labels_arg[label].join(', ')})"
+    else
+      patched = "#{label}"
+    end
+    if !@partitions[label].nil? && @partitions[label].last.first == :ret
+      patched = "return " + patched
+    end
+    patched
   end
 
   def opcode_operator op
@@ -527,7 +562,12 @@ class Asmrb
     nil
   end
 
+  def fetch statement
+    @compile_stack << statement
+  end
+
   OPCODES = {
+    :slp => lambda {|amount| "sleep #{amount}"},
     :dbg => lambda {"binding.pry"},
     :req => lambda {|_|},
     
@@ -535,26 +575,26 @@ class Asmrb
     :red => lambda {|op| "#{@compile_stack}.reduce :#{op}" },
     
     :pop => lambda { @compile_stack.pop },
-    :icr => lambda {|arg| @compile_stack << "#{arg} = #{arg} + 1" },
-    :dcr => lambda {|arg| @compile_stack << "#{arg} = #{arg} - 1" },
+    :icr => lambda {|arg| fetch "#{arg} = #{arg} + 1" },
+    :dcr => lambda {|arg| fetch "#{arg} = #{arg} - 1" },
 
     :mov => lambda {|src, dest| "#{dest} = #{src}" },
-    :dpl => lambda { @compile_stack << @compile_stack.last },
+    :dpl => lambda { fetch @compile_stack.last },
     
-    :car => lambda {|arg| @compile_stack << "#{arg}.first" },
-    :cdr => lambda {|arg| @compile_stack << "#{arg}.drop(1)" },
-    :len => lambda {|arg| @compile_stack << "#{arg}.length" },
+    :car => lambda {|arg| fetch "#{arg}.first" },
+    :cdr => lambda {|arg| fetch "#{arg}.drop(1)" },
+    :len => lambda {|arg| fetch "#{arg}.length" },
     
     :arg => lambda {|*args|
             # ignore it
             },
     :los => lambda {|*args|
-              args.reverse.each{|arg| @compile_stack << arg}
+              args.reverse.each{|arg| fetch arg}
               nil
             },
     :psh => lambda {|arg|
               arg = "\"#{arg}\"" if arg.class == String
-              @compile_stack << arg
+              fetch arg
               nil
             },
     :lea => lambda {|var|
@@ -596,10 +636,10 @@ class Asmrb
     :inv => lambda {|obj, f|
               begin
                 if method(f).parameters.length == 0
-                  @compile_stack << "#{obj}.#{f}" 
+                  fetch "#{obj}.#{f}" 
                 else
                   args = method(f).parameters.collect{@compile_stack.pop}
-                  @compile_stack << "#{obj}.#{f} #{args.join(', ')}"
+                  fetch "#{obj}.#{f} #{args.join(', ')}"
                 end
                 nil
               rescue Exception => e
@@ -609,80 +649,39 @@ class Asmrb
   }
 end
 
-# demo for testing
-# @x = Asmrb.new do
-#     fun :play
-#     arg :toy
-#     psh :toy
-#     cal :puts
-    
-#     blo :after_print
-#     psh :@times
-#     jnl :init_timer
-
-#     blo :append
-#     inv :@times, :to_s
-#     psh "X"
-#     add
-#     cal :puts
-
-#     blo :count
-#     psh :@times    
-#     psh 1
-#     add
-#     lea :@times
-#     psh :@times
-#     psh 10
-#     jeq :final
-#     psh "__"
-#     rec
-
-#     blo :final
-#     psh "__"
-#     cal :puts
-#     inv :@times, :to_s
-#     psh "Final result = "
-#     add
-#     cal :puts
-#     exi
-
-#     blo :init_timer
-#     psh 0
-#     lea :@times
-#     jmp :append
-# end
-
-# @x.is_debug = false
-# test = @x.to_ruby
-# puts test.light_green
-# eval test
-# play "I'm The Trung, here we go:"
+def asmrb &block
+  Asmrb.new &block
+end
 
 # # applying: argumented  block ( lambda )
 # # should be "inline block" technique also, 
 # # to improve performance and local variable sharing.
-# @f = Asmrb.new do
+# @y = asmrb do
 #   fun :factorial
 #   arg :acc, :n
+#   los :acc, :n
 #   los :n, 1
-#   jlt :final
+#   jlt :result
   
-#   blo :cont
+#   blo :else_block
 #   arg :acc, :n
-#   los :n, :acc
+#   los :acc, :n
 #   mul
 #   los :n, 1
 #   sub
-#   rec 
-
-#   blo :final
+#   rec
+  
+#   blo :result
 #   arg :acc
 #   psh :acc
-#   cal :puts
-#   exi             # no return yet, because return doesn't mean anything inside a block. we can't escape.
+#   ret
 # end
 
-# source = @f.to_ruby
-# puts source
-# eval source
-# factorial 1, 3
+# @y.is_debug = true
+# puts @y.invoke 1, 3
+# #@y.all_opcodes
+# test = @y.to_ruby
+# puts test
+# eval test
+# @y = factorial 1, 1000
+# puts "Start test: #{@y}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asmrb
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6.2.0
+  version: 0.0.2.6.2.1
 platform: ruby
 authors:
 - The Trung