waxeye 0.5.0 → 0.6.0

data/README

@@ -1,7 +1,7 @@
 
 ============================================
 | Waxeye Parser Generator                  |
-| v 0.5.0                                  |
+| v 0.6.0                                  |
 | www.waxeye.org                           |
 | Copyright (C) 2008 Orlando D. A. R. Hill |
 ============================================
@@ -31,6 +31,7 @@ Features
 * Automatic AST Generation
 
 * Choice of Programming Language
+  - C
   - Java
   - Ruby
   - Scheme
@@ -65,7 +66,7 @@ Windows:
 Building
 ========
 
-1. Install MzScheme v372; either with DrScheme or alone.
+1. Install MzScheme v4; either with DrScheme or alone.
    http://download.plt-scheme.org
 
 2. Install Waxeye's backend for PLT Scheme.
@@ -81,9 +82,15 @@ Building
    ./build/unix
 
    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.
+
+   - 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.
+
+   - From your Waxeye installation directory, run the 'build\exe.bat' script in a
+   command prompt.
+
+   - When the script has finished, press 'y' then 'Enter' to remove the
+   temporary files.
 
 
 Running
@@ -93,7 +100,9 @@ Unix, OSX:
 Use 'waxeye'.
 
 Windows:
-Use a command prompt to run `waxeye.exe`.
+Use a command prompt to run `waxeye.exe`. Note: If using the interpreter under
+Windows, you will need to press 'Ctrl-z' and then 'Enter' after the input you
+want to interpret.
 
 
 License

data/lib/waxeye.rb

@@ -50,15 +50,16 @@ module Waxeye
   end
 
   class ParseError
-    attr_reader :pos, :line, :col
-    def initialize(pos, line, col)
+    attr_reader :pos, :line, :col, :nt
+    def initialize(pos, line, col, nt)
       @pos = pos
       @line = line
       @col = col
+      @nt = nt
     end
 
     def display()
-      print "parse error at pos=#{pos}, line=#{line}, col=#{col}\n"
+      print "parse error: failed to match '#{nt}' at line=#{line}, col=#{col}, pos=#{pos}\n"
     end
   end
 
@@ -132,17 +133,18 @@ module Waxeye
         @line_counting = line_counting
         @tab_width = tab_width
         @automata = automata
-        @states_stack = []
+        @fa_stack = []
         @cache = {}
         @input = input
         @input_len = input.length
         @input_pos = 0
-        @line = 0
+        @line = 1
         @column = 0
         @last_cr = false
         @error_pos = 0
-        @error_line = 0
+        @error_line = 1
         @error_col = 0
+        @error_nt = @automata[start].type
       end
 
       def parse()
@@ -166,12 +168,11 @@ module Waxeye
         start_cr = @last_cr
         automaton = @automata[index]
         type = automaton.type
-        states = automaton.states
         mode = automaton.mode
 
-        @states_stack.push(states)
+        @fa_stack.push(automaton)
         res = match_state(0)
-        @states_stack.pop()
+        @fa_stack.pop()
 
         value = if type == :_and
                   restore_pos(start_pos, start_line, start_col, start_cr)
@@ -195,10 +196,10 @@ module Waxeye
                       when 1
                         res[0]
                       else
-                        AST.new(type, res, :pos)
+                        AST.new(type, res, [start_pos, @input_pos])
                       end
                     else
-                      AST.new(type, res, :pos)
+                      AST.new(type, res, [start_pos, @input_pos])
                     end
                   else
                     update_error()
@@ -210,7 +211,7 @@ module Waxeye
       end
 
       def match_state(index)
-        state = @states_stack.last[index]
+        state = @fa_stack.last.states[index]
         res = match_edges(state.edges)
         res ? res : (state.match and []) 
       end
@@ -271,6 +272,7 @@ module Waxeye
           @error_pos = @input_pos
           @error_line = @line
           @error_col = @column
+          @error_nt = @fa_stack.last.type
         end
         false
       end
@@ -302,13 +304,13 @@ module Waxeye
         if res
           if @eof_check and @input_pos < @input_len
             # Create a parse error - Not all input consumed
-            ParseError.new(@error_pos, @error_line, @error_col)
+            ParseError.new(@error_pos, @error_line, @error_col, @error_nt)
           else
             res
           end
         else
           # Create a parse error
-          ParseError.new(@error_pos, @error_line, @error_col)
+          ParseError.new(@error_pos, @error_line, @error_col, @error_nt)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: waxeye
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Orlando D. A. R. Hill
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-24 00:00:00 +02:00
+date: 2008-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: []