Skip to content

Commit ae4fc8d

Browse files
ylafonylafon
committed
added parsing of short rgba form (#1234 and #10203040) per css-color-4 + some refactoring of parameter in function to match common practise (more needed for other values)
1 parent 3ffc6a4 commit ae4fc8d

26 files changed

Lines changed: 128 additions & 126 deletions

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

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
import java.io.InputStreamReader;
77
import java.io.UnsupportedEncodingException;
88
import java.util.ArrayList;
9-
import java.util.Iterator;
109
import java.net.URL;
11-
import java.math.BigDecimal;
1210

1311
import org.w3c.css.values.CssValue;
1412
import org.w3c.css.values.CssOperator;
@@ -39,7 +37,6 @@
3937
import org.w3c.css.values.CssTypes;
4038
import org.w3c.css.values.CssVolume;
4139
import org.w3c.css.properties.css.CssProperty;
42-
import org.w3c.css.parser.Frame;
4340
import org.w3c.css.parser.CssError;
4441
import org.w3c.css.parser.CssErrorToken;
4542
import org.w3c.css.parser.CssSelectors;
@@ -63,7 +60,6 @@
6360
import org.w3c.css.util.InvalidParamException;
6461
import org.w3c.css.util.WarningParamException;
6562
import org.w3c.css.util.Util;
66-
import org.w3c.css.util.Messages;
6763

6864
import org.w3c.css.selectors.AdjacentSiblingSelector;
6965
import org.w3c.css.selectors.AttributeSelector;
@@ -6097,28 +6093,28 @@ final public boolean prio() throws ParseException {
60976093
jj_consume_token(LPARAN);
60986094
String funcname = n.image.toLowerCase();
60996095
if (funcname.equals("rgb(")) {
6100-
color.setRGBColor(exp, ac);
6096+
color.setRGBColor(ac, exp);
61016097
{if ("" != null) return color;}
61026098
} else if (funcname.equals("rgba(")) {
6103-
color.setRGBAColor(exp, ac);
6099+
color.setRGBAColor(ac, exp);
61046100
{if ("" != null) return color;}
61056101
} else if (funcname.equals("hsl(")) {
6106-
color.setHSLColor(exp, ac);
6102+
color.setHSLColor(ac, exp);
61076103
{if ("" != null) return color;}
61086104
} else if (funcname.equals("hsla(")) {
6109-
color.setHSLColor(exp, ac);
6105+
color.setHSLColor(ac, exp);
61106106
{if ("" != null) return color;}
61116107
} else if (funcname.equals("hwb(")) {
6112-
color.setHWBColor(exp, ac);
6108+
color.setHWBColor(ac, exp);
61136109
{if ("" != null) return color;}
61146110
} else if (funcname.equals("lab(")) {
6115-
color.setLABColor(exp, ac);
6111+
color.setLABColor(ac, exp);
61166112
{if ("" != null) return color;}
61176113
} else if (funcname.equals("gray(")) {
6118-
color.setGrayColor(exp, ac);
6114+
color.setGrayColor(ac, exp);
61196115
{if ("" != null) return color;}
61206116
} else if (funcname.equals("lch(")) {
6121-
color.setLCHColor(exp, ac);
6117+
color.setLCHColor(ac, exp);
61226118
{if ("" != null) return color;}
61236119
} else if (funcname.equals("image(")) {
61246120
CssImage img = new CssImage();
@@ -6142,7 +6138,7 @@ final public boolean prio() throws ParseException {
61426138
{if ("" != null) return img;}
61436139
} else if (funcname.equals("atsc-rgba(")) {
61446140
if (getAtRule().toString().equals("@media atsc-tv")) {
6145-
color.setATSCRGBAColor(exp, ac);
6141+
color.setATSCRGBAColor(ac, exp);
61466142
{if ("" != null) return color;}
61476143
} else {
61486144
addError(new InvalidParamException("onlyATSC", "", ac),
@@ -6984,15 +6980,15 @@ private boolean jj_3R_200()
69846980
return false;
69856981
}
69866982

6987-
private boolean jj_3R_211()
6983+
private boolean jj_3R_199()
69886984
{
6989-
if (jj_scan_token(COMMA)) return true;
6985+
if (jj_scan_token(IMPORTANT_NOT)) return true;
69906986
return false;
69916987
}
69926988

6993-
private boolean jj_3R_199()
6989+
private boolean jj_3R_211()
69946990
{
6995-
if (jj_scan_token(IMPORTANT_NOT)) return true;
6991+
if (jj_scan_token(COMMA)) return true;
69966992
return false;
69976993
}
69986994

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import java.io.InputStream;
2525
import java.io.InputStreamReader;
2626
import java.io.UnsupportedEncodingException;
2727
import java.util.ArrayList;
28-
import java.util.Iterator;
2928
import java.net.URL;
30-
import java.math.BigDecimal;
3129

3230
import org.w3c.css.values.CssValue;
3331
import org.w3c.css.values.CssOperator;
@@ -58,7 +56,6 @@ import org.w3c.css.values.CssSemitone;
5856
import org.w3c.css.values.CssTypes;
5957
import org.w3c.css.values.CssVolume;
6058
import org.w3c.css.properties.css.CssProperty;
61-
import org.w3c.css.parser.Frame;
6259
import org.w3c.css.parser.CssError;
6360
import org.w3c.css.parser.CssErrorToken;
6461
import org.w3c.css.parser.CssSelectors;
@@ -82,7 +79,6 @@ import org.w3c.css.util.CssVersion;
8279
import org.w3c.css.util.InvalidParamException;
8380
import org.w3c.css.util.WarningParamException;
8481
import org.w3c.css.util.Util;
85-
import org.w3c.css.util.Messages;
8682

8783
import org.w3c.css.selectors.AdjacentSiblingSelector;
8884
import org.w3c.css.selectors.AttributeSelector;
@@ -3037,28 +3033,28 @@ CssValue function() :
30373033
")" {
30383034
String funcname = n.image.toLowerCase();
30393035
if (funcname.equals("rgb(")) {
3040-
color.setRGBColor(exp, ac);
3036+
color.setRGBColor(ac, exp);
30413037
return color;
30423038
} else if (funcname.equals("rgba(")) {
3043-
color.setRGBAColor(exp, ac);
3039+
color.setRGBAColor(ac, exp);
30443040
return color;
30453041
} else if (funcname.equals("hsl(")) {
3046-
color.setHSLColor(exp, ac);
3042+
color.setHSLColor(ac, exp);
30473043
return color;
30483044
} else if (funcname.equals("hsla(")) {
3049-
color.setHSLColor(exp, ac);
3045+
color.setHSLColor(ac, exp);
30503046
return color;
30513047
} else if (funcname.equals("hwb(")) {
3052-
color.setHWBColor(exp, ac);
3048+
color.setHWBColor(ac, exp);
30533049
return color;
30543050
} else if (funcname.equals("lab(")) {
3055-
color.setLABColor(exp, ac);
3051+
color.setLABColor(ac, exp);
30563052
return color;
30573053
} else if (funcname.equals("gray(")) {
3058-
color.setGrayColor(exp, ac);
3054+
color.setGrayColor(ac, exp);
30593055
return color;
30603056
} else if (funcname.equals("lch(")) {
3061-
color.setLCHColor(exp, ac);
3057+
color.setLCHColor(ac, exp);
30623058
return color;
30633059
} else if (funcname.equals("image(")) {
30643060
CssImage img = new CssImage();
@@ -3082,7 +3078,7 @@ CssValue function() :
30823078
return img;
30833079
} else if (funcname.equals("atsc-rgba(")) {
30843080
if (getAtRule().toString().equals("@media atsc-tv")) {
3085-
color.setATSCRGBAColor(exp, ac);
3081+
color.setATSCRGBAColor(ac, exp);
30863082
return color;
30873083
} else {
30883084
addError(new InvalidParamException("onlyATSC", "", ac),

‎org/w3c/css/parser/analyzer/CssParserTokenManager.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
import java.io.InputStreamReader;
66
import java.io.UnsupportedEncodingException;
77
import java.util.ArrayList;
8-
import java.util.Iterator;
98
import java.net.URL;
10-
import java.math.BigDecimal;
119
import org.w3c.css.values.CssValue;
1210
import org.w3c.css.values.CssOperator;
1311
import org.w3c.css.values.CssAngle;
@@ -37,7 +35,6 @@
3735
import org.w3c.css.values.CssTypes;
3836
import org.w3c.css.values.CssVolume;
3937
import org.w3c.css.properties.css.CssProperty;
40-
import org.w3c.css.parser.Frame;
4138
import org.w3c.css.parser.CssError;
4239
import org.w3c.css.parser.CssErrorToken;
4340
import org.w3c.css.parser.CssSelectors;
@@ -61,7 +58,6 @@
6158
import org.w3c.css.util.InvalidParamException;
6259
import org.w3c.css.util.WarningParamException;
6360
import org.w3c.css.util.Util;
64-
import org.w3c.css.util.Messages;
6561
import org.w3c.css.selectors.AdjacentSiblingSelector;
6662
import org.w3c.css.selectors.AttributeSelector;
6763
import org.w3c.css.selectors.ChildSelector;

‎org/w3c/css/properties/css1/CssBackgroundColor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression,
6363
switch (val.getType()) {
6464
case CssTypes.CSS_HASH_IDENT:
6565
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
66-
c.setShortRGBColor(val.toString(), ac);
66+
c.setShortRGBColor(ac, val.toString());
6767
setColor(c);
6868
break;
6969
case CssTypes.CSS_COLOR:

‎org/w3c/css/properties/css1/CssBorder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ protected static SideValues checkBorderSide(ApplContext ac, CssProperty caller,
132132
break;
133133
case CssTypes.CSS_HASH_IDENT:
134134
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
135-
c.setShortRGBColor(val.toString(), ac);
135+
c.setShortRGBColor(ac, val.toString());
136136
_color = c;
137137
break;
138138
case CssTypes.CSS_COLOR:

‎org/w3c/css/properties/css1/CssBorderColor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public CssBorderColor(ApplContext ac, CssExpression expression,
7070
switch (val.getType()) {
7171
case CssTypes.CSS_HASH_IDENT:
7272
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
73-
c.setShortRGBColor(val.toString(), ac);
73+
c.setShortRGBColor(ac, val.toString());
7474
res.add(c);
7575
break;
7676
case CssTypes.CSS_COLOR:

‎org/w3c/css/properties/css1/CssColor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public CssColor(ApplContext ac, CssExpression expression, boolean check)
4646
switch (val.getType()) {
4747
case CssTypes.CSS_HASH_IDENT:
4848
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
49-
c.setShortRGBColor(val.toString(), ac);
49+
c.setShortRGBColor(ac, val.toString());
5050
color = c;
5151
break;
5252
case CssTypes.CSS_IDENT:

‎org/w3c/css/properties/css2/CssBackgroundColor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public CssBackgroundColor(ApplContext ac, CssExpression expression,
4949
switch (val.getType()) {
5050
case CssTypes.CSS_HASH_IDENT:
5151
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
52-
c.setShortRGBColor(val.toString(), ac);
52+
c.setShortRGBColor(ac, val.toString());
5353
setColor(c);
5454
break;
5555
case CssTypes.CSS_COLOR:

‎org/w3c/css/properties/css2/CssBorder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ protected static SideValues checkBorderSide(ApplContext ac, CssProperty caller,
130130
break;
131131
case CssTypes.CSS_HASH_IDENT:
132132
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
133-
c.setShortRGBColor(val.toString(), ac);
133+
c.setShortRGBColor(ac, val.toString());
134134
_color = c;
135135
break;
136136
case CssTypes.CSS_COLOR:

‎org/w3c/css/properties/css2/CssBorderColor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public CssBorderColor(ApplContext ac, CssExpression expression,
6666
switch (val.getType()) {
6767
case CssTypes.CSS_HASH_IDENT:
6868
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
69-
c.setShortRGBColor(val.toString(), ac);
69+
c.setShortRGBColor(ac, val.toString());
7070
res.add(c);
7171
break;
7272
case CssTypes.CSS_COLOR:
@@ -148,7 +148,7 @@ protected static CssValue checkBorderSideColor(ApplContext ac, CssProperty calle
148148
switch (val.getType()) {
149149
case CssTypes.CSS_HASH_IDENT:
150150
org.w3c.css.values.CssColor c = new org.w3c.css.values.CssColor();
151-
c.setShortRGBColor(val.toString(), ac);
151+
c.setShortRGBColor(ac, val.toString());
152152
retval = c;
153153
break;
154154
case CssTypes.CSS_COLOR:

0 commit comments

Comments
 (0)