braingasm 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd80d14547d49b0c815eed05dccd712772b3bb58
-  data.tar.gz: 1664bf7fc54b68e9e830d497eccae10522663fce
+  metadata.gz: 41e3533b688fd89095305a59c011c395b74fd8df
+  data.tar.gz: 17354beb196e6fb94998c021f9f52532c53723ec
 SHA512:
-  metadata.gz: d74db6070885068e3c7c844189e2fd72ba309018357495851cac96f53729350259e93b3017acf84cfd0020ff4c32aabb0aca543d6eb6aa90282e154f7aedcc93
-  data.tar.gz: 0228237b8fa8682463eb3ad40f83c9d31b544a1eb71da0b07f6ac7d88359df2d0ddfea83c9acc8c06b0d02482849cc637a48bdbb10d393418ed94cfdd675635f
+  metadata.gz: 6cea12d603342077e4d1290602fc808845b03f073109e26189c18e62a309629f63876e4215220acaf9c689dd335ceb804f21f1b71c3e5deb0db29013edaf52c6
+  data.tar.gz: f77a348b9d2c49349053aff9fa1e22092b95cc02f0b8b9532e5eb92f65dcfd20749f49a0451e44ba0d4ac1d7dd5f62e836d92fd7042d4b797b54d6fb4123723e

data/braingasm.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/daniero/braingasm"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 2.3'
+
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -21,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "trollop", "~> 2.1.2"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 11.2.2"
-  spec.add_development_dependency "rspec", "~> 3.5"
+  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_development_dependency "rake", "~> 12"
+  spec.add_development_dependency "rspec", "~> 3.6"
 end

data/examples/quine.bg

@@ -0,0 +1 @@
+2898478,:.

data/exe/braingasm

@@ -19,11 +19,12 @@ opts = Trollop::options do
   opt :as_is,         "EOF leaves cell unchanged"
   conflicts :zero, :negative, :as_is
 
-  opt :unbound,       "Allow arbitrarily large cells"
+  opt :unbound,       "Allow arbitrarily large cells (on by default)"
+  opt :bound,         "Don't Allow arbitrarily large cells"
   opt :cell_size,     "Cell size in bits",
                       :short => '-s',
                       :default => 8
-  conflicts :unbound, :cell_size
+  conflicts :unbound, :bound, :cell_size
 end
 
 Braingasm.handle_options(opts)
@@ -35,6 +36,8 @@ err "Error: No such file: #{filename}" unless File.exists?(filename)
 begin
   code = IO.read(filename)
   Braingasm.run(code)
+rescue Braingasm::ExitSignal => e
+  exit e.code
 rescue Braingasm::BraingasmError => e
   err "#{e.type}: #{e.message}"
 end

data/lib/braingasm.rb

@@ -12,14 +12,19 @@ module Braingasm
   end
 
   def self.initialize_machine(code)
-    tokenizer = Tokenizer.new(code)
-    compiler = Compiler.new
-    program = Parser.new(tokenizer, compiler).parse_program
     machine = Machine.new
 
+    machine.program = compile(code)
     machine.input = InputBuffer.new($<)
     machine.output = $>
-    machine.program = program
     machine
   end
+
+  def self.compile(code)
+    tokenizer = Tokenizer.new(code)
+    compiler = Compiler.new
+    parser = Parser.new(tokenizer, compiler)
+
+    parser.parse_program
+  end
 end

data/lib/braingasm/compiler.rb

@@ -14,6 +14,11 @@ module Braingasm
       prefix
     end
 
+    READ_CELL = ->(n, m) { m.cell }
+    def read_cell
+      push_prefix @prefixes.fix_params(READ_CELL)
+    end
+
     def pos
       push_prefix ->(m) { m.pos }
     end
@@ -25,30 +30,52 @@ module Braingasm
     end
 
     def zero
-      push_prefix ->(m) { m.last_write == 0 ? 1 : 0 }
+      read_cell if @prefixes.empty?
+
+      push_prefix @prefixes.fix_params(->(n, m) { n.zero? ? 1 : 0 })
+    end
+
+    def signed
+      push_prefix ->(m) { m.last_write >= 0 ? 0 : 1 }
     end
 
     def parity
-      push_prefix ->(m) { (m.last_write &.% 2) || 0 }
+      read_cell if @prefixes.empty?
+
+      push_prefix @prefixes.fix_params(->(n, m) { (n % 2) ^ 1 })
     end
 
-    def right()
+    def oddity
+      read_cell if @prefixes.empty?
+
+      push_prefix @prefixes.fix_params(->(n, m) { n % 2 })
+    end
+
+    def right
       @prefixes.fix_params ->(n, m) { m.inst_right(n) }
     end
 
-    def left()
+    def left
       @prefixes.fix_params ->(n, m) { m.inst_left(n) }
     end
 
-    def inc()
+    def inc
       @prefixes.fix_params ->(n, m) { m.inst_inc(n) }
     end
 
-    def dec()
+    def dec
       @prefixes.fix_params ->(n, m) { m.inst_dec(n) }
     end
 
-    def print()
+    def multiply
+      @prefixes.fix_params ->(n, m) { m.inst_multiply(n) }, 2
+    end
+
+    def divide
+      @prefixes.fix_params ->(n, m) { m.inst_divide(n) }, 2
+    end
+
+    def print
       if @prefixes.empty?
         ->(m) { m.inst_print_cell }
       else
@@ -56,7 +83,7 @@ module Braingasm
       end
     end
 
-    def print_int()
+    def print_int
       if @prefixes.empty?
         ->(m) { m.inst_print_cell_int }
       else
@@ -64,18 +91,50 @@ module Braingasm
       end
     end
 
-    def read()
+    def read
       if @prefixes.empty?
         ->(m) { m.inst_read_byte }
+      elsif @prefixes.first.is_a? String
+        string = @prefixes.first
+
+        @prefixes.fix_params ->(n, m) {
+          from, to = m.dp, m.dp + string.size
+
+          if m.tape_limit && to > m.tape_limit
+            limit = m.tape_limit
+            cutoff = to - limit
+
+            m.tape[from..limit] = string.bytes[0..cutoff]
+            m.tape[0...cutoff] = string.bytes[(cutoff+1)..-1]
+          else
+            m.tape[from...to] = string.bytes
+          end
+        }
       else
         @prefixes.fix_params ->(n, m) { m.cell = n }
       end
     end
 
-    def read_int()
+    def read_int
       @prefixes.fix_params ->(n, m) { m.inst_read_int(n) }, 10
     end
 
+    def compare
+      ->(m) { m.inst_compare_cells }
+    end
+
+    def quit
+      @prefixes.fix_params ->(n, m) { m.inst_quit(n) }, 1
+    end
+
+    def tape_limit
+      if @prefixes.empty?
+        push_prefix ->(m) { x = m.pos; x + (x < 0 ? -1 : 1) }
+      end
+
+      @prefixes.fix_params ->(n, m) { m.limit_tape(n) }
+    end
+
     def jump(to)
       ->(m) { m.inst_jump(to) }
     end

data/lib/braingasm/errors.rb

@@ -26,4 +26,11 @@ module Braingasm
       @to = to
     end
   end
+
+  class ExitSignal < VMError
+    attr_reader :code
+    def initialize(code=0)
+      @code = code
+    end
+  end
 end

data/lib/braingasm/machine.rb

@@ -6,7 +6,8 @@ module Braingasm
   # A Machine keeps the state of a running program, and exposes various
   # operations to modify this state
   class Machine
-    attr_accessor :tape, :dp, :program, :ip, :ctrl_stack, :last_write, :input, :output
+    attr_accessor :tape, :dp, :program, :ip, :ctrl_stack, :last_write, :input, :output,
+      :tape_limit
 
     def initialize
       @tape = Array.new(10) { 0 }
@@ -19,12 +20,7 @@ module Braingasm
     end
 
     def run
-      return if @program.empty?
-
-      loop do
-        step()
-        break unless @ip < @program.size
-      end
+      step while @ip < @program.size
     end
 
     def step
@@ -47,8 +43,20 @@ module Braingasm
       @dp - @data_offset
     end
 
