lisp 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 42a5f2b1b6e96db9ab76de11598d650aa99a4f4c
-  data.tar.gz: 258c6c47e9dca2afd7ab5e7e9c265caadfe7fa8a
+SHA256:
+  metadata.gz: 3140fcbe7a7a85548c0efa3d612b29cc3fdd0cb152f90c913c6c3814c8425b36
+  data.tar.gz: 2c48b33ebed20827bd71168ff5c3a54ee064682d3dc1abfaaf3a5679f7f92777
 SHA512:
-  metadata.gz: a80b1fdda67cffb7e3a8ca1369a27b418b1d591efc460422a60dcc2196f24bd7919be6f40e068453d6c949c059f3d37a485cc04e74018f4d11e9b8b99d7e1a9f
-  data.tar.gz: cd35640693b386066596e6dfc26433f088650170e817715a174ddaf018cdec9f421a2373f8a72a332da7b74412e57af8c300d8a94c271711cf278a0d39d226b8
+  metadata.gz: e642ce75f5b2aea99869cf57049c722dedb51afaff16d49d9108ef665bc500564589c848a64bdb9ca3822866a2e7c0ce74cfa59723d675608c9862600d3c2262
+  data.tar.gz: 0511e2a95f6bf7851f29ab4e46ce33f2a927deb9efd9e463ad819b836113b3d3953781adb1301e86d35a3634a7b8e04bd141cbe4839a0ac7bf182da03f524b15

data/.github/workflows/ci.yaml

@@ -0,0 +1,19 @@
+name: Continuous Integration
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: [ '2.3', '2.7' ]
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.gitignore

@@ -2,3 +2,5 @@ Gemfile.lock
 env
 pkg
 coverage
+doc
+.yardoc

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-group :test do
-  gem "simplecov"
-end
+gem "rake", "~> 12.0"
+gem "yard", "~> 0.9"
+gem "simplecov", "~> 0.17"
 
 gemspec

data/README.md

@@ -1,9 +1,9 @@
 lisp
 ====
 
-![Gem][1] ![Build Status][2]
+![Gem Version][3] ![Gem][1] ![Build Status][2]
 
-Lisp Interpreter in the Ruby Programming Language - 70 LOC. Inspired by [Lis.py](http://norvig.com/lispy.html).
+Minimal Lisp interpreter using 75LOC and only standard libraries excluding the REPL. Inspired by [Lis.py](http://norvig.com/lispy.html).
 
 ```clojure
 $ lisp-repl
@@ -20,12 +20,36 @@ ctrl-c to exit
 
 Install
 -------
-![Gem Version][3]
 
 ```
 gem install lisp
 ```
 
+Usage
+-----
+
+```clojure
+require "lisp"
+
+Lisp.eval(<<-eos)
+  (begin
+    (define fact
+      (lambda (n)
+        (if (<= n 1)
+          1
+          (* n (fact (- n 1))))))
+    (fact 10))
+eos # => 3628800
+```
+
+Commandline
+-----------
+
+```
+lisp-repl
+```
+
+
 Features
 --------
 

data/Rakefile

@@ -1,7 +1,29 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+require 'yard'
 
-require 'rake/testtask'
+YARD::Rake::YardocTask.new do |t|
+  t.files = ['lib/**/*.rb', 'README', 'CHANGELOG', 'CODE_OF_CONDUCT']
+  t.options = []
+  t.stats_options = ['--list-undoc']
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
 
-task :default do
-  Dir.glob('./test/*.rb').each { |file| require file}
+namespace :gh do
+  desc "Deploy yard docs to github pages"
+  task :pages => :yard do
+    `git add -f doc`
+    `git commit -am "update: $(date)"`
+    `git subtree split --prefix doc -b gh-pages`
+    `git push -f origin gh-pages:gh-pages`
+    `git branch -D gh-pages`
+    `git reset head~1`
+  end
 end
+
+task :default => :test

data/lib/lisp.rb

@@ -1,76 +1,8 @@
-$:.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.dirname(__FILE__)
 
 require "lisp/version"
+require "lisp/interpreter"
 require "lisp/repl"
 
 module Lisp
-  def self.eval string
-    execute parse tokenize string
-  end
-
-  def self.tokenize string
-    string.gsub("("," ( ").gsub(")"," ) ").split
-  end
-
-  def self.parse tokens, tree = []
-    raise "unexpected: eof" if tokens.size.zero?
-
-    case token = tokens.shift
-    when "("
-      while tokens[0] != ")" do
-        tree.push parse tokens
-      end
-      tokens.shift
-      tree
-    when ")"
-      raise "unexpected: )"
-    else
-      atom token
-    end
-  end
-
-  def self.atom token
-    case token
-    when /\d/
-      token.to_f % 1 > 0 ? token.to_f : token.to_i
-    else
-      token.to_sym
-    end
-  end
-
-  def self.execute expression, scope = global
-    return scope.fetch(expression) { |var| raise "#{var} is undefined" } if expression.is_a? Symbol
-    return expression                                                    unless expression.is_a? Array
-
-    case expression[0]
-    when :define
-      _, var, expression = expression
-      scope[var]         = execute expression, scope
-    when :lambda
-      _, params, expression = expression
-      lambda { |*args| execute expression, scope.merge(Hash[params.zip(args)]) }
-    when :if
-      _, test, consequent, alternative = expression
-      expression                       = if execute test, scope then consequent else alternative end
-      execute expression, scope
-    when :set!
-      _, var, expression                     = expression
-      if scope.has_key?(var) then scope[var] = execute expression, scope else raise "#{var} is undefined" end
-    when :begin
-      _, *expression = expression
-      expression.map { |expression| execute expression, scope }.last
-    else
-      function, *args = expression.map { |expression| execute expression, scope }
-      function.call *args
-    end
-  end
-
-  def self.global
-    @scope ||= begin
-      operators = [:==, :"!=", :"<", :"<=", :">", :">=", :+, :-, :*, :/]
-      operators.inject({}) do |scope, operator|
-        scope.merge operator => lambda { |*args| args.inject &operator }
-      end
-    end
-  end
 end

data/lib/lisp/interpreter.rb

@@ -0,0 +1,74 @@
+module Lisp
+  class << self
+    def eval string
+      execute parse tokenize string
+    end
+
+    def tokenize string
+      string.gsub("(", " ( ").gsub(")", " ) ").split
+    end
+
+    def parse tokens, tree = []
+      raise "unexpected: eof" if tokens.size.zero?
+
+      case token = tokens.shift
+      when "("
+        while tokens[0] != ")" do
+          tree.push parse tokens
+        end
+        tokens.shift
+        tree
+      when ")"
+        raise "unexpected: )"
+      else
+        atom token
+      end
+    end
+
+    def execute expression, scope = global
+      return scope.fetch(expression) { |var| raise "#{var} is undefined" } if expression.is_a? Symbol
+      return expression unless expression.is_a? Array
+
+      case expression[0]
+      when :define
+        _, var, expression = expression
+        scope[var] = execute expression, scope
+      when :lambda
+        _, params, expression = expression
+        lambda { |*args| execute expression, scope.merge(Hash[params.zip(args)]) }
+      when :if
+        _, test, consequent, alternative = expression
+        expression = if execute test, scope then consequent else alternative end
+        execute expression, scope
+      when :set!
+        _, var, expression = expression
+        if scope.has_key?(var) then scope[var] = execute expression, scope else raise "#{var} is undefined" end
+      when :begin
+        _, *expression = expression
+        expression.map { |expression| execute expression, scope }.last
+      else
+        function, *args = expression.map { |expression| execute expression, scope }
+        function.call *args
+      end
+    end
+
+    private
+
+    def atom token
+      case token
+      when /^[\p{N}\.]+$/
+        token.to_f % 1 > 0 ? token.to_f : token.to_i
+      else
+        token.to_sym
+      end
+    end
+
+    def global
+      operators = [:==, :"!=", :"<", :"<=", :">", :">=", :+, :-, :*, :/]
+
+      operators.inject({}) do |scope, operator|
+        scope.merge operator => lambda { |*args| args.inject &operator }
+      end
+    end
+  end
+end

data/lib/lisp/repl.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require "coolline"
 require "coderay"
 

data/lib/lisp/version.rb

@@ -1,3 +1,3 @@
 module Lisp
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.5.1'.freeze
 end

data/lisp.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'lisp/version'

data/test/{test_lisp.rb → lisp_test.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require "bundler/setup"
 
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support', '*.rb'))].each { |file| require file }
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '*.rb'))].each { |file| require file }
 
 require "lisp"
 require "minitest/autorun"
@@ -29,7 +29,8 @@ class TestLisp < MiniTest::Unit::TestCase
   end
 
   def test_ast_call
-    assert_equal [:lambda, [:r], [:*, 3.141592653, [:*, :r, :r]]], Lisp.parse(Lisp.tokenize("(lambda (r) (* 3.141592653 (* r r)))"))
+    assert_equal [:lambda, [:r], [:*, 3.141592653, [:*, :r, :r]]],
+                 Lisp.parse(Lisp.tokenize("(lambda (r) (* 3.141592653 (* r r)))"))
   end
 
   # execution
@@ -126,6 +127,8 @@ class TestLisp < MiniTest::Unit::TestCase
   end
 
   def test_repl
+    skip if ENV['CI']
+
     pid     = Process.pid
     subject = Lisp::REPL.new
     thread  = Thread.new do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lisp
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - James Moriarty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coolline
@@ -88,19 +88,20 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yaml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/lisp-repl
 - lib/lisp.rb
+- lib/lisp/interpreter.rb
 - lib/lisp/repl.rb
 - lib/lisp/version.rb
 - lisp.gemspec
+- test/lisp_test.rb
 - test/support/simplecov.rb
-- test/test_lisp.rb
 homepage: ''
 licenses:
 - MIT
@@ -120,11 +121,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Lisp Interpreter in Ruby.
 test_files:
+- test/lisp_test.rb
 - test/support/simplecov.rb
-- test/test_lisp.rb

data/.travis.yml

@@ -1,19 +0,0 @@
-sudo: false
-
-language: ruby
-
-rvm:
-  - 2.3.8
-
-env:
-  global:
-    - CC_TEST_REPORTER_ID=0a4c13b71635c00cee43aba776853ade9404cc745c42977e25a5877a3e148527
-
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-  - gem install bundler -v 2.0.2
-
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT