rubylisp 0.2.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b0a096ef5fa46d08615d4c222367a34836a0b7
-  data.tar.gz: 70c1c21b7dbdc44f90a363c1449e0884277a1629
+  metadata.gz: bb5f9ceceb5366ea22a1684c23f1f891baff4ee9
+  data.tar.gz: 4dcf3352fe2c53178012846dd428a55e25e6ff5e
 SHA512:
-  metadata.gz: d3dc36bfb715c2107428acc3c04e79d13880969c82b4b5a8681f4b7be5a3025a811a0eee146c431536cd4d0527f975476d9508d5a24ce367bcf0f6048f11cbc9
-  data.tar.gz: 0305826d42b7b62acc6828a776a6145c28a805cf0d80a325d79088b12d5caca69f8a7da8ebea341e83094b0e304e737223ebb0646b64dc01fd4058dde2e68343
+  metadata.gz: 8b6a30a4b7811e1c08bd49710de04c17ac2cce55a0bd9cd375e5f71c58c386c7c0a70c1335c79cb40d55fc558e06812568b48990b178f39fb0b0264451f5db30
+  data.tar.gz: 8cd9f89766f14601094794fa31404629e5780ce5072ad95abfd346b4733152c7962fa68c17234e475247458e7d65a93985ab7a6fe4bd61ff769c1df60c9293c2

data/README.md

@@ -43,13 +43,75 @@ Or install it yourself as:
 4. Push to the branch (git push origin my-new-feature)
 5. Create new Pull Request
 
-## REPL
+## The rubylisp command ##
+
+Installing the rubylisp gem installs the `rubylisp` command
+
+    >:rubylisp help
+      NAME:
+    
+        rubylisp
+    
+      DESCRIPTION:
+    
+        A large sub/super-set of MIT/GNU-Scheme implemented in pure Ruby.
+    
+      COMMANDS:
+            
+        help Display global or [command] help documentation         
+        repl Rubylisp REPL          
+        test Runs tests     
+    
+      GLOBAL OPTIONS:
+            
+        -h, --help 
+            Display help documentation
+            
+        -v, --version 
+            Display version information
+            
+        -t, --trace 
+            Display backtrace when an error occurs
+            
+    >:
+
+        
+### REPL ###
 
 RubyLisp includes a very basic REPL that, as expected, lets you type
 in snippets (it does not support multiline snippets) of Lisp code,
 evaluates them, and prints the result.
 
-    >: rubylisp
+    >:rubylisp help repl
+
+    NAME:
+    
+        repl
+    
+      SYNOPSIS:
+    
+        rubylisp repl [options]
+    
+      DESCRIPTION:
+    
+        Rubylisp REPL
+    
+      EXAMPLES:
+            
+        # Simply run the REPL
+        rubylisp repl
+            
+        # Run the REPL, loading a file first
+        rubylisp repl --file code.lsp
+            
+      OPTIONS:
+            
+        -f, --file LISPFILE 
+            The name of the lisp file to load
+            
+
+
+    >: rubylisp repl
 
     RubyLisp REPL
     > 4
@@ -61,6 +123,71 @@ evaluates them, and prints the result.
     > (fib 4)
     24
 
+The repl uses readline for editing and history. History is saved in ~/.rubylisp_history. Evaling `(quit)` will exit the repl.
+
+### Test runner ###
+
+The `rubylisp` command also contains a test runner.
+
+    >:ruby -Ilib bin/rubylisp help test
+    
+      NAME:
+    
+        test
+    
+      SYNOPSIS:
+    
+        rubylisp test [options]
+    
+      DESCRIPTION:
+    
+        Runs tests
+    
+      EXAMPLES:
+            
+        # Run the tests in tests/list_tests.lsp with verbose output
+        rubylisp test -v -f tests/list_tests.lsp
+            
+        # Quietly run all tests in the directory tests
+        rubylisp test -q -d tests
+            
+      OPTIONS:
+            
+        -f, --file TESTFILE 
+            The name of the test file to run
+            
+        -d, --dir TESTDIR 
+            The name of a directory of test files, all of which will be run
+            
+        --verbose 
+            Verbose test output: all context & it labels, and each assertion and it's result.
+            
+        --terse 
+            terse test output (the default): + for passes, - for failures, and ! for errors
+            
+        --quiet 
+            Only output a summary
+
+    >:rubylisp test -d lisptest --terse
+    
+    
+    Running lisp tests
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ++++++++++++++++++++++++++++
+    Ran 928 lisp tests in 7.0789 seconds
+    928 passes, 0 failures, 0 errors
+
 ## Integrating
 
 

data/bin/rubylisp

@@ -1,24 +1,99 @@
 #!/usr/bin/env ruby
 
 require 'rubylisp'
+require 'rubygems'
+require 'commander/import'
 require 'readline'
+require 'readline/history/restore'
 
 Lisp::Initializer.register_builtins
 Lisp::Debug.interactive = true
 
-puts 'RubyLisp REPL'
-puts 'Copyright 2014 David R. Astels'
-puts
-parser = Lisp::Parser.new
-
-while line = Readline.readline('> ', true)
-  begin 
-    puts parser.parse_and_eval(line)
-  rescue Exception => ex
-    exit if ex.to_s == "exit"
-    puts "ERROR: #{ex}"
-    puts ex.backtrace
+program :version, '0.0.1'
+program :description, 'A large sub/super-set of MIT/GNU-Scheme implemented in pure Ruby.'
+
+# Smarter Readline to prevent empty and dups
+#   1. Read a line and append to history
+#   2. Quick Break on nil
+#   3. Remove from history if empty or dup
+
+def readline_with_hist_management
+  line = Readline.readline('> ', true)
+  return nil if line.nil?
+  if line =~ /^\s*$/ or Readline::HISTORY.to_a[-2] == line
+    Readline::HISTORY.pop
+  end
+  line
+end
+
+command :repl do |c|
+  c.syntax = 'rubylisp repl [options]'
+  c.summary = 'Rubylisp REPL'
+  c.description = c.summary
+  c.example 'Simply run the REPL', 'rubylisp repl'
+  c.example 'Run the REPL, loading a file first', 'rubylisp repl --file code.lsp'
+  c.option '-f', '--file LISPFILE', String, 'The name of the lisp file to load'
+  c.action do |args, options|
+    history_path = File.join(Dir.home, '.rubylisp_history')
+    unless File.exist?(history_path)
+      File.open(history_path, "w") {|f| }
+    end
+    Readline::History::Restore.new(history_path)
+
+    options.default :file => ""
+    puts 'RubyLisp REPL'
+    puts 'Copyright 2014-2015 David R. Astels'
+    puts
+    parser = Lisp::Parser.new
+    parser.process_file(options.file) if options.file != ""
+    while line = readline_with_hist_management
+      begin 
+        puts parser.parse_and_eval(line).print_string
+      rescue Exception => ex
+        exit if ex.to_s == "exit"
+        puts "ERROR: #{ex}"
+        # puts ex.backtrace
+      end
+    end
   end
 end
 
+command :test do |c|
+  c.syntax = 'rubylisp test [options]'
+  c.summary = 'Runs tests'
+  c.description = c.summary
+  c.example 'Run the tests in tests/list_tests.lsp with verbose output', 'rubylisp test -v -f tests/list_tests.lsp'
+  c.example 'Quietly run all tests in the directory tests', 'rubylisp test -q -d tests'
+  c.option '-f', '--file TESTFILE', String, 'The name of the test file to run'
+  c.option '-d', '--dir TESTDIR', String, 'The name of a directory of test files, all of which will be run'
+  c.option '--verbose', "Verbose test output: all context & it labels, and each assertion and it's result."
+  c.option '--terse', 'terse test output (the default): + for passes, - for failures, and ! for errors'
+  c.option '--quiet', 'Only output a summary'
+  c.action do |args, options|
+    options.default :file => "",
+                    :dir => "",
+                    :verbose => false,
+                    :quiet => false
+    rubylisp_home = ENV['RUBYLISP_HOME'] || "."
+    cmd, arg = if options.file != ""
+                          ["run-test", File.join(rubylisp_home, options.file)]
+                        elsif options.dir != ""
+                          ["run-all-tests", File.join(rubylisp_home, options.dir)]
+                        else
+                          puts "Either a file or directory must be specified"
+                          exit
+                        end
+    verbosity = if options.verbose
+                  "'verbose"
+                elsif options.quiet
+                  "'quiet"
+                else
+                  ""
+                end
+    test_command = "(#{cmd} \"#{arg}\" #{verbosity})"
+    parser = Lisp::Parser.new
+    parser.process_file("#{rubylisp_home}/lisp/testing.lsp") 
+    parser.parse_and_eval(test_command).value
+  end
+end
 

data/lib/rubylisp/atom.rb

@@ -68,15 +68,23 @@ module Lisp
       false
     end
 
-    def alist?
+    def frame?
       false
     end
 
-    def frame?
+    def vector?
       false
     end
 
-    def vector?
+    def port?
+      false
+    end
+
+    def eof_object?
+      false
+    end
+
+    def environment?
       false
     end
 
@@ -88,10 +96,16 @@ module Lisp
       self.class.new(self.value)
     end
     
+    def eqv?(sexpr)
+      self == sexpr
+    end
+
     def eq?(sexpr)
-      return false if sexpr.nil?
-      return false if self.type != sexpr.type
-      self.value == sexpr.value
+      eqv?(sexpr)
+    end
+    
+    def equal?(sexpr)
+      eq?(sexpr)
     end
     
     def type
@@ -133,6 +147,11 @@ module Lisp
     def set!(v)
     end
 
+    def to_s
+      @value.to_s
+    end
+
+    
     def print_string
       self.to_s
     end

data/lib/rubylisp/boolean.rb

@@ -2,11 +2,11 @@ module Lisp
 
   class Boolean < Atom
     def self.TRUE
-      @true_constant ||= Boolean.new(true)
+      @true_constant ||= Lisp::Boolean.new(true)
     end
 
     def self.FALSE
-      @false_constant ||= Boolean.new(false)
+      @false_constant ||= Lisp::Boolean.new(false)
     end
 
     def self.with_value(b)
@@ -26,8 +26,11 @@ module Lisp
     end
 
     def to_s
-      return "#t" if @value
-      "#f"
+      if @value
+        "#t"
+      else
+        "#f"
+      end
     end
 
     def true?
@@ -44,6 +47,6 @@ module Lisp
     
   end
 
-  TRUE = Boolean.TRUE
-  FALSE = Boolean.FALSE
+  TRUE = Lisp::Boolean.TRUE
+  FALSE = Lisp::Boolean.FALSE
 end

data/lib/rubylisp/builtins.rb

@@ -7,26 +7,27 @@ module Lisp
     end
 
     def self.register_builtins
-      Lisp::Equivalence.register
-      Lisp::Math.register
-      Lisp::Logical.register
-      Lisp::SpecialForms.register
-      Lisp::ListSupport.register
-      Lisp::Relational.register
-      Lisp::TypeChecks.register
-      Lisp::Assignment.register
-      Lisp::Testing.register
-      Lisp::IO.register
-      Lisp::AList.register
-      Lisp::Frame.register
-      Lisp::Character.register
-      Lisp::String.register
-      Lisp::NativeObject.register
-      Lisp::ClassObject.register
-      Lisp::System.register
-      Lisp::Vector.register
+      Lisp::PrimEquivalence.register
+      Lisp::PrimMath.register
+      Lisp::PrimLogical.register
+      Lisp::PrimSpecialForms.register
+      Lisp::PrimListSupport.register
+      Lisp::PrimRelational.register
+      Lisp::PrimTypeChecks.register
+      Lisp::PrimAssignment.register
+      Lisp::PrimIo.register
+      Lisp::PrimAlist.register
+      Lisp::PrimFrame.register
+      Lisp::PrimCharacter.register
+      Lisp::PrimString.register
+      Lisp::PrimNativeObject.register
+      Lisp::PrimClassObject.register
+      Lisp::PrimSystem.register
+      Lisp::PrimVector.register
       Lisp::Debug.register
+      Lisp::PrimEnvironment.register
     end
+
   end
 
 end