heist 0.2.1 → 0.3.0

data/lib/builtin/primitives.rb

@@ -124,21 +124,14 @@ end
 
 # TODO write a more exact implementation, and implement (eq?)
 define('eqv?') do |op1, op2|
-  (Identifier === op1 and op1 == op2) or op1.equal?(op2)
+  ([Identifier, Character].any? { |type| type === op1 } and op1 == op2) or
+  op1.equal?(op2)
 end
 
 define('equal?') do |op1, op2|
   op1 == op2
 end
 
-# Returns true iff the given number is exact i.e. an integer, a
-# rational, or a complex made of integers
-define('exact?') do |value|
-  call('rational?', value) || (Complex === value &&
-                               call('rational?', value.real) &&
-                               call('rational?', value.imag))
-end
-
 # Returns true iff the arguments are monotonically decreasing
 define('>') do |*args|
   result = true
@@ -187,6 +180,10 @@ define('integer?') do |value|
   Integer === value
 end
 
+define('char?') do |value|
+  Character === value
+end
+
 define('string?') do |value|
   String === value
 end
@@ -203,6 +200,10 @@ define('pair?') do |value|
   Cons === value and value.pair?
 end
 
+define('vector?') do |value|
+  Vector === value
+end
+
 #----------------------------------------------------------------
 
 # Numerical functions
@@ -266,7 +267,7 @@ end
 # Returns a new complex number with the given real and
 # imaginary parts
 define('make-rectangular') do |real, imag|
-  Complex.new(real, imag)
+  Complex(real, imag)
 end
 
 # Returns the real part of a number
@@ -321,6 +322,117 @@ end
 
 #----------------------------------------------------------------
 
+# Symbol functions
+
+# Returns a new string by casting the given symbol to a string
+define('symbol->string') do |symbol|
+  symbol.to_s
+end
+
+# Returns the symbol whose name is the given string
+define('string->symbol') do |string|
+  Identifier.new(string)
+end
+
+#----------------------------------------------------------------
+
+# Character functions
+
+# Returns true iff the two characters are equal
+define('char=?') do |op1, op2|
+  Character === op1 and op1 == op2
+end
+
+define('char<?') do |op1, op2|
+  Character === op1 and Character === op2 and op1 < op2
+end
+
+define('char>?') do |op1, op2|
+  Character === op1 and Character === op2 and op1 > op2
+end
+
+define('char<=?') do |op1, op2|
+  Character === op1 and Character === op2 and op1 <= op2
+end
+
+define('char>=?') do |op1, op2|
+  Character === op1 and Character === op2 and op1 >= op2
+end
+
+# Returns a new character from an ASCII code
+define('integer->char') do |code|
+  Character.new(code.chr)
+end
+
+# Returns the ASCII code for a character
+define('char->integer') do |char|
+  char.char_code
+end
+
+#----------------------------------------------------------------
+
+# String functions
+
+# Returns a new string of the given size, filled with the given
+# character. If no character is given, a space is used.
+define('make-string') do |size, char|
+  char = " " if char.nil?
+  char.to_s * size
+end
+
+# Returns the length of the string
+define('string-length') do |string|
+  string.length
+end
+
+# Returns the kth character in the string
+define('string-ref') do |string, k|
+  size = string.length
+  raise BadIndexError.new("Cannot access index #{k} in string \"#{string}\"") if k >= size
+  char = string[k]
+  char = char.chr if Numeric === char
+  Character.new(char)
+end
+
+# Sets the kth character in string equal to char
+define('string-set!') do |string, k, char|
+  raise ImmutableError.new("Cannot modify string constant") if string.frozen?
+  string[k] = char.to_s
+  string
+end
+
+#----------------------------------------------------------------
+
+# Vector functions
+
+# Returns a new vector of the given size, filled with the given
+# filler value (this defaults to the NULL list)
+define('make-vector') do |size, fill|
+  fill = Cons::NULL if fill.nil?
+  Vector.new(size, fill)
+end
+
+# Returns the length of the vector
+define('vector-length') do |vector|
+  vector.size
+end
+
+# Returns the kth element of a vector
+define('vector-ref') do |vector, k|
+  size = vector.size
+  raise BadIndexError.new("Cannot access index #{k} of vector of length #{size}") if k >= size
+  vector[k]
+end
+
+# Sets the kth element of a vector to object
+define('vector-set!') do |vector, k, object|
+  size = vector.size
+  raise BadIndexError.new("Cannot modify index #{k} of vector of length #{size}") if k >= size
+  vector[k] = object
+end
+
+#----------------------------------------------------------------
+
 # Control features
 
 # Calls a function using a list for the arguments

data/lib/builtin/syntax.scm

@@ -61,11 +61,11 @@
 ; for several nested (let)s. Variables may refer to those that
 ; preceed them but not vice versa.
 (define-syntax let* (syntax-rules ()
-  [(let* ([name expression]) body ...)
-    (let ([name expression]) body ...)]
-  [(let* ([n1 e1] [n2 e2] ...) body ...)
+  [(let* ([n1 e1] [n2 e2] [n3 e3] ...) body ...)  ; 2 or more bindings
     (let ([n1 e1])
-      (let* ([n2 e2] ...) body ...))]))
+      (let* ([n2 e2] [n3 e3] ...) body ...))]
+  [(let* ([name expression] ...) body ...)        ; 0 or 1 binding
+    (let ([name expression] ...) body ...)]))
 
 ; (letrec) evaluates values in the inner scope, so lambdas are
 ; able to refer to other values assigned using the (letrec).
@@ -159,14 +159,10 @@
 ; it will evaluate it and insert the result into the
 ; surrounding quoted list.
 (define-syntax quasiquote (syntax-rules (unquote unquote-splicing)
-  [(quasiquote (unquote expr))
-    expr]
-  [(quasiquote ((unquote-splicing expr)))
-    expr]
-  [(quasiquote ((unquote-splicing expr) . rest))
-    (append expr (quasiquote rest))]
-  [(quasiquote (first . rest))
-    (cons (quasiquote first) (quasiquote rest))]
-  [(quasiquote expr)
-    'expr]))
+  [`,expr                 expr]
+  [`(,@first . rest)      (append first `rest)]
+  [`(first . rest)        (cons `first `rest)]
+  [`#(,@first rest ...)   (list->vector `(,@first rest ...))]
+  [`#(expr ...)           (list->vector `(expr ...))]
+  [`expr                  'expr]))
 

data/lib/heist.rb

@@ -9,7 +9,7 @@ require 'treetop'
 # utility methods that don't belong anywhere else. See the README for an
 # overview of Heist's features.
 module Heist
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
   
   ROOT_PATH    = File.expand_path(File.dirname(__FILE__))
   PARSER_PATH  = ROOT_PATH + '/parser/'
@@ -21,6 +21,7 @@ module Heist
   require PARSER_PATH + 'scheme'
   require PARSER_PATH + 'nodes'
   require RUNTIME_PATH + 'runtime'
+  require ROOT_PATH + '/trie'
   require ROOT_PATH + '/repl'
   
   LOAD_PATH = [LIB_PATH]
@@ -33,6 +34,7 @@ module Heist
   class MacroError            < SyntaxError; end
   class MacroTemplateMismatch < MacroError; end
   class TypeError             < RuntimeError; end
+  class BadIndexError         < TypeError; end
   class ImmutableError        < TypeError; end
   
   class << self
@@ -55,25 +57,15 @@ module Heist
           expression
     end
     
-    # Returns a new complex number with the given +real+ and +imaginary+ parts.
-    def complex(real, imaginary)
-      Complex.new(real, imaginary)
-    end
-    
-    # Returns a new rational number with the given +numerator+ and +denominator+.
-    def rational(numerator, denominator)
-      Rational(numerator, denominator)
-    end
-    
     # Returns the result of dividing the first argument by the second. If both
     # arguments are integers, returns a rational rather than performing
     # integer division as Ruby would normally do.
     def divide(op1, op2)
       [op1, op2].all? { |value| Integer === value } ?
-          rational(op1, op2) :
+          Rational(op1, op2) :
           op1.to_f / op2
     end
+    
   end
-  
 end
 

data/lib/parser/nodes.rb

@@ -31,7 +31,7 @@ module Heist
       # Converts all the +Treetop+ objects in the +Program+ to Heist objects
       # and raw Ruby data ready for interpretation using a +Runtime+.
       def convert!
-        return if @data
+        return @data if @data
         @data = Runtime::Cons.construct(elements[1].elements, true) { |c| c.eval }
       end
     end
@@ -55,6 +55,17 @@ module Heist
       end
     end
     
+    # A +Vector+ is an array-like structure if integer-indexed cells
+    module Vector
+      def eval
+        Runtime::Vector.new(cells) { |cell| cell.eval }
+      end
+      
+      def cells
+        @cells ||= elements[2].elements
+      end
+    end
+    
     # <tt>QuotedCell</tt> are generated using the quoting shorthands.
     class QuotedCell < Treetop::Runtime::SyntaxNode
       # Evaluating a +QuotedCell+ produces a +Cons+ that expresses a function
@@ -81,7 +92,7 @@ module Heist
       end
     end
     
-    module Boolean
+    class Boolean < Treetop::Runtime::SyntaxNode
       def eval
         @value ||= (text_value == "#t")
       end
@@ -89,7 +100,7 @@ module Heist
     
     class Complex < Treetop::Runtime::SyntaxNode
       def eval
-        @value ||= Heist.complex(real.eval, imaginary.eval)
+        @value ||= Complex(real.eval, imaginary.eval)
       end
     end
     
@@ -101,7 +112,7 @@ module Heist
     
     class Rational < Treetop::Runtime::SyntaxNode
       def eval
-        @value ||= Heist.rational(numerator.eval, denominator.eval)
+        @value ||= Rational(numerator.eval, denominator.eval)
       end
     end
     
@@ -111,9 +122,18 @@ module Heist
       end
     end
     
+    class Character < Treetop::Runtime::SyntaxNode
+      def eval
+        Runtime::Character.new(glyph.text_value)
+      end
+    end
+    
     class String < Treetop::Runtime::SyntaxNode
       def eval
-        @value ||= Kernel.eval(text_value)
+        return @value if @value
+        @value = Kernel.eval(text_value)
+        @value.freeze
+        @value
       end
     end
     

data/lib/parser/scheme.rb

@@ -22,7 +22,7 @@ module Heist
       if r2
         r1 = r2
       else
-        r1 = SyntaxNode.new(input, index...index)
+        r1 = instantiate_node(SyntaxNode,input, index...index)
       end
       s0 << r1
       if r1
@@ -35,11 +35,11 @@ module Heist
             break
           end
         end
-        r3 = SyntaxNode.new(input, i3...index, s3)
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
         s0 << r3
       end
       if s0.last
-        r0 = (Program).new(input, i0...index, s0)
+        r0 = instantiate_node(Program,input, i0...index, s0)
         r0.extend(Program0)
       else
         self.index = i0
@@ -75,11 +75,11 @@ module Heist
           break
         end
       end
-      r1 = SyntaxNode.new(input, i1...index, s1)
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
       s0 << r1
       if r1
         if input.index("#!", index) == index
-          r3 = (SyntaxNode).new(input, index...(index + 2))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
           @index += 2
         else
           terminal_parse_failure("#!")
@@ -92,7 +92,7 @@ module Heist
             i5, s5 = index, []
             i6 = index
             if input.index(Regexp.new('[\\n\\r]'), index) == index
-              r7 = (SyntaxNode).new(input, index...(index + 1))
+              r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               r7 = nil
@@ -101,12 +101,12 @@ module Heist
               r6 = nil
             else
               self.index = i6
-              r6 = SyntaxNode.new(input, index...index)
+              r6 = instantiate_node(SyntaxNode,input, index...index)
             end
             s5 << r6
             if r6
               if index < input_length
-                r8 = (SyntaxNode).new(input, index...(index + 1))
+                r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
                 @index += 1
               else
                 terminal_parse_failure("any character")
@@ -115,7 +115,7 @@ module Heist
               s5 << r8
             end
             if s5.last
-              r5 = (SyntaxNode).new(input, i5...index, s5)
+              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
               r5.extend(Shebang0)
             else
               self.index = i5
@@ -127,12 +127,12 @@ module Heist
               break
             end
           end
-          r4 = SyntaxNode.new(input, i4...index, s4)
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
           s0 << r4
         end
       end
       if s0.last
-        r0 = (SyntaxNode).new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(Shebang1)
       else
         self.index = i0
@@ -189,7 +189,7 @@ module Heist
         end
       end
       if s1.last
-        r1 = (QuotedCell).new(input, i1...index, s1)
+        r1 = instantiate_node(QuotedCell,input, i1...index, s1)
         r1.extend(Cell0)
       else
         self.index = i1
@@ -207,22 +207,27 @@ module Heist
           if r8
             r7 = r8
           else
-            r9 = _nt_atom
+            r9 = _nt_vector
             if r9
               r7 = r9
             else
-              self.index = i7
-              r7 = nil
+              r10 = _nt_atom
+              if r10
+                r7 = r10
+              else
+                self.index = i7
+                r7 = nil
+              end
             end
           end
           s5 << r7
           if r7
-            r10 = _nt_ignore
-            s5 << r10
+            r11 = _nt_ignore
+            s5 << r11
           end
         end
         if s5.last
-          r5 = (Cell).new(input, i5...index, s5)
+          r5 = instantiate_node(Cell,input, i5...index, s5)
           r5.extend(Cell1)
         else
           self.index = i5
@@ -251,7 +256,7 @@ module Heist
 
       i0 = index
       if input.index("'", index) == index
-        r1 = (SyntaxNode).new(input, index...(index + 1))
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure("'")
@@ -261,7 +266,7 @@ module Heist
         r0 = r1
       else
         if input.index("`", index) == index
-          r2 = (SyntaxNode).new(input, index...(index + 1))
+          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("`")
@@ -271,7 +276,7 @@ module Heist
           r0 = r2
         else
           if input.index(",@", index) == index
-            r3 = (SyntaxNode).new(input, index...(index + 2))
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 2))
             @index += 2
           else
             terminal_parse_failure(",@")
@@ -281,7 +286,7 @@ module Heist
             r0 = r3
           else
             if input.index(",", index) == index
-              r4 = (SyntaxNode).new(input, index...(index + 1))
+              r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure(",")
@@ -311,7 +316,7 @@ module Heist
       end
 
       if input.index(".", index) == index
-        r0 = (SyntaxNode).new(input, index...(index + 1))
+        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure(".")
@@ -323,6 +328,27 @@ module Heist
       return r0
     end
 
+    def _nt_hash
+      start_index = index
+      if node_cache[:hash].has_key?(index)
+        cached = node_cache[:hash][index]
+        @index = cached.interval.end if cached
+        return cached
+      end
+
+      if input.index("#", index) == index
+        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure("#")
+        r0 = nil
+      end
+
+      node_cache[:hash][start_index] = r0
+
+      return r0
+    end
+
     module List0 #:nodoc:
       def cells
         elements[1]
@@ -348,7 +374,7 @@ module Heist
       i0 = index
       i1, s1 = index, []
       if input.index("(", index) == index
-        r2 = (SyntaxNode).new(input, index...(index + 1))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure("(")
@@ -360,7 +386,7 @@ module Heist
         s1 << r3
         if r3
           if input.index(")", index) == index
-            r4 = (SyntaxNode).new(input, index...(index + 1))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure(")")
@@ -370,7 +396,7 @@ module Heist
         end
       end
       if s1.last
-        r1 = (SyntaxNode).new(input, i1...index, s1)
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         r1.extend(List0)
       else
         self.index = i1
@@ -382,7 +408,7 @@ module Heist
       else
         i5, s5 = index, []
         if input.index("[", index) == index
-          r6 = (SyntaxNode).new(input, index...(index + 1))
+          r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("[")
@@ -394,7 +420,7 @@ module Heist
           s5 << r7
           if r7
             if input.index("]", index) == index
-              r8 = (SyntaxNode).new(input, index...(index + 1))
+              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("]")
@@ -404,7 +430,7 @@ module Heist
           end
         end
         if s5.last
-          r5 = (SyntaxNode).new(input, i5...index, s5)
+          r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
           r5.extend(List1)
         else
           self.index = i5
@@ -470,7 +496,7 @@ module Heist
         self.index = i2
         r2 = nil
       else
-        r2 = SyntaxNode.new(input, i2...index, s2)
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
       end
       s1 << r2
       if r2
@@ -486,7 +512,7 @@ module Heist
           end
         end
         if s4.last
-          r4 = (SyntaxNode).new(input, i4...index, s4)
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
           r4.extend(Cells0)
         else
           self.index = i4
@@ -495,7 +521,7 @@ module Heist
         s1 << r4
       end
       if s1.last
-        r1 = (SyntaxNode).new(input, i1...index, s1)
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         r1.extend(Cells1)
       else
         self.index = i1
@@ -514,14 +540,14 @@ module Heist
             break
           end
         end
-        r9 = SyntaxNode.new(input, i9...index, s9)
+        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
         s8 << r9
         if r9
           r11 = _nt_ignore
           s8 << r11
         end
         if s8.last
-          r8 = (SyntaxNode).new(input, i8...index, s8)
+          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
           r8.extend(Cells2)
         else
           self.index = i8
@@ -540,6 +566,149 @@ module Heist
       return r0
     end
 
+    module Vector0 #:nodoc:
+      def hash
+        elements[0]
+      end
+
+      def ignore
+        elements[3]
+      end
+
+    end
+
+    module Vector1 #:nodoc:
+      def hash
+        elements[0]
+      end
+
+      def ignore
+        elements[3]
+      end
+
+    end
+
+    def _nt_vector
+      start_index = index
+      if node_cache[:vector].has_key?(index)
+        cached = node_cache[:vector][index]
+        @index = cached.interval.end if cached
+        return cached
+      end
+
+      i0 = index
+      i1, s1 = index, []
+      r2 = _nt_hash
+      s1 << r2
+      if r2
+        if input.index("(", index) == index
+          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure("(")
+          r3 = nil
+        end
+        s1 << r3
+        if r3
+          s4, i4 = [], index
+          loop do
+            r5 = _nt_cell
+            if r5
+              s4 << r5
+            else
+              break
+            end
+          end
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          s1 << r4
+          if r4
+            r6 = _nt_ignore
+            s1 << r6
+            if r6
+              if input.index(")", index) == index
+                r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                @index += 1
+              else
+                terminal_parse_failure(")")
+                r7 = nil
+              end
+              s1 << r7
+            end
+          end
+        end
+      end
+      if s1.last
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+        r1.extend(Vector0)
+      else
+        self.index = i1
+        r1 = nil
+      end
+      if r1
+        r0 = r1
+        r0.extend(Vector)
+      else
+        i8, s8 = index, []
+        r9 = _nt_hash
+        s8 << r9
+        if r9
+          if input.index("[", index) == index
+            r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure("[")
+            r10 = nil
+          end
+          s8 << r10
+          if r10
+            s11, i11 = [], index
+            loop do
+              r12 = _nt_cell
+              if r12
+                s11 << r12
+              else
+                break
+              end
+            end
+            r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+            s8 << r11
+            if r11
+              r13 = _nt_ignore
+              s8 << r13
+              if r13
+                if input.index("]", index) == index
+                  r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                  @index += 1
+                else
+                  terminal_parse_failure("]")
+                  r14 = nil
+                end
+                s8 << r14
+              end
+            end
+          end
+        end
+        if s8.last
+          r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+          r8.extend(Vector1)
+        else
+          self.index = i8
+          r8 = nil
+        end
+        if r8
+          r0 = r8
+          r0.extend(Vector)
+        else
+          self.index = i0
+          r0 = nil
+        end
+      end
+
+      node_cache[:vector][start_index] = r0
+
+      return r0
+    end
+
     def _nt_atom
       start_index = index
       if node_cache[:atom].has_key?(index)
@@ -591,55 +760,60 @@ module Heist
         if r3
           r1 = r3
         else
-          r4 = _nt_string
+          r4 = _nt_character
           if r4
             r1 = r4
           else
-            self.index = i1
-            r1 = nil
+            r5 = _nt_string
+            if r5
+              r1 = r5
+            else
+              self.index = i1
+              r1 = nil
+            end
           end
         end
       end
       s0 << r1
       if r1
-        i5 = index
-        i6, s6 = index, []
-        i7 = index
-        r8 = _nt_delimiter
-        if r8
-          r7 = nil
+        i6 = index
+        i7, s7 = index, []
+        i8 = index
+        r9 = _nt_delimiter
+        if r9
+          r8 = nil
         else
-          self.index = i7
-          r7 = SyntaxNode.new(input, index...index)
+          self.index = i8
+          r8 = instantiate_node(SyntaxNode,input, index...index)
         end
-        s6 << r7
-        if r7
+        s7 << r8
+        if r8
           if index < input_length
-            r9 = (SyntaxNode).new(input, index...(index + 1))
+            r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure("any character")
-            r9 = nil
+            r10 = nil
           end
-          s6 << r9
+          s7 << r10
         end
-        if s6.last
-          r6 = (SyntaxNode).new(input, i6...index, s6)
-          r6.extend(Datum0)
+        if s7.last
+          r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+          r7.extend(Datum0)
         else
-          self.index = i6
-          r6 = nil
+          self.index = i7
+          r7 = nil
         end
-        if r6
-          r5 = nil
+        if r7
+          r6 = nil
         else
-          self.index = i5
-          r5 = SyntaxNode.new(input, index...index)
+          self.index = i6
+          r6 = instantiate_node(SyntaxNode,input, index...index)
         end
-        s0 << r5
+        s0 << r6
       end
       if s0.last
-        r0 = (Datum).new(input, i0...index, s0)
+        r0 = instantiate_node(Datum,input, i0...index, s0)
         r0.extend(Datum1)
       else
         self.index = i0
@@ -651,6 +825,13 @@ module Heist
       return r0
     end
 
+    module Boolean0 #:nodoc:
+      def hash
+        elements[0]
+      end
+
+    end
+
     def _nt_boolean
       start_index = index
       if node_cache[:boolean].has_key?(index)
@@ -659,32 +840,24 @@ module Heist
         return cached
       end
 
-      i0 = index
-      if input.index("#t", index) == index
-        r1 = (SyntaxNode).new(input, index...(index + 2))
-        @index += 2
-      else
-        terminal_parse_failure("#t")
-        r1 = nil
-      end
+      i0, s0 = index, []
+      r1 = _nt_hash
+      s0 << r1
       if r1
-        r0 = r1
-        r0.extend(Boolean)
-      else
-        if input.index("#f", index) == index
-          r2 = (SyntaxNode).new(input, index...(index + 2))
-          @index += 2
+        if input.index(Regexp.new('[tf]'), index) == index
+          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
         else
-          terminal_parse_failure("#f")
           r2 = nil
         end
-        if r2
-          r0 = r2
-          r0.extend(Boolean)
-        else
-          self.index = i0
-          r0 = nil
-        end
+        s0 << r2
+      end
+      if s0.last
+        r0 = instantiate_node(Boolean,input, i0...index, s0)
+        r0.extend(Boolean0)
+      else
+        self.index = i0
+        r0 = nil
       end
 
       node_cache[:boolean][start_index] = r0
@@ -765,7 +938,7 @@ module Heist
       s0 << r1
       if r1
         if input.index("+", index) == index
-          r4 = (SyntaxNode).new(input, index...(index + 1))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("+")
@@ -789,7 +962,7 @@ module Heist
           s0 << r5
           if r5
             if input.index("i", index) == index
-              r8 = (SyntaxNode).new(input, index...(index + 1))
+              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("i")
@@ -800,7 +973,7 @@ module Heist
         end
       end
       if s0.last
-        r0 = (Complex).new(input, i0...index, s0)
+        r0 = instantiate_node(Complex,input, i0...index, s0)
         r0.extend(Complex0)
       else
         self.index = i0
@@ -836,7 +1009,7 @@ module Heist
       if r1
         i2, s2 = index, []
         if input.index(".", index) == index
-          r3 = (SyntaxNode).new(input, index...(index + 1))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure(".")
@@ -857,12 +1030,12 @@ module Heist
             self.index = i4
             r4 = nil
           else
-            r4 = SyntaxNode.new(input, i4...index, s4)
+            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
           end
           s2 << r4
         end
         if s2.last
-          r2 = (SyntaxNode).new(input, i2...index, s2)
+          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
           r2.extend(Real0)
         else
           self.index = i2
@@ -871,7 +1044,7 @@ module Heist
         s0 << r2
       end
       if s0.last
-        r0 = (Real).new(input, i0...index, s0)
+        r0 = instantiate_node(Real,input, i0...index, s0)
         r0.extend(Real1)
       else
         self.index = i0
@@ -906,7 +1079,7 @@ module Heist
       s0 << r1
       if r1
         if input.index("/", index) == index
-          r2 = (SyntaxNode).new(input, index...(index + 1))
+          r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("/")
@@ -919,7 +1092,7 @@ module Heist
         end
       end
       if s0.last
-        r0 = (Rational).new(input, i0...index, s0)
+        r0 = instantiate_node(Rational,input, i0...index, s0)
         r0.extend(Rational0)
       else
         self.index = i0
@@ -947,7 +1120,7 @@ module Heist
 
       i0, s0 = index, []
       if input.index("-", index) == index
-        r2 = (SyntaxNode).new(input, index...(index + 1))
+        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure("-")
@@ -956,13 +1129,13 @@ module Heist
       if r2
         r1 = r2
       else
-        r1 = SyntaxNode.new(input, index...index)
+        r1 = instantiate_node(SyntaxNode,input, index...index)
       end
       s0 << r1
       if r1
         i3 = index
         if input.index("0", index) == index
-          r4 = (SyntaxNode).new(input, index...(index + 1))
+          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("0")
@@ -973,7 +1146,7 @@ module Heist
         else
           i5, s5 = index, []
           if input.index(Regexp.new('[1-9]'), index) == index
-            r6 = (SyntaxNode).new(input, index...(index + 1))
+            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r6 = nil
@@ -989,11 +1162,11 @@ module Heist
                 break
               end
             end
-            r7 = SyntaxNode.new(input, i7...index, s7)
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
             s5 << r7
           end
           if s5.last
-            r5 = (SyntaxNode).new(input, i5...index, s5)
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
             r5.extend(Integer0)
           else
             self.index = i5
@@ -1009,7 +1182,7 @@ module Heist
         s0 << r3
       end
       if s0.last
-        r0 = (Integer).new(input, i0...index, s0)
+        r0 = instantiate_node(Integer,input, i0...index, s0)
         r0.extend(Integer1)
       else
         self.index = i0
@@ -1021,6 +1194,64 @@ module Heist
       return r0
     end
 
+    module Character0 #:nodoc:
+      def glyph
+        elements[1]
+      end
+    end
+
+    def _nt_character
+      start_index = index
+      if node_cache[:character].has_key?(index)
+        cached = node_cache[:character][index]
+        @index = cached.interval.end if cached
+        return cached
+      end
+
+      i0, s0 = index, []
+      if input.index("#\\", index) == index
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 2))
+        @index += 2
+      else
+        terminal_parse_failure("#\\")
+        r1 = nil
+      end
+      s0 << r1
+      if r1
+        i2 = index
+        r3 = _nt_identifier
+        if r3
+          r2 = r3
+        else
+          if index < input_length
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure("any character")
+            r4 = nil
+          end
+          if r4
+            r2 = r4
+          else
+            self.index = i2
+            r2 = nil
+          end
+        end
+        s0 << r2
+      end
+      if s0.last
+        r0 = instantiate_node(Character,input, i0...index, s0)
+        r0.extend(Character0)
+      else
+        self.index = i0
+        r0 = nil
+      end
+
+      node_cache[:character][start_index] = r0
+
+      return r0
+    end
+
     module String0 #:nodoc:
     end
 
@@ -1034,7 +1265,7 @@ module Heist
 
       i0, s0 = index, []
       if input.index('"', index) == index
-        r1 = (SyntaxNode).new(input, index...(index + 1))
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure('"')
@@ -1046,7 +1277,7 @@ module Heist
         loop do
           i3 = index
           if input.index('\\"', index) == index
-            r4 = (SyntaxNode).new(input, index...(index + 2))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 2))
             @index += 2
           else
             terminal_parse_failure('\\"')
@@ -1056,7 +1287,7 @@ module Heist
             r3 = r4
           else
             if input.index(Regexp.new('[^"]'), index) == index
-              r5 = (SyntaxNode).new(input, index...(index + 1))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               r5 = nil
@@ -1074,11 +1305,11 @@ module Heist
             break
           end
         end
-        r2 = SyntaxNode.new(input, i2...index, s2)
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
         s0 << r2
         if r2
           if input.index('"', index) == index
-            r6 = (SyntaxNode).new(input, index...(index + 1))
+            r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure('"')
@@ -1088,7 +1319,7 @@ module Heist
         end
       end
       if s0.last
-        r0 = (String).new(input, i0...index, s0)
+        r0 = instantiate_node(String,input, i0...index, s0)
         r0.extend(String0)
       else
         self.index = i0
@@ -1129,12 +1360,12 @@ module Heist
         r3 = nil
       else
         self.index = i3
-        r3 = SyntaxNode.new(input, index...index)
+        r3 = instantiate_node(SyntaxNode,input, index...index)
       end
       s2 << r3
       if r3
         if index < input_length
-          r5 = (SyntaxNode).new(input, index...(index + 1))
+          r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("any character")
@@ -1143,7 +1374,7 @@ module Heist
         s2 << r5
       end
       if s2.last
-        r2 = (SyntaxNode).new(input, i2...index, s2)
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
         r2.extend(Identifier0)
       else
         self.index = i2
@@ -1160,12 +1391,12 @@ module Heist
             r8 = nil
           else
             self.index = i8
-            r8 = SyntaxNode.new(input, index...index)
+            r8 = instantiate_node(SyntaxNode,input, index...index)
           end
           s7 << r8
           if r8
             if index < input_length
-              r10 = (SyntaxNode).new(input, index...(index + 1))
+              r10 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1174,7 +1405,7 @@ module Heist
             s7 << r10
           end
           if s7.last
-            r7 = (SyntaxNode).new(input, i7...index, s7)
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
             r7.extend(Identifier1)
           else
             self.index = i7
@@ -1190,12 +1421,12 @@ module Heist
           self.index = i6
           r6 = nil
         else
-          r6 = SyntaxNode.new(input, i6...index, s6)
+          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
         end
         s1 << r6
       end
       if s1.last
-        r1 = (SyntaxNode).new(input, i1...index, s1)
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         r1.extend(Identifier2)
       else
         self.index = i1
@@ -1212,12 +1443,12 @@ module Heist
           r12 = nil
         else
           self.index = i12
-          r12 = SyntaxNode.new(input, index...index)
+          r12 = instantiate_node(SyntaxNode,input, index...index)
         end
         s11 << r12
         if r12
           if index < input_length
-            r14 = (SyntaxNode).new(input, index...(index + 1))
+            r14 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure("any character")
@@ -1226,7 +1457,7 @@ module Heist
           s11 << r14
         end
         if s11.last
-          r11 = (SyntaxNode).new(input, i11...index, s11)
+          r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
           r11.extend(Identifier3)
         else
           self.index = i11
@@ -1255,7 +1486,7 @@ module Heist
       end
 
       if input.index(Regexp.new('[0-9]'), index) == index
-        r0 = (SyntaxNode).new(input, index...(index + 1))
+        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r0 = nil
@@ -1306,16 +1537,21 @@ module Heist
       if r1
         r0 = r1
       else
-        r2 = _nt_paren
+        r2 = _nt_hash
         if r2
           r0 = r2
         else
-          r3 = _nt_space
+          r3 = _nt_paren
           if r3
             r0 = r3
           else
-            self.index = i0
-            r0 = nil
+            r4 = _nt_space
+            if r4
+              r0 = r4
+            else
+              self.index = i0
+              r0 = nil
+            end
           end
         end
       end
@@ -1334,7 +1570,7 @@ module Heist
       end
 
       if input.index(Regexp.new('[\\(\\)\\[\\]]'), index) == index
-        r0 = (SyntaxNode).new(input, index...(index + 1))
+        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r0 = nil
@@ -1354,7 +1590,7 @@ module Heist
       end
 
       if input.index(Regexp.new('[\\s\\n\\r\\t]'), index) == index
-        r0 = (SyntaxNode).new(input, index...(index + 1))
+        r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         r0 = nil
@@ -1366,6 +1602,16 @@ module Heist
     end
 
     module Ignore0 #:nodoc:
+      def comment
+        elements[0]
+      end
+
+      def ignore
+        elements[1]
+      end
+    end
+
+    module Ignore1 #:nodoc:
     end
 
     def _nt_ignore
@@ -1386,20 +1632,33 @@ module Heist
           break
         end
       end
-      r1 = SyntaxNode.new(input, i1...index, s1)
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
       s0 << r1
       if r1
-        r4 = _nt_comment
+        i4, s4 = index, []
+        r5 = _nt_comment
+        s4 << r5
+        if r5
+          r6 = _nt_ignore
+          s4 << r6
+        end
+        if s4.last
+          r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
+          r4.extend(Ignore0)
+        else
+          self.index = i4
+          r4 = nil
+        end
         if r4
           r3 = r4
         else
-          r3 = SyntaxNode.new(input, index...index)
+          r3 = instantiate_node(SyntaxNode,input, index...index)
         end
         s0 << r3
       end
       if s0.last
-        r0 = (SyntaxNode).new(input, i0...index, s0)
-        r0.extend(Ignore0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Ignore1)
       else
         self.index = i0
         r0 = nil
@@ -1414,9 +1673,6 @@ module Heist
     end
 
     module Comment1 #:nodoc:
-      def ignore
-        elements[2]
-      end
     end
 
     def _nt_comment
@@ -1429,7 +1685,7 @@ module Heist
 
       i0, s0 = index, []
       if input.index(";", index) == index
-        r1 = (SyntaxNode).new(input, index...(index + 1))
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
         @index += 1
       else
         terminal_parse_failure(";")
@@ -1442,7 +1698,7 @@ module Heist
           i3, s3 = index, []
           i4 = index
           if input.index(Regexp.new('[\\n\\r]'), index) == index
-            r5 = (SyntaxNode).new(input, index...(index + 1))
+            r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             r5 = nil
@@ -1451,12 +1707,12 @@ module Heist
             r4 = nil
           else
             self.index = i4
-            r4 = SyntaxNode.new(input, index...index)
+            r4 = instantiate_node(SyntaxNode,input, index...index)
           end
           s3 << r4
           if r4
             if index < input_length
-              r6 = (SyntaxNode).new(input, index...(index + 1))
+              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -1465,7 +1721,7 @@ module Heist
             s3 << r6
           end
           if s3.last
-            r3 = (SyntaxNode).new(input, i3...index, s3)
+            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
             r3.extend(Comment0)
           else
             self.index = i3
@@ -1477,15 +1733,11 @@ module Heist
             break
           end
         end
-        r2 = SyntaxNode.new(input, i2...index, s2)
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
         s0 << r2
-        if r2
-          r7 = _nt_ignore
-          s0 << r7
-        end
       end
       if s0.last
-        r0 = (SyntaxNode).new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
         r0.extend(Comment1)
       else
         self.index = i0