rips 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba8ac0a5eaa357455a6e03c2a68780872c13e52
-  data.tar.gz: dadbb4848036104eccb883594f6ebc55242e2f8e
+  metadata.gz: da602175a9a4fad4303735f4839de634fdd6c69f
+  data.tar.gz: ddec7e453dc99ce5ad427b8a8ba1d727ad3c7858
 SHA512:
-  metadata.gz: bea3e6aa10a9688867818db06eb00cd1ea57259c1346fe3784ebcf1f7c3eb639db7b8e14556b8ee0cf3c05574aab69187fd9a8fb7d1e08c7825c6c3b4f991dbb
-  data.tar.gz: 4df51297c08a6e4460327b78aeab6856e619a0f773baf6e5b7e8ad95d1b9d716bcd167fb5389fbab79995fefc16300d54cc4e73e2111ffe9ee330ea6398638ae
+  metadata.gz: 2e133f6438d2a32d2cc03cc93e72a3ac2ab6f83cbb358146e21d7007334f900bc5df54a9636e499850fba1284fc4ac4c550294c3288b124610605e7e1e0f3169
+  data.tar.gz: ea199e86cc2cf07d5fde0eb4bcc5a585ed311ac21354c1be517896be45a9e4112d09219c1e4e346c07253638d0e4f10a197b14076fbcf65320100b9ef6489d49

data/lib/rips/assembler.rb

@@ -61,16 +61,6 @@ module Rips
       find_instructions
       find_labels
 
-      puts "instructions...."
-      @instructions.each do |k|
-        puts "#{k}"
-      end      
-
-      puts "labels...."
-      @labels.each do |k,v|
-        puts "#{k}:#{v}"
-      end
-
       @input.each do |line|
 
         # If line is empty -> next line
@@ -135,7 +125,7 @@ module Rips
         @cmd[:name] = line.split("#").first.split(" ").first.downcase
         @cmd[:arguments] = line.split("#").first.split("#{@cmd[:name]} ")
         if !@cmd[:arguments].empty?
-          @cmd[:arguments] = @cmd[:arguments].pop.split("#").first.delete(" ").split(",")
+          @cmd[:arguments] = @cmd[:arguments].pop.split("#").first.del(/\s+|\t+/).split(",")
         end
         if @cmd[:arguments].first == "jr" ||
            @cmd[:arguments].first == "nop"
@@ -148,14 +138,12 @@ module Rips
 
     # Translate label's name to instruction's number
     def parse_label
-      if (@instruction.is_a? Rips::Instructions::Bez) ||
+      if (@instruction.is_a? Rips::Instructions::Beqz) ||
          (@instruction.is_a? Rips::Instructions::Bnez) ||
          (@instruction.is_a? Rips::Instructions::J) ||
          (@instruction.is_a? Rips::Instructions::Jal)
 
-          puts @cmd[:arguments]
           @cmd[:arguments] = [@labels[@cmd[:arguments].first].to_s]
-          puts "Salto a: #{@cmd[:arguments]}"
       end
     end
 

data/lib/rips/instructions/{bez.rb → beqz.rb}

@@ -3,14 +3,14 @@ require "rips/instructions/instruction"
 module Rips
   module Instructions
 
-    class Bez < Instruction
+    class Beqz < Instruction
 
       attr_reader :variables, :length
 
       # @variables: types of instruction's variables
       # @length: length in bits for each variable
       def initialize
-        super("bez",Formats::BFormat.new(0b001111))
+        super("beqz",Formats::BFormat.new(0b011111))
         @variables = [Variables::Address.new]
         @length = {r1:10, op:6}
       end

data/lib/rips/instructions/bnez.rb

@@ -10,7 +10,7 @@ module Rips
       # @variables: types of instruction's variables
       # @length: length in bits for each variable
       def initialize
-        super("bnez",Formats::BFormat.new(0b011111))
+        super("bnez",Formats::BFormat.new(0b001111))
         @variables = [Variables::Address.new]
         @length = {r1:10, op:6}
       end

data/lib/rips/instructions/set.rb

@@ -8,7 +8,7 @@ module Rips
         "jal", 
         "ji", 
         "jr", 
-        "bez", 
+        "beqz", 
         "bnez", 
         "lesr", 
         "li", 

data/lib/rips/instructions.rb

@@ -1,6 +1,6 @@
 require "rips/instructions/add"
 require "rips/instructions/and"
-require "rips/instructions/bez"
+require "rips/instructions/beqz"
 require "rips/instructions/bnez"
 require "rips/instructions/j"
 require "rips/instructions/jal"

data/lib/rips/utils.rb

@@ -6,4 +6,13 @@ class Integer
       '%0*b' % [width, self]
     end
   end
+end
+
+class String
+  def del(regexp)
+    gsub(regexp,'')
+  end
+  def del!(regexp)
+    gsub!(regexp,'')
+  end
 end

data/lib/rips/version.rb

@@ -1,3 +1,3 @@
 module Rips
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/rips.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec'
+
+  spec.required_ruby_version = '>= 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rips
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Madh93
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,7 +80,7 @@ files:
 - lib/rips/instructions.rb
 - lib/rips/instructions/add.rb
 - lib/rips/instructions/and.rb
-- lib/rips/instructions/bez.rb
+- lib/rips/instructions/beqz.rb
 - lib/rips/instructions/bnez.rb
 - lib/rips/instructions/instruction.rb
 - lib/rips/instructions/j.rb
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="