- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 11 Mar 2008 10:16:16 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv6001
Modified Files:
CssParserTokenManager.java SimpleCharStream.java
Log Message:
new versions due to the mote from javacc3.2 to javacc4
Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CssParserTokenManager.java 27 Sep 2007 08:46:45 -0000 1.17
+++ CssParserTokenManager.java 11 Mar 2008 10:16:14 -0000 1.18
@@ -1,6 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. CssParserTokenManager.java */
package org.w3c.css.parser.analyzer;
-
import java.io.InputStream;
import java.util.Vector;
import java.util.Enumeration;
@@ -54,15 +53,14 @@
import org.w3c.css.selectors.attributes.AttributeSubstr;
import org.w3c.css.selectors.attributes.AttributeSuffix;
-public class CssParserTokenManager implements CssParserConstants {
[...1352 lines suppressed...]
error_line++;
error_column = 0;
- } else
+ }
+ else
error_column++;
}
if (!EOFSeen) {
input_stream.backup(1);
error_after = curPos <= 1 ? "" : input_stream.GetImage();
}
- throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar,
- TokenMgrError.LEXICAL_ERROR);
- }
+ throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
}
}
+}
}
Index: SimpleCharStream.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/SimpleCharStream.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SimpleCharStream.java 14 Sep 2005 15:14:18 -0000 1.3
+++ SimpleCharStream.java 11 Mar 2008 10:16:14 -0000 1.4
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 3.0 */
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */
package org.w3c.css.parser.analyzer;
/**
@@ -27,6 +27,11 @@
protected char[] buffer;
protected int maxNextCharInd = 0;
protected int inBuf = 0;
+ protected int tabSize = 8;
+
+ protected void setTabSize(int i) { tabSize = i; }
+ protected int getTabSize(int i) { return tabSize; }
+
protected void ExpandBuff(boolean wrapAround)
{
@@ -162,7 +167,7 @@
break;
case '\t' :
column--;
- column += (8 - (column & 07));
+ column += (tabSize - (column % tabSize));
break;
default :
break;
@@ -190,11 +195,11 @@
char c = buffer[bufpos];
UpdateLineColumn(c);
- return (c);
+ return c;
}
/**
- * @deprecated
+ * @deprecated
* @see #getEndColumn
*/
@@ -203,7 +208,7 @@
}
/**
- * @deprecated
+ * @deprecated
* @see #getEndLine
*/
@@ -248,7 +253,7 @@
}
public SimpleCharStream(java.io.Reader dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
this(dstream, startline, startcolumn, 4096);
}
@@ -277,7 +282,7 @@
}
public void ReInit(java.io.Reader dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
ReInit(dstream, startline, startcolumn, 4096);
}
@@ -286,35 +291,68 @@
{
ReInit(dstream, 1, 1, 4096);
}
+ public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+ {
+ this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+ }
+
public SimpleCharStream(java.io.InputStream dstream, int startline,
int startcolumn, int buffersize)
{
- this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
+ this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+ }
+
+ public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn) throws java.io.UnsupportedEncodingException
+ {
+ this(dstream, encoding, startline, startcolumn, 4096);
}
public SimpleCharStream(java.io.InputStream dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
this(dstream, startline, startcolumn, 4096);
}
+ public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+ {
+ this(dstream, encoding, 1, 1, 4096);
+ }
+
public SimpleCharStream(java.io.InputStream dstream)
{
this(dstream, 1, 1, 4096);
}
+ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+ {
+ ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+ }
+
public void ReInit(java.io.InputStream dstream, int startline,
int startcolumn, int buffersize)
{
- ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
+ ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+ }
+
+ public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+ {
+ ReInit(dstream, encoding, 1, 1, 4096);
}
public void ReInit(java.io.InputStream dstream)
{
ReInit(dstream, 1, 1, 4096);
}
+ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn) throws java.io.UnsupportedEncodingException
+ {
+ ReInit(dstream, encoding, startline, startcolumn, 4096);
+ }
public void ReInit(java.io.InputStream dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
ReInit(dstream, startline, startcolumn, 4096);
}
@@ -378,7 +416,7 @@
bufcolumn[j] = newCol + columnDiff;
columnDiff = nextColDiff;
i++;
- }
+ }
if (i < len)
{
Received on Tuesday, 11 March 2008 10:16:28 UTC