+    def calculate_new_dp(move)
+      if @tape_limit
+        if @tape_limit >= 0
+          (@dp + move) % @tape_limit
+        else
+          (@dp + move) % -@tape_limit
+        end
+      else
+        @dp + move
+      end
+    end
+
     def inst_right(n=1)
-      new_dp = @dp + n
+      new_dp = calculate_new_dp(n)
       no_cells = @tape.length
 
       if new_dp >= no_cells
@@ -60,17 +68,17 @@ module Braingasm
     end
 
     def inst_left(n=1)
-      new_dp = @dp - n
+      new_dp = calculate_new_dp(-n)
 
       if new_dp < 0
         new_cells = -new_dp
         new_cells.times { @tape.unshift 0 }
         @data_offset += new_cells
 
-        new_dp = 0
+        @dp = 0
+      else
+        @dp = new_dp
       end
-
-      @dp = new_dp
     end
 
     def inst_print_tape
@@ -78,13 +86,19 @@ module Braingasm
     end
 
     def inst_inc(n=1)
-      @tape[@dp] += n
-      trigger_cell_updated
+      self.cell += n
     end
 
     def inst_dec(n=1)
-      @tape[@dp] -= n
-      trigger_cell_updated
+      self.cell -= n
+    end
+
+    def inst_multiply(n=2)
+      self.cell *= n
+    end
+
+    def inst_divide(n=2)
+      self.cell /= n
     end
 
     def inst_jump(to)
@@ -105,12 +119,27 @@ module Braingasm
       ctrl_stack << x
     end
 
+    def print_bytes(b)
+      d,m = b.divmod(256)
+
+      if d > 0
+        print_bytes(d)
+      end
+
+      @output.putc(m)
+    end
+
     def inst_print(chr)
-      @output.putc chr
+      case chr
+      when Integer
+        print_bytes(chr)
+      else
+        @output.print chr
+      end
     end
 
     def inst_print_cell
-      @output.putc cell
+      print_bytes(cell)
     end
 
     def inst_print_int(n)
@@ -122,18 +151,30 @@ module Braingasm
     end
 
     def inst_read_byte
