rubymotionlisp 0.2.2 → 1.0.0

data/lib/rubylisp/symbol.rb

@@ -32,7 +32,6 @@ module Lisp
     def naked?
       @naked
     end
-    
 
     def type
       :symbol

data/lib/rubylisp/tokenizer.rb

@@ -4,27 +4,60 @@ module Lisp
 
     attr_reader :line_number
 
+    def self.from_string(str)
+      self.new(StringIO.new(str, "r"))
+    end
+
+    def self.from_file(f)
+      self.new(f)
+    end
+    
     def initialize(src)
-      @lookahead_token = 0
-      @lookahead_literal = ''
       @source = src
-      @position = 0
+      @lookahead_token = nil
+      @lookahead_literal = ''
+      @eof = false
+      @almost_eof = false
+      @curent_ch = nil
+      @next_ch = nil
+      @next_next_ch = nil
+      init
     end
 
+    def advance
+      if @source.eof?
+        @eof = true
+        @almost_eof = true
+        @current_ch = nil
+        @next_ch = nil
+      else
+        @current_ch = @source.readchar
+        if @source.eof?
+          @almost_eof = true
+          @next_ch = nil
+        else
+          @next_ch = @source.readchar
+          if @source.eof?
+            @next_next_ch = nil
+          else
+            @next_next_ch = @source.readchar
+            @source.ungetc(@next_next_ch)
+          end
+          @source.ungetc(@next_ch)
+        end
+      end
+    end
+    
     def next_token
       return @lookahead_token, @lookahead_literal
     end
 
     def eof?
-      @position >= @source.length
+      @eof
     end
 
     def almost_eof?
-      @position == @source.length - 1
-    end
-
-    def next_char
-      almost_eof? ? nil : @source[@position + 1]
+      @almost_eof
     end
 
     def letter?(ch)
@@ -40,7 +73,7 @@ module Lisp
     end
 
     def number?(ch)
-      digit?(ch) || (ch == '-' && digit?(next_char))
+      digit?(ch) || (ch == '-' && digit?(@next_ch))
     end
 
 
@@ -49,50 +82,55 @@ module Lisp
     end
 
 
+    def graph?(ch)
+      ch =~ /[[:graph:]]/
+    end
+
+
     def symbol_character?(ch)
-      return true if letter?(ch)
-      return true if (?0..?9).include?(ch)
-      return "-_?!:*=<>".include?(ch)
+      graph?(ch) && !("();\"'`|[]{}#,.".include?(ch))
     end
 
     def read_symbol
-      start = @position
+      lit = ""
       tok = nil
-      if @source[@position] == '.'
-        @position += 1
+      if @current_ch == '.'
+        lit << @current_ch
+        advance
         tok = :FFI_SEND_SYMBOL
       end
 
-      while !eof? && (symbol_character?(@source[@position]) ||
-                      (@source[@position] == '.' && !symbol_character?(@source[@position+1]) && tok.nil?) ||
-                      (@source[@position] == '/' && symbol_character?(@source[@position+1])))
-        tok ||= :FFI_NEW_SYMBOL if @source[@position] == '.'
-        tok = :FFI_STATIC_SYMBOL if @source[@position] == '/'
-        @position += 1
+      while !eof? && ((@current_ch == '.' && !symbol_character?(@next_ch) && tok.nil?) ||
+                      (@current_ch == '/' && symbol_character?(@next_ch)) ||
+                      (symbol_character?(@current_ch)))
+        tok ||= :FFI_NEW_SYMBOL if @current_ch == '.' && !lit.empty?
+        tok = :FFI_STATIC_SYMBOL if @current_ch == '/' && !lit.empty?
+        lit << @current_ch
+        advance
       end
 
       tok ||= :SYMBOL
       return tok, case tok
                   when :SYMBOL, :FFI_STATIC_SYMBOL
-                    @source[start...@position]
+                    lit
                   when :FFI_SEND_SYMBOL
-                    @source[start+1...@position]
+                    lit[1..-1]
                   when :FFI_NEW_SYMBOL
-                    @source[start...@position-1]
+                    lit[0..-2]
                   end
     end
 
-    def read_number
-      start = @position
-      @position += 1 if @source[@position] == '-'
-      hex = @source[@position, 2] == "#x"
+    def read_number(hex)
+      lit = ""
+      if @current_ch == '-'
+        lit << @current_ch
+        advance
+      end
       is_float = false
-      @position += 2 if hex
-      ch = @source[@position]
-      while !eof? && (digit?(ch) || (hex && hex?(ch)) || (!hex && !is_float && ch == ?.))
-        is_float ||= (ch == ?.)
-        @position += 1
-        ch = @source[@position]
+      while !eof? && (digit?(@current_ch) || (hex && hex?(@current_ch)) || (!hex && !is_float && @current_ch == '.'))
+        is_float ||= !hex && (@current_ch == '.')
+        lit << @current_ch
+        advance
       end
 
       tok = if hex
