- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 05 Jan 2010 13:55:51 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv30930/org/w3c/css/parser/analyzer
Modified Files:
CssParser.java CssParser.jj CssParserTokenManager.java
ParseException.java
Log Message:
Implementation of css3-background (partial, missing background-color and background, also borders not done)
cf. http://www.w3.org/TR/2009/CR-css3-background-20091217/
moved and corrected implementation of css3-multicol
cf. http://www.w3.org/TR/2009/CR-css3-multicol-20091217/
Some reorganization of code.
Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- CssParserTokenManager.java 17 Dec 2009 16:08:11 -0000 1.34
+++ CssParserTokenManager.java 5 Jan 2010 13:55:49 -0000 1.35
@@ -22,7 +22,7 @@
import org.w3c.css.values.CssFunction;
import org.w3c.css.values.CssUnicodeRange;
import org.w3c.css.values.CssResolution;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssError;
Index: CssParser.jj
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- CssParser.jj 17 Dec 2009 16:08:11 -0000 1.70
+++ CssParser.jj 5 Jan 2010 13:55:48 -0000 1.71
@@ -44,7 +44,7 @@
import org.w3c.css.values.CssFunction;
import org.w3c.css.values.CssUnicodeRange;
import org.w3c.css.values.CssResolution;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssError;
Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- CssParser.java 17 Dec 2009 16:08:11 -0000 1.69
+++ CssParser.java 5 Jan 2010 13:55:48 -0000 1.70
@@ -24,7 +24,7 @@
import org.w3c.css.values.CssFunction;
import org.w3c.css.values.CssUnicodeRange;
import org.w3c.css.values.CssResolution;
-import org.w3c.css.properties.css1.CssProperty;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssError;
@@ -168,15 +168,14 @@
public void ReInitWithAc(InputStream stream, ApplContext ac,
String charset)
{
- InputStream is = /*new CommentSkipperInputStream(stream);*/stream;
if (charset == null) {
charset = "iso-8859-1";
}
InputStreamReader isr = null;
try {
- isr = new InputStreamReader(is, charset);
+ isr = new InputStreamReader(stream, charset);
} catch (UnsupportedEncodingException uex) {
- isr = new InputStreamReader(is);
+ isr = new InputStreamReader(stream);
}
// reinit, it can not happen...
// ...in theory ;)
Index: ParseException.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/ParseException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ParseException.java 17 Dec 2009 16:08:12 -0000 1.7
+++ ParseException.java 5 Jan 2010 13:55:49 -0000 1.8
@@ -173,7 +173,8 @@
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()));
+ retval.append("\\u");
+ retval.append(s.substring(s.length() - 4, s.length()));
} else {
retval.append(ch);
}
Received on Tuesday, 5 January 2010 13:55:52 UTC