asmrb 0.0.2.5 → 0.0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74225be18e6ad9f8003585d23373d487c9dd99b4
-  data.tar.gz: f48368b4eea421396a0efab10d52ab49140e5c23
+  metadata.gz: 771ddde246ce924141e25cc6c4f8d6a95342f74c
+  data.tar.gz: 8dd350e2b9e6d536a019c553c4d229d1e9325e2b
 SHA512:
-  metadata.gz: fc11d9c607e77bc977264d6c5f9c78699d790441fbde902f3305693a727126bf6d4d8cf81602a9f660edbccc180f74c99d2f2050a7c8b92b5863f5d4bfba55aa
-  data.tar.gz: f8e4e0b9145ebd6c208f68de766149b97ff8cb47eba73e72462ac58cb889020892adde0667105e31a2f4349d49638640762f55ae784da74923b9a0b993e48f5c
+  metadata.gz: 06a741a3c1589f1b6ffc4afc70f5596e462e0a5c3abaa84ef46ef56f814a9a3f2dd690092a38ac66ebbb4a482e426840d4e4885b5ae2b4dc4d79c81f8a4bc766
+  data.tar.gz: c0729a4f76c4ab2835e019f59493dabce3e4080eaad0749d4ae1b802b41ca648173e81857df8a55deeff770b6db2145926df467aaf7a7cd9d2712cbd17bf2997

data/lib/asmrb.rb

@@ -84,20 +84,24 @@ class Asm
                 @stack.push e
               },
 
-    "add" => lambda { | a, b |
-                @variables[b] = @variables[b] + refvar(a)
+    "dupl" => lambda {
+                @stack.push @stack.last
               },
 
-    "sub" => lambda { | a, b |
-                @variables[b] = @variables[b] - refvar(a)
+    "add" => lambda {
+                @stack.push @stack.pop + @stack.pop
               },
 
-    "mul" => lambda { | a, b |
-                @variables[b] = @variables[b] * refvar(a)
+    "sub" => lambda {
+                @stack.push @stack.pop - @stack.pop
               },
 
-    "div" => lambda { | a, b |
-                @variables[b] = @variables[b] / refvar(a)
+    "mul" => lambda {
+                @stack.push @stack.pop * @stack.pop
+              },
+
+    "div" => lambda {
+                @stack.push @stack.pop / @stack.pop
               },
 
     "incr" => lambda { |dest, incval = 1|
@@ -114,6 +118,12 @@ class Asm
                       @variables[src] : src
               },
 
+
+    "jz" => lambda { | name |
+                req_args "jz", 1
+                @pc = @labels[name] if @stack.pop == 0
+              },
+
     "jnz" => lambda { | name |
                 req_args "jnz", 1
                 @pc = @labels[name] if @stack.pop != 0
@@ -134,11 +144,12 @@ class Asm
                 @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 )
+    "cmp" => lambda {
+                  a = @stack.pop
+                  b = @stack.pop
+                  @stack.push(
+                    a > b ? :gt
+                          : a == b ? :eq : :lt )
               },
 
 
@@ -167,7 +178,7 @@ class Asm
               },
 
     "req"  => lambda {|amount|
-                raise Exception.new "require #{amount} #{ pluralize(amount, "argument") }." if @stack.length != amount
+                raise Exception.new "require #{amount} arg." if @stack.length < amount
               },
 
     "dbg" => lambda {
@@ -183,16 +194,6 @@ class Asm
                 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
               },
@@ -379,15 +380,19 @@ end
 Asm.new do
   defn :factorial
   arg  acc, n
-  cmp  n,   1
+  push 1
+  push n
+  cmp
   jge  :recursion
   jmp  :exit
 
   label :recursion
-  mul  n, acc
-  sub  1, n
   push acc
   push n
+  mul
+  push 1
+  push n
+  sub
   jmp  :factorial
   label :exit
   push acc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asmrb
 version: !ruby/object:Gem::Version
-  version: 0.0.2.5
+  version: 0.0.2.6
 platform: ruby
 authors:
 - The Trung
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies: []
 description: create a toy assembly-like DSL in ruby
 email: deulamco@gmail.com