waxeye 0.4.0 → 0.5.0

data/README

@@ -1,7 +1,7 @@
 
 ============================================
 | Waxeye Parser Generator                  |
-| v 0.4.0                                  |
+| v 0.5.0                                  |
 | www.waxeye.org                           |
 | Copyright (C) 2008 Orlando D. A. R. Hill |
 ============================================
@@ -39,8 +39,8 @@ Features
 User Manual
 ===========
 
-Waxeye's user manual is in 'docs/manual.html' and 'docs/manual.pdf'.
-The latest version is also online at http://waxeye.org/manual.html.
+Waxeye's user manual is in 'docs/manual.html'. The latest version is also
+online at http://waxeye.org/manual.html.
 
 
 Installation
@@ -69,18 +69,21 @@ Building
    http://download.plt-scheme.org
 
 2. Install Waxeye's backend for PLT Scheme.
-Unix, OSX:
+   Unix, OSX:
    sudo ln -s /usr/local/waxeye/src/scheme/waxeye /usr/local/plt/lib/plt/collects/
 
-Windows:
-   Copy the dir 'src/scheme/waxeye' into your PLT-Scheme collections directory.
+   Windows:
+   Copy the directory 'src/scheme/waxeye' into your PLT-Scheme 'collects'
+   directory. For example, that might be 'C:\Program Files\PLT\collects'.
 
 3. Build Waxeye
-Unix, OSX:
+   Unix, OSX:
    ./build/unix
 
-Windows:
-   TODO: Translate 'build/unix' to a Windows equivalent.
+   Windows:
+   From your Waxeye installation directory, run the 'build\exe.bat' script in a
+   command prompt. If your PLT-Scheme installation isn't 'C:\Program Files\PLT'
+   then you will need to modify 'build\exe.bat' to use the correct path.
 
 
 Running
@@ -100,8 +103,7 @@ MIT/X11 - All files (except the user manual) are under the permissive MIT/X11
 license.
 
 GNU FDL - Waxeye's user manual is under the GNU Free Documentation License.
-This includes all files in the 'doc/book' directory, 'doc/manual.html' and
-'doc/manual.pdf'.
+This includes the files 'doc/book/book' and 'doc/manual.html'.
 
 
 Support

data/lib/waxeye.rb

@@ -41,11 +41,11 @@ module Waxeye
   end
 
   class Automaton
-    attr_reader :type, :states, :voided
-    def initialize(type, states, voided)
+    attr_reader :type, :states, :mode
+    def initialize(type, states, mode)
       @type = type
       @states = states
-      @voided = voided
+      @mode = mode
     end
   end
 
@@ -167,7 +167,7 @@ module Waxeye
         automaton = @automata[index]
         type = automaton.type
         states = automaton.states
-        voided = automaton.voided
+        mode = automaton.mode
 
         @states_stack.push(states)
         res = match_state(0)
@@ -180,16 +180,28 @@ module Waxeye
                   restore_pos(start_pos, start_line, start_col, start_cr)
                   if res
                     update_error()
-                    false
                   else
                     true
                   end
                 else
                   if res
-                    (voided ? true : AST.new(type, res, :pos))
+                    case mode
+                    when :void
+                      true
+                    when :prune
+                      case res.length
+                      when 0
+                        true
+                      when 1
+                        res[0]
+                      else
+                        AST.new(type, res, :pos)
+                      end
+                    else
+                      AST.new(type, res, :pos)
+                    end
                   else
                     update_error()
-                    false
                   end
                 end
 
@@ -219,11 +231,11 @@ module Waxeye
         start_cr = @last_cr
         t = edge.trans
         res = if t == :_wild
-                @input_pos < @input_len ? mv() : (update_error(); false)
+                @input_pos < @input_len ? mv() : update_error()
               elsif t.is_a?(String)
-                @input_pos < @input_len and t[0] == @input[@input_pos] ? mv() : (update_error(); false)
+                @input_pos < @input_len and t[0] == @input[@input_pos] ? mv() : update_error()
               elsif t.is_a?(Array)
-                @input_pos < @input_len and within_set?(t, @input[@input_pos]) ? mv() : (update_error(); false)
+                @input_pos < @input_len and within_set?(t, @input[@input_pos]) ? mv() : update_error()
               elsif t.is_a?(Integer)
                 match_automaton(t)
               else
@@ -260,6 +272,7 @@ module Waxeye
           @error_line = @line
           @error_col = @column
         end
+        false
       end
 
       def mv()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: waxeye
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Orlando D. A. R. Hill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-07 00:00:00 +02:00
+date: 2008-08-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -46,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: waxeye
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2