crisp 0.0.7 → 0.0.8

data/CHANGELOG.md

@@ -1,7 +1,16 @@
-## 0.0.8 (2010-xx-xx)
+## 0.0.9 (2011-xx-xx)
 
 * ...
 
+## 0.0.8 (2011-01-06)
+
+* local bindings with let
+* cond provides a kind of switch/case statemnts, including default path
+* load lets you load crisp source files at runtime
+* loops can be performed with loop/recur
+* internal fixes and refactorings
+* more examples
+
 ## 0.0.6/0.0.7 (2010-12-17)
 
 * if else statements

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.homepage = "http://github.com/mgsnova/crisp"
     gem.authors = ['Markus Gerdes']
     gem.add_dependency 'treetop', '~> 1.4.9'
-    gem.add_development_dependency 'rspec', '~> 2.3.0'
+    gem.add_development_dependency 'rspec', '~> 2.4.0'
   end
 
   Jeweler::GemcutterTasks.new

data/bin/crisp

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'lib/crisp'
+require 'crisp'
 
 if ARGV.size == 0
   Crisp::Shell.new.run

data/crisp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{crisp}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Markus Gerdes"]
-  s.date = %q{2010-12-17}
+  s.date = %q{2011-01-06}
   s.default_executable = %q{crisp}
   s.email = %q{github@mgsnova.de}
   s.executables = ["crisp"]
@@ -25,7 +25,9 @@ Gem::Specification.new do |s|
     "autotest/discover.rb",
     "bin/crisp",
     "crisp.gemspec",
+    "examples/factorial.crisp",
     "examples/fibonacci.crisp",
+    "examples/run.crisp",
     "lib/crisp.rb",
     "lib/crisp/chained_env.rb",
     "lib/crisp/crisp.treetop",
@@ -83,14 +85,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<treetop>, ["~> 1.4.9"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
     else
       s.add_dependency(%q<treetop>, ["~> 1.4.9"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     end
   else
     s.add_dependency(%q<treetop>, ["~> 1.4.9"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
   end
 end
 

data/examples/factorial.crisp

@@ -0,0 +1,6 @@
+(def factorial
+  (fn [n]
+    (loop [cnt n acc 1]
+      (if (= 0 cnt)
+        acc
+        (recur (- cnt 1) (* acc cnt))))))

data/examples/fibonacci.crisp

@@ -3,4 +3,3 @@
   (if (< n 2)
     n
     (+ (fib (- n 1)) (fib (- n 2))))))
-(println "fibonacci for 10 is" (fib 10))

data/examples/run.crisp

@@ -0,0 +1,5 @@
+(load "fibonacci")
+(load "factorial")
+
+(println "fibonacci for 10 is" (fib 10))
+(println "factorial of 10 is" (factorial 10))

data/lib/crisp.rb

@@ -3,7 +3,7 @@ require "treetop"
 require "pp"
 
 module Crisp
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end
 
 require 'crisp/errors'

data/lib/crisp/chained_env.rb

@@ -29,5 +29,15 @@ module Crisp
     def []=(key, val)
       @second[key] = val
     end
+
+    # returns global loop data of global/second env
+    def global_loop_data
+      @second.global_loop_data
+    end
+
+    # set global loop data to global/second env
+    def global_loop_data=(data)
+      @second.global_loop_data = data
+    end
   end
 end

data/lib/crisp/crisp.treetop

@@ -37,7 +37,7 @@ grammar Crisp
   end
 
   rule symbol
-    [a-z] [a-z0-9]* <Nodes::SymbolLiteral>
+    [a-zA-Z] [a-zA-Z0-9]* <Nodes::SymbolLiteral>
   end
 
   rule integer

data/lib/crisp/env.rb

@@ -2,6 +2,8 @@ module Crisp
   # The Crisp environment is basically a key/value store.
   # The value for each key is immutable, so you can only store one time for each key
   class Env
+    attr_accessor :global_loop_data
+
     # create a new internal hash
     def initialize
       @map = {}

data/lib/crisp/errors.rb

@@ -9,4 +9,7 @@ module Crisp
   class EnvironmentError < StandardError
   end
 
+  class LoopError < StandardError
+  end
+
 end

data/lib/crisp/functions/core.rb

@@ -54,10 +54,6 @@ module Crisp
             raise ArgumentError, "no argument list defined"
           end
 
-          if args[1].class.name != "Crisp::Nodes::Operation"
-            raise ArgumentError, "no function body defined"
-          end
-
           fn_arg_list = args[0].raw_elements
           fn_operation = args[1]
 
@@ -72,7 +68,7 @@ module Crisp
 
             chained_env = ChainedEnv.new(local_env, env)
 
-            fn_operation.eval(chained_env)
+            fn_operation.resolve_and_eval(chained_env)
           end
         end.bind('fn', current_env)
 
@@ -96,6 +92,127 @@ module Crisp
           res ? res.resolve_and_eval(env) : res
         end.bind('if', current_env)
 
+        # cond
+        # cond works like a switch/case statement, evaluating the first expression where the condition matches
+        #
+        #  (cond
+        #   false (println "should not be printed")
+        #   true (println "should be printed"))
+        Function.new do
+          if args.size.odd?
+            raise ArgumentError, "argument list has to contain even list of arguments"
+          end
+
+          result = nil
+
+          args.each_with_index do |arg, idx|
+            next if idx.odd?
+            if (arg.class.name == 'Crisp::Nodes::SymbolLiteral' and arg.text_value == 'else') or
+               (![nil, false].include?(arg.resolve_and_eval(env)))
+              result = args[idx + 1].resolve_and_eval(env)
+              break
+            end
+          end
+
+          result
+        end.bind("cond", current_env)
+
+        # let
+        # create local binding only valid within let and evaluate expressions
+        #
+        #  (let [x 1 y 2] (+ x y))
+        #  => 3
+        Function.new do
+          if args[0].class.name != "Crisp::Nodes::ArrayLiteral"
+            raise ArgumentError, "no argument list defined"
+          end
+
+          if args[0].raw_elements.size.odd?
+            raise ArgumentError, "argument list has to contain even list of arguments"
+          end
+
+          local_env = Env.new
+          chained_env = ChainedEnv.new(local_env, env)
+          binding_array = args[0].raw_elements
+
+          binding_array.each_with_index do |key, idx|
+            next if idx.odd?
+            local_env[key.text_value] = binding_array[idx+1].resolve_and_eval(chained_env)
+          end
+
+          args[1..-1].map do |op|
+            op.resolve_and_eval(chained_env)
+          end.last
+        end.bind('let', current_env)
+
+        # loop
+        # create loop with a local binding, perform a loopjump using recur
+        #
+        #  (loop [cnt 5 acc 1]
+        #    (if (= 0 cnt)
+        #      acc
+        #      (recur (- cnt 1) (* acc cnt))))
+        #  => 120
+        Function.new do
+          if env.global_loop_data
+            raise LoopError, "nested loops are not allowed"
+          end
+
+          if args[0].class.name != "Crisp::Nodes::ArrayLiteral"
+            raise ArgumentError, "no argument list defined"
+          end
+
+          if args[0].raw_elements.size.odd?
+            raise ArgumentError, "argument list has to contain even list of arguments"
+          end
+
+          local_env = Env.new
+          chained_env = ChainedEnv.new(local_env, env)
+          binding_array = args[0].raw_elements
+          argument_name_array = []
+
+          binding_array.each_with_index do |key, idx|
+            next if idx.odd?
+            local_env[key.text_value] = binding_array[idx+1].resolve_and_eval(chained_env)
+            argument_name_array << key.text_value
+          end
+
+          env.global_loop_data = {
+            :operations => args[1..-1],
+            :argument_names =>  argument_name_array
+          }
+
+          result = args[1..-1].map do |op|
+            op.resolve_and_eval(chained_env)
+          end.last
+
+          env.global_loop_data = nil
+
+          result
+        end.bind('loop', current_env)
+
+        # recur
+        # only used inside a loop. recur will trigger a new run of the loop
+        # see 'loop' for an example
+        Function.new do
+          if !env.global_loop_data
+            raise LoopError, "recur called outside loop"
+          end
+
+          validate_args_count(env.global_loop_data[:argument_names].size, args.size)
+
+          local_env = Env.new
+          chained_env = ChainedEnv.new(local_env, env)
+
+          env.global_loop_data[:argument_names].each_with_index do |key, idx|
+            local_env[key] = args[idx].resolve_and_eval(env)
+          end
+
+          env.global_loop_data[:operations].map do |op|
+            op.resolve_and_eval(chained_env)
+          end.last
+        end.bind('recur', current_env)
+
         # .
         # perform a native call on an object with optional arguments
         #
@@ -103,12 +220,42 @@ module Crisp
         #  => "ABC"
         Function.new do
           meth = args[0].text_value.to_sym
-          target = args[1].resolve_and_eval(env)
+          target = if args[1].class.name == "Crisp::Nodes::SymbolLiteral" and !env.has_key?(args[1].text_value)
+            Object.const_get(args[1].text_value)
+          else
+            args[1].resolve_and_eval(env)
+          end
           values = args[2..-1].map { |arg| arg.resolve_and_eval(env) }
 
           NativeCallInvoker.new(target, meth, values).invoke!
         end.bind('.', current_env)
 
+        # load
+        # include content of another crisp source file
+        #
+        #  (load "business_logic")
+        #  => true
+        Function.new do
+          args_evaled.collect(&:to_s).each do |filename|
+            pwd = `pwd`.strip
+            file = if filename[0..1] == '/'
+              File.join(pwd, filename)
+            else
+              filename
+            end.sub(".crisp$", '') + '.crisp'
+
+            if !File.exists?(file)
+              raise Crisp::ArgumentError, "file #{file} not found"
+            end
+
+            filecontent = File.read(file)
+            ast = Crisp::Parser.new.parse(filecontent)
+            Crisp::Runtime.new(env).run(ast)
+          end
+
+          true
+        end.bind('load', current_env)
+
       end
     end
   end

data/lib/crisp/nodes/block.rb

@@ -4,13 +4,9 @@ module Crisp
     class Block < Base
       # eval each element of the block and return the last result
       def eval(env)
-        last_result = nil
-
-        elements.each do |op|
-          last_result = op.resolve_and_eval(env)
-        end
-
-        last_result
+        elements.map do |op|
+          op.resolve_and_eval(env)
+        end.last
       end
 
       # a block resolves to itself

data/lib/crisp/nodes/operation.rb

@@ -5,9 +5,9 @@ module Crisp
       # get the function binded to the given function name and eval it (including arguments)
       def eval(env)
         if self.func_identifier.class.name == "Crisp::Nodes::Operation"
-          self.func_identifier.eval(env).eval(env, self.element_list.elements.collect(&:element))
+          self.func_identifier.eval(env).eval(env, raw_element_list)
         else
-          env[self.func_identifier.text_value].eval(env, self.element_list.elements.collect(&:element))
+          env[self.func_identifier.text_value].eval(env, raw_element_list)
         end
       end
 
@@ -15,6 +15,12 @@ module Crisp
       def resolve(env)
         self
       end
+
+      private
+
+      def raw_element_list
+        self.element_list.elements.collect(&:element)
+      end
     end
   end
 end

data/lib/crisp/runtime.rb

@@ -6,9 +6,9 @@ module Crisp
   # Run code by calling run with the output of the parser as argurment.
   class Runtime
     # create a new env and load all functions when creating a new runtime
-    def initialize
-      @env = Env.new
-      Functions.load(@env)
+    def initialize(env = nil)
+      @env = env || Env.new
+      Functions.load(@env) if !env
     end
 
     # run the parsed code (abstract syntax tree)

data/spec/crisp/arithmetics_spec.rb

@@ -82,7 +82,7 @@ describe "arithemtic functions" do
     evaluate("(< 1 2)").should == true
   end
 
-  it "should calc fibonacci numbers" do
+  it "calculates fibonacci numbers" do
     evaluate("
       (def fib (
         fn [n]

data/spec/crisp/basic_spec.rb

@@ -3,17 +3,17 @@ require 'spec_helper'
 describe "the language" do
   include Crisp::SpecHelper
 
-  it "does not bother whitspaces characters in expressions" do
+  it "does not bother whitspace characters in expressions" do
     evaluate(" \r\t\n (\r+\t 1\n2 \t(\n - 9\r\t  \n   2)\r)\r\t   ").should == 10
   end
 
-  it "creates syntax error on invalid expressions" do
+  it "raises a syntax error on invalid expressions" do
     lambda do
       evaluate("(()")
     end.should raise_error(Crisp::SyntaxError, "syntax error at : 0")
   end
 
-  it "bind arrays to symbols" do
+  it "binds arrays to symbols" do
     evaluate("(def bla [1 2 3])").size.should == 3
     evaluate("(def bla [1 2 3])")[1].should == 2
     evaluate("(def foo 5)(def bla [1 2 foo])")[2].should == 5

data/spec/crisp/core_spec.rb

@@ -80,4 +80,140 @@ describe "the core language features" do
   it "resolves symbols in if statements" do
     evaluate("(def foo 2)(if true foo)").should == 2
   end
+
+  it "uses local binding with let" do
+    evaluate("(let [x 1] x)").should == 1
+  end
+
+  it "uses more complex local bindings with let" do
+    evaluate("(let [x 2 y x] (* x y))").should == 4
+  end
+
+  it "evaluates several expressions within local binding" do
+    evaluate("(let [x 2 y 3] (* x y) (+ x y))").should == 5
+  end
+
+  it "binds symbols to global binding within local binding" do
+    evaluate("(let [x 1 y 2] (def foo (+ x y))) foo").should == 3
+  end
+
+  it "overrides global binding within local binding" do
+    evaluate("(def x 1)(let [x 2] x)").should == 2
+  end
+
+  it "ensures that local binding is only valid within let" do
+    evaluate("(def x 1)(let [x 2] x) x").should == 1
+  end
+
+  it "can handle emtpy local binding" do
+    evaluate("(let [] 2)").should == 2
+  end
+
+  it "raises an error when calling let without correct argument" do
+    lambda do
+      evaluate("(let 2 2)")
+    end.should raise_error(Crisp::ArgumentError, "no argument list defined")
+  end
+
+  it "raises an error when calling let with odd binding list" do
+    lambda do
+      evaluate("(let [x 1 y] 2)")
+    end.should raise_error(Crisp::ArgumentError, "argument list has to contain even list of arguments")
+  end
+
+  it "raises an error if file to be load not there" do
+    lambda do
+      evaluate('(load "not_there")')
+    end.should raise_error(Crisp::ArgumentError, /file (.*) not found/)
+
+    lambda do
+      evaluate('(load "/not_there")')
+    end.should raise_error(Crisp::ArgumentError, "file /not_there.crisp not found")
+  end
+
+  it "loads other crisp files" do
+    File.open("/tmp/crisp_test_file.crisp", 'w') do |f|
+      f << "(def foo 123)"
+    end
+
+    evaluate('(load "/tmp/crisp_test_file")(+ 1 foo)').should == 124
+  end
+
+  it "uses the current environment when loading other crisp source files" do
+    File.open("/tmp/crisp_test_file.crisp", 'w') do |f|
+      f << "(def bla 123)"
+    end
+
+    lambda do
+      evaluate('(def bla 321)(load "/tmp/crisp_test_file")')
+    end.should raise_error(Crisp::EnvironmentError, "bla already binded")
+  end
+
+  it "raises an error if calling cond with wrong number of arguments" do
+    lambda do
+      evaluate("(cond false 1 true)")
+    end.should raise_error(Crisp::ArgumentError, "argument list has to contain even list of arguments")
+  end
+
+  it "has cond statement" do
+    evaluate("(cond)").should == nil
+    evaluate("(cond false 1 false 2)").should == nil
+    evaluate("(cond true 3)").should == 3
+    evaluate("(cond true 3 false 2)").should == 3
+    evaluate("(cond false 3 true 2)").should == 2
+    evaluate("(cond (= 1 1) (+ 1 1))").should == 2
+    evaluate("(cond true 3 true 2 true 1)").should == 3
+  end
+
+  it "does not eval expressions for unmatched condition" do
+    evaluate("(cond false (def foo 1) true 2)(def foo 2) foo").should == 2
+  end
+
+  it "has a default condition in cond" do
+    evaluate("(cond false 1 true 2 else 3)").should == 2
+    evaluate("(cond true 1 true 2 else 3)").should == 1
+    evaluate("(cond false 1 else 2 true 3)").should == 2
+  end
+
+  it "raises an error when calling loop without correct argument" do
+    lambda do
+      evaluate("(loop 2 2)")
+    end.should raise_error(Crisp::ArgumentError, "no argument list defined")
+  end
+
+  it "raises an error when calling loop with odd binding list" do
+    lambda do
+      evaluate("(loop [x 1 y] 2)")
+    end.should raise_error(Crisp::ArgumentError, "argument list has to contain even list of arguments")
+  end
+
+  it "raises an error when calling recur outside a loop" do
+    lambda do
+      evaluate("(recur 1)")
+    end.should raise_error(Crisp::LoopError, "recur called outside loop")
+  end
+
+  it "raises an error when calling recur with wrong number of arguments" do
+    lambda do
+      evaluate("(loop [x 1] (recur 1 2))")
+    end.should raise_error(Crisp::ArgumentError, "wrong number of arguments for 'recur' (2 for 1)")
+  end
+
+  it "calculates factorials using loop recur" do
+    evaluate("
+      (def factorial
+        (fn [n]
+          (loop [cnt n acc 1]
+            (if (= 0 cnt)
+              acc
+              (recur (- cnt 1) (* acc cnt))))))
+      (factorial 5)
+    ").should == 120
+  end
+
+  it "raises an error when nesting loops" do
+    lambda do
+      evaluate("(loop [x 1] (loop [a 1 b 2] (+ a b)))")
+    end.should raise_error(Crisp::LoopError, "nested loops are not allowed")
+  end
 end

data/spec/crisp/function_spec.rb

@@ -15,10 +15,11 @@ describe "the languages functions" do
     end.should raise_error(Crisp::ArgumentError, "no argument list defined")
   end
 
-  it "does not create a function when not providing a proper function body" do
-    lambda do
-      evaluate("(fn [] [])")
-    end.should raise_error(Crisp::ArgumentError, "no function body defined")
+  it "does return primitive values as result" do
+    evaluate("((fn [] 1))").should == 1
+    evaluate('((fn [] "abc"))').should == 'abc'
+    evaluate('((fn [] [1 2 3]))').should == [1, 2, 3]
+    evaluate("((fn [x] x) 2)").should == 2
   end
 
   it "creates functions" do

data/spec/crisp/native_call_invoker_spec.rb

@@ -3,21 +3,27 @@ require 'spec_helper'
 describe "NativeCallInvoker functionality" do
   include Crisp::SpecHelper
 
-  it "should execute String#reverse probably" do
+  it "executes ruby native String#reverse" do
     evaluate('(. reverse "foobar")').should == 'raboof'
   end
 
-  it "should execute Array#first probably" do
+  it "executes ruby native Array#first" do
     evaluate('(. first [1 2 3])').should == 1
   end
 
-  it "should execute Array#first(n) probably" do
+  it "executes ruby native Array#first(n)" do
     evaluate('(. first [1 2 3] 2)').should == [1,2]
   end
 
-  it "should raise a named exception on invalid method" do
+  it "raises a named exception on invalid method" do
     lambda do
       evaluate('(. foo "bar")')
     end.should raise_error(NoMethodError, %q{undefined method `foo' for "bar":String})
   end
+
+  it "executes calls on Ruby classes" do
+    evaluate("(. new String)").should == ''
+    evaluate('(. new String "123")').should == '123'
+    evaluate("(. new Array 5 2)").should == [2, 2, 2, 2, 2]
+  end
 end

data/spec/crisp/string_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "string functionality" do
   include Crisp::SpecHelper
 
-  it "should concat strings" do
+  it "concats strings" do
     evaluate('(+ "foo" "bar")').should == 'foobar'
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crisp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Markus Gerdes
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 +01:00
+date: 2011-01-06 00:00:00 +01:00
 default_executable: crisp
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
         - 2
-        - 3
+        - 4
         - 0
-        version: 2.3.0
+        version: 2.4.0
   type: :development
   version_requirements: *id002
 description: 
@@ -67,7 +67,9 @@ files:
 - autotest/discover.rb
 - bin/crisp
 - crisp.gemspec
+- examples/factorial.crisp
 - examples/fibonacci.crisp
+- examples/run.crisp
 - lib/crisp.rb
 - lib/crisp/chained_env.rb
 - lib/crisp/crisp.treetop