[Jython-checkins] SF.net SVN: jython:[5151] branches/asm

[<fwi...@us...>]

Revision: 5151
          http://jython.svn.sourceforge.net/jython/?rev=5151&view=rev
Author:   fwierzbicki
Date:     2008-08-11 18:31:41 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
remove LeadingSpaceSkippingStream and replace with LEADING_WS in Python.g.
No idea what I was thinking with LeadingSpaceSkippingStream...

Modified Paths:
--------------
    branches/asm/grammar/Python.g
    branches/asm/src/org/python/core/ParserFacade.java

Removed Paths:
-------------
    branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java

Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g	2008-08-11 16:43:44 UTC (rev 5150)
+++ branches/asm/grammar/Python.g	2008-08-11 18:31:41 UTC (rev 5151)
@@ -298,7 +298,7 @@
            ;
 
 //eval_input: testlist NEWLINE* ENDMARKER
-eval_input : (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* -> ^(Expression testlist)
+eval_input : LEADING_WS? (NEWLINE)* testlist[expr_contextType.Load] (NEWLINE)* -> ^(Expression testlist)
            ;
 
 //not in CPython's Grammar file

Deleted: branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java
===================================================================
--- branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java	2008-08-11 16:43:44 UTC (rev 5150)
+++ branches/asm/src/org/python/antlr/LeadingSpaceSkippingStream.java	2008-08-11 18:31:41 UTC (rev 5151)
@@ -1,39 +0,0 @@
-package org.python.antlr;
-
-import java.io.InputStream;
-import java.io.IOException;
-
-public class LeadingSpaceSkippingStream extends InputStream {
-
-    private InputStream inputStream;
-    private boolean maybeLeadingSpaces = true;
-
-    public LeadingSpaceSkippingStream(InputStream is) {
-        inputStream = is;
-    }
-
-    public int read() throws IOException {
-        int i = inputStream.read();
-        while (maybeLeadingSpaces) {
-            if (i != ' ') {
-                maybeLeadingSpaces = false;
-            } else {
-                i = inputStream.read();
-            }
-        }
-        return i;
-    }
-
-    public boolean markSupported() {
-        return inputStream.markSupported();
-    }
-
-    public void mark(int readAheadLimit) {
-        inputStream.mark(readAheadLimit);
-    }
-
-    public void reset() throws IOException {
-        maybeLeadingSpaces = true;
-        inputStream.reset();
-    }
-}

Modified: branches/asm/src/org/python/core/ParserFacade.java
===================================================================
--- branches/asm/src/org/python/core/ParserFacade.java	2008-08-11 16:43:44 UTC (rev 5150)
+++ branches/asm/src/org/python/core/ParserFacade.java	2008-08-11 18:31:41 UTC (rev 5151)
@@ -18,7 +18,6 @@
 
 import org.python.antlr.ExpressionParser;
 import org.python.antlr.InteractiveParser;
-import org.python.antlr.LeadingSpaceSkippingStream;
 import org.python.antlr.ParseException;
 import org.python.antlr.ModuleParser;
 import org.python.antlr.NoCloseReaderStream;
@@ -103,7 +102,7 @@
         modType node = null;
         try {
             if (kind.equals("eval")) {
-                bufreader = prepBufreader(new LeadingSpaceSkippingStream(bstream), cflags, filename);
+                bufreader = prepBufreader(bstream, cflags, filename);
                 CharStream cs = new NoCloseReaderStream(bufreader);
                 ExpressionParser e = new ExpressionParser(cs, filename);
                 node = e.parse();
@@ -117,7 +116,7 @@
                 ModuleParser g = new ModuleParser(cs, filename);
                 node = g.file_input();
             } else {
-               throw Py.ValueError("parse kind must be eval, exec, " + "or single");
+                throw Py.ValueError("parse kind must be eval, exec, or single");
             }
         } catch (Throwable t) {
             throw fixParseError(bufreader, t, filename);
@@ -150,12 +149,12 @@
                 InteractiveParser i = new InteractiveParser(bufreader, filename);
                 node = i.parse();
             } else if (kind.equals("eval")) {
-                bufreader = prepBufreader(new LeadingSpaceSkippingStream(bstream), cflags, filename);
+                bufreader = prepBufreader(bstream, cflags, filename);
                 CharStream cs = new NoCloseReaderStream(bufreader);
                 ExpressionParser e = new ExpressionParser(cs, filename);
                 node = e.parse();
             } else {
-                throw Py.ValueError("parse kind must be eval, exec, " + "or single");
+                throw Py.ValueError("parse kind must be eval, exec, or single");
             }
         } catch (Throwable t) {
             PyException p = fixParseError(bufreader, t, filename);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.