sparse 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/sparse/sparse.rb

@@ -1,5 +1,3 @@
-require 'strscan'
-
 class Sparse
   def parse(text)
     @scanner = StringScanner.new(text)
@@ -9,6 +7,8 @@ class Sparse
     result = []
     until @scanner.eos?
       case
+        when whitespace || comment
+          # do nothing
         when open_parenthesis
           result << strip
         when quote
@@ -17,13 +17,10 @@ class Sparse
             blowup 'Expected list'
           end
           @scanner.unscan
-        when whitespace || comment
-          #do nothing
         else
           blowup
       end
 
-      # puts "parse rest: ->#{@scanner.rest.bytes.to_a.map{|b| b < 32 ? b : b.chr}}"
     end
 
     result
@@ -31,11 +28,7 @@ class Sparse
   end
 
   private
-  def format_text(text)
-    text.size < 10 ? text : "#{text[0..7]}..."
-  end
-
-  def blowup(message = "Unexpected token #{format(@scanner.rest)}")
+  def blowup(message = "Unexpected token #{@scanner.rest}")
     raise SyntaxError.new "#{message} in position #{@scanner.pos + 1}, line #{@line}, column #{@scanner.pos - @column + 1}"
   end
 
@@ -43,31 +36,34 @@ class Sparse
     current = []
     until close_parenthesis
       start_rest = @scanner.rest
-      whitespace
 
       case
-        when whitespace
-          # nothing, as usual
+        when whitespace || comment
+          # do nothing
         when open_parenthesis
           current << strip
         when quote
           current << :quote
-          unless open_parenthesis || symbol || number # || string
-            p @scanner.rest
+          unless open_parenthesis || symbol || number
             blowup 'Expected a list, symbol or number'
           end
           @scanner.unscan
+        when fn
+          current << :fn
+          unless open_parenthesis
+            blowup 'Expected a list'
+          end
+          @scanner.unscan
         when symbol
           sym = @scanner.matched
           current << (sym == '- ' ? '-' : sym).to_sym
+        when string
+          current << @scanner.matched
         when number
           current << eval(@scanner.matched)
       end
 
-#      puts "strip rest: #{@scanner.rest.bytes.to_a.map{|b| b < 32 ? b : b.chr}}"
-
       if start_rest == @scanner.rest
-        p @scanner.rest
         blowup 'Unbalanced brackets'
 
       end
@@ -101,8 +97,12 @@ class Sparse
     @scanner.scan(/[']/)
   end
 
+  def fn
+    @scanner.scan(/[#]/)
+  end
+
   def symbol
-    @scanner.scan(/([-][^0-9]|[+*\/]|[a-zA-Z\$][a-zA-Z0-9\-\$]*)/)
+    @scanner.scan(/([-][^0-9]|[&+*\/:]|[a-zA-Z\$][a-zA-Z0-9\-\$]*[?]?)/)
   end
 
   def number
@@ -113,4 +113,8 @@ class Sparse
     @scanner.scan(/^;.*$/)
   end
 
+  def string
+    @scanner.scan(/"[^"]*"/)
+  end
+
 end

data/lib/sparse.rb

@@ -1 +1,2 @@
+require 'strscan'
 require 'sparse/sparse'

data/sparse.gemspec

@@ -0,0 +1,65 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{sparse}
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Plinio Balduino"]
+  s.date = %q{2011-07-16}
+  s.description = %q{Fast and light S-Expression parser}
+  s.email = %q{pbalduino+github@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/sparse.rb",
+    "lib/sparse/sparse.rb",
+    "sparse.gemspec",
+    "spec/complete_code_spec.rb",
+    "spec/empty_lists_spec.rb",
+    "spec/invalid_syntax_spec.rb",
+    "spec/nested_lists_spec.rb",
+    "spec/quote_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/pbalduino/sparse}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{Fast and light S-Expression parser}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+  end
+end
+

data/spec/complete_code_spec.rb

@@ -145,6 +145,134 @@ lisp
     end
 
     # http://www.lispworks.com/documentation/lcl50/ug/ug-22.html#HEADING22-0
+    it "copied from lispworks" do
+      code = <<lisp
+;; Declare the correct package for this application; 
+;; for this example, use the "user" package.
+(in-package "USER")
+
+;; Define a default size for the queue.
+(defconstant default-queue-size 100 "Default size of a queue")
+
+
+;;; The following structure encapsulates a queue.  It contains a
+;;; simple vector to hold the elements and a pair of pointers to
+;;; index into the vector.  One is a "put pointer" that indicates
+;;; where the next element is stored into the queue.  The other is
+;;; a "get pointer" that indicates the place from which the next
+;;; element is retrieved.
+;;;
+;;; When put-ptr = get-ptr, the queue is empty.
+;;; When put-ptr + 1 = get-ptr, the queue is full.
+(defstruct (queue (:constructor create-queue)
+                  (:print-function queue-print-function))
+  (elements #() :type simple-vector)    
+                                 ; simple vector of elements
+  (put-ptr 0 :type fixnum)       ; next place to put an element
+  (get-ptr 0 :type fixnum)       ; next place to take an element
+  )
+
+
+;; To make QUEUE-NEXT efficient, give the Compiler some hints.
+(eval-when (compile eval)
+  (proclaim '(inline queue-next))
+  (proclaim '(function queue-next (queue fixnum) fixnum))
+  )
+
+
+(defun queue-next (queue ptr)
+  "Increment a queue pointer by 1 and wrap around if needed."
+  (let ((length (length (queue-elements queue)))
+        (try (the fixnum (1+ ptr))))
+    (if (eql? try length) 0 try)))
+
+
+(defun queue-get (queue &optional (default nil))
+  ; return DEFAULT if the queue is empty."
+  "Get an element from QUEUE"
+  (check-type queue queue)
+  (let ((get (queue-get-ptr queue))
+        (put (queue-put-ptr queue)))
+    (if (eql? get put)
+        ;; Queue is empty.
+        default
+        ;; Get the element and update the get-ptr.
+        (prog1
+          (svref (queue-elements queue) get)
+          (setf (queue-get-ptr queue) (queue-next queue get))))))
+
+
+;; Define a function to put an element into the queue.  If the
+;; queue is already full, QUEUE-PUT returns NIL.  If the queue
+;; isn't full, QUEUE-PUT stores the element and returns T.
+(defun queue-put (queue element)
+  "Store ELEMENT in the QUEUE and return T on success or NIL on failure."
+  (check-type queue queue)
+  (let* ((get (queue-get-ptr queue))
+         (put (queue-put-ptr queue))
+         (next (queue-next queue put)))
+    (unless (eql? get next)
+      ;; store element
+      (setf (svref (queue-elements queue) put) element) 
+      (setf (queue-put-ptr queue) next)      ; update put-ptr
+      t)))                                   ; indicate success
+
+
+;; Define a SETF method.
+(defsetf queue-get queue-put)
+
+
+(defun queue-print-function (queue stream depth)
+  "This is the function used to print queue structures."
+  (declare (ignore depth))
+  (multiple-value-bind (current-size max-size)
+      (queue-length queue)
+    (format stream "#<Queue ~A/~A ~X>" 
+            current-size
+            max-size
+            (liquid pointer queue))))
+
+
+(defun queue-length (queue)
+  "Returns as two values the number of elements in the queue 
+   and the maximum number of elements the queue can hold."
+  (check-type queue queue)
+  (let ((length (length (queue-elements queue)))
+        (delta (the fixnum (- (queue-put-ptr queue) 
+          (queue-get-ptr queue)))))
+    (declare (fixnum length delta))
+    ;; The maximum number of elements the queue can hold is 
+    ;; (1- LENGTH) because a queue is empty when put-ptr = 
+    ;; get-ptr.
+    (values (mod delta length) (the fixnum (1- length)))))
+
+
+(defun queue-empty-p (queue)
+  "Return T if QUEUE is empty."
+  (check-type queue queue)
+  (eql? (queue-put-ptr queue) (queue-get-ptr queue)))
+
+
+(defun queue-full-p (queue)
+  "Return T if QUEUE is full."
+  (check-type queue queue)
+  (eql? (queue-get-ptr queue) 
+     (queue-next queue (queue-put-ptr queue))))
+
+
+;; Create a queue. The :ELEMENTS keyword specifies a simple
+;; vector to hold the elements of the queue. Note that the
+;; maximum number of elements the queue can hold is one less than
+;; the length of the vector.
+(defun make-queue (&key (elements (make-array (1+ default-queue-size))))
+  "Create a queue."
+  (check-type elements simple-vector)
+  (create-queue :elements elements))
+
+lisp
+
+      @parser.parse code
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11380380 !ruby/object:Gem::Requirement
+  requirement: &11262144 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *11380380
+  version_requirements: *11262144
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11379948 !ruby/object:Gem::Requirement
+  requirement: &11261844 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11379948
+  version_requirements: *11261844
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11379612 !ruby/object:Gem::Requirement
+  requirement: &11261400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *11379612
+  version_requirements: *11261400
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &11379216 !ruby/object:Gem::Requirement
+  requirement: &11260932 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11379216
+  version_requirements: *11260932
 description: Fast and light S-Expression parser
 email: pbalduino+github@gmail.com
 executables: []
@@ -74,6 +74,7 @@ files:
 - VERSION
 - lib/sparse.rb
 - lib/sparse/sparse.rb
+- sparse.gemspec
 - spec/complete_code_spec.rb
 - spec/empty_lists_spec.rb
 - spec/invalid_syntax_spec.rb
@@ -96,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -540899953
+      hash: 503240909
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: