ookie 0.2.1 → 0.3.0

data/README.rdoc

@@ -1,15 +1,21 @@
 = ookie
 
-ookie is an Ook! language interpreter written in Ruby, aimed at:
+ookie is an Ook! and Brainfuck language interpreter written in Ruby, aimed at:
 
-* executing your classy Ook! code by embedding a shebang line:
+* executing your classy Ook!/BF code by embedding a shebang line:
 
   #!/usr/bin/env ookie
-  << classy Ook! code >>
 
-* embedding your Ook! code as a String in your Ruby code
+  << classy code >>
 
-  Ookie.run(%q{ just as classy Ook! code })
+* executing your Ook!/BF code using the command line tool:
+
+  $ ookie mycode.ook	# => Ook! code
+  $ ookie mycode.b	# => Brainfuck code
+
+* embedding your Ook!/BF code as a String in your Ruby code
+
+  Ookie.run(%q{ just as classy Brainfuck code }, :bfk)
 
 You can test it behind a simple web interface at http://ook.heroku.com
 

data/bin/ookie

@@ -14,7 +14,7 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'ookie'
 
 def usage
-  STDERR.puts "Ookie Ook! interpreter #{Ookie::Version::STRING}\n\nUsage: #{File.basename $0} [-v] <file>"
+  STDERR.puts "Ookie Ook! & Brainfuck interpreter #{Ookie::Version::STRING}\n\nUsage: #{File.basename $0} [-v] <file>\n\n\t-v\t:= turn on verbose output\n\tfile\t:= any file, yet BF will only be used for .b files"
   exit 1
 end
 
@@ -35,6 +35,7 @@ end
 
 begin
   ookie = Ookie::Interpreter.new(code)
+  ookie.lang = arg.end_with?('.b') ? :bfk : :ook
   ookie.verbose = verbose
   ookie.run
 rescue => ex

data/lib/ookie/interpreter.rb

@@ -11,29 +11,32 @@
 module Ookie
   class Interpreter
     RE_OOK_CODE = /\s*(Ook[!?\.])\s*/
+    RE_BFK_CODE = /\s*([<>\+-\.,\[\]])\s*/
 
     CodeInfo		= Class.new(StandardError)
     EndOfInstructions 	= Class.new(CodeInfo)
 
     CodeError		= Class.new(StandardError)
+    NoCode		= Class.new(CodeError)
     UnmatchedStartLoop	= Class.new(CodeError)
     UnmatchedEndLoop	= Class.new(CodeError)
-    NoOokCode		= Class.new(CodeError)
-    OddNumberOfOoks	= Class.new(CodeError)
+
+    OokCodeError	= Class.new(StandardError)
+    OddNumberOfOoks	= Class.new(OokCodeError)
 
     attr_reader :ooks, :mem, :pc, :loops
     attr_writer :verbose
-    attr_accessor :ifd, :ofd, :code
+    attr_accessor :code, :ifd, :ofd, :efd, :lang
 
     def verbose(msg = nil)
-      STDERR.puts "#{self.class}: #{msg}" if @verbose and msg
+      @efd.puts "#{self.class}: #{msg}" if @verbose and msg
       @verbose
     end
 
-    def initialize(code = '', ifd = STDIN, ofd = STDOUT)
+    def initialize(code = '', ifd = STDIN, ofd = STDOUT, efd = STDERR)
       @verbose = false
-      @ifd, @ofd = ifd, ofd
-      @code = code
+      @code, @ifd, @ofd, @efd = code, ifd, ofd, efd
+      @lang = :ook
       reset!
     end
 
@@ -43,13 +46,14 @@ module Ookie
       @mem = MemoryArray.new
     end
 
-    def self.run(code)
-      new.run(code)
+    def self.run(code, lang = :ook)
+      new.run(code, lang)
     end
 
-    def run(code = nil)
+    def run(code = nil, lang = nil)
       @code = code if code
-      parse
+      @lang = lang if lang
+      send("parse_#@lang")
       loop { stepi }
     rescue EndOfInstructions
       verbose 'program finished correctly'
@@ -57,7 +61,7 @@ module Ookie
 
     def stepi
       insn = next_insn
-      if insn.empty?
+      if insn.nil?
         raise UnmatchedStartLoop unless @loops.empty?
         raise EndOfInstructions
       end
@@ -116,6 +120,10 @@ module Ookie
 
     private
 
+    def next_insn
+      @ooks[@pc]
+    end
+
     def skip_loop
       nesting = 1
       loop do
@@ -131,16 +139,37 @@ module Ookie
       end
     end
 
-    def parse
-      @ooks = @code.scan(RE_OOK_CODE).flatten
-      raise NoOokCode if @ooks.empty?
-      raise OddNumberOfOoks if @ooks.size.odd?
+    def parse_helper(re)
+      @ooks = @code.scan(re).flatten
+      raise NoCode if @ooks.empty?
+      @ooks = yield
     end
 
-    def next_insn
-      @ooks.slice(@pc*2, 2).join('_').downcase.gsub('!', 'x').gsub('?','q').gsub('.','d')
-    rescue NoMethodError	# happens when last instruction is an end loop
-      ''
+    def parse_ook
+      parse_helper(RE_OOK_CODE) do
+        raise OddNumberOfOoks if @ooks.size.odd?
+        @ooks.each_slice(2).entries.collect! do |o|
+          o.join('_').downcase.gsub('!', 'x').gsub('?', 'q').gsub('.', 'd')
+        end
+      end
+    end
+
+    def parse_bfk
+      parse_helper(RE_BFK_CODE) do
+        @ooks.collect! do |b|
+          case b
+          when '>' then 'ookd_ookq'
+          when '<' then 'ookq_ookd'
+          when '+' then 'ookd_ookd'
+          when '-' then 'ookx_ookx'
+          when '.' then 'ookx_ookd'
+          when ',' then 'ookd_ookx'
+          when '[' then 'ookx_ookq'
+          else 'ookq_ookx'
+          end
+        end
+      end
     end
+
   end
 end

data/lib/ookie/version.rb

@@ -11,8 +11,8 @@
 module Ookie
   module Version
     MAJOR = 0
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/ookie.gemspec

@@ -0,0 +1,97 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ookie}
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Alejandro Martinez Ruiz"]
+  s.date = %q{2010-10-23}
+  s.default_executable = %q{ookie}
+  s.description = %q{Ookie is a simple Ook! interpreter you can use to either directly execute your Ook! source code (via shebang) or embed it in your own Ruby programs}
+  s.email = %q{alex@flawedcode.org}
+  s.executables = ["ookie"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "bin/ookie",
+    "examples/another.ook",
+    "examples/asciidown.ook",
+    "examples/bf2ook.ook",
+    "examples/cat.ook",
+    "examples/fibonacci.ook",
+    "examples/hello.ook",
+    "examples/holamundo.ook",
+    "examples/ook.ook",
+    "examples/prime.b",
+    "examples/prime.ook",
+    "examples/rev.ook",
+    "lib/ookie.rb",
+    "lib/ookie/interpreter.rb",
+    "lib/ookie/memoryarray.rb",
+    "lib/ookie/version.rb",
+    "ookie.gemspec",
+    "spec/ookie_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/unleashed/ookie}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Ookie is a simple Ook! interpreter}
+  s.test_files = [
+    "spec/ookie_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre5"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alejandro Martinez Ruiz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-23 00:00:00 +02:00
 default_executable: ookie
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,6 +197,7 @@ files:
 - lib/ookie/interpreter.rb
 - lib/ookie/memoryarray.rb
 - lib/ookie/version.rb
+- ookie.gemspec
 - spec/ookie_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -53849645
+      hash: -1506199298662524959
       segments: 
       - 0
       version: "0"