@@ -103,7 +141,7 @@ module Lisp
               :NUMBER
             end
 
-      return tok, @source[start...@position]
+      return tok, lit
     end
 
 
@@ -111,15 +149,15 @@ module Lisp
       i = 0
       processed_str = ""
       while i < str.length
-        if str[i] == ?\\
+        if str[i] == '\\'
           processed_str << if i < (str.length - 1)
                              i += 1
                              case (str[i])
-                             when ?n
+                             when 'n'
                                "\n"
-                             when ?t
+                             when 't'
                                "\t"
-                             when ?\\
+                             when '\\'
                                "\\"
                              else
                                "\\#{str[i]}"
@@ -137,15 +175,15 @@ module Lisp
 
 
     def read_string
-      start = @position
-      @position += 1
-      while !eof? && @source[@position] != ?"
-        @position += 1
+      lit = ""
+      while !eof? && @current_ch != '"'
+        lit << @current_ch
+        advance
       end
 
       return :EOF, '' if eof?
-      @position += 1
-      return :STRING, process_escapes(@source[start...@position])
+      advance
+      return :STRING, process_escapes(lit)
     end
 
 
@@ -155,122 +193,107 @@ module Lisp
 
 
     def read_character
-      @position += 2
-      start = @position
-      @position += 1
-      while !eof? && !divider?(@source[@position])
-        @position += 1
+      lit = ""
+      lit << @current_ch
+      advance
+      while !eof? && !divider?(@current_ch)
+        lit << @current_ch
+        advance
       end
 
-      return :CHARACTER, @source[start...@position]
+      return :CHARACTER, lit
     end
 
 
     def read_next_token
       return :EOF, '' if eof?
 
-      while space?(@source[@position])
-        @line_number += 1 if @source[@position] == ?\n
-        @position += 1
+      while space?(@current_ch)
+        @line_number += 1 if @current_ch == "\n"
+        advance
         return :EOF, '' if eof?
       end
 
-      current_ch = @source[@position]
-      next_ch = @source[@position + 1] unless almost_eof?
-
-      if letter?(current_ch) || ('*._'.include?(current_ch) && letter?(next_ch))
-        return read_symbol
-      elsif number?(current_ch)
-        return read_number
-      elsif current_ch == ?- && number?(next_ch)
-        return read_number
-      elsif current_ch == ?# && next_ch == ?x
-        return read_number
-      elsif current_ch == ?"
+      if number?(@current_ch)
+        return read_number(false)
+      elsif @current_ch == '-' && number?(@next_ch)
+        return read_number(false)
+      elsif @current_ch == '#' && @next_ch == 'x'
+        advance
+        advance
+        return read_number(true)
+      elsif @current_ch == '"'
+        advance
         return read_string
-      elsif current_ch == ?# && next_ch == ?\\
+      elsif @current_ch == '#' && @next_ch == '\\'
+        advance
+        advance
         return read_character
-      elsif current_ch == ?'
-        @position += 1
+      elsif @current_ch == '\'' && @next_ch == '{'
+        advance
+        advance
+        return :QUOTE_LBRACE, "'{"
+      elsif @current_ch == '\'' && @next_ch == '#' && @next_next_ch == '('
+        advance
+        advance
+        advance
+        return :QUOTE_HASH_LPAREN, "'#("
+      elsif @current_ch == '\''
+        advance
         return :QUOTE, "'"
-      elsif current_ch == ?`
-        @position += 1
+      elsif @current_ch == '`'
+        advance
         return :BACKQUOTE, "`"
-      elsif current_ch == ?, && next_ch == ?@
-        @position += 2
+      elsif @current_ch == ',' && @next_ch == '@'
+        advance
+        advance
         return :COMMAAT, ",@"
-      elsif current_ch == ?,
-        @position += 1
+      elsif @current_ch == ','
+        advance
         return :COMMA, ","
-      elsif current_ch == ?(
-        @position += 1
+      elsif @current_ch == '('
+        advance
         return :LPAREN, "("
-      elsif current_ch == ?)
-        @position += 1
+      elsif @current_ch == '#' && @next_ch == '('
+        advance
+        advance
+        return :HASH_LPAREN, "#("
+      elsif @current_ch == ')'
+        advance
         return :RPAREN, ")"
-      elsif current_ch == ?{
-        @position += 1
+      elsif @current_ch == '{'
+        advance
         return :LBRACE, "{"
-      elsif current_ch == ?}
-        @position += 1
+      elsif @current_ch == '}'
+        advance
         return :RBRACE, "}"
