asmrb 0.0.2.6.1 → 0.0.2.6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89294081ff079041464adfb3f71fd744e635bc43
-  data.tar.gz: 548d68fb5bbe3d58af342f206cb7861d11f977ad
+  metadata.gz: 57d706ea40276b6485207d9090aa93329ef6090c
+  data.tar.gz: a7b388a89846c4a280419790c4139578afdb0722
 SHA512:
-  metadata.gz: bec94b11bd62ec137fe1c9520559632074446d792b82390b7ed82be5cf93aa34560f841614d87ea882d3b270f970ba4f3720e537c5f3c75efb03e297489931ec
-  data.tar.gz: ba09be2b2a7b4c3cc8437392209782598e85c4c2f68ac8315c7c517ed9856cc294273a3e466dbde6cc44216dc67786c9f982967d14be1c09a1c9b59a06a8d981
+  metadata.gz: 5ac464f3459c2ac32f4454b25a3597b39392791124a05dc7a76fdbe7b30240de7051d8394979f06e27bedf7d094f0f86c32066a331d750ba0715601591213de6
+  data.tar.gz: 7eaa37903c8dd999209ab4fd78512fd29ba5ba2e8ab15fd2ff63d88eed461bee1bf7819674ade9430c4c31ba4645022d0d51bc8ff18415959e648c21489516b3

data/lib/asmrb.rb

@@ -21,7 +21,7 @@ class Asmrb
   #   car arr             # get out first element of arr
   #   call :puts          # call ruby's puts
   #   cdr arr             # get rest of arr Array
-  #   jmp :rec_print      # jump back to :rec_print ( or start of this function )
+  #   recur               # jump back to :rec_print ( or start of this function )
   #   label :exit         # ending label.
   # end
   # => $rec_print
@@ -37,9 +37,9 @@ class Asmrb
   attr_reader :variables, :stack, :source, :name, :result, :params,:is_debug, :is_compiled
   attr_writer :is_debug
 
-  def initialize(&block)
+  def initialize &block
     new_scope
-    assemble &block
+    assemble &block unless block.nil?
   end
 
   def new_scope
@@ -56,7 +56,7 @@ class Asmrb
     @is_compiled = false
   end
 
-  def refvar(val)
+  def refvar val
     val.is_a?(Symbol) ? @variables[val] : val
   end
 
@@ -123,7 +123,6 @@ class Asmrb
                       @variables[src] : src
               },
 
-
     "jz" => lambda { | name |
                 req_args "jz", 1
                 @pc = @labels[name] if @stack.pop == 0
@@ -224,7 +223,7 @@ class Asmrb
                 end
                 @stack.push invoke if !invoke.nil?
               },
-    "rec"   => lambda {
+    "recur" => lambda {
                 @pc = -1
               },
 
@@ -237,9 +236,9 @@ class Asmrb
               }
   }
 
-  def create_label(lbl)
+  def create_label lbl
     @labels[lbl] = @program.length-1
-    #binding.pry
+    puts "#{@label[lbl]}: #{lbl}".purple if @is_debug
   end
 
   def method_missing(name, *args)
@@ -253,9 +252,7 @@ class Asmrb
       @program << [sname, args]
       # get parameter amount:
       @params = args.length if sname == "arg"
-
     else
-
       case sname
 
       when "label"
@@ -267,7 +264,6 @@ class Asmrb
 
       else
         return name
-
       end
     end
   end
@@ -281,12 +277,12 @@ class Asmrb
     puts "#{@stack} > #{@name}".yellow  if debug
     begin
       @pc = 0
-      until(@pc == @program.length)
+      until @pc == @program.length
         # get instruction:
         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]])
+        self.instance_exec *instr[1], &OPS[instr[0]]
         #binding.pry if debug
         @pc += 1
       end
@@ -322,36 +318,47 @@ class Asmrb
     puts "\n----------------------"
   end
 
-  def debug(e,instr)
+  def debug e, instr
+    if @pc.nil? || instr.nil?
+      puts "possible null jump:".red
+      binding.pry
+    end
     puts "\n--------[BUG]---------"
-
     # error scope:
-    debug_start = @pc >= 1 ? @pc - 1 : 0
-
-    debug_end = @pc <= (@program.length - 2) ?
-                @pc + 1  : @pc
-
+    scope_begin = @pc >= 1 ? @pc - 1 : 0
+    scope_end = @pc <= (@program.length - 2) ? @pc + 1  : @pc
     # ranging...
-    (debug_start..debug_end).each do | i |
+    (scope_begin..scope_end).each do | i |
       instr = @program[i]
       color = i != @pc ?  :light_green : :magenta
-      puts "#{i}: #{instr[0]} #{instr[1]}".colorize color #if !instr.nil?
+      puts "#{i}: #{instr[0]} #{instr[1]}".colorize color
+    end
+    unless instr.nil?
+      puts "\nat line #{@pc}:" +
+           "#{ops_info(@program[@pc][0])}" +
+           "has #{e.message}".colorize(:magenta)
     end
-    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
 
-  def ops_info(name)
-    parameters = []
-    OPS[name].parameters.each {|pair| parameters << pair.last }
+  def all_ops
+    OPS.map do |k,v|
+      ops_info k
+    end
+  end
+
+  def ops_info name
+    parameters = Array.new
+    OPS[name].parameters.each do |pair|
+      parameters << pair.last
+    end
     "#{name} [#{parameters.join(', ')}]"
   end
 
   def arguments(args=[])
     args.each do | arg |
-     @stack << arg
-   end
+      @stack << arg
+    end
   end
 
   def invoke(*args)
@@ -365,7 +372,7 @@ class Asmrb
     @stack = []
   end
 
-  def assemble(&block)
+  def assemble &block
     load_program(&block)
     eval "$#{@name} = self.clone"
     eval "$#{@name}"
@@ -452,7 +459,7 @@ Asmrb.new do
   push 1
   push :n
   sub
-  rec
+  recur
 end
 
 #$factorial.is_debug = true

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: asmrb
 version: !ruby/object:Gem::Version
-  version: 0.0.2.6.1
+  version: 0.0.2.6.1.2
 platform: ruby
 authors:
 - The Trung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies: []
-description: create a toy assembly-like DSL in ruby
+description: create a toy assembly-like DSL in ruby, checkout the homepage for usage
+  & syntax.
 email: deulamco@gmail.com
 executables: []
 extensions: []
@@ -40,6 +41,6 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: assembly-like DSL in ruby
+summary: assembly-like DSL toy in ruby
 test_files: []
 has_rdoc: