W3C home > Mailing lists > Public > www-validator-cvs@w3.org > March 2008

2002/css-validator/org/w3c/css/parser/analyzer ParseException.java,1.4,1.5

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 20 Mar 2008 12:17:13 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1JcJhp-0004r6-33@lionel-hutz.w3.org>

Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv18638

Modified Files:
	ParseException.java 
Log Message:
optimization, stacktrace is not needed and consumes time. 
(could be re-added for debug purposes only)
also for message creation, now using StringBuilder


Index: ParseException.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/ParseException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ParseException.java	14 Sep 2005 15:14:18 -0000	1.4
+++ ParseException.java	20 Mar 2008 12:17:11 -0000	1.5
@@ -12,181 +12,190 @@
  */
 public class ParseException extends Exception {
 
-  /**
-   * This constructor is used by the method "generateParseException"
-   * in the generated parser.  Calling this constructor generates
-   * a new object of this type with the fields "currentToken",
-   * "expectedTokenSequences", and "tokenImage" set.  The boolean
-   * flag "specialConstructor" is also set to true to indicate that
-   * this constructor was used to create this object.
-   * This constructor calls its super class with the empty string
-   * to force the "toString" method of parent class "Throwable" to
-   * print the error message in the form:
-   *     ParseException: <result of getMessage>
-   */
-  public ParseException(Token currentTokenVal,
-                        int[][] expectedTokenSequencesVal,
-                        String[] tokenImageVal
-                       )
-  {
-    super("");
-    specialConstructor = true;
-    currentToken = currentTokenVal;
-    expectedTokenSequences = expectedTokenSequencesVal;
-    tokenImage = tokenImageVal;
-  }
+    public final Throwable fillInStackTrace() {
+	return this;
+    }
 
-  /**
-   * The following constructors are for use by you for whatever
-   * purpose you can think of.  Constructing the exception in this
-   * manner makes the exception behave in the normal way - i.e., as
-   * documented in the class "Throwable".  The fields "errorToken",
-   * "expectedTokenSequences", and "tokenImage" do not contain
-   * relevant information.  The JavaCC generated code does not use
-   * these constructors.
-   */
+    /**
+     * This constructor is used by the method "generateParseException"
+     * in the generated parser.  Calling this constructor generates
+     * a new object of this type with the fields "currentToken",
+     * "expectedTokenSequences", and "tokenImage" set.  The boolean
+     * flag "specialConstructor" is also set to true to indicate that
+     * this constructor was used to create this object.
+     * This constructor calls its super class with the empty string
+     * to force the "toString" method of parent class "Throwable" to
+     * print the error message in the form:
+     *     ParseException: <result of getMessage>
+     */
+    public ParseException(Token currentTokenVal,
+			  int[][] expectedTokenSequencesVal,
+			  String[] tokenImageVal) {
+	super("");
+	specialConstructor = true;
+	currentToken = currentTokenVal;
+	expectedTokenSequences = expectedTokenSequencesVal;
+	tokenImage = tokenImageVal;
+    }
 
-  public ParseException() {
-    super();
-    specialConstructor = false;
-  }
+    /**
+     * The following constructors are for use by you for whatever
+     * purpose you can think of.  Constructing the exception in this
+     * manner makes the exception behave in the normal way - i.e., as
+     * documented in the class "Throwable".  The fields "errorToken",
+     * "expectedTokenSequences", and "tokenImage" do not contain
+     * relevant information.  The JavaCC generated code does not use
+     * these constructors.
+     */
 
-  public ParseException(String message) {
-    super(message);
-    specialConstructor = false;
-  }
+    public ParseException() {
+	super();
+	specialConstructor = false;
+    }
 
-  /**
-   * This variable determines which constructor was used to create
-   * this object and thereby affects the semantics of the
-   * "getMessage" method (see below).
-   */
-  protected boolean specialConstructor;
+    public ParseException(String message) {
+	super(message);
+	specialConstructor = false;
+    }
 
-  /**
-   * This is the last token that has been consumed successfully.  If
-   * this object has been created due to a parse error, the token
-   * followng this token will (therefore) be the first error token.
-   */
-  public Token currentToken;
+    /**
+     * This variable determines which constructor was used to create
+     * this object and thereby affects the semantics of the
+     * "getMessage" method (see below).
+     */
+    protected boolean specialConstructor;
 
-  /**
-   * Each entry in this array is an array of integers.  Each array
-   * of integers represents a sequence of tokens (by their ordinal
-   * values) that is expected at this point of the parse.
-   */
-  public int[][] expectedTokenSequences;
+    /**
+     * This is the last token that has been consumed successfully.  If
+     * this object has been created due to a parse error, the token
+     * followng this token will (therefore) be the first error token.
+     */
+    public Token currentToken;
 
-  /**
-   * This is a reference to the "tokenImage" array of the generated
-   * parser within which the parse error occurred.  This array is
-   * defined in the generated ...Constants interface.
-   */
-  public String[] tokenImage;
+    /**
+     * Each entry in this array is an array of integers.  Each array
+     * of integers represents a sequence of tokens (by their ordinal
+     * values) that is expected at this point of the parse.
+     */
+    public int[][] expectedTokenSequences;
 
-  /**
-   * This method has the standard behavior when this object has been
-   * created using the standard constructors.  Otherwise, it uses
-   * "currentToken" and "expectedTokenSequences" to generate a parse
-   * error message and returns it.  If this object has been created
-   * due to a parse error, and you do not catch it (it gets thrown
-   * from the parser), then this method is called during the printing
-   * of the final stack trace, and hence the correct error message
-   * gets displayed.
-   */
-  public String getMessage() {
-    if (!specialConstructor) {
-      return super.getMessage();
-    }
-    String expected = "";
-    int maxSize = 0;
-    for (int i = 0; i < expectedTokenSequences.length; i++) {
-      if (maxSize < expectedTokenSequences[i].length) {
-        maxSize = expectedTokenSequences[i].length;
-      }
-      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-        expected += tokenImage[expectedTokenSequences[i][j]] + " ";
-      }
-      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-        expected += "...";
-      }
-      expected += eol + "    ";
-    }
-    String retval = "Encountered \"";
-    Token tok = currentToken.next;
-    for (int i = 0; i < maxSize; i++) {
-      if (i != 0) retval += " ";
-      if (tok.kind == 0) {
-        retval += tokenImage[0];
-        break;
-      }
-      retval += add_escapes(tok.image);
-      tok = tok.next;
-    }
-    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-    retval += "." + eol;
-    if (expectedTokenSequences.length == 1) {
-      retval += "Was expecting:" + eol + "    ";
-    } else {
-      retval += "Was expecting one of:" + eol + "    ";
+    /**
+     * This is a reference to the "tokenImage" array of the generated
+     * parser within which the parse error occurred.  This array is
+     * defined in the generated ...Constants interface.
+     */
+    public String[] tokenImage;
+
+    /**
+     * This method has the standard behavior when this object has been
+     * created using the standard constructors.  Otherwise, it uses
+     * "currentToken" and "expectedTokenSequences" to generate a parse
+     * error message and returns it.  If this object has been created
+     * due to a parse error, and you do not catch it (it gets thrown
+     * from the parser), then this method is called during the printing
+     * of the final stack trace, and hence the correct error message
+     * gets displayed.
+     */
+    public String getMessage() {
+	if (!specialConstructor) {
+	    return super.getMessage();
+	}
+	StringBuilder expected = new StringBuilder();
+	int maxSize = 0;
+	int tokenlength = expectedTokenSequences.length;
+	for (int i = 0; i < tokenlength; i++) {
+	    int ets[] = expectedTokenSequences[i];
+	    int etslength = ets.length;
+	    if (maxSize < etslength) {
+		maxSize = etslength;
+	    }
+	    for (int j = 0; j < etslength; j++) {
+		expected.append(tokenImage[ets[j]]).append(' ');
+	    }
+	    if (ets[etslength - 1] != 0) {
+		expected.append("...");
+	    }
+	    expected.append(eol).append("    ");
+	}
+	StringBuilder retval = new StringBuilder(128);
+	retval.append("Encountered \"");
+	Token tok = currentToken.next;
+	for (int i = 0; i < maxSize; i++) {
+	    if (i != 0) {
+		retval.append(' ');
+	    }
+	    if (tok.kind == 0) {
+		retval.append(tokenImage[0]);
+		break;
+	    }
+	    retval.append(add_escapes(tok.image));
+	    tok = tok.next;
+	}
+	retval.append("\" at line ").append(currentToken.next.beginLine);
+	retval.append(", column ").append(currentToken.next.beginColumn);
+	retval.append('.').append(eol);
+	if (expectedTokenSequences.length == 1) {
+	    retval.append("Was expecting:").append(eol).append("    ");
+	} else {
+	    retval.append("Was expecting one of:").append(eol).append("    ");
+	}
+	retval.append(expected);
+	return retval.toString();
     }
-    retval += expected;
-    return retval;
-  }
 
-  /**
-   * The end of line string for this machine.
-   */
-  protected String eol = System.getProperty("line.separator", "\n");
+    /**
+     * The end of line string for this machine.
+     */
+    protected String eol = System.getProperty("line.separator", "\n");
 
-  /**
-   * Used to convert raw characters to their escaped version
-   * when these raw version cannot be used as part of an ASCII
-   * string literal.
-   */
-  protected String add_escapes(String str) {
-      StringBuffer retval = new StringBuffer();
-      char ch;
-      for (int i = 0; i < str.length(); i++) {
-        switch (str.charAt(i))
-        {
-           case 0 :
-              continue;
-           case '\b':
-              retval.append("\\b");
-              continue;
-           case '\t':
-              retval.append("\\t");
-              continue;
-           case '\n':
-              retval.append("\\n");
-              continue;
-           case '\f':
-              retval.append("\\f");
-              continue;
-           case '\r':
-              retval.append("\\r");
-              continue;
-           case '\"':
-              retval.append("\\\"");
-              continue;
-           case '\'':
-              retval.append("\\\'");
-              continue;
-           case '\\':
-              retval.append("\\\\");
-              continue;
-           default:
-              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                 String s = "0000" + Integer.toString(ch, 16);
-                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-              } else {
-                 retval.append(ch);
-              }
-              continue;
-        }
-      }
-      return retval.toString();
-   }
+    /**
+     * Used to convert raw characters to their escaped version
+     * when these raw version cannot be used as part of an ASCII
+     * string literal.
+     */
+    protected String add_escapes(String str) {
+	StringBuilder retval = new StringBuilder();
+	char ch;
+	for (int i = 0; i < str.length(); i++) {
+	    switch (str.charAt(i))
+	    {
+	    case 0 :
+		continue;
+	    case '\b':
+		retval.append("\\b");
+		continue;
+	    case '\t':
+		retval.append("\\t");
+		continue;
+	    case '\n':
+		retval.append("\\n");
+		continue;
+	    case '\f':
+		retval.append("\\f");
+		continue;
+	    case '\r':
+		retval.append("\\r");
+		continue;
+	    case '\"':
+		retval.append("\\\"");
+		continue;
+	    case '\'':
+		retval.append("\\\'");
+		continue;
+	    case '\\':
+		retval.append("\\\\");
+		continue;
+	    default:
+		if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+		    String s = "0000" + Integer.toString(ch, 16);
+		    retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+		} else {
+		    retval.append(ch);
+		}
+		continue;
+	    }
+	}
+	return retval.toString();
+    }
 
 }
Received on Thursday, 20 March 2008 12:17:44 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:00 GMT