From: Finn B. <bc...@us...> - 2001-11-27 13:51:41
|
Update of /cvsroot/jython/jython/org/python/parser In directory usw-pr-cvs1:/tmp/cvs-serv9040/parser Modified Files: ReaderCharStream.java SimpleNode.java TokenMgrError.java Log Message: Whitespace normalization. Index: ReaderCharStream.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/ReaderCharStream.java,v retrieving revision 2.1 retrieving revision 2.2 diff -C2 -d -r2.1 -r2.2 *** ReaderCharStream.java 2001/07/20 13:37:43 2.1 --- ReaderCharStream.java 2001/11/27 13:51:38 2.2 *************** *** 191,195 **** /** ! * @deprecated * @see #getEndColumn */ --- 191,195 ---- /** ! * @deprecated * @see #getEndColumn */ *************** *** 200,204 **** /** ! * @deprecated * @see #getEndLine */ --- 200,204 ---- /** ! * @deprecated * @see #getEndLine */ *************** *** 303,307 **** columnDiff = nextColDiff; i++; ! } if (i < len) --- 303,307 ---- columnDiff = nextColDiff; i++; ! } if (i < len) Index: SimpleNode.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/SimpleNode.java,v retrieving revision 2.16 retrieving revision 2.17 diff -C2 -d -r2.16 -r2.17 *** SimpleNode.java 2001/10/28 17:13:44 2.16 --- SimpleNode.java 2001/11/27 13:51:38 2.17 *************** *** 17,21 **** public org.python.compiler.ScopeInfo scope; // for nested scopes public boolean from_future_checked = false; // from __future__ support ! public SimpleNode(int i) { id = i; --- 17,21 ---- public org.python.compiler.ScopeInfo scope; // for nested scopes public boolean from_future_checked = false; // from __future__ support ! public SimpleNode(int i) { id = i; *************** *** 82,86 **** } ! public static String parseString(String s, int quotes, int beginLine, int beginColumn) { //System.out.println("string: "+s); --- 82,86 ---- } ! public static String parseString(String s, int quotes, int beginLine, int beginColumn) { //System.out.println("string: "+s); *************** *** 91,95 **** ustring = true; start++; ! } quoteChar = s.charAt(start); if (quoteChar == 'r' || quoteChar == 'R') { --- 91,95 ---- ustring = true; start++; ! } quoteChar = s.charAt(start); if (quoteChar == 'r' || quoteChar == 'R') { Index: TokenMgrError.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/parser/TokenMgrError.java,v retrieving revision 2.3 retrieving revision 2.4 diff -C2 -d -r2.3 -r2.4 *** TokenMgrError.java 2001/02/23 20:27:40 2.3 --- TokenMgrError.java 2001/11/27 13:51:38 2.4 *************** *** 90,94 **** * Returns a detailed message for the Error when it is thrown by the * token manager to indicate a lexical error. ! * Parameters : * EOFSeen : indicates if EOF caused the lexicl error * curLexState : lexical state in which this error occured --- 90,94 ---- * Returns a detailed message for the Error when it is thrown by the * token manager to indicate a lexical error. ! * Parameters : * EOFSeen : indicates if EOF caused the lexicl error * curLexState : lexical state in which this error occured *************** *** 116,120 **** * You can also modify the body of this method to customize your error messages. * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not ! * of end-users concern, so you can return something like : * * "Internal Error : Please file a bug report .... " --- 116,120 ---- * You can also modify the body of this method to customize your error messages. * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not ! * of end-users concern, so you can return something like : * * "Internal Error : Please file a bug report .... " |