-      @tape[@dp] = @input.getbyte || Options[:eof] || @tape[@dp]
-      trigger_cell_updated
+      self.cell = @input.getbyte || Options[:eof] || @tape[@dp]
     end
 
     def inst_read_int(radix=10)
       return unless @input.gets =~ /\d+/
 
       @input.ungetc($')
-      @tape[@dp] = $&.to_i(radix)
-      trigger_cell_updated
+      self.cell = $&.to_i(radix)
     end
 
+    def inst_compare_cells
+      operand = @dp == 0 ? 0 : @tape[@dp-1]
+      @last_write = @tape[@dp] - operand
+    end
+
+    def inst_quit(value, code=0)
+      raise ExitSignal.new(code) unless value == 0
+    end
+
+    def limit_tape(cell_number)
+      @tape_limit = cell_number
+    end
+
+
     private
     def trigger_cell_updated
       @tape[@dp] %= Options[:cell_limit] if Options[:wrap_cells]

data/lib/braingasm/options.rb

@@ -3,7 +3,7 @@ module Braingasm
     @options = {}
     @defaults = {
       eof: 0,
-      wrap_cells: true,
+      wrap_cells: false,
       cell_limit: 256
     }.freeze
 
@@ -33,11 +33,12 @@ module Braingasm
     Options[:eof] = -1 if command_line_options[:negative]
     Options[:eof] = nil if command_line_options[:as_is]
 
-    Options[:wrap_cells] = false if command_line_options[:unbound]
+    Options[:wrap_cells] = true if command_line_options[:bound]
 
     if command_line_options[:cell_size_given]
       cell_size = command_line_options[:cell_size]
       Options[:cell_limit] = 2**cell_size
+      Options[:wrap_cells] = true
     end
   end
 end

data/lib/braingasm/parser.rb

@@ -26,41 +26,54 @@ module Braingasm
       token = tokens.next
 
       case token
-      when Integer
-        @compiler.push_prefix token
-        false
-      when :hash
-        @compiler.pos()
-        false
-      when :r
-        @compiler.random()
-        false
-      when :z
-        @compiler.zero()
-        false
-      when :p
-        @compiler.parity()
-        false
       when :right
-        @compiler.right()
+        @compiler.right
       when :left
-        @compiler.left()
-      when :plus
-        @compiler.inc()
-      when :minus
-        @compiler.dec()
-      when :period
-        @compiler.print()
-      when :colon
-        @compiler.print_int()
-      when :comma
-        @compiler.read()
-      when :semicolon
-        @compiler.read_int()
+        @compiler.left
+      when :increment
+        @compiler.inc
+      when :decrement
+        @compiler.dec
+      when :multiply
+        @compiler.multiply
+      when :divide
+        @compiler.divide
+      when :print
+        @compiler.print
+      when :output
+        @compiler.print_int
+      when :read
+        @compiler.read
+      when :input
+        @compiler.read_int
+      when :compare
+        @compiler.compare
+      when :quit
+        @compiler.quit
+      when :tape_limit
+        @compiler.tape_limit
       when :loop_start
         @compiler.loop_start(@program.size)
       when :loop_end
         @compiler.loop_end(@program.size)
+      else
+        case token
+        when Integer, String
+          @compiler.push_prefix token
+        when :position
+          @compiler.pos
+        when :random
+          @compiler.random
+        when :zero
+          @compiler.zero
+        when :signed
+          @compiler.signed
+        when :parity
+          @compiler.parity
+        when :oddity
+          @compiler.oddity
+        end
+        false
       end
     rescue BraingasmError => e
       raise_parsing_error(e.message)

data/lib/braingasm/prefixes.rb

@@ -5,7 +5,7 @@ module Braingasm
   class PrefixStack
     extend Forwardable
     attr_accessor :stack
-    def_delegators :@stack, :empty?, :<<, :pop, :==
+    def_delegators :@stack, :empty?, :<<, :pop, :==, :first
 
     def initialize
       @stack = []
@@ -15,7 +15,7 @@ module Braingasm
       prefix = @stack.pop || default_param
 
       case prefix
-      when Integer
+      when Integer, String
         function.curry.call(prefix)
       when Proc
         proc do |m|

data/lib/braingasm/tokenizer.rb

@@ -35,22 +35,36 @@ module Braingasm
 
     private
     def read_token(scanner)
-      return scanner.matched.to_i if scanner.scan(/\d+/)
-      @@simple_tokens[scanner.scan(/\S/)] || :unknown
+      if scanner.scan(/\d+/)
+        scanner.matched.to_i
+      elsif scanner.scan(/"/)
+        s = scanner.scan(/[^"]*/)
+        scanner.skip(/"/)
+        s
+      else
+        @@simple_tokens[scanner.scan(/\S/)] || :unknown
+      end
     end
 
-    @@simple_tokens = { '+' => :plus,
-                        '-' => :minus,
+    @@simple_tokens = { '+' => :increment,
+                        '-' => :decrement,
+                        '*' => :multiply,
+                        '/' => :divide,
                         '<' => :left,
                         '>' => :right,
-                        '.' => :period,
-                        ':' => :colon,
-                        ',' => :comma,
-                        ';' => :semicolon,
-                        '#' => :hash,
-                        'r' => :r,
-                        'p' => :p,
-                        'z' => :z,
+                        '.' => :print,
+                        ':' => :output,
+                        ',' => :read,
+                        ';' => :input,
+                        'C' => :compare,
+                        '#' => :position,
+                        'r' => :random,
+                        'p' => :parity,
+                        'o' => :oddity,
+                        'z' => :zero,
+                        's' => :signed,
+                        'Q' => :quit,
+                        'L' => :tape_limit,
                         '[' => :loop_start,
                         ']' => :loop_end }
 

data/lib/braingasm/version.rb

@@ -1,3 +1,3 @@
 module Braingasm
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braingasm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Rødskog
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.2.2
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 description: braingasm combines the readability of brainfuck with the high-level functionality
   of assembly
 email: danielmero@gmail.com
@@ -86,6 +86,7 @@ files:
 - braingasm.gemspec
 - examples/io.b
 - examples/number_prefixes.bg
+- examples/quine.bg
 - exe/braingasm
 - lib/braingasm.rb
 - lib/braingasm/compiler.rb
@@ -109,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: It's liek brainfuck and assembly in one!