obtuse 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - ruby-head
+  - jruby-19mode
+  - rbx-19mode
+script: bundle exec rspec spec

data/README.md

@@ -1,29 +1,40 @@
-# Obtuse
+# Obtuse [![Build Status](https://travis-ci.org/utkarshkukreti/obtuse.png)](https://travis-ci.org/utkarshkukreti/obtuse)
 
-TODO: Write a gem description
+Obtuse is a stack-oriented programming language, optimized for brevity.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+### Using Git (recommended)
 
-    gem 'obtuse'
+```
+$ git clone https://github.com/utkarshkukreti/obtuse.git
+$ cd obtuse
+$ bundle install
+$ rake install
+```
 
-And then execute:
+### Using RubyGems
 
-    $ bundle
+```
+$ gem install obtuse
+```
 
-Or install it yourself as:
+## Usage
 
-    $ gem install obtuse
+Run
 
-## Usage
+```
+$ obtuse
+```
+
+to start the interactive REPL.
+
+## Documentation
+
+Check out `spec/obtuse_spec.rb` for all functions and their outputs.
 
-TODO: Write usage instructions here
+## License
 
-## Contributing
+The MIT License.
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+Copyright (c) 2012, Utkarsh Kukreti.

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+task :pry do
+  system "pry -Ilib -robtuse -e 'include Obtuse'"
+end
+
+task default: :pry

data/lib/obtuse.rb

@@ -1,5 +1,7 @@
 require "parslet"
 
+require "obtuse/ast/lambda"
+
 require "obtuse/parser"
 require "obtuse/transform"
 require "obtuse/evaluator"

data/lib/obtuse/ast/lambda.rb

@@ -0,0 +1,11 @@
+module Obtuse
+  module AST
+    class Lambda
+      attr_accessor :expression
+
+      def initialize(expression)
+        @expression = expression
+      end
+    end
+  end
+end

data/lib/obtuse/evaluator.rb

@@ -1,26 +1,209 @@
 module Obtuse
   class Evaluator
-    attr_reader :stack
+    attr_accessor :stdin
+    attr_reader :stack, :stash
 
     def initialize
       @stack     = []
+      @stash     = []
+      @stdin     = $stdin
       @parser    = Parser.new
       @transform = Transform.new
     end
 
-    def eval(input)
-      @transform.apply(@parser.parse(input)).each do |atom|
+    def eval(input, parsed = false)
+      if parsed == false
+        input = @transform.apply(@parser.parse(input))
+      end
+
+      input.each do |atom|
         case atom
-        when Integer, String
+        when Integer, String, Array, AST::Lambda
           push atom
         when :+, :-, :*, :/, :%, :^
           atom = :** if atom == :^
-          y, x = pop, pop
-          if Integer === x && Integer === y ||
-            String === x && String === y
+          x, y = pop 2
+          if Integer === x && Integer === y
             push x.send(atom, y)
+          elsif String === x && Integer === y
+            case atom
+            when :+
+              push x + y.to_s
+            when :*
+              push x * y
+            when :%
+              push x % y
+            end
+          elsif String === x && String === y
+            case atom
+            when :+
+              push x + y
+            when :-
+              push (x.chars.to_a - y.chars.to_a).join
+            when :*
+              push x.chars.to_a.join(y)
+            end
+          elsif String === x && Array === y
+            case atom
+            when :%
+              push x % y
+            end
+          elsif Array === x
+            case atom
+            when :+
+              push x + Array(y)
+            when :-
+              push x - Array(y)
+            when :*
+              if Integer === y
+                push x * y
+              elsif String === y
+                push x.join(y)
+              elsif Array === y
+                first = x.shift
+                push x.reduce([first]) {|fold, el| fold + y + [el] }
+              elsif AST::Lambda === y
+                push x.shift
+                x.each do |el|
+                  push el
+                  eval y.expression, true
+                end
+              end
+            when :%
+              if AST::Lambda === y
+                stash
+                x.each do |el|
+                  push el
+                  eval y.expression, true
+                end
+                stack = @stack
+                unstash
+                push stack
+              end
+            end
+          else
+          end
+        when :"#"
+          x = pop
+          if Integer === x
+            push [*0...x]
+          elsif String === x || Array === x
+            push x.length
+          end
+        when :"$"
+          x = pop
+          if Integer === x
+            push @stack[-x - 1] if @stack[-x - 1]
+          elsif String === x
+            push x.chars.sort.join
+          elsif Array === x
+            push x.sort
+          elsif AST::Lambda === x
+            y = x
+            x = pop
+            case x
+            when String, Array
+              stash
+              array = String === x ? x.chars.to_a : x
+              array.sort_by! do |el|
+                @stack = []
+                push el
+                eval y.expression, true
+                @stack
+              end
+              unstash
+              push String === x ? array.join : array
+            end
+          end
+        when :~
+          x = pop
+          case x
+          when String
+            eval x
+          when Array
+            @stack += x
+          when AST::Lambda
+            eval x.expression, true
+          end
+        when :!
+          push truthy?(pop) ? 0 : 1
+        when :"@"
+          x, y, z = pop 3
+          push y; push z; push x
+        when :"."
+          x = peek
+          push x if x
+        when :";"
+          pop
+        when :"["
+          stash
+        when :"]"
+          stack = @stack
+          unstash
+          push stack
+        when :"=", :<, :>
+          atom = :== if atom == :"="
+          x, y = pop 2
+          if Integer === x && Integer === y ||
+              String === x && String === y ||
+               Array === x && Array === y
+            push x.send(atom, y) ? 1 : 0
+          end
+        when :"\\"
+          x, y = pop 2
+          push y; push x;
+        when :I
+          x, y, z = pop 3
+          if AST::Lambda === x
+            eval x.expression, true
+            if truthy?(pop)
+              AST::Lambda === y ? eval(y.expression, true) : push(y)
+            else
+              AST::Lambda === z ? eval(z.expression, true) : push(z)
+            end
           else
+            if truthy?(x)
+              AST::Lambda === y ? eval(y.expression, true) : push(y)
+            else
+              AST::Lambda === z ? eval(z.expression, true) : push(z)
+            end
+          end
+        when :W
+          x, y = pop 2
+          if AST::Lambda === x && AST::Lambda === y
+            loop do
+              eval x.expression, true
+              break unless truthy?(pop)
+              eval y.expression, true
+            end
+          end
+        when :Ic
+          push pop.to_i.chr
+        when :Sg
+          x, y, z = pop 3
+          if (Integer === x || String === x) &&
+             (Integer === y || String === y) &&
+             (Integer === z || String === z)
+            push x.to_s.gsub(y.to_s, z.to_s)
           end
+        when :Sl
+          push pop.to_s.downcase
+        when :Su
+          push pop.to_s.upcase
+        when :Sc
+          push pop.to_s.capitalize
+        when :So
+          push pop.to_s.ord
+        when :Si
+          x, y = pop 2
+          push x.to_s.include?(y.to_s) ? 1 : 0
+        when :St
+          x, y, z = pop 3
+          push x.to_s.tr(y.to_s, z.to_s)
+        when :Ra
+          push stdin.read.chomp
+        when :Rl
+          push stdin.gets.chomp
         end
       end
     end
@@ -29,12 +212,25 @@ module Obtuse
       @stack << object
     end
 
-    def pop
-      @stack.pop
+    def pop(n = nil)
+      n ? @stack.pop(n) : @stack.pop
     end
 
     def peek
       @stack.last
     end
+
+    def stash
+      @stash << @stack
+      @stack = []
+    end
+
+    def unstash
+      @stack = @stash.pop
+    end
+
+    def truthy?(x)
+      !(x.nil? || x == 0 || x == "" || x == [])
+    end
   end
 end

data/lib/obtuse/parser.rb

@@ -4,9 +4,10 @@ module Obtuse
     rule(:spaces?) { spaces.maybe           }
     rule(:digit)   { match["0-9"]           }
     rule(:digits)  { match["0-9"].repeat(1) }
+    rule(:minus)   { str("-")               }
 
     rule :integer do
-      digits.as(:integer) >> spaces?
+      (minus.maybe >> digits).as(:integer) >> spaces?
     end
 
     rule :string do
@@ -15,12 +16,19 @@ module Obtuse
     end
 
     rule :function do
-      %w{+ - * / % ^}.map { |name| str name }.reduce(:|).
+      %w{+ - * / % ^ # $ ~ ! @ . ; [ ] = < > \\
+          W Ic I Sg Sl Su Sc So Si St Ra Rl}.
+        map { |name| str name }.reduce(:|).
         as(:function) >> spaces?
     end
 
+    rule :lambda do
+      str("{") >> spaces? >> expression.as(:expression).as(:lambda) >>
+      str("}") >> spaces?
+    end
+
     rule :expression do
-      spaces? >> (string | integer | function).repeat >> spaces?
+      spaces? >> (integer | string | function | lambda).repeat >> spaces?
     end
 
     root :expression

data/lib/obtuse/transform.rb

@@ -5,5 +5,10 @@ module Obtuse
     rule(string:   simple(:x)) do
       x.to_s.gsub('\\t', "\t").gsub('\\n', "\n").gsub('\\"', '"')
     end
+    rule(array: sequence(:x)) { x }
+
+    rule lambda: { expression: subtree(:expression) } do
+      AST::Lambda.new expression
+    end
   end
 end

data/lib/obtuse/version.rb

@@ -1,3 +1,3 @@
 module Obtuse
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/examples_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Obtuse do
+  describe "GCD" do
+    # From http://www.golfscript.com/golfscript/examples.html
+    e '13483 74205 {.}{.@\%}W;', 13483.gcd(74205)
+  end
+
+  describe "LCM" do
+    e '13483 74205 .@.@{.}{.@\%}W;\@*\/', 13483.lcm(74205)
+  end
+
+  describe "Project Euler" do
+    describe "Problem #6: Find the difference between the sum of the squares" +
+      " of the first one hundred natural numbers and the square of the sum." do
+      e '101#{+}*2^101#{2^}%{+}*-', 25164150
+    end
+  end
+end

data/spec/obtuse_spec.rb

@@ -5,31 +5,348 @@ describe Obtuse do
     Obtuse::VERSION.should be_a String
   end
 
-  describe "Integer Integer (+|-|*|/|%|^)" do
-    e "2 1+", 3
-    e "10 20 +", 30
-    e "2 3-", -1
-    e "10 20 -", -10
-    e "2 3*", 6
-    e "10 20 *", 200
-    e "2 3/", 0
-    e "10 20 /", 0
-    e "2 3%", 2
-    e "10 20 %", 10
-    e "2 3^", 8
-    e "10 20 ^", 10 ** 20
+  describe "Primitives" do
+    describe "Integer" do
+      e "2", 2
+      e "100", 100
+      e "-10", -10
+    end
 
-    e "1 2+3-", 0
-    e "5 1 4 5 2 3 4 +-+-+-", 0
+    describe "String" do
+      e %q{"a \n b \n c \t\td\na"}, "a \n b \n c \t\td\na"
+    end
   end
 
-  describe "String" do
-    e %q{"a \n b \n c \t\td\na"}, "a \n b \n c \t\td\na"
+  describe "Functions" do
+    describe "+" do
+      describe "Integer Integer" do
+        e "2 1+", 3
+        e "10 20 +", 30
+        e "2 -3+", -1
+      end
+
+      describe "String Integer" do
+        e %q{"foo: "42+}, "foo: 42"
+      end
+
+      describe "String String" do
+        e '"foo""bar"+', "foobar"
+        e '"foo" "bar"+', "foobar"
+        e '"foo\\"" "bar"+', 'foo"bar'
+      end
+
+      describe "Array Object" do
+        e %q{[1 2] 1 +}, [1, 2, 1]
+        e %q{[1 2] "1" +}, [1, 2, "1"]
+        e %q{[1] [] +}, [1]
+        e %q{[1 2] [3 4] +}, [1, 2, 3, 4]
+      end
+    end
+
+    describe "-" do
+      describe "Integer Integer" do
+        e "2 3-", -1
+        e "10 20 -", -10
+        e "-10 -20-", 10
+      end
+
+      describe "String String" do
+        e %q{"aaa""a"-}, ""
+        e %q{"cabc""b"-}, "cac"
+        e %q{"cabc""cb"-}, "a"
+        e %q{"cabc""cab"-}, ""
+      end
+
+      describe "Array Object" do
+        e %q{[1 2] 1 -}, [2]
+        e %q{[1 2] "1" -}, [1, 2]
+        e %q{[1] [] -}, [1]
+        e %q{[1 2 3 3 1 4 4] [3 4] -}, [1, 2, 1]
+      end
+    end
+
+    describe "*" do
+      describe "Integer Integer" do
+        e "2 3*", 6
+        e "10 20 *", 200
+        e "-5 5*", -25
+      end
+
+      describe "(String | Array) Integer" do
+        e %q{"foobar "3*}, "foobar foobar foobar "
+        e %q{[1 2 3] 3*}, [1, 2, 3, 1, 2, 3, 1, 2, 3]
+      end
+
+      describe "String String" do
+        e %q{"foobar" " 3 "*}, "f 3 o 3 o 3 b 3 a 3 r"
+      end
+
+      describe "Array String" do
+        e %q{[1 2 3] ", "*}, "1, 2, 3"
+        e %q{[1 . 3] ", "*}, "1, 1, 3"
+      end
+
+      describe "Array Array" do
+        e %q{[1 2 3] [1] *}, [1, 1, 2, 1, 3]
+        e %q{[1 2 3] [0 1] *}, [1, 0, 1, 2, 0, 1, 3]
+      end
+
+      describe "Array Lambda (Fold)" do
+        e %q{[1 2 3] {+} *}, 6
+        e %q{[1 2 3] {-} *}, -4
+      end
+    end
+
+    describe "/" do
+      describe "Integer Integer" do
+        e "2 3/", 0
+        e "10 20 /", 0
+        e "10 -2/", -5
+      end
+    end
+
+    describe "%" do
+      describe "Integer Integer" do
+        e "2 3%", 2
+        e "10 20 %", 10
+        e "5 -3%", -1
+      end
+
+      describe "String Integer" do
+        e %q{"%05d" 123%}, "00123"
+      end
+
+      describe "String Array" do
+        e %q{"%02d %03d %04d"4#%}, "00 001 0002"
+        e %q{"%02d %03d %04d"[0 1 2 3 4 5]%}, "00 001 0002"
+      end
+
+      describe "Array Lambda (Map)" do
+        e %q{[1 2 3 4] {..} %}, [1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4]
+      end
+    end
+
+    describe "^" do
+      describe "Integer Integer" do
+        e "2 3^", 8
+        e "10 20 ^", 10 ** 20
+        e "-3 3^", -27
+      end
+    end
+
+    describe "#" do
+      describe "Integer" do
+        e "3#", [0, 1, 2]
+      end
+
+      describe "String" do
+        e %q{"foo bar"#}, 7
+      end
+
+      describe "Array" do
+        e "10##", 10
+        e "[1 2]#", 2
+      end
+    end
+
+    describe "$" do
+      describe "Integer" do
+        e %q{5 $}, [], stack: true
+        e %q{1 0 $}, [1, 1], stack: true
+        e %q{5#~ 3 $}, [0, 1, 2, 3, 4, 1], stack: true
+      end
+
+      describe "String" do
+        e %q{"abcdcba"$}, "aabbccd"
+      end
+
+      describe "Array" do
+        e %q{[1 4 3] $}, [1, 3, 4]
+      end
+
+      describe "(String | Array) Lambda (Sort by)" do
+        e %q{"abca" {.} $}, "aabc"
+        e %q{[1 4 3] {-1 *} $}, [4, 3, 1]
+      end
+    end
+
+    describe "~" do
+      describe "String" do
+        e %q{"123"~}, 123
+        e %q{"1 2 3 + -"~}, -4
+      end
+
+      describe "Array" do
+        e %q{4#~+++}, 6
+        e %q{[1 2]~+}, 3
+      end
+
+      describe "Lambda" do
+        e '{1 1 +}~', 2
+      end
+    end
+
+    describe "!" do
+      describe "" do
+        e "!", 1
+      end
+
+      describe "Integer" do
+        e "1!", 0
+        e "0!", 1
+      end
+
+      describe "String" do
+        e %q{""!}, 1
+        e %q{"foo"!}, 0
+      end
+
+      describe "Array" do
+        e "1#!", 0
+        e "0#!", 1
+        e "[]!", 1
+        e "[1]!", 0
+      end
+    end
+
+    describe "@" do
+      describe "Object Object Object" do
+        e %q{"abc" 10 4# @}, [10, [0, 1, 2, 3], "abc"], stack: true
+      end
+    end
+
+    describe "." do
+      describe "" do
+        e %q{1 2 .}, [1, 2, 2], stack: true
+        e %q{.}, [], stack: true
+      end
+    end
+
+    describe ";" do
+      describe "" do
+        e %q{1 2;}, [1], stack: true
+        e %q{2;}, [], stack: true
+        e %q{;}, [], stack: true
+      end
+    end
+
+    describe "[]" do
+      e %q{[1 . 2 . + . [1 . .]]}, [1, 1, 4, 4, [1, 1, 1]]
+    end
+
+    describe "=" do
+      describe "Object Object" do
+        e %q{12 12 =}, 1
+        e %q{"foo" "foo " =}, 0
+      end
+    end
+
+    describe "<" do
+      describe "Object Object" do
+        e %q{5 3 <}, 0
+        e %q{"bar" "foo" <}, 1
+      end
+    end
+
+    describe ">" do
+      describe "Object Object" do
+        e %q{5 3 >}, 1
+        e %q{"bar" "foo" >}, 0
+      end
+    end
+
+    describe "\\" do
+      describe "Object Object" do
+        e %q{1 2 \\}, [2, 1], stack: true
+        e %q{[] [1] \\}, [[1], []], stack: true
+      end
+    end
+
+    describe "I" do
+      describe "Object Object Object" do
+        e '0 1 2 I', 2
+        e '1 1 2 I', 1
+        e '0 1 {...} {.}I', [0, 0, 0, 0], stack: true
+      end
+    end
+
+    describe "W" do
+      describe "Lambda Lambda" do
+        e '3{.}{1-}W', 0
+        e '5{.}{1-.}W', [4, 3, 2, 1, 0, 0], stack: true
+      end
+    end
+
+    describe "Ic" do
+      describe "Integer" do
+        e "97 Ic", "a"
+      end
+    end
+
+    describe "Sg" do
+      describe "(Integer | String) (Integer | String) (Integer | String)" do
+        e %q{123 1 2 Sg}, "223"
+        e %q{"123" 1 "s" Sg}, "s23"
+        e %q{123 1 "s" Sg}, "s23"
+        e %q{"foo bar" "f" "b" Sg}, "boo bar"
+      end
+    end
+
+    describe "Sl" do
+      describe "String" do
+        e %q{"Foo Bar!" Sl}, "foo bar!"
+      end
+    end
+
+    describe "Su" do
+      describe "String" do
+        e %q{"Foo Bar!" Su}, "FOO BAR!"
+      end
+    end
+
+    describe "Sc" do
+      describe "String" do
+        e %q{"foo bar!" Sc}, "Foo bar!"
+      end
+    end
+
+    describe "So" do
+      describe "String" do
+        e %q{"a" So}, 97
+      end
+    end
+
+    describe "Si" do
+      describe "(Integer | String) (Integer | String)" do
+        e %q{123 11 Si}, 0
+        e %q{123 "11" Si}, 0
+        e %q{"foo bar" "o b" Si}, 1
+        e %q{"444" 4 Si}, 1
+      end
+    end
+
+    describe "St" do
+      describe "(Integer | String) (Integer | String) (Integer | String)" do
+        e %q{123 13 98 St}, "928"
+        e %q{"123" "13" 98 St}, "928"
+        e %q{"hello" "a-y" "b-z" St}, "ifmmp"
+        e %q{"hello" "^aeiou" 0 St}, "0e00o"
+      end
+    end
+
+    describe "Ra" do
+      e "Ra", "abc\nbcd", stdin: "abc\nbcd"
+    end
+
+    describe "Rl" do
+      e "Rl", "abc", stdin: "abc\nbcd"
+    end
   end
 
-  describe "String String +" do
-    e '"foo""bar"+', "foobar"
-    e '"foo" "bar"+', "foobar"
-    e '"foo\\"" "bar"+', 'foo"bar'
+  describe "Mixture" do
+    e "1 2+3-", 0
+    e "5 1 4 5 2 3 4 +-+-+-", 0
+    e "1-2-3-+", 2
+    e "1-2- 3+", 6
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,25 @@
 require "bundler/setup"
 require "simplecov"
 SimpleCov.start do
-  add_group "Libraries", "/lib"
+  add_group  "Libraries", "/lib"
+  add_filter "/lib/obtuse/cli.rb"
 end
 require "obtuse"
 
 RSpec.configure do |config|
-  def e(input, output)
-    it "should evaluate #{input.inspect} to #{output.inspect}" do
+  def e(input, output, options = {})
+    stdin = options[:stdin]
+    stdin = String === stdin ? StringIO.new(stdin) : $stdin
+
+    it "should evaluate `#{input}` to `#{output}`" do
       evaluator = Obtuse::Evaluator.new
+      evaluator.stdin = stdin
       evaluator.eval(input)
-      evaluator.peek.should eq output
+      if options[:stack]
+        evaluator.stack.should eq output
+      else
+        evaluator.peek.should eq output
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: obtuse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -101,6 +101,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -108,12 +109,14 @@ files:
 - Rakefile
 - bin/obtuse
 - lib/obtuse.rb
+- lib/obtuse/ast/lambda.rb
 - lib/obtuse/cli.rb
 - lib/obtuse/evaluator.rb
 - lib/obtuse/parser.rb
 - lib/obtuse/transform.rb
 - lib/obtuse/version.rb
 - obtuse.gemspec
+- spec/examples_spec.rb
 - spec/obtuse_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/utkarshkukreti/obtuse
@@ -141,6 +144,7 @@ signing_key:
 specification_version: 3
 summary: A Stack-oriented programming language, optimized for brevity.
 test_files:
+- spec/examples_spec.rb
 - spec/obtuse_spec.rb
 - spec/spec_helper.rb
 has_rdoc: