waxeye 0.6.0 → 0.7.0

data/README

@@ -1,7 +1,7 @@
 
 ============================================
 | Waxeye Parser Generator                  |
-| v 0.6.0                                  |
+| v 0.7.0                                  |
 | www.waxeye.org                           |
 | Copyright (C) 2008 Orlando D. A. R. Hill |
 ============================================
@@ -33,6 +33,7 @@ Features
 * Choice of Programming Language
   - C
   - Java
+  - Python
   - Ruby
   - Scheme
 

data/lib/waxeye.rb

@@ -40,7 +40,7 @@ module Waxeye
     end
   end
 
-  class Automaton
+  class FA
     attr_reader :type, :states, :mode
     def initialize(type, states, mode)
       @type = type
@@ -58,8 +58,8 @@ module Waxeye
       @nt = nt
     end
 
-    def display()
-      print "parse error: failed to match '#{nt}' at line=#{line}, col=#{col}, pos=#{pos}\n"
+    def to_s()
+      "parse error: failed to match '#{nt}' at line=#{line}, col=#{col}, pos=#{pos}\n"
     end
   end
 
@@ -71,70 +71,68 @@ module Waxeye
       @pos = pos
     end
 
-    def display_sexpr()
-      display_sexpr_iter(self)
-      print "\n"
+    def to_s_sexpr()
+      acc = []
+      display_sexpr_iter(self, acc)
+      acc.to_s
     end
 
-    def display()
-      display_iter(self, [0])
+    def to_s()
+      acc = []
+      to_s_iter(self, [0], acc)
+      acc.to_s
     end
 
     private
-    def display_sexpr_iter(ast)
-      print '('
-      print ast.type
+    def to_s_sexpr_iter(ast, acc)
+      acc.push('(')
+      acc.push(ast.type)
       ast.children.each do |a|
-        print " "
+        acc.push(" ")
         if a.is_a?(Waxeye::AST)
-          display_sexpr_iter(a)
+          display_sexpr_iter(a, acc)
         else
-          print a
+          acc.push(a)
         end
       end
-      print ')'
+      acc.push(')')
     end
 
-    def display_iter(ast, indent)
-      (indent[0] - 1).times {|| print '    ' }
-      print '->  ' if indent[0] > 0
-      print ast.type, "\n"
-      indent[0] = indent[0] + 1
+    def to_s_iter(ast, indent, acc)
+      (indent[0] - 1).times {|| acc.push('    ') }
+      acc.push('->  ') if indent[0] > 0
+      acc.push(ast.type)
+      indent[0] += 1
       ast.children.each do |a|
+        acc.push("\n")
         if a.is_a?(Waxeye::AST)
-          display_iter(a, indent)
+          to_s_iter(a, indent, acc)
         else
-          (indent[0] - 1).times {|| print '    ' }
-          print '|   ' if indent[0] > 0
-          print a, "\n"
+          (indent[0] - 1).times {|| acc.push('    ') }
+          acc.push('|   ') if indent[0] > 0
+          acc.push(a)
         end
       end
-      indent[0] = indent[0] - 1
+      indent[0] -= 1
     end
   end
 
   class WaxeyeParser
-    def initialize(start, eof_check, line_counting, tab_width, automata)
+    def initialize(start, eof_check, automata)
       @start = start
       @eof_check = eof_check
-      @line_counting = line_counting
-      @tab_width = tab_width
       @automata = automata
     end
 
     def parse(input)
-      InnerParser.new(@start, @eof_check, @line_counting, @tab_width, @automata, input).parse()
+      InnerParser.new(@start, @eof_check, @automata, input).parse()
     end
 
     class InnerParser
-      def initialize(start, eof_check, line_counting, tab_width, automata, input)
+      def initialize(start, eof_check, automata, input)
         @start = start
         @eof_check = eof_check
-        @line_counting = line_counting
-        @tab_width = tab_width
         @automata = automata
-        @fa_stack = []
-        @cache = {}
         @input = input
         @input_len = input.length
         @input_pos = 0
@@ -144,7 +142,9 @@ module Waxeye
         @error_pos = 0
         @error_line = 1
         @error_col = 0
-        @error_nt = @automata[start].type
+        @error_nt = automata[start].type
+        @fa_stack = []
+        @cache = {}
       end
 
       def parse()
@@ -279,20 +279,20 @@ module Waxeye
 
       def mv()
         ch = @input[@input_pos].chr()
-        @input_pos = @input_pos + 1
+        @input_pos += 1
 
         if ch == '\r'
-          @line = @line + 1
+          @line += 1
           @column = 0
           @last_cr = true
         else
           if ch == '\n'
             if not @last_cr
-              @line = @line + 1
+              @line += 1
               @column = 0
             end
           else
-            @column = @column + 1
+            @column += 1
           end
           @last_cr = false
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: waxeye
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Orlando D. A. R. Hill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-17 00:00:00 +01:00
+date: 2008-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -50,6 +50,6 @@ rubyforge_project: waxeye
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: The Ruby runtime for Waxeye parsers
+summary: Ruby runtime for the Waxeye Parser Generator
 test_files: []