fixed bug 465

darcs-hash:20040309084640-5007d-50094a0c204196a493850a4230fcd5563fa41c6e.gz

diff --git a/Makefile b/Makefile
index 6f0ddc0..685b011 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ plat_classes_Solaris := org.ibex.plat.Solaris $(plat_classes_X11)
 plat_classes_Darwin  := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX)
 
 plat_java_src_sources     := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_classes_$(platform))))
-java_src_sources          := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v plat)
+java_src_sources          := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/)
 java_src_sources          += $(plat_java_src_sources)
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
 

diff --git a/src/org/ibex/js/Lexer.java b/src/org/ibex/js/Lexer.java
index 5aab728..ac6f6e1 100644 (file)
--- a/src/org/ibex/js/Lexer.java
+++ b/src/org/ibex/js/Lexer.java
@@ -43,7 +43,7 @@ class Lexer implements Tokens {
     protected String string = null;
 
     /** the line number of the most recently <i>lexed</i> token */
-    private int line = 0;
+    protected int line = 0;
 
     /** the line number of the most recently <i>parsed</i> token */
     protected int parserLine = 0;

diff --git a/src/org/ibex/js/Parser.java b/src/org/ibex/js/Parser.java
index 09f50db..ded2556 100644 (file)
--- a/src/org/ibex/js/Parser.java
+++ b/src/org/ibex/js/Parser.java
@@ -940,7 +940,7 @@ class Parser extends Lexer implements ByteCodes {
 
 
     // ParserException //////////////////////////////////////////////////////////////////////
-    private IOException pe(String s) { return new IOException(sourceName + ":" + parserLine + " " + s); }
+    private IOException pe(String s) { return new IOException(sourceName + ":" + line + " " + s); }
     
 }