Merge pull request w3c#87 from w3c/sideshowbarker/TokenMgrError-ParseException-add-getLine-getColumn

Add getLine/column to TokenMgrError+ParseException

Author: ylafon

org/w3c/css/parser/CssParseException.java

@@ -45,13 +45,41 @@ public class CssParseException extends ParseException {
 
     private boolean error;
 
+    /**
+     * Line number of the error.
+     */
+    int errorLine;
+
+    /**
+     * Column number of the error.
+     */
+    int errorColumn;
+
+    /**
+     * Gets the line number of the error.
+     */
+    public int getLine() {
+        return this.errorLine;
+    }
+
+    /**
+     * Gets the column number of the error.
+     */
+    public int getColumn() {
+        return this.errorColumn;
+    }
+
     /**
      * Create a new CssParseException
      */
     public CssParseException(Exception exc) {
+        this.errorLine = -1;
+        this.errorColumn = -1;
         parseException = exc;
         if (parseException instanceof ParseException) {
             ParseException e = (ParseException) exc;
+            this.errorLine = e.getLine();
+            this.errorColumn = e.getColumn();
             error = (e.currentToken != null
                     && e.expectedTokenSequences != null
                     && e.tokenImage != null);

org/w3c/css/parser/analyzer/CssParser.java

@@ -547,7 +547,8 @@ private static String addOperator(char operator, String value) {
       afterImportDeclaration();
       jj_consume_token(0);
     } catch (TokenMgrError err) {
-addError (new ParseException(ac.getMsg().getString("generator.unrecognize")),
+addError (new ParseException(ac.getMsg().getString("generator.unrecognize"),
+            err.getLine(), err.getColumn()),
             err.getMessage());
     }
   }
@@ -5294,14 +5295,6 @@ private boolean jj_2_5(int xla)
     finally { jj_save(4, xla); }
   }
 
-  private boolean jj_3R_138()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_177()) jj_scanpos = xsp;
-    return false;
-  }
-
   private boolean jj_3R_126()
  {
     if (jj_scan_token(S)) return true;
@@ -5911,6 +5904,14 @@ private boolean jj_3R_129()
     return false;
   }
 
+  private boolean jj_3R_138()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_177()) jj_scanpos = xsp;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public CssParserTokenManager token_source;
   SimpleCharStream jj_input_stream;

org/w3c/css/parser/analyzer/CssParser.jj

@@ -716,7 +716,8 @@ void parserUnit() :
 	    afterImportDeclaration()
 	    <EOF>
         } catch (TokenMgrError err) {
-            addError (new ParseException(ac.getMsg().getString("generator.unrecognize")),
+            addError (new ParseException(ac.getMsg().getString("generator.unrecognize"),
+            err.getLine(), err.getColumn()),
 	    err.getMessage());
         }
 }

org/w3c/css/parser/analyzer/ParseException.java

@@ -40,6 +40,8 @@ public ParseException(Token currentTokenVal,
     currentToken = currentTokenVal;
     expectedTokenSequences = expectedTokenSequencesVal;
     tokenImage = tokenImageVal;
+    this.errorLine = -1;
+    this.errorColumn = -1;
   }
 
   /**
@@ -54,13 +56,47 @@ public ParseException(Token currentTokenVal,
 
   public ParseException() {
     super();
+    this.errorLine = -1;
+    this.errorColumn = -1;
   }
 
   /** Constructor with message. */
   public ParseException(String message) {
     super(message);
+    this.errorLine = -1;
+    this.errorColumn = -1;
   }
 
+  /** Constructor with message, line number, and column number */
+  public ParseException(String message, int errorLine, int errorColumn) {
+    super(message);
+    this.errorLine = errorLine;
+    this.errorColumn = errorColumn;
+  }
+
+  /**
+   * Line number of the error.
+   */
+  int errorLine;
+
+  /**
+   * Column number of the error.
+   */
+  int errorColumn;
+
+  /**
+   * Gets the line number of the error.
+   */
+  public int getLine() {
+    return this.errorLine;
+  }
+
+  /**
+   * Gets the column number of the error.
+   */
+  public int getColumn() {
+    return this.errorColumn;
+  }
 
   /**
    * This is the last token that has been consumed successfully.  If

org/w3c/css/parser/analyzer/TokenMgrError.java

@@ -43,6 +43,30 @@ public class TokenMgrError extends Error
    */
   int errorCode;
 
+  /**
+   * Line number of the error.
+   */
+  int errorLine;
+
+  /**
+   * Column number of the error.
+   */
+  int errorColumn;
+
+  /**
+   * Gets the line number of the error.
+   */
+  public int getLine() {
+    return this.errorLine;
+  }
+
+  /**
+   * Gets the column number of the error.
+   */
+  public int getColumn() {
+    return this.errorColumn;
+  }
+
   /**
    * Replaces unprintable characters by their escaped (or unicode escaped)
    * equivalents in the given string
@@ -142,6 +166,8 @@ public TokenMgrError(String message, int reason) {
   /** Full Constructor. */
   public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
     this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+    this.errorLine = errorLine;
+    this.errorColumn = errorColumn;
   }
 }
 /* JavaCC - OriginalChecksum=71ef0692844cb226bd1fcd5a89d517eb (do not edit this line) */