-      elsif current_ch == ?[
-        @position += 1
+      elsif @current_ch == '['
+        advance
         return :LBRACKET, "["
-      elsif current_ch == ?]
-        @position += 1
+      elsif @current_ch == ']'
+        advance
         return :RBRACKET, "]"
-      elsif current_ch == ?.
-        @position += 1
+      elsif @current_ch == '.' && space?(@next_ch)
+        advance
         return :PERIOD, "."
-      elsif current_ch == ?/ && next_ch == ?=
-        @position += 2
-        return :SYMBOL, "!="
-      elsif current_ch == ?- && next_ch == ?>
-        @position += 2
-        return :SYMBOL, "->"
-      elsif current_ch == ?= && next_ch == ?>
-        @position += 2
-        return :SYMBOL, "=>"
-      elsif "+-*/%".include?(current_ch)
-        @position += 1
-        return :SYMBOL, current_ch.to_s
-      elsif current_ch == ?< && next_ch == ?=
-        @position += 2
-        return :SYMBOL, "<="
-      elsif current_ch == ?<
-        @position += 1
-        return :SYMBOL, "<"
-      elsif current_ch == ?> && next_ch == ?=
-        @position += 2
-        return :SYMBOL, ">="
-      elsif current_ch == ?>
-        @position += 1
-        return :SYMBOL, ">"
-      elsif current_ch == ?= && next_ch == ?=
-        @position += 2
-        return :SYMBOL, "="
-      elsif current_ch == ?=
-        @position += 1
-        return :SYMBOL, "="
-      elsif current_ch == ?! && next_ch == ?=
-        @position += 2
-        return :SYMBOL, "!="
-      elsif current_ch == ?!
-        @position += 1
-        return :SYMBOL, "!"
-      elsif current_ch == ?# && next_ch == ?t
-        @position += 2
+      elsif @current_ch == '.' && symbol_character?(@next_ch)
+        return read_symbol
+        elsif symbol_character?(@current_ch)
+          return read_symbol
+        elsif @current_ch == '#' && @next_ch == 't'
+        advance
+        advance
         return :TRUE, "#t"
-      elsif current_ch == ?# && next_ch == ?f
-        @position += 2
+      elsif @current_ch == '#' && @next_ch == 'f'
+        advance
+        advance
         return :FALSE, "#f"
-      elsif current_ch == ?;
-        start = @position
+      elsif @current_ch == ';'
+        lit = ""
         while true
-          return :COMMENT, @source[start..-1] if eof?
-          return :COMMENT, @source[start...@position] if @source[@position] == ?\n
-          @position += 1
+          return :COMMENT, lit if eof? || @current_ch == "\n"
+          lit << @current_ch
+          advance
         end
       else
         return :ILLEGAL, ''
@@ -278,12 +301,13 @@ module Lisp
     end
 
     def consume_token
-      @lookahead_token, @lookahead_literal = read_next_token
+      @lookahead_token, @lookahead_literal = self.read_next_token
       consume_token if @lookahead_token == :COMMENT
     end
 
     def init
       @line_number = 0
+      advance
       consume_token
     end
 

data/lib/rubylisp/vector.rb

@@ -2,31 +2,6 @@ module Lisp
 
   class Vector < Atom
 
-    def self.register
-      Primitive.register("make-vector")   {|args, env| Lisp::Vector::make_vector_impl(args, env) }
-      Primitive.register("vector")   {|args, env| Lisp::Vector::vector_impl(args, env) }
-    end
-
-    def self.make_vector_impl(args, env)
-      c = args
-      a = []
-      while !c.nil?
-        a << c.car.evaluate(env)
-        c = c.cdr
-      end
-
-      Lisp::Vector.new(a)
-    end
-  
-
-    def self.vector_impl(args, env)
-      return Lisp::Debug.process_error("vector requires a single list argument.", env) unless args.length == 1
-      
-      c = args.car.evaluate(env)
-      Lisp::Vector.new(c.to_a)
-    end
-  
-
     def self.with_array(a)
       self.new(a)
     end
@@ -38,6 +13,10 @@ module Lisp
     end
 
 
+    def update!(a)
+      @value = a
+    end
+
     def type
       :vector
     end
@@ -70,24 +49,24 @@ module Lisp
     
 
     def to_s
-      "[#{@value.join(' ')}]"
+      "#(#{@value.join(' ')})"
     end
 
 
     def at(n)
-      @value[n - 1]
+      @value[n]
     end
     alias_method :nth, :at
 
 
     def nth_tail(n)
       return Lisp::Vector.new if n > @value.size
-      Lisp::Vector.new(@value[(n - 1)..-1])
+      Lisp::Vector.new(@value[n..-1])
     end
     
     
     def at_put(n, d)
-      @value[n - 1] = d
+      @value[n] = d
     end
 
 
@@ -96,11 +75,11 @@ module Lisp
     end
 
 
-    def eq?(other)
+    def equal?(other)
       return false unless other.vector?
       return false unless @value.size == other.value.size
       (0..@value.size).each do |i|
-        return false unless Lisp::Equivalence.equal_check(other.value[i], value[i]).value
+        return false unless other.value[i].equal?(value[i])
       end
       true
     end

data/lib/rubymotion/debug.rb

@@ -0,0 +1,40 @@
+# Copyright 2014 David R. Astels.  All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+  
+module Lisp
+
+  class Debug
+
+    class <<self
+      attr_accessor :trace, :on_error, :on_entry, :single_step, :interactive, :target_env, :eval_in_debug_repl
+    end
+      
+
+    def self.register
+      self.trace = false
+      self.on_error = false
+      self.on_entry = []
+      self.single_step = false
+      self.interactive = false
+      self.target_env = nil
+      self.eval_in_debug_repl = false
+    end
+
+
+    def self.process_error(error_message, env)
+      raise error_message
+    end
+
+
+    def self.log_eval(sexpr, env)
+    end
+
+
+    def self.log_result(result, env)
+    end
+    
+  
+  end
+end

data/lib/rubymotion/require-fix.rb

@@ -0,0 +1 @@
+def require(*args); end

data/lib/rubymotionlisp.rb

@@ -2,11 +2,15 @@ unless defined?(Motion::Project::Config)
   raise "This file must be required within a RubyMotion project Rakefile."
 end
 
+lib_dir_path = File.dirname(File.expand_path(__FILE__))
 Motion::Project::App.setup do |app|
  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
   Dir.glob(File.join(File.dirname(__FILE__), 'rubylisp/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
+  Dir.glob(File.join(File.dirname(__FILE__), 'rubymotion/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubymotionlisp
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Dave Astels
@@ -17,42 +17,53 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/rubylisp/alist.rb
-- lib/rubylisp/assignment.rb
 - lib/rubylisp/atom.rb
 - lib/rubylisp/binding.rb
 - lib/rubylisp/boolean.rb
+- lib/rubylisp/builtins.rb
 - lib/rubylisp/character.rb
+- lib/rubylisp/class_object.rb
 - lib/rubylisp/cons_cell.rb
+- lib/rubylisp/environment.rb
 - lib/rubylisp/environment_frame.rb
-- lib/rubylisp/equivalence.rb
+- lib/rubylisp/eof_object.rb
 - lib/rubylisp/exception.rb
 - lib/rubylisp/ext.rb
-- lib/rubylisp/ffi_class.rb
 - lib/rubylisp/ffi_new.rb
 - lib/rubylisp/ffi_send.rb
 - lib/rubylisp/ffi_static.rb
 - lib/rubylisp/frame.rb
 - lib/rubylisp/function.rb
-- lib/rubylisp/io.rb
-- lib/rubylisp/list_support.rb
-- lib/rubylisp/logical.rb
 - lib/rubylisp/macro.rb
-- lib/rubylisp/math.rb
-- lib/rubylisp/motion_builtins.rb
+- lib/rubylisp/native_object.rb
 - lib/rubylisp/number.rb
-- lib/rubylisp/object.rb
 - lib/rubylisp/parser.rb
+- lib/rubylisp/port.rb
+- lib/rubylisp/prim_alist.rb
+- lib/rubylisp/prim_assignment.rb
+- lib/rubylisp/prim_character.rb
+- lib/rubylisp/prim_class_object.rb
+- lib/rubylisp/prim_environment.rb
+- lib/rubylisp/prim_equivalence.rb
+- lib/rubylisp/prim_frame.rb
+- lib/rubylisp/prim_io.rb
+- lib/rubylisp/prim_list_support.rb
+- lib/rubylisp/prim_logical.rb
+- lib/rubylisp/prim_math.rb
+- lib/rubylisp/prim_native_object.rb
+- lib/rubylisp/prim_relational.rb
+- lib/rubylisp/prim_special_forms.rb
+- lib/rubylisp/prim_string.rb
+- lib/rubylisp/prim_system.rb
+- lib/rubylisp/prim_type_checks.rb
+- lib/rubylisp/prim_vector.rb
 - lib/rubylisp/primitive.rb
-- lib/rubylisp/relational.rb
-- lib/rubylisp/special_forms.rb
 - lib/rubylisp/string.rb
 - lib/rubylisp/symbol.rb
-- lib/rubylisp/system.rb
-- lib/rubylisp/testing.rb
 - lib/rubylisp/tokenizer.rb
-- lib/rubylisp/type_checks.rb
 - lib/rubylisp/vector.rb
+- lib/rubymotion/debug.rb
+- lib/rubymotion/require-fix.rb
 - lib/rubymotionlisp.rb
 homepage: https://bitbucket.org/dastels/rubylisp
 licenses:
@@ -74,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Lisp in RubyMotion