braingasm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803b75a915a22087c3ff27c5b5960381bd05b36e
-  data.tar.gz: 0321e68035610e58a2fd83e795d6c1588b700bcd
+  metadata.gz: 3239900206d0d94f1e850e61fdd57d58e3b86bcd
+  data.tar.gz: 4fd0c8ad374a69870fe4798d9534ed3030f4ef3b
 SHA512:
-  metadata.gz: 352c4a0c18097b93024223b10193a37cfc160639104d1592dd1b2fc7240b83231e5afcc19cb620eb3e3fbd79def8988724f899a5a786f8e1aa91ada5e5267d87
-  data.tar.gz: 0233ac17008cbb6f894a9eafb3496cb83ea197b552b56b19a3c61e2d329eedefbf4c274a9d1f945cc7b14aa2dea22488e7618d54f3c13c36af7c67cf9e66986f
+  metadata.gz: d5584e4ae8b22e9124b4d1195826abdb5c8f8e9c41080b76c86f7e42a42f20266d028c3bc937bcd065b4c3c0c63759c5b23f4d2aa9c754312a705ea01ca04fc5
+  data.tar.gz: 0b7042686c1af47686a8bc6428703457b9e4e390a1bc2cb17f4d1655c1192358f128bbb96225936e54ac16510297daaa980590773c9ddd1adc491e2e6741772f

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in braingasm.gemspec
 gemspec
+
+gem 'trollop', '= 2.1.2'

data/README.md

@@ -28,7 +28,11 @@ More information about the different prefixes and registers will come.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Install Braingasm from the command line with:
+
+    $ gem install braingasm
+
+Or to use it in your application, add this line to your Gemfile:
 
 ```ruby
 gem 'braingasm'
@@ -38,10 +42,6 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install braingasm
-
 ## Usage
 
     $ braingasm my_program.bg

data/braingasm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 11.2"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler", "~> 1.12.5"
+  spec.add_development_dependency "rake", "~> 11.2.2"
+  spec.add_development_dependency "rspec", "~> 3.5"
 end

data/examples/io.b

@@ -0,0 +1,25 @@
+[
+  Written by Daniel B Cristofani, fetched from
+  http://www.hevanet.com/cristofd/brainfuck/tests.b
+
+    This is for testing i/o; give it a return followed by an EOF. (Try it both
+    with file input--a file consisting only of one blank line--and with
+    keyboard input, i.e. hit return and then ctrl-d (Unix) or ctrl-z
+    (Windows).)
+
+    It should give two lines of output; the two lines should be identical, and
+    should be lined up one over the other. If that doesn't happen, ten is not
+    coming through as newline on output.
+
+    The content of the lines tells how input is being processed; each line
+    should be two uppercase letters.
+
+    Anything with O in it means newline is not coming through as ten on input.
+    * LK means newline input is working fine, and EOF leaves the cell unchanged
+      (which I recommend).
+    * LB means newline input is working fine, and EOF translates as 0.
+    * LA means newline input is working fine, and EOF translates as -1.
+      Anything else is fairly unexpected.
+]
+
+>,>+++++++++,>+++++++++++[<++++++<++++++<+>>>-]<<.>.<<-.>.>.<<.

data/exe/braingasm

@@ -1,14 +1,41 @@
 #!/usr/bin/env ruby
 
 require 'braingasm'
+require 'braingasm/version'
 require 'braingasm/errors'
+require 'braingasm/options'
+require 'trollop'
 
-input = IO.read(ARGV.shift)
+def err(message)
+  $stderr.puts message
+  exit 1
+end
+
+opts = Trollop::options do
+  version "Braingasm v#{Braingasm::VERSION}"
+
+  opt :zero,          "EOF returns 0 (default)"
+  opt :negative,      "EOF returns -1"
+  opt :as_is,         "EOF leaves cell unchanged"
+  conflicts :zero, :negative, :as_is
+
+  opt :unbound,       "Allow aritrarily large cells"
+  opt :cell_size,     "Cell size in bits",
+                      :short => '-s',
+                      :default => 8
+  conflicts :unbound, :cell_size
+end
+
+Braingasm.handle_options(opts)
+
+filename = ARGV.shift
+err "Error: No filname given" unless filename
+err "Error: No such file: #{filename}" unless File.exists?(filename)
 
 begin
+  input = IO.read(filename)
   machine = Braingasm.initialize_machine(input)
   machine.run
 rescue Braingasm::BraingasmError => e
-  $stderr.puts "#{e.type}: #{e.message}"
-  exit 1
+  err "#{e.type}: #{e.message}"
 end

data/lib/braingasm/errors.rb

@@ -19,4 +19,11 @@ module Braingasm
 
   class VMError < BraingasmError
   end
+
+  class JumpSignal < VMError
+    attr_reader :to
+    def initialize(to)
+      @to = to
+    end
+  end
 end

data/lib/braingasm/machine.rb

@@ -1,4 +1,5 @@
 require "braingasm/errors"
+require "braingasm/options"
 
 module Braingasm
 
@@ -23,8 +24,10 @@ module Braingasm
     end
 
     def step
-      move = @program[@ip].call(self)
-      @ip = move
+      @program[@ip].call(self)
+      @ip += 1
+    rescue JumpSignal => jump
+      @ip = jump.to
     end
 
     def inst_right(n=1)
@@ -37,47 +40,54 @@ module Braingasm
       end
 
       @dp = new_dp
-      @ip + 1
     end
 
     def inst_left(n=1)
-      @dp -= 1
-      raise VMError, "Moved outside the tape" if @dp < 0
-      @ip + 1
+      new_dp = @dp - n
+
+      if new_dp < 0
+        n.times do
+          @tape.unshift 0
+        end
+        new_dp = 0
+      end
+
+      @dp = new_dp
     end
 
     def inst_print_tape
       p @tape
-      @ip + 1
     end
 
     def inst_inc(n=1)
       @tape[@dp] += n
-      @ip + 1
+      wrap_cell
     end
 
     def inst_dec(n=1)
       @tape[@dp] -= n
-      @ip + 1
+      wrap_cell
     end
 
     def inst_jump(to)
-      to
+      raise JumpSignal.new(to)
     end
 
     def inst_jump_if_zero(to)
-      @tape[@dp] == 0 ? to : @ip + 1
+      raise JumpSignal.new(to) if @tape[@dp] == 0
     end
 
     def inst_print_cell
-      print @tape[@dp].chr
-      @ip + 1
+      putc @tape[@dp]
     end
 
     def inst_read_byte
-      @tape[@dp] = ARGF.getbyte || 0
-      @ip + 1
+      @tape[@dp] = ARGF.getbyte || Options[:eof] || @tape[@dp]
     end
 
+    private
+    def wrap_cell
+      @tape[@dp] %= Options[:cell_limit] if Options[:wrap_cells]
+    end
   end
 end

data/lib/braingasm/options.rb

@@ -0,0 +1,39 @@
+module Braingasm
+  module Options
+    @options = {}
+    @defaults = {
+      eof: 0,
+      wrap_cells: true,
+      cell_limit: 256
+    }.freeze
+
+    def self.[](option)
+      return @options[option] if @options.has_key?(option)
+      check_defaults(option)
+      @defaults[option]
+    end
+
+    def self.[]=(option, value)
+      check_defaults(option)
+      @options[option] = value
+    end
+
+    private
+    def self.check_defaults(option)
+      raise ArgumentError, "Unknown option '#{option}'" unless @defaults.has_key?(option)
+    end
+  end
+
+  def self.handle_options(**command_line_options)
+    Options[:eof] = 0 if command_line_options[:zero]
+    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]
+
+    if command_line_options[:cell_size_given]
+      cell_size = command_line_options[:cell_size]
+      Options[:cell_limit] = 2**cell_size
+    end
+  end
+end

data/lib/braingasm/parser.rb

@@ -36,17 +36,9 @@ module Braingasm
       when :comma
         read()
       when :loop_start
-        new_loop = Loop.new
-        @loop_stack.push(new_loop)
-        new_loop.start_index = @program.size
-        new_loop
+        loop_start()
       when :loop_end
-        current_loop = @loop_stack.pop
-        raise_parsing_error("Unmatched `]`") unless current_loop
-        instruction = jump(current_loop.start_index)
-        index = @program.size
-        current_loop.stop_index = index
-        instruction
+        loop_end()
       end
     end
 
@@ -84,13 +76,27 @@ module Braingasm
       -> m { m.inst_jump(to) }
     end
 
+    def loop_start()
+        new_loop = Loop.new
+        @loop_stack.push(new_loop)
+        new_loop.start_index = @program.size
+        new_loop
+    end
+
+    def loop_end
+        current_loop = @loop_stack.pop
+        raise_parsing_error("Unmatched `]`") unless current_loop
+        index = @program.size
+        current_loop.stop_index = index
+        jump(current_loop.start_index)
+    end
+
     class Loop
       attr_accessor :start_index, :stop_index
 
       def call(machine)
         machine.inst_jump_if_zero(stop_index + 1)
       end
-
     end
 
     def raise_parsing_error(message)

data/lib/braingasm/version.rb

@@ -1,3 +1,3 @@
 module Braingasm
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braingasm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Rødskog
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.12.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 description: braingasm combines the readability of brainfuck with the high-level functionality
   of assembly
 email: danielmero@gmail.com
@@ -70,10 +70,12 @@ files:
 - bin/console
 - bin/setup
 - braingasm.gemspec
+- examples/io.b
 - exe/braingasm
 - lib/braingasm.rb
 - lib/braingasm/errors.rb
 - lib/braingasm/machine.rb
+- lib/braingasm/options.rb
 - lib/braingasm/parser.rb
 - lib/braingasm/tokenizer.rb
 - lib/braingasm/version.rb