lasp 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 834e32aec6fd535ecec0d68c7297cb3184ced218
-  data.tar.gz: ccc67e45c0aeb24b368a51a6bcea67d09af86db9
+  metadata.gz: 9fca3af94104dd1dc67d77518aaf7453a42b109d
+  data.tar.gz: a2a3d7157ec4383687b5cefe14de7d0f643058e5
 SHA512:
-  metadata.gz: ca7f8e586069ed34fa69c03c9c3b16a789b25b695e342d7e2124e5c1b6a9c7b5a23d12cfa4fa329b8668bcb24597ff1e4c8626a39888622369db3e20addab53e
-  data.tar.gz: 32229cfbb3e1c039249adcedacd75a8e50b3ad3ef0c71f3b0e522d8d5816a5d48429ddd9fa540157d7923b77a195bd46fe921d8b2d8f8086110896e2d1286675
+  metadata.gz: 81b9f85741d98c4395246d241fcbe471ee9524247bb297a2fc9b1519494ac0db0ab0622fac4e47256191f756432ec64de867be555afbf4dbb1aef27f5a173eab
+  data.tar.gz: 54e9ac7f09dbb55fb2bb807df769c4040026cf0d7d2b8a4004182f439cd66c399eaf237344dbd1c68e90d08989b7889c264547dcdea09fdbf7b365269be66dfb

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Läsp changelog
 
+## v0.5.0
+
+- Merge `lasp-repl` command into `lasp`, it starts when not provided with a filename.
+- Don't send env to functions implemented as Ruby procs, it was never used.
+- Specs as default rake task.
+
 ## v0.4.0
 
 Implicit do-blocks around files. You can now do this...:

data/README.md

@@ -17,11 +17,11 @@ sudo gem install lasp
 
 ## Running
 
-After installing there are two commands available to you:
+After installing you can invoke `lasp` for a REPL or provide a lasp-file to execute.
 
 ```bash
 # An interactive prompt that lets you play with the language
-lasp-repl
+lasp
 
 # Run lasp-files
 lasp path/to/program.lasp
@@ -132,15 +132,12 @@ Implemented in Läsp itself.
 ### Run the specs
 
 ```bash
-rspec
-
-# or more verbose
-rspec --format=documentation
+rake
 ```
 
 ### Dev REPL
 
 ```bash
-# This is basically just a shorthand for `rake install && lasp-repl`
+# This is basically just a shorthand for `rake install && lasp`
 rake repl
 ```

data/Rakefile

@@ -1,6 +1,10 @@
 require "bundler/gem_tasks"
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+
 desc "Install and laund the Läsp REPL"
 task :repl => [:install] do
-  sh "lasp-repl"
+  sh "lasp"
 end

data/bin/lasp

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
 require "lasp"
+require "lasp/repl"
 Lasp::load_stdlib!
 
-unless ARGV.first
-  puts "You have to supply a path"
-  exit!
+if ARGV.first
+  Lasp::execute_file(ARGV.first)
+else
+  Lasp::repl
 end
-
-Lasp::execute_file(ARGV.first)

data/lib/lasp/corelib.rb

@@ -1,22 +1,22 @@
 module Lasp
   CORELIB = {
-    :+          => -> (_, *args)         { args.reduce(:+)                 },
-    :-          => -> (_, *args)         { args.reduce(:-)                 },
-    :*          => -> (_, *args)         { args.reduce(:*)                 },
-    :/          => -> (_, *args)         { args.reduce(:/)                 },
-    :<          => -> (_, *args)         { args.sort == args               },
-    :>          => -> (_, *args)         { args.sort.reverse == args       },
-    :"="        => -> (_, *args)         { args.uniq.count == 1            },
-    :list       => -> (_, *args)         { args                            },
-    :head       => -> (_, list)          { list.first                      },
-    :tail       => -> (_, list)          { list.drop(1)                    },
-    :cons       => -> (_, item, list)    { [item] + list                   },
-    :"hash-map" => -> (_, *args)         { Hash[*args]                     },
-    :get        => -> (_, key, a)        { a[key]                          },
-    :assoc      => -> (_, a, key, val)   { a.dup.tap { |a| a[key]=val    } },
-    :dissoc     => -> (_, a, key)        { a.dup.tap { |a| a.delete(key) } },
-    :not        => -> (_, arg)           { !arg                            },
-    :println    => -> (_, output)        { puts output                     },
-    :"."        => -> (_, obj, m, *args) { obj.send(m, *args)              },
+    :+          => -> (*args)         { args.reduce(:+)                 },
+    :-          => -> (*args)         { args.reduce(:-)                 },
+    :*          => -> (*args)         { args.reduce(:*)                 },
+    :/          => -> (*args)         { args.reduce(:/)                 },
+    :<          => -> (*args)         { args.sort == args               },
+    :>          => -> (*args)         { args.sort.reverse == args       },
+    :"="        => -> (*args)         { args.uniq.count == 1            },
+    :list       => -> (*args)         { args                            },
+    :head       => -> (list)          { list.first                      },
+    :tail       => -> (list)          { list.drop(1)                    },
+    :cons       => -> (item, list)    { [item] + list                   },
+    :"hash-map" => -> (*args)         { Hash[*args]                     },
+    :get        => -> (key, a)        { a[key]                          },
+    :assoc      => -> (a, key, val)   { a.dup.tap { |a| a[key]=val    } },
+    :dissoc     => -> (a, key)        { a.dup.tap { |a| a.delete(key) } },
+    :not        => -> (arg)           { !arg                            },
+    :println    => -> (output)        { puts output                     },
+    :"."        => -> (obj, m, *args) { obj.send(m, *args)              },
   }
 end

data/lib/lasp/eval.rb

@@ -20,18 +20,17 @@ module Lasp
       env[key] = eval(value, env)
     elsif head == :fn
       params, func = tail
-      # Use env from context to properly scope closures
-      -> (_, *args) { eval(func, env.merge(Hash[params.zip(args)])) }
+      -> (*args) { eval(func, env.merge(Hash[params.zip(args)])) }
     elsif head == :do
       tail.map { |form| eval(form, env) }.last
     elsif head == :if
       conditional, true_form, false_form = tail
       eval(conditional, env) ? eval(true_form, env) : eval(false_form, env)
     elsif Proc === head
-      head.(env, *tail)
+      head.(*tail)
     else
       fn = eval(head, env)
-      fn.(env, *tail.map { |form| eval(form, env) })
+      fn.(*tail.map { |form| eval(form, env) })
     end
   end
 end

data/lib/lasp/repl.rb

@@ -0,0 +1,21 @@
+require "lasp"
+require "readline"
+
+module Lasp
+  module_function
+
+  def repl
+    trap("SIGINT") { puts "\n\nBye!"; exit }
+
+    puts "((( Läsp v#{Lasp::VERSION} REPL (ctrl+c to exit) )))\n\n"
+    loop do
+      begin
+        input =  Readline.readline("lasp> ", true)
+        result = Lasp::execute(input)
+        puts "   => #{result.inspect}"
+      rescue
+        puts "   *> #{$!}"
+      end
+    end
+  end
+end

data/lib/lasp/version.rb

@@ -1,3 +1,3 @@
 module Lasp
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lasp
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jimmy Börjesson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,7 +43,6 @@ email:
 - lagginglion@gmail.com
 executables:
 - lasp
-- lasp-repl
 extensions: []
 extra_rdoc_files: []
 files:
@@ -55,13 +54,13 @@ files:
 - README.md
 - Rakefile
 - bin/lasp
-- bin/lasp-repl
 - lasp.gemspec
 - lib/lasp.rb
 - lib/lasp/corelib.rb
 - lib/lasp/env.rb
 - lib/lasp/eval.rb
 - lib/lasp/parser.rb
+- lib/lasp/repl.rb
 - lib/lasp/stdlib.lasp
 - lib/lasp/version.rb
 homepage: https://github.com/alcesleo/lasp

data/bin/lasp-repl

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-require "lasp"
-require "readline"
-
-Lasp::load_stdlib!
-
-trap("SIGINT") { puts "\n\nBye!"; exit }
-
-puts "((( Läsp v#{Lasp::VERSION} REPL (ctrl+c to exit) )))\n\n"
-loop do
-  begin
-    input =  Readline.readline("lasp> ", true)
-    result = Lasp::execute(input)
-    puts "   => #{result.inspect}"
-  rescue
-    puts "   *> #{$!}"
-  end
-end