asmrb 0.0.2 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8918ef5cf8db67f71ead50fbe2f1d21573fd41
-  data.tar.gz: cbc7c9a2fe7fe641910ad92ea511bcf1bbaed323
+  metadata.gz: f3068def65f664536adb24c11b82d0b7e63d6a85
+  data.tar.gz: 33f463277925245b25ef4f62fa78e4188c27b1c7
 SHA512:
-  metadata.gz: a2737586b1ad6e86ee190a2395b9ba3c95ea0cea7d9cb70487e8625862e97706fd930c9dada8f1ce9fd3ca4f8ae5b0963da4952c24c6073e02e037f2e46054a7
-  data.tar.gz: f5f84ac83bec2eb3bb232856c1d5393f5dce5d92f628953e7fecf98ed707b3be0b1aa350da6c98fc659878e9d3c04450bf710c910e25c2ca06d74b68b951d64a
+  metadata.gz: 3382c649f7a80fa31f28570003e5b56beaf8cc6c016bd3a94249cf1ffcc720d6d9b6622a9b5a1f44c4ec2c7acc17b4615846a42d71b369951d51ec3fce8d48ae
+  data.tar.gz: dfb30e2a85d3e595b34d36f4df32355946876811a7fd9bbdbad8976df6b8f3abd2d7c3fdcd97d19f358bfb1389413b4dc326dbca3a290e83dc588cdc1449ffe9

data/lib/asmrb.rb

@@ -3,18 +3,28 @@ require 'colorize'
 require 'pry'
 
 class Asm
-  attr_reader :variables, :stack, :name, :is_debug, :result
+  attr_reader :variables, :stack, :name, :is_debug, :result, :functions, :params
   attr_writer :is_debug
 
   def initialize(&block)
-    @variables = { }
+    @functions = {}
+    new_scope
+    assemble &block
+  end
+
+  def export
+
+  end
+
+  def new_scope
+    @variables = {}
     @program = []
+    @params = 0
     @labels = {}
     @stack = []
     @result = nil
     @is_debug = false
-    @name = "undefined"
-    assemble &block
+    @name = "it"
   end
 
   def new_var(dest)
@@ -30,8 +40,9 @@ class Asm
   end
 
   OPS = {
+
     "rdu" => lambda { | ops |
-                e = eval "@stack.reduce(&:#{ops})"
+                e = eval "@stack.reduce(:#{ops})"
                 @stack.push e
               },
 
@@ -66,28 +77,32 @@ class Asm
                 #new_var dest
               },
 
-    "jlt" => lambda { |less, more|
-                req_args "jlt", 2
-                @@pc = @labels[name] if @stack[@stack.length - 1] < @stack[@stack.length - 2]
-                @stack.drop 2
-              },
-
     "jge" => lambda { |name|
                 req_args "jge", 1
-                x = @stack.pop
-                y = @stack.pop
-                @@pc = @labels[name] if x >= y
+                @pc = @labels[name] if @stack.pop == :gt
               },
 
-    "lt" => lambda { |a, b|
-                req_args "lt", 2
-                @stack.push (a > b)
+    "jlt" => lambda { |name|
+                req_args "jlt", 1
+                @pc = @labels[name] if @stack.pop == :lt
+              },
+
+    "jeq" => lambda { |name|
+                req_args "jeq", 1
+                @pc = @labels[name] if @stack.pop == :eq
+              },
+
+    "cmp" => lambda { |a, b|
+                a = refvar(a)
+                b = refvar(b)
+                @stack.push ( a > b ? :gt
+                              : a == b ? :eq : :lt )
               },
 
 
     "jmp" => lambda { |name|
-                @@pc = @labels[name]
-                new_title "[#{name}]" #if @@pc != @program.length-1
+                @pc = @labels[name]
+                new_title "[#{name}]" #if @pc != @program.length-1
               },
 
     "pop"  => lambda {|val|
@@ -115,12 +130,30 @@ class Asm
               },
 
     "dbg" => lambda {
-                puts "#{@stack} > #{@program[@@pc][0]}".light_green
+                puts "#{@stack} > #{@program[@pc][0]}".light_green
                 binding.pry
               },
 
-    "func"  => lambda {|&block|
-                @stack.push block
+    "func"  => lambda {|name|
+                args = []
+                params = eval "$#{name}.params"
+                params.times do
+                  args << @stack.pop
+                end
+                eval "$#{name}.is_debug = true" if @is_debug
+                o = eval "$#{name}.invoke #{args.join(',')}"
+                # for some reasons, this pointer is increased,
+                # after invoking the outside function.
+                # @@pc is belong to class, sync with all objects
+                # made with this class.
+                # while @pc is stick to instance that created 
+                # by this class.
+                # which is why invoking other Asm, cause @@pc
+                # to increase, while @pc don't.
+                # to test this problem, uncomment below and rake test:
+                #@pc += 1
+                @stack.push o if !o.nil?
+                #binding.pry
               },
 
     "ivok" => lambda { |obj, f |
@@ -131,6 +164,7 @@ class Asm
               },
 
     "call" => lambda {|fname|
+                #binding.pry
                 _method = method(fname)
                 if _method.parameters.length > 0
                   args = []
@@ -158,11 +192,13 @@ class Asm
   end
 
   def method_missing(name, *args)
-
+    # :name => "name"
     sname = name.to_s
 
     if OPS.keys.include?(sname)
       @program << [sname, args]
+      # get parameter amount:
+      @params = args.length if sname == "arg"
 
     else
 
@@ -187,36 +223,37 @@ class Asm
   end
 
   def execute(debug=false)
-    new_line
+    new_line if debug
     puts "#{@stack} > #{@name}".yellow  if debug
     begin
-      @@pc = 0
-      until(@@pc == @program.length)
+      @pc = 0
+      until(@pc == @program.length)
         # get instruction:
-        instr = @program[@@pc]
-        puts "#{@@pc}: #{instr[0]} #{instr[1]}".light_green if debug
-        # execute proc:
+        instr = @program[@pc]
+        puts "#{@pc}: #{instr[0]} #{instr[1]}".light_green if debug
+        # execute proc: arg ,  proc
         self.instance_exec(*instr[1], &OPS[instr[0]])
         #binding.pry if debug
-        @@pc += 1
+        @pc += 1
       end
+      #binding.pry
       @result = @stack.last
       clear
     rescue Exception => e
       debug e, instr
     end
-    new_line
+    new_line if debug
     @result
   end
 
   def fast_execute(*args)
     arguments args
-    @@pc = 0
-    until(@@pc == @program.length)
+    @pc = 0
+    until(@pc == @program.length)
       # execute proc:
-      self.instance_exec(*@program[@@pc][1],
-                         &OPS[@program[@@pc][0]])
-      @@pc += 1
+      self.instance_exec(*@program[@pc][1],
+                         &OPS[@program[@pc][0]])
+      @pc += 1
     end
     @result = @stack.last
     clear
@@ -228,28 +265,26 @@ class Asm
   end
 
   def new_line
-    puts "\n----------------------"   if is_debug
+    puts "\n----------------------"
   end
 
   def debug(e,instr)
     puts "\n--------[BUG]---------"
 
     # error scope:
-    debug_start = @@pc >= 1 ? @@pc - 1 : 0
+    debug_start = @pc >= 1 ? @pc - 1 : 0
 
-    debug_end = @@pc <= (@program.length - 2) ?
-                @@pc + 1  : @@pc
+    debug_end = @pc <= (@program.length - 2) ?
+                @pc + 1  : @pc
 
     # ranging...
     (debug_start..debug_end).each do | i |
 
       instr = @program[i]
-      color = i != @@pc ?  :light_green : :magenta
+      color = i != @pc ?  :light_green : :magenta
       puts "#{i}: #{instr[0]} #{instr[1]}".colorize color #if !instr.nil?
     end
-
-    puts "\nat line #{@@pc}: #{ops_info(@program[@@pc][0])} has #{e.message}".colorize(:magenta)
-
+    puts "\nat line #{@pc}: #{ops_info(@program[@pc][0])} has #{e.message}".colorize(:magenta) if !instr.nil?
     # test via pry:
     binding.pry if is_debug
   end
@@ -278,7 +313,7 @@ class Asm
 
   def assemble(&block)
     load_program(&block)
-    eval "$#{@name} = self.dup"
+    eval "$#{@name} = self.clone"
     eval "$#{@name}"
   end
 
@@ -298,10 +333,9 @@ class Asm
     Asm.assemble do
       defn :factorial
       arg  acc, n
-      push 1
-      push n
-
+      cmp  n, 1
       jge  :cont
+
       push acc
       jmp  :exit
 

metadata

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