jython-checkins

[Jython-checkins] SF.net SVN: jython:[5543] trunk/jython/src/org/python/core/ParserFacade. java

[<le...@us...>]

Revision: 5543
          http://jython.svn.sourceforge.net/jython/?rev=5543&view=rev
Author:   leosoto
Date:     2008-11-05 02:56:03 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
ParserFacade#partialParse: Check that the input reader is not null before trying to validate a partial sentence

Modified Paths:
--------------
    trunk/jython/src/org/python/core/ParserFacade.java

Modified: trunk/jython/src/org/python/core/ParserFacade.java
===================================================================
--- trunk/jython/src/org/python/core/ParserFacade.java	2008-11-05 02:39:25 UTC (rev 5542)
+++ trunk/jython/src/org/python/core/ParserFacade.java	2008-11-05 02:56:03 UTC (rev 5543)
@@ -165,7 +165,7 @@
             return parse(reader, kind, filename, cflags);
         } catch (Throwable t) {
             PyException p = fixParseError(reader, t, filename);
-            if (validPartialSentence(reader, kind, filename)) {
+            if (reader != null && validPartialSentence(reader, kind, filename)) {
                 return null;
             }
             throw p;


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

[Jython-checkins] SF.net SVN: jython:[6221] trunk/jython/src/org/python/core/ParserFacade. java

[<pj...@us...>]

Revision: 6221
          http://jython.svn.sourceforge.net/jython/?rev=6221&view=rev
Author:   pjenvey
Date:     2009-04-12 00:21:44 +0000 (Sun, 12 Apr 2009)

Log Message:
-----------
restore the original encoding of SyntaxError text

Modified Paths:
--------------
    trunk/jython/src/org/python/core/ParserFacade.java

Modified: trunk/jython/src/org/python/core/ParserFacade.java
===================================================================
--- trunk/jython/src/org/python/core/ParserFacade.java	2009-04-11 21:27:36 UTC (rev 6220)
+++ trunk/jython/src/org/python/core/ParserFacade.java	2009-04-12 00:21:44 UTC (rev 6221)
@@ -44,7 +44,7 @@
 
     private ParserFacade() {}
 
-    private static String getLine(BufferedReader reader, int line) {
+    private static String getLine(ExpectedEncodingBufferedReader reader, int line) {
         if (reader == null) {
             return "";
         }
@@ -53,7 +53,14 @@
             for (int i = 0; i < line; i++) {
                 text = reader.readLine();
             }
-            return text == null ? text : text + "\n";
+            if (text == null) {
+                return text;
+            }
+            if (reader.encoding != null) {
+                // restore the original encoding
+                text = new PyUnicode(text).encode(reader.encoding);
+            }
+            return text + "\n";
         } catch (IOException ioe) {
         }
         return text;
@@ -80,7 +87,7 @@
                 line = node.getLine();
                 col = node.getCharPositionInLine();
             }
-            String text=getLine(reader, line);
+            String text= getLine(reader, line);
             String msg = e.getMessage();
             if (e.getType() == Py.IndentationError) {
                 return new PyIndentationError(msg, line, col, text, filename);


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

[Jython-checkins] SF.net SVN: jython:[6963] trunk/jython/src/org/python/core/ParserFacade. java

[<nr...@us...>]

Revision: 6963
          http://jython.svn.sourceforge.net/jython/?rev=6963&view=rev
Author:   nriley
Date:     2010-01-24 01:15:55 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
Better handle errors where a BufferedReader cannot be constructed while parsing (i.e., there are issues with underlying Reader).  Partially addresses #1536.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/ParserFacade.java

Modified: trunk/jython/src/org/python/core/ParserFacade.java
===================================================================
--- trunk/jython/src/org/python/core/ParserFacade.java	2010-01-23 22:58:13 UTC (rev 6962)
+++ trunk/jython/src/org/python/core/ParserFacade.java	2010-01-24 01:15:55 UTC (rev 6963)
@@ -118,8 +118,10 @@
         try {
             bufReader = prepBufReader(reader, cflags, filename);
             // first, try parsing as an expression
-            return parse(bufReader, CompileMode.eval, filename, cflags );
+            return parse(bufReader, CompileMode.eval, filename, cflags);
         } catch (Throwable t) {
+            if (bufReader == null)
+                throw Py.JavaError(t); // can't do any more
             try {
                 // then, try parsing as a module
                 bufReader.reset();
@@ -128,7 +130,8 @@
                 throw fixParseError(bufReader, tt, filename);
             }
         } finally {
-            close(bufReader);
+            if (bufReader != null)
+                close(bufReader);
         }
     }
 


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

[Jython-checkins] SF.net SVN: jython:[6964] trunk/jython/src/org/python/core/ParserFacade. java

[<nr...@us...>]

Revision: 6964
          http://jython.svn.sourceforge.net/jython/?rev=6964&view=rev
Author:   nriley
Date:     2010-01-24 01:19:10 +0000 (Sun, 24 Jan 2010)

Log Message:
-----------
Undo an unnecessary double check.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/ParserFacade.java

Modified: trunk/jython/src/org/python/core/ParserFacade.java
===================================================================
--- trunk/jython/src/org/python/core/ParserFacade.java	2010-01-24 01:15:55 UTC (rev 6963)
+++ trunk/jython/src/org/python/core/ParserFacade.java	2010-01-24 01:19:10 UTC (rev 6964)
@@ -130,8 +130,7 @@
                 throw fixParseError(bufReader, tt, filename);
             }
         } finally {
-            if (bufReader != null)
-                close(bufReader);
+            close(bufReader);
         }
     }
 


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