rubymotionlisp 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c9718f339ca93186dafa8165c1770ed3ac54ae
-  data.tar.gz: cbb7459b2700bd3e754e67a376be801cf9d8a554
+  metadata.gz: edf460c69b7a6c37ad3d8e0ba6b7f7ae3fee1d66
+  data.tar.gz: d91504f34b6d53f559724eb0eb0b54bb3b8c1820
 SHA512:
-  metadata.gz: 9d1a6fb500711bb718ecd443a00dd49ae7e1da7262ea36e587c3d1c30e604b8d89ba88a08ed8df6beb03b240f163153409f5ee781adad39a7753f4818fbe5a0f
-  data.tar.gz: b08b3633a0fad3ccfda4e6824d40400cc983c4dfc7dc5aeeee2867dc8395241c83256f6b67697b162007e0e6add6bc64aaa992cc3f75c3ad199343fbfa3b43dc
+  metadata.gz: 932e99eba3ed5bed2a8c783e2275c2907b1abea1076952964edfed3ef1e1fe92843f4c06b1aedf956b05144657d81e92089e9af7f89ab4ebbea05ca05737128b
+  data.tar.gz: 191e9847203785b2bdae6dba875fabab5ce4f4aa8b97b954dd72addd8627caf0569d6a9b9421db69b57871e227a6b0d7c6b9730ce1a04f2f07ed22700a1f6ee1

data/lib/rubylisp/cons_cell.rb

@@ -17,197 +17,6 @@ module Lisp
     def value
       self
     end
-    
-    def set_car!(d)
-      @car = d
-    end
-
-    def lisp_object?
-      true
-    end
-    
-    def set_cdr!(d)
-      @cdr = d
-    end
-
-
-    def set_nth!(n, d)
-      return nil if empty?
-      c = self
-      n.times {|i| c = c.cdr}
-      c.set_car!(d)
-    end
-
-    
-    def empty?
-      @car.nil? && @cdr.nil?
-    end
-
-    def string?
-      false
-    end
-
-    def character?
-      false
-    end
-
-    def number?
-      false
-    end
-
-    def positive?
-      false
-    end
-
-    def zero?
-      false
-    end
-
-    def negative?
-      false
-    end
-
-    def symbol?
-      false
-    end
-
-    def primitive?
-      false
-    end
-
-    def special?
-      false
-    end
-
-    def function?
-      false
-    end
-
-    def macro?
-      false
-    end
-
-    def pair?
-      true
-    end
-
-    def list?
-      true
-    end
-
-    def frame?
-      false
-    end
-
-    def vector?
-      false
-    end
-
-    def eq?(other)
-      return true if empty? && (other.nil? || (other.pair? && other.empty?))
-      other.pair? && self == other
-    end
-
-    def eqv?(other)
-      return true if empty? && (other.nil? || (other.pair? && other.empty?))
-      other.pair? && self == other
-    end
-    
-    def equal?(other)
-      return true if empty? && (other.nil? || (other.pair? && other.empty?))
-      return false unless other.pair?
-      @car.equal?(other.car) && @cdr.equal?(other.cdr)
-    end
-    
-    def type
-      :pair
-    end
-
-    def to_s_helper
-      return "#{@car.to_s}" if @cdr.nil?
-      return "#{@car.to_s} . #{@cdr.to_s}" unless @cdr.pair?
-      "#{@car.to_s} #{@cdr.to_s_helper}"
-    end
-
-    def to_s
-      return "()" if self.empty?
-      return "'#{@cdr.car.to_s}" if @car.symbol? && @car.name == "quote"
-      return "{#{@cdr.to_s_helper}}" if @car.symbol? && @car.name == "make-frame"
-      return "#(#{@cdr.to_s_helper})" if @car.symbol? && @car.name == "make-vector"
-      return "(#{@car.to_s} . #{@cdr.to_s})" if !@cdr.nil? && !@cdr.pair?
-      return "(#{self.to_s_helper})"
-    end
-
-    def print_string_helper
-      @cdr.nil? ? "#{@car.print_string}" : "#{@car.print_string} #{@cdr.print_string_helper}"
-    end
-
-    def print_string
-      return "()" if self.empty?
-      return "'#{@cdr.car.print_string}" if @car.symbol? && @car.name == "quote"
-      return "{#{@cdr.print_string_helper}}" if @car.symbol? && @car.name == "make-frame"
-      return "#(#{@cdr.print_string_helper})" if @car.symbol? && @car.name == "make-vector"
-      return "(#{@car.print_string} . #{@cdr.print_string})" if !@cdr.nil? && !@cdr.pair?
-      return "(#{self.print_string_helper})"
-    end
-
-    def to_a
-      a = []
-      return a if empty?
-      c = self
-      until c.nil?
-        a << c.car
-        c = c.cdr
-      end
-      a
-    end
-
-    def each &block
-      return if empty?
-      c = self
-      if self.length > 0
-        until c.nil?
-          yield c.car 
-          c = c.cdr
-        end
-      end
-    end
-
-    def self.array_to_list(cells, tail=nil)
-      return cons() if cells.empty? && tail.nil?
-      head = ConsCell.new
-      last_cell = head
-      (0...cells.length).each do |i|
-        new_cell = self.cons(cells[i], nil)
-        last_cell.set_cdr!(new_cell)
-        last_cell = new_cell
-      end
-      last_cell.set_cdr!(tail)
-      head.cdr
-    end
-
-    def traverse(path)
-      next_cell = self
-      path.chars.each do |p|
-        return nil if next_cell.nil?  || !next_cell.pair?
-        next_cell = ((p == ?a) ? next_cell.car : next_cell.cdr)
-      end
-      next_cell
-    end
-
-    def method_missing(name, *args, &block)
-      if name[0] == ?c && name[-1] == ?r && (name[1..-2].chars.all? {|e| "ad".include?(e)})
-        self.traverse(name[1..-2].reverse)
-      else
-        super
-      end
-    end
-
-    def nth(n)
-      c = self
-      n.times {|i| c = c.cdr}
-      c.car
-    end
 
     def nth_tail(n)
       c = self
@@ -220,12 +29,16 @@ module Lisp
       return obj.value
     end
 
+
+    def push_current_code
+      env.current_code.unshift(self.print_string)
+    end
     
 
     def inner_eval(env)
       func = @car.evaluate(env)
       return Lisp::Debug.process_error("There is no function or macro named #{@car}", env) if func.nil?
-      env.current_code.unshift(self.print_string()) if !Lisp::Debug.eval_in_debug_repl && Lisp::Debug.interactive
+      push_current_code if !Lisp::Debug.eval_in_debug_repl && Lisp::Debug.interactive
 
       Lisp::Debug.log_eval(self, env)
       

data/lib/rubylisp/parser.rb

@@ -5,28 +5,40 @@ module Lisp
     def initialize
     end
 
-    def make_number(str)
-      Lisp::Number.with_value(str.to_i)
+    def make_number(str, pos)
+      Lisp::Number.with_value(str.to_i).tap do |obj|
+        obj.set_location(pos, str.length)
+      end
     end
 
     def make_hex_number(str)
-      Lisp::Number.with_value(["0x", str].join.to_i(0))
+      Lisp::Number.with_value(["0x", str].join.to_i(0)).tap do |obj|
+        obj.set_location(pos, str.length)
+      end
     end
 
     def make_float(str)
-      Lisp::Number.with_value(str.to_f)
+      Lisp::Number.with_value(str.to_f).tap do |obj|
+        obj.set_location(pos, str.length)
+      end
     end
 
     def make_string(str)
-      Lisp::String.with_value(str)
+      Lisp::String.with_value(str).tap do |obj|
+        obj.set_location(pos, str.length)
+      end
     end
 
     def make_symbol(str)
-      Lisp::Symbol.named(str)
+      Lisp::Symbol.named(str).tap do |obj|
+        obj.set_location(pos, str.length)
+      end
     end
 
     def make_character(ch)
-      Lisp::Character.with_value(ch)
+      Lisp::Character.with_value(ch).tap do |obj|
+        obj.set_location(pos, str.length)
+      end
     end
 
     def parse_cons_cell(tokens)
@@ -130,15 +142,25 @@ module Lisp
         when :COMMENT
           next
         when :NUMBER
-          return make_number(lit)
+          return make_number(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :FLOAT
-          return make_float(lit)
+          return make_float(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :HEXNUMBER
-          return make_hex_number(lit)
+          return make_hex_number(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :STRING
-          return make_string(lit)
+          return make_string(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :CHARACTER
-          return make_character(lit)
+          return make_character(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :LPAREN
           return parse_cons_cell(tokens)
         when :LBRACE
@@ -150,35 +172,65 @@ module Lisp
         when :QUOTE_HASH_LPAREN
           return parse_vector(tokens, true)
         when :SYMBOL
-          return make_symbol(lit)
+          return make_symbol(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :FFI_NEW_SYMBOL
-          return Lisp::FfiNew.new(lit)
+          return Lisp::FfiNew.new(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :FFI_SEND_SYMBOL
-          return Lisp::FfiSend.new(lit)
+          return Lisp::FfiSend.new(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :FFI_STATIC_SYMBOL
-          return Lisp::FfiStatic.new(lit)
+          return Lisp::FfiStatic.new(lit).tap do |obj|
+        obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         when :FALSE
-          return Lisp::FALSE
+          if @parse_for_debugging
+            return Lisp::Boolean.with_value(false).tap do |obj|
+              obj.set_location(pos, 2) if @parse_for_debugging
+            end
+          else
+            return Lisp::FALSE
+          end)
         when :TRUE
-          return Lisp::TRUE
+          if @parse_for_debugging
+            return Lisp::Boolean.with_value(false).tap do |obj|
+              obj.set_location(pos, 2) if @parse_for_debugging
+            end
+          else
+            return Lisp::TRUE
+          end)
         when :QUOTE
           expr = parse_sexpr(tokens)
-          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('quote'), expr])
+          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('quote'), expr]).tap do |obj|
+            obj.set_location(pos, expr.src_length + 1) if @parse_for_debugging
+          end
         when :BACKQUOTE
           expr = parse_sexpr(tokens)
-          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('quasiquote'), expr])
+          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('quasiquote'), expr]).tap do |obj|
+            obj.set_location(pos, expr.src_length + 1) if @parse_for_debugging
+          end
         when :COMMA
           expr = parse_sexpr(tokens)
-          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('unquote'), expr])
+          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('unquote'), expr]).tap do |obj|
+            obj.set_location(pos, expr.src_length + 1) if @parse_for_debugging
+          end
         when :COMMAAT
           expr = parse_sexpr(tokens)
-          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('unquote-splicing'), expr])
+          return Lisp::ConsCell.array_to_list([Lisp::Symbol.named('unquote-splicing'), expr]).tap do |obj|
+            obj.set_location(pos, expr.src_length + 2) if @parse_for_debugging
+          end
         when :WHITESPACE
           next
         when :ILLEGAL
           return Lisp::Debug.process_error("Illegal token: #{lit} on line #{tokens.line_number}", Lisp::EnvironmentFrame.global)
         else
-          return make_symbol(lit)
+          return make_symbol(lit).tap do |obj|
+            obj.set_location(pos, lit.length) if @parse_for_debugging
+          end
         end
       end
     end

data/lib/rubylisp/symbol.rb

@@ -38,6 +38,7 @@ module Lisp
     end
 
     def evaluate(env)
+      super
       return self if @naked
       env.value_of(self)
     end

data/lib/rubylisp/tokenizer.rb

@@ -51,7 +51,7 @@ module Lisp
     end
     
     def next_token
-      return @lookahead_token, @lookahead_literal
+      return @position, @lookahead_token, @lookahead_literal
     end
 
     def eof?
@@ -112,7 +112,7 @@ module Lisp
       end
 
       tok ||= :SYMBOL
-      return tok, case tok
+      return @position, tok, case tok
                   when :SYMBOL, :FFI_STATIC_SYMBOL
                     lit
                   when :FFI_SEND_SYMBOL
@@ -143,7 +143,7 @@ module Lisp
               :NUMBER
             end
 
-      return tok, lit
+      return @position, tok, lit
     end
 
 
@@ -183,9 +183,9 @@ module Lisp
         advance
       end
 
-      return :EOF, '' if eof?
+      return @position, :EOF, '' if eof?
       advance
-      return :STRING, process_escapes(lit)
+      return @position, :STRING, process_escapes(lit)
     end
 
 
@@ -203,25 +203,27 @@ module Lisp
         advance
       end
 
-      return :CHARACTER, lit
+      return @position, :CHARACTER, lit
     end
 
 
     def read_next_token
-      return :EOF, '' if eof?
+      @position = @source.pos
+      
+      return @position, :EOF, '' if eof?
 
       if @absorb_whitespace
         while space?(@current_ch)
           @line_number += 1 if @current_ch == "\n"
           advance
-          return :EOF, '' if eof?
+          return @position, :EOF, '' if eof?
         end
       end
       
       if !@absorb_whitespace && space?(@current_ch)
         @line_number += 1 if @current_ch == "\n"
         advance
-        return :WHITESPACE, " "
+        return @position, :WHITESPACE, " "
       elsif number?(@current_ch)
         return read_number(false)
       elsif @current_ch == '-' && number?(@next_ch)
@@ -240,50 +242,50 @@ module Lisp
       elsif @current_ch == '\'' && @next_ch == '{'
         advance
         advance
-        return :QUOTE_LBRACE, "'{"
+        return @position, :QUOTE_LBRACE, "'{"
       elsif @current_ch == '\'' && @next_ch == '#' && @next_next_ch == '('
         advance
         advance
         advance
-        return :QUOTE_HASH_LPAREN, "'#("
+        return @position, :QUOTE_HASH_LPAREN, "'#("
       elsif @current_ch == '\''
         advance
-        return :QUOTE, "'"
+        return @position, :QUOTE, "'"
       elsif @current_ch == '`'
         advance
-        return :BACKQUOTE, "`"
+        return @position, :BACKQUOTE, "`"
       elsif @current_ch == ',' && @next_ch == '@'
         advance
         advance
-        return :COMMAAT, ",@"
+        return @position, :COMMAAT, ",@"
       elsif @current_ch == ','
         advance
-        return :COMMA, ","
+        return @position, :COMMA, ","
       elsif @current_ch == '('
         advance
-        return :LPAREN, "("
+        return @position, :LPAREN, "("
       elsif @current_ch == '#' && @next_ch == '('
         advance
         advance
-        return :HASH_LPAREN, "#("
+        return @position, :HASH_LPAREN, "#("
       elsif @current_ch == ')'
         advance
-        return :RPAREN, ")"
+        return @position, :@position, RPAREN, ")"
       elsif @current_ch == '{'
         advance
-        return :LBRACE, "{"
+        regturn @position, :LBRACE, "{"
       elsif @current_ch == '}'
         advance
-        return :RBRACE, "}"
+        return @position, :RBRACE, "}"
       elsif @current_ch == '['
         advance
-        return :LBRACKET, "["
+        return @position, :LBRACKET, "["
       elsif @current_ch == ']'
         advance
-        return :RBRACKET, "]"
+        return @position, :RBRACKET, "]"
       elsif @current_ch == '.' && space?(@next_ch)
         advance
-        return :PERIOD, "."
+        return @position, :PERIOD, "."
       elsif @current_ch == '.' && symbol_character?(@next_ch)
         return read_symbol
         elsif symbol_character?(@current_ch)
@@ -291,20 +293,20 @@ module Lisp
         elsif @current_ch == '#' && @next_ch == 't'
         advance
         advance
-        return :TRUE, "#t"
+        return @position, :TRUE, "#t"
       elsif @current_ch == '#' && @next_ch == 'f'
         advance
         advance
-        return :FALSE, "#f"
+        return @position, :FALSE, "#f"
       elsif @current_ch == ';'
         lit = ""
         while true
-          return :COMMENT, lit if eof? || @current_ch == "\n"
+          return @position, :COMMENT, lit if eof? || @current_ch == "\n"
           lit << @current_ch
           advance
         end
       else
-        return :ILLEGAL, @current_ch
+        return @position, :ILLEGAL, @current_ch
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubymotionlisp
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Dave Astels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies: []
 description: An embeddable Lisp as an extension language for RubyMotion
 email: dastels@icloud.com