From 6091985f4ed01c40f5658cc003ff856c5489d3d4 Mon Sep 17 00:00:00 2001 From: Yves Lafon Date: Wed, 28 Jul 2021 16:52:02 +0200 Subject: [PATCH 1/7] change grammar to allow ratio as a value (need testing for interaction with '/') --- org/w3c/css/parser/analyzer/CssParser.jj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org/w3c/css/parser/analyzer/CssParser.jj b/org/w3c/css/parser/analyzer/CssParser.jj index 00f550db8..57f14dd24 100644 --- a/org/w3c/css/parser/analyzer/CssParser.jj +++ b/org/w3c/css/parser/analyzer/CssParser.jj @@ -2821,7 +2821,9 @@ void term(CssExpression exp) : } { ( ( ( operator=unaryOperator() )? - ( n= { setValue(new CssNumber(), exp, operator, n, NUMBER); } + ( ( LOOKAHEAD( ( )* "/" ) ratio(exp, operator) + | n= { setValue(new CssNumber(), exp, operator, n, NUMBER); } + ) | n= { setValue(new CssPercentage(), exp, operator, n, PERCENTAGE); } | n= { setValue(new CssLength(), exp, operator, n, RELFONTLENGTH); } | n= { setValue(new CssLength(), exp, operator, n, RELVIEWLENGTH); } From e3ef094cf1dcef3c5fa697de558d9e504615bd56 Mon Sep 17 00:00:00 2001 From: Yves Lafon Date: Wed, 28 Jul 2021 16:53:41 +0200 Subject: [PATCH 2/7] regen --- org/w3c/css/parser/analyzer/CssParser.java | 675 +++++++++++---------- 1 file changed, 363 insertions(+), 312 deletions(-) diff --git a/org/w3c/css/parser/analyzer/CssParser.java b/org/w3c/css/parser/analyzer/CssParser.java index 78fb6f96e..06afa5a09 100644 --- a/org/w3c/css/parser/analyzer/CssParser.java +++ b/org/w3c/css/parser/analyzer/CssParser.java @@ -5766,8 +5766,21 @@ final public boolean prio() throws ParseException { } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case NUMBER:{ - n = jj_consume_token(NUMBER); + if (jj_2_9(2147483647)) { + ratio(exp, operator); + } else { + switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { + case NUMBER:{ + n = jj_consume_token(NUMBER); setValue(new CssNumber(), exp, operator, n, NUMBER); + break; + } + default: + jj_la1[211] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } break; } case PERCENTAGE:{ @@ -5867,7 +5880,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[211] = jj_gen; + jj_la1[212] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5929,7 +5942,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[212] = jj_gen; + jj_la1[213] = jj_gen; break label_142; } jj_consume_token(S); @@ -5943,7 +5956,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[213] = jj_gen; + jj_la1[214] = jj_gen; break label_143; } jj_consume_token(COMMA); @@ -5955,7 +5968,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[214] = jj_gen; + jj_la1[215] = jj_gen; break label_144; } jj_consume_token(S); @@ -5970,7 +5983,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[215] = jj_gen; + jj_la1[216] = jj_gen; break label_145; } jj_consume_token(S); @@ -6005,7 +6018,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[216] = jj_gen; + jj_la1[217] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6059,20 +6072,20 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[217] = jj_gen; + jj_la1[218] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[218] = jj_gen; + jj_la1[219] = jj_gen; jj_consume_token(-1); throw new ParseException(); } label_146: while (true) { - if (jj_2_9(2)) { + if (jj_2_10(2)) { ; } else { break label_146; @@ -6117,12 +6130,12 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[219] = jj_gen; + jj_la1[220] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case NUMBER:{ - if (jj_2_10(2147483647)) { + if (jj_2_11(2147483647)) { ratio(exp, operator); } else { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -6132,7 +6145,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[220] = jj_gen; + jj_la1[221] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6258,14 +6271,14 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[221] = jj_gen; + jj_la1[222] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[222] = jj_gen; + jj_la1[223] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6277,7 +6290,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[223] = jj_gen; + jj_la1[224] = jj_gen; break label_147; } jj_consume_token(S); @@ -6348,7 +6361,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[224] = jj_gen; + jj_la1[225] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6360,7 +6373,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[225] = jj_gen; + jj_la1[226] = jj_gen; break label_148; } jj_consume_token(S); @@ -6368,7 +6381,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[226] = jj_gen; + jj_la1[227] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6386,7 +6399,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[227] = jj_gen; + jj_la1[228] = jj_gen; break label_149; } jj_consume_token(S); @@ -6405,7 +6418,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[228] = jj_gen; + jj_la1[229] = jj_gen; break label_150; } jj_consume_token(S); @@ -6418,7 +6431,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[229] = jj_gen; + jj_la1[230] = jj_gen; break label_151; } jj_consume_token(COMMA); @@ -6430,7 +6443,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[230] = jj_gen; + jj_la1[231] = jj_gen; break label_152; } jj_consume_token(S); @@ -6445,7 +6458,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[231] = jj_gen; + jj_la1[232] = jj_gen; break label_153; } jj_consume_token(S); @@ -6469,7 +6482,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[232] = jj_gen; + jj_la1[233] = jj_gen; break label_154; } jj_consume_token(S); @@ -6488,7 +6501,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[233] = jj_gen; + jj_la1[234] = jj_gen; break label_155; } jj_consume_token(S); @@ -6501,7 +6514,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[234] = jj_gen; + jj_la1[235] = jj_gen; break label_156; } jj_consume_token(COMMA); @@ -6513,7 +6526,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[235] = jj_gen; + jj_la1[236] = jj_gen; break label_157; } jj_consume_token(S); @@ -6528,7 +6541,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[236] = jj_gen; + jj_la1[237] = jj_gen; break label_158; } jj_consume_token(S); @@ -6552,7 +6565,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[237] = jj_gen; + jj_la1[238] = jj_gen; break label_159; } jj_consume_token(S); @@ -6566,7 +6579,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[238] = jj_gen; + jj_la1[239] = jj_gen; break label_160; } jj_consume_token(S); @@ -6580,7 +6593,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[239] = jj_gen; + jj_la1[240] = jj_gen; break label_161; } jj_consume_token(S); @@ -6594,7 +6607,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[240] = jj_gen; + jj_la1[241] = jj_gen; break label_162; } jj_consume_token(S); @@ -6608,7 +6621,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[241] = jj_gen; + jj_la1[242] = jj_gen; break label_163; } jj_consume_token(S); @@ -6622,7 +6635,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[242] = jj_gen; + jj_la1[243] = jj_gen; break label_164; } jj_consume_token(S); @@ -6646,7 +6659,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[243] = jj_gen; + jj_la1[244] = jj_gen; break label_165; } jj_consume_token(S); @@ -6660,7 +6673,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[244] = jj_gen; + jj_la1[245] = jj_gen; break label_166; } jj_consume_token(S); @@ -6699,7 +6712,7 @@ final public boolean prio() throws ParseException { nb_pre_sp = 0; label_167: while (true) { - if (jj_2_11(2)) { + if (jj_2_12(2)) { ; } else { break label_167; @@ -6719,7 +6732,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[245] = jj_gen; + jj_la1[246] = jj_gen; break label_168; } jj_consume_token(S); @@ -6729,7 +6742,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[246] = jj_gen; + jj_la1[247] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6745,7 +6758,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[247] = jj_gen; + jj_la1[248] = jj_gen; break label_169; } } @@ -6774,7 +6787,7 @@ final public boolean prio() throws ParseException { c = new CssCalc(ac, v1); label_170: while (true) { - if (jj_2_12(2)) { + if (jj_2_13(2)) { ; } else { break label_170; @@ -6787,7 +6800,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[248] = jj_gen; + jj_la1[249] = jj_gen; break label_171; } jj_consume_token(S); @@ -6803,7 +6816,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[249] = jj_gen; + jj_la1[250] = jj_gen; break label_172; } jj_consume_token(S); @@ -6821,7 +6834,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[250] = jj_gen; + jj_la1[251] = jj_gen; break label_173; } jj_consume_token(S); @@ -6844,7 +6857,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[251] = jj_gen; + jj_la1[252] = jj_gen; break label_174; } jj_consume_token(S); @@ -6858,7 +6871,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[252] = jj_gen; + jj_la1[253] = jj_gen; break label_175; } jj_consume_token(COMMA); @@ -6870,7 +6883,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[253] = jj_gen; + jj_la1[254] = jj_gen; break label_176; } jj_consume_token(S); @@ -6885,7 +6898,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[254] = jj_gen; + jj_la1[255] = jj_gen; break label_177; } jj_consume_token(S); @@ -6894,14 +6907,14 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[255] = jj_gen; + jj_la1[256] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[256] = jj_gen; + jj_la1[257] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6932,7 +6945,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[257] = jj_gen; + jj_la1[258] = jj_gen; ; } n = jj_consume_token(NUMBER); @@ -6949,7 +6962,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[258] = jj_gen; + jj_la1[259] = jj_gen; break label_178; } jj_consume_token(S); @@ -6963,7 +6976,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[259] = jj_gen; + jj_la1[260] = jj_gen; break label_179; } jj_consume_token(S); @@ -6973,7 +6986,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[260] = jj_gen; + jj_la1[261] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6992,7 +7005,7 @@ final public boolean prio() throws ParseException { c = new CssCalc(ac, v1); nb_pre_sp = 0; label_180: while (true) { - if (jj_2_13(2)) { + if (jj_2_14(2)) { ; } else { break label_180; @@ -7012,7 +7025,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[261] = jj_gen; + jj_la1[262] = jj_gen; break label_181; } jj_consume_token(S); @@ -7022,7 +7035,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[262] = jj_gen; + jj_la1[263] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7038,7 +7051,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[263] = jj_gen; + jj_la1[264] = jj_gen; break label_182; } } @@ -7067,7 +7080,7 @@ final public boolean prio() throws ParseException { c = new CssCalc(ac, v1); label_183: while (true) { - if (jj_2_14(2)) { + if (jj_2_15(2)) { ; } else { break label_183; @@ -7080,7 +7093,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[264] = jj_gen; + jj_la1[265] = jj_gen; break label_184; } jj_consume_token(S); @@ -7095,7 +7108,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[265] = jj_gen; + jj_la1[266] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7107,7 +7120,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[266] = jj_gen; + jj_la1[267] = jj_gen; break label_185; } jj_consume_token(S); @@ -7148,7 +7161,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[267] = jj_gen; + jj_la1[268] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -7198,7 +7211,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[268] = jj_gen; + jj_la1[269] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7214,7 +7227,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[269] = jj_gen; + jj_la1[270] = jj_gen; break label_186; } jj_consume_token(S); @@ -7228,7 +7241,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[270] = jj_gen; + jj_la1[271] = jj_gen; break label_187; } jj_consume_token(S); @@ -7267,7 +7280,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[271] = jj_gen; + jj_la1[272] = jj_gen; break label_188; } jj_consume_token(S); @@ -7281,7 +7294,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[272] = jj_gen; + jj_la1[273] = jj_gen; break label_189; } jj_consume_token(COMMA); @@ -7293,7 +7306,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[273] = jj_gen; + jj_la1[274] = jj_gen; break label_190; } jj_consume_token(S); @@ -7308,7 +7321,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[274] = jj_gen; + jj_la1[275] = jj_gen; break label_191; } jj_consume_token(S); @@ -7317,7 +7330,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[275] = jj_gen; + jj_la1[276] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7337,7 +7350,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[276] = jj_gen; + jj_la1[277] = jj_gen; break label_192; } jj_consume_token(S); @@ -7351,7 +7364,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[277] = jj_gen; + jj_la1[278] = jj_gen; break label_193; } jj_consume_token(S); @@ -7379,7 +7392,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[278] = jj_gen; + jj_la1[279] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7392,7 +7405,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[279] = jj_gen; + jj_la1[280] = jj_gen; break label_194; } jj_consume_token(S); @@ -7400,7 +7413,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[280] = jj_gen; + jj_la1[281] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -7415,7 +7428,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[281] = jj_gen; + jj_la1[282] = jj_gen; break label_195; } jj_consume_token(S); @@ -7424,7 +7437,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[282] = jj_gen; + jj_la1[283] = jj_gen; ; } jj_consume_token(LPARAN); @@ -7449,12 +7462,12 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[283] = jj_gen; + jj_la1[284] = jj_gen; break label_196; } jj_consume_token(S); } - if (jj_2_15(2)) { + if (jj_2_16(2)) { exp = expr(); jj_consume_token(LPARAN); String funcname = n.image.toLowerCase(); @@ -7536,7 +7549,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[284] = jj_gen; + jj_la1[285] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7568,7 +7581,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[285] = jj_gen; + jj_la1[286] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7944,41 +7957,15 @@ private boolean jj_2_15(int xla) finally { jj_save(14, xla); } } - private boolean jj_3R_335() + private boolean jj_2_16(int xla) { - if (jj_scan_token(COMMA)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_326()) return true; - return false; - } - - private boolean jj_3R_301() - { - if (jj_scan_token(FUNCTIONCLAMP)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_326()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(COMMA)) return true; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_326()) return true; - return false; + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_16(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(15, xla); } } - private boolean jj_3R_337() + private boolean jj_3R_339() { Token xsp; xsp = jj_scanpos; @@ -8043,16 +8030,16 @@ private boolean jj_3R_337() return false; } - private boolean jj_3R_334() + private boolean jj_3R_336() { Token xsp; xsp = jj_scanpos; - if (jj_3R_337()) jj_scanpos = xsp; + if (jj_3R_339()) jj_scanpos = xsp; if (jj_3R_203()) return true; return false; } - private boolean jj_3R_322() + private boolean jj_3R_324() { if (jj_scan_token(RPARAN)) return true; Token xsp; @@ -8066,16 +8053,16 @@ private boolean jj_3R_322() if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_329()) jj_scanpos = xsp; + if (jj_3R_331()) jj_scanpos = xsp; if (jj_scan_token(LPARAN)) return true; return false; } - private boolean jj_3R_332() + private boolean jj_3R_334() { Token xsp; xsp = jj_scanpos; - if (jj_3R_334()) { + if (jj_3R_336()) { jj_scanpos = xsp; if (jj_scan_token(43)) return true; } @@ -8086,13 +8073,13 @@ private boolean jj_3R_332() return false; } - private boolean jj_3R_330() + private boolean jj_3R_332() { Token xsp; xsp = jj_scanpos; - if (jj_3R_332()) { + if (jj_3R_334()) { jj_scanpos = xsp; - if (jj_3R_333()) return true; + if (jj_3R_335()) return true; } return false; } @@ -8123,30 +8110,13 @@ private boolean jj_3R_230() return false; } - private boolean jj_3R_325() + private boolean jj_3R_327() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_324() - { - if (jj_scan_token(MINUS)) return true; - return false; - } - - private boolean jj_3R_297() - { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_324()) { - jj_scanpos = xsp; - if (jj_3R_325()) return true; - } - return false; - } - - private boolean jj_3R_336() + private boolean jj_3R_338() { if (jj_scan_token(COMMA)) return true; Token xsp; @@ -8154,18 +8124,11 @@ private boolean jj_3R_336() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_326()) return true; - return false; - } - - private boolean jj_3R_323() - { - if (jj_3R_330()) return true; - if (jj_scan_token(COLON)) return true; + if (jj_3R_329()) return true; return false; } - private boolean jj_3R_299() + private boolean jj_3R_301() { if (jj_scan_token(FUNCTIONMAX)) return true; Token xsp; @@ -8173,19 +8136,43 @@ private boolean jj_3R_299() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_326()) return true; + if (jj_3R_329()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; - if (jj_3R_335()) { jj_scanpos = xsp; break; } + if (jj_3R_337()) { jj_scanpos = xsp; break; } } if (jj_scan_token(LPARAN)) return true; return false; } + private boolean jj_3R_326() + { + if (jj_scan_token(MINUS)) return true; + return false; + } + + private boolean jj_3R_297() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_326()) { + jj_scanpos = xsp; + if (jj_3R_327()) return true; + } + return false; + } + + private boolean jj_3R_325() + { + if (jj_3R_332()) return true; + if (jj_scan_token(COLON)) return true; + return false; + } + private boolean jj_3R_213() { if (jj_3R_230()) return true; @@ -8215,7 +8202,7 @@ private boolean jj_3R_212() return false; } - private boolean jj_3R_300() + private boolean jj_3R_302() { if (jj_scan_token(FUNCTIONMIN)) return true; Token xsp; @@ -8223,14 +8210,14 @@ private boolean jj_3R_300() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_326()) return true; + if (jj_3R_329()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; - if (jj_3R_336()) { jj_scanpos = xsp; break; } + if (jj_3R_338()) { jj_scanpos = xsp; break; } } if (jj_scan_token(LPARAN)) return true; return false; @@ -8253,17 +8240,17 @@ private boolean jj_3R_218() return false; } - private boolean jj_3R_201() + private boolean jj_3R_285() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_218()) jj_scanpos = xsp; + if (jj_scan_token(UNICODERANGE)) return true; return false; } - private boolean jj_3R_285() + private boolean jj_3R_201() { - if (jj_scan_token(UNICODERANGE)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_218()) jj_scanpos = xsp; return false; } @@ -8275,11 +8262,11 @@ private boolean jj_3R_284() private boolean jj_3R_283() { - if (jj_3R_304()) return true; + if (jj_3R_306()) return true; return false; } - private boolean jj_3R_304() + private boolean jj_3R_306() { Token xsp; xsp = jj_scanpos; @@ -8307,7 +8294,7 @@ private boolean jj_3R_328() return false; } - private boolean jj_3R_327() + private boolean jj_3R_330() { if (jj_3R_203()) return true; if (jj_scan_token(EQ)) return true; @@ -8321,15 +8308,21 @@ private boolean jj_3R_281() return false; } + private boolean jj_3R_313() + { + if (jj_3R_303()) return true; + return false; + } + private boolean jj_3R_282() { if (jj_3R_203()) return true; return false; } - private boolean jj_3R_311() + private boolean jj_3R_312() { - if (jj_3R_301()) return true; + if (jj_3R_302()) return true; return false; } @@ -8357,27 +8350,21 @@ private boolean jj_3R_222() return false; } - private boolean jj_3R_310() - { - if (jj_3R_300()) return true; - return false; - } - - private boolean jj_3R_309() + private boolean jj_3R_311() { - if (jj_3R_299()) return true; + if (jj_3R_301()) return true; return false; } - private boolean jj_3R_308() + private boolean jj_3R_310() { - if (jj_3R_298()) return true; + if (jj_3R_300()) return true; return false; } - private boolean jj_3R_307() + private boolean jj_3R_309() { - if (jj_3R_303()) return true; + if (jj_3R_305()) return true; return false; } @@ -8385,15 +8372,15 @@ private boolean jj_3R_280() { Token xsp; xsp = jj_scanpos; - if (jj_3R_307()) { - jj_scanpos = xsp; - if (jj_3R_308()) { - jj_scanpos = xsp; if (jj_3R_309()) { jj_scanpos = xsp; if (jj_3R_310()) { jj_scanpos = xsp; - if (jj_3R_311()) return true; + if (jj_3R_311()) { + jj_scanpos = xsp; + if (jj_3R_312()) { + jj_scanpos = xsp; + if (jj_3R_313()) return true; } } } @@ -8419,7 +8406,7 @@ private boolean jj_3R_277() return false; } - private boolean jj_3_10() + private boolean jj_3_11() { if (jj_scan_token(NUMBER)) return true; Token xsp; @@ -8479,7 +8466,7 @@ private boolean jj_3R_269() return false; } - private boolean jj_3R_339() + private boolean jj_3R_341() { if (jj_scan_token(COMMA)) return true; return false; @@ -8503,13 +8490,13 @@ private boolean jj_3R_266() return false; } - private boolean jj_3R_305() + private boolean jj_3R_307() { if (jj_3R_328()) return true; return false; } - private boolean jj_3R_306() + private boolean jj_3R_308() { if (jj_scan_token(NUMBER)) return true; return false; @@ -8519,14 +8506,14 @@ private boolean jj_3R_265() { Token xsp; xsp = jj_scanpos; - if (jj_3R_305()) { + if (jj_3R_307()) { jj_scanpos = xsp; - if (jj_3R_306()) return true; + if (jj_3R_308()) return true; } return false; } - private boolean jj_3_15() + private boolean jj_3_16() { if (jj_3R_211()) return true; if (jj_scan_token(LPARAN)) return true; @@ -8609,13 +8596,13 @@ private boolean jj_3R_205() return false; } - private boolean jj_3R_338() + private boolean jj_3R_340() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3_9() + private boolean jj_3_10() { if (jj_scan_token(S)) return true; return false; @@ -8635,17 +8622,17 @@ private boolean jj_3R_262() private boolean jj_3R_261() { - if (jj_3R_304()) return true; + if (jj_3R_306()) return true; return false; } - private boolean jj_3R_341() + private boolean jj_3R_343() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_303() + private boolean jj_3R_305() { if (jj_scan_token(FUNCTION)) return true; Token xsp; @@ -8654,50 +8641,30 @@ private boolean jj_3R_303() if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3_15()) { + if (jj_3_16()) { jj_scanpos = xsp; - if (jj_3R_327()) return true; + if (jj_3R_330()) return true; } return false; } - private boolean jj_3R_342() + private boolean jj_3R_344() { if (jj_3R_203()) return true; return false; } - private boolean jj_3R_340() + private boolean jj_3R_342() { Token xsp; xsp = jj_scanpos; - if (jj_3R_342()) { + if (jj_3R_344()) { jj_scanpos = xsp; if (jj_scan_token(131)) return true; } return false; } - private boolean jj_3R_231() - { - Token xsp; - xsp = jj_scanpos; - if (jj_scan_token(29)) { - jj_scanpos = xsp; - if (jj_scan_token(30)) { - jj_scanpos = xsp; - if (jj_scan_token(48)) { - jj_scanpos = xsp; - if (jj_scan_token(135)) { - jj_scanpos = xsp; - if (jj_scan_token(137)) return true; - } - } - } - } - return false; - } - private boolean jj_3R_260() { if (jj_3R_203()) return true; @@ -8715,12 +8682,32 @@ private boolean jj_3R_259() return false; } - private boolean jj_3R_313() + private boolean jj_3R_315() { if (jj_scan_token(NUMBER)) return true; return false; } + private boolean jj_3R_231() + { + Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(29)) { + jj_scanpos = xsp; + if (jj_scan_token(30)) { + jj_scanpos = xsp; + if (jj_scan_token(48)) { + jj_scanpos = xsp; + if (jj_scan_token(135)) { + jj_scanpos = xsp; + if (jj_scan_token(137)) return true; + } + } + } + } + return false; + } + private boolean jj_3R_258() { if (jj_scan_token(DIV)) return true; @@ -8735,7 +8722,7 @@ private boolean jj_3R_257() private boolean jj_3R_256() { - if (jj_3R_303()) return true; + if (jj_3R_305()) return true; return false; } @@ -8750,7 +8737,7 @@ private boolean jj_3R_255() if (jj_scan_token(CUSTOM_PROPERTY_NAME)) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_339()) { jj_scanpos = xsp; break; } + if (jj_3R_341()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; @@ -8762,17 +8749,17 @@ private boolean jj_3R_255() private boolean jj_3R_254() { - if (jj_3R_302()) return true; + if (jj_3R_304()) return true; return false; } private boolean jj_3R_253() { - if (jj_3R_301()) return true; + if (jj_3R_303()) return true; return false; } - private boolean jj_3R_302() + private boolean jj_3R_304() { if (jj_scan_token(FUNCTIONATTR)) return true; Token xsp; @@ -8786,28 +8773,28 @@ private boolean jj_3R_302() if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_340()) jj_scanpos = xsp; + if (jj_3R_342()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_341()) jj_scanpos = xsp; + if (jj_3R_343()) jj_scanpos = xsp; if (jj_scan_token(LPARAN)) return true; return false; } private boolean jj_3R_252() { - if (jj_3R_300()) return true; + if (jj_3R_302()) return true; return false; } private boolean jj_3R_251() { - if (jj_3R_299()) return true; + if (jj_3R_301()) return true; return false; } private boolean jj_3R_250() { - if (jj_3R_298()) return true; + if (jj_3R_300()) return true; return false; } @@ -8869,7 +8856,7 @@ private boolean jj_3R_293() if (jj_scan_token(CUSTOM_PROPERTY_NAME)) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_338()) { jj_scanpos = xsp; break; } + if (jj_3R_340()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; @@ -8881,7 +8868,7 @@ private boolean jj_3R_293() private boolean jj_3R_292() { - if (jj_3R_302()) return true; + if (jj_3R_304()) return true; return false; } @@ -8893,25 +8880,25 @@ private boolean jj_3R_249() private boolean jj_3R_291() { - if (jj_3R_301()) return true; + if (jj_3R_303()) return true; return false; } private boolean jj_3R_290() { - if (jj_3R_300()) return true; + if (jj_3R_302()) return true; return false; } private boolean jj_3R_289() { - if (jj_3R_299()) return true; + if (jj_3R_301()) return true; return false; } private boolean jj_3R_288() { - if (jj_3R_298()) return true; + if (jj_3R_300()) return true; return false; } @@ -8923,7 +8910,7 @@ private boolean jj_3R_287() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_326()) return true; + if (jj_3R_329()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } @@ -8932,19 +8919,19 @@ private boolean jj_3R_287() return false; } - private boolean jj_3R_321() + private boolean jj_3R_323() { if (jj_scan_token(FREQ)) return true; return false; } - private boolean jj_3R_320() + private boolean jj_3R_322() { if (jj_scan_token(TIME)) return true; return false; } - private boolean jj_3R_319() + private boolean jj_3R_321() { if (jj_scan_token(ANGLE)) return true; return false; @@ -8956,37 +8943,37 @@ private boolean jj_3R_248() return false; } - private boolean jj_3R_318() + private boolean jj_3R_320() { if (jj_scan_token(FLEX)) return true; return false; } - private boolean jj_3R_317() + private boolean jj_3R_319() { if (jj_scan_token(ABSOLUTLENGTH)) return true; return false; } - private boolean jj_3R_316() + private boolean jj_3R_318() { if (jj_scan_token(RELVIEWLENGTH)) return true; return false; } - private boolean jj_3R_315() + private boolean jj_3R_317() { if (jj_scan_token(RELFONTLENGTH)) return true; return false; } - private boolean jj_3R_312() + private boolean jj_3R_314() { if (jj_3R_297()) return true; return false; } - private boolean jj_3R_314() + private boolean jj_3R_316() { if (jj_scan_token(PERCENTAGE)) return true; return false; @@ -8996,12 +8983,8 @@ private boolean jj_3R_286() { Token xsp; xsp = jj_scanpos; - if (jj_3R_312()) jj_scanpos = xsp; + if (jj_3R_314()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_313()) { - jj_scanpos = xsp; - if (jj_3R_314()) { - jj_scanpos = xsp; if (jj_3R_315()) { jj_scanpos = xsp; if (jj_3R_316()) { @@ -9014,7 +8997,11 @@ private boolean jj_3R_286() jj_scanpos = xsp; if (jj_3R_320()) { jj_scanpos = xsp; - if (jj_3R_321()) return true; + if (jj_3R_321()) { + jj_scanpos = xsp; + if (jj_3R_322()) { + jj_scanpos = xsp; + if (jj_3R_323()) return true; } } } @@ -9067,6 +9054,18 @@ private boolean jj_3R_246() return false; } + private boolean jj_3_9() + { + if (jj_scan_token(NUMBER)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(DIV)) return true; + return false; + } + private boolean jj_3R_245() { if (jj_scan_token(SPL)) return true; @@ -9150,7 +9149,13 @@ private boolean jj_3R_235() return false; } - private boolean jj_3_14() + private boolean jj_3R_299() + { + if (jj_scan_token(NUMBER)) return true; + return false; + } + + private boolean jj_3_15() { Token xsp; while (true) { @@ -9170,9 +9175,20 @@ private boolean jj_3_14() return false; } + private boolean jj_3R_298() + { + if (jj_3R_328()) return true; + return false; + } + private boolean jj_3R_234() { - if (jj_scan_token(NUMBER)) return true; + Token xsp; + xsp = jj_scanpos; + if (jj_3R_298()) { + jj_scanpos = xsp; + if (jj_3R_299()) return true; + } return false; } @@ -9254,14 +9270,14 @@ private boolean jj_3R_202() } while (true) { xsp = jj_scanpos; - if (jj_3_9()) { jj_scanpos = xsp; break; } + if (jj_3_10()) { jj_scanpos = xsp; break; } } return false; } private boolean jj_3R_295() { - if (jj_3R_322()) return true; + if (jj_3R_324()) return true; return false; } @@ -9276,7 +9292,7 @@ private boolean jj_3R_204() return false; } - private boolean jj_3_13() + private boolean jj_3_14() { Token xsp; xsp = jj_scanpos; @@ -9292,7 +9308,7 @@ private boolean jj_3_13() return false; } - private boolean jj_3_12() + private boolean jj_3_13() { Token xsp; while (true) { @@ -9397,9 +9413,21 @@ private boolean jj_3R_208() return false; } + private boolean jj_3R_207() + { + if (jj_scan_token(ANY)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_224()) return true; + return false; + } + private boolean jj_3R_296() { - if (jj_3R_323()) return true; + if (jj_3R_325()) return true; return false; } @@ -9435,18 +9463,6 @@ private boolean jj_3R_214() return false; } - private boolean jj_3R_207() - { - if (jj_scan_token(ANY)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_224()) return true; - return false; - } - private boolean jj_3_4() { if (jj_3R_199()) return true; @@ -9516,13 +9532,13 @@ private boolean jj_3R_206() return false; } - private boolean jj_3R_331() + private boolean jj_3R_333() { if (jj_3R_224()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_12()) { jj_scanpos = xsp; break; } + if (jj_3_13()) { jj_scanpos = xsp; break; } } return false; } @@ -9568,7 +9584,7 @@ private boolean jj_3R_215() return false; } - private boolean jj_3_11() + private boolean jj_3_12() { Token xsp; xsp = jj_scanpos; @@ -9584,13 +9600,13 @@ private boolean jj_3_11() return false; } - private boolean jj_3R_326() + private boolean jj_3R_329() { - if (jj_3R_331()) return true; + if (jj_3R_333()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_11()) { jj_scanpos = xsp; break; } + if (jj_3_12()) { jj_scanpos = xsp; break; } } return false; } @@ -9615,6 +9631,23 @@ private boolean jj_3R_203() return false; } + private boolean jj_3R_300() + { + if (jj_scan_token(FUNCTIONCALC)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_329()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(LPARAN)) return true; + return false; + } + private boolean jj_3R_217() { if (jj_3R_203()) return true; @@ -9632,42 +9665,37 @@ private boolean jj_3R_200() return false; } - private boolean jj_3R_298() + private boolean jj_3R_335() { - if (jj_scan_token(FUNCTIONCALC)) return true; Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + xsp = jj_scanpos; + if (jj_scan_token(40)) { + jj_scanpos = xsp; + if (jj_scan_token(117)) { + jj_scanpos = xsp; + if (jj_scan_token(106)) return true; + } } - if (jj_3R_326()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_scan_token(LPARAN)) return true; return false; } - private boolean jj_3R_333() + private boolean jj_3R_337() { + if (jj_scan_token(COMMA)) return true; Token xsp; - xsp = jj_scanpos; - if (jj_scan_token(40)) { - jj_scanpos = xsp; - if (jj_scan_token(117)) { - jj_scanpos = xsp; - if (jj_scan_token(106)) return true; - } - } while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } + if (jj_3R_329()) return true; return false; } - private boolean jj_3R_329() + private boolean jj_3R_331() { if (jj_scan_token(COLON)) return true; return false; @@ -9682,6 +9710,28 @@ private boolean jj_3_5() return false; } + private boolean jj_3R_303() + { + if (jj_scan_token(FUNCTIONCLAMP)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_329()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(COMMA)) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_329()) return true; + return false; + } + /** Generated Token Manager. */ public CssParserTokenManager token_source; SimpleCharStream jj_input_stream; @@ -9693,7 +9743,7 @@ private boolean jj_3_5() private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[286]; + final private int[] jj_la1 = new int[287]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -9707,21 +9757,21 @@ private boolean jj_3_5() jj_la1_init_4(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0xc00000,0xc00000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0xa8000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x80000000,0x200000,0x0,0x0,0x0,0x200000,0x18000000,0x18000000,0x18000000,0x200000,0x200000,0x200000,0x200000,0x18000000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x28000000,0x200000,0x200000,0x28200000,0x18000000,0xa8000000,0xa8000000,0xa8000000,0x200000,0x0,0x200000,0xa8000000,0x80000000,0x200000,0x200000,0x200000,0xa8000000,0x0,0x200000,0xa8000000,0x200000,0x28200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x200000,0x3000000,0x200000,0x0,0x200000,0x3000000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x18000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x18000000,0x200000,0x18000000,0x0,0x200000,0x80000000,0x200000,0x200000,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x18200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x0,0x18000000,0x200000,0x200000,0x18000000,0x200000,0x18200000,0x200000,0x200000,0x0,0x200000,0x18000000,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x80000000,0x200000,0x0,0x0,}; + jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0xc00000,0xc00000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0xa8000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x80000000,0x200000,0x0,0x0,0x0,0x200000,0x18000000,0x18000000,0x18000000,0x200000,0x200000,0x200000,0x200000,0x18000000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x28000000,0x200000,0x200000,0x28200000,0x18000000,0xa8000000,0xa8000000,0xa8000000,0x200000,0x0,0x200000,0xa8000000,0x80000000,0x200000,0x200000,0x200000,0xa8000000,0x0,0x200000,0xa8000000,0x200000,0x28200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x200000,0x3000000,0x200000,0x0,0x200000,0x3000000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x18000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x18000000,0x200000,0x18000000,0x0,0x0,0x200000,0x80000000,0x200000,0x200000,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x18200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x0,0x18000000,0x200000,0x200000,0x18000000,0x200000,0x18200000,0x200000,0x200000,0x0,0x200000,0x18000000,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x80000000,0x200000,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x9e,0x4000020,0x0,0x0,0x0,0x4000020,0x0,0x1000098,0x0,0x0,0x1000098,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x18,0x0,0x0,0x2,0x98,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x2,0x0,0x1000010,0x0,0x0,0x1000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x3bd099f,0x0,0x1000000,0x0,0x9e,0x0,0x0,0x0,0x0,0x200009e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x3bd0001,0x3bd0001,0x3bd089f,0x0,0x100,0x0,0x3bd099f,0x0,0x0,0x0,0x0,0x3bd099f,0x20000,0x0,0x3bd099f,0x0,0x1,0x0,0x0,0xba080300,0xba080300,0xba080300,0xba080300,0xba28039e,0xb8000000,0xb8000000,0x20009e,0x20009e,0x20009e,0x0,0x0,0x1e000,0x0,0xbe,0x0,0x1e000,0x0,0xba28039e,0x0,0x0,0xbe,0x0,0x0,0x0,0x9e,0x2000000,0x300,0x0,0x0,0x2000000,0x0,0x0,0x0,0xbe,0x0,0xbe,0x0,0x0,0x10000,0x0,0x10000,0x0,0x0,0x10000,0x0,0x10000,0xfc0003be,0x0,0x0,0xf8000400,0x0,0x0,0x0,0x0,0x180000,0x41c03be,0xfc1c07be,0x0,0x0,0x0,0xf8000000,0x0,0x40003be,0x0,0xfc0003be,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x240000,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x240000,0x0,0x0,0xf8000000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9000000,0x0,0x0,0x9e,0x0,0x9e,0x0,0x0,0x0,0x9e,0x300,}; + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x9e,0x4000020,0x0,0x0,0x0,0x4000020,0x0,0x1000098,0x0,0x0,0x1000098,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x18,0x0,0x0,0x2,0x98,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x2,0x0,0x1000010,0x0,0x0,0x1000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x3bd099f,0x0,0x1000000,0x0,0x9e,0x0,0x0,0x0,0x0,0x200009e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x3bd0001,0x3bd0001,0x3bd089f,0x0,0x100,0x0,0x3bd099f,0x0,0x0,0x0,0x0,0x3bd099f,0x20000,0x0,0x3bd099f,0x0,0x1,0x0,0x0,0xba080300,0xba080300,0xba080300,0xba080300,0xba28039e,0xb8000000,0xb8000000,0x20009e,0x20009e,0x20009e,0x0,0x0,0x1e000,0x0,0xbe,0x0,0x1e000,0x0,0xba28039e,0x0,0x0,0xbe,0x0,0x0,0x0,0x9e,0x2000000,0x300,0x0,0x0,0x2000000,0x0,0x0,0x0,0xbe,0x0,0xbe,0x0,0x0,0x10000,0x0,0x10000,0x0,0x0,0x10000,0x0,0x10000,0xfc0003be,0x0,0x0,0x0,0xf8000400,0x0,0x0,0x0,0x0,0x180000,0x41c03be,0xfc1c07be,0x0,0x0,0x0,0xf8000000,0x0,0x40003be,0x0,0xfc0003be,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x240000,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x240000,0x0,0x0,0xf8000000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9000000,0x0,0x0,0x9e,0x0,0x9e,0x0,0x0,0x0,0x9e,0x300,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x1000,0x0,0x0,0x40000000,0x80000000,0x0,0x0,0x0,0x2000,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc000,0x3fffc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x85c,0x85c,0x85c,0x85c,0x5c,0x5c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x200,0x0,0x0,0x200,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x0,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x100,0x0,0x5ff,0x0,0x0,0x0,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x1000,0x0,0x0,0x40000000,0x80000000,0x0,0x0,0x0,0x2000,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc000,0x3fffc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x85c,0x85c,0x85c,0x85c,0x5c,0x5c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x200,0x0,0x0,0x200,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x0,0x100,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x100,0x0,0x5ff,0x0,0x0,0x0,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x200400,0x0,0x0,0x0,0x0,0x200400,0x0,0x0,0x200400,0x0,0x0,0x0,0x0,0xa00000,0xa00000,0xa00000,0xa00000,0xa00000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x40400000,0x40400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f100000,0x7f100000,0x0,0x0,0x4f000000,0x4f000000,0x0,0x100000,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x200400,0x0,0x0,0x0,0x0,0x200400,0x0,0x0,0x200400,0x0,0x0,0x0,0x0,0xa00000,0xa00000,0xa00000,0xa00000,0xa00000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x40400000,0x40400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f100000,0x7f100000,0x0,0x0,0x4f000000,0x4f000000,0x0,0x100000,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_4() { - jj_la1_4 = new int[] {0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x1fe,0x1fe,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_4 = new int[] {0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x1fe,0x1fe,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[15]; + final private JJCalls[] jj_2_rtns = new JJCalls[16]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -9736,7 +9786,7 @@ public CssParser(java.io.InputStream stream, String encoding) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 286; i++) jj_la1[i] = -1; + for (int i = 0; i < 287; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9751,7 +9801,7 @@ public void ReInit(java.io.InputStream stream, String encoding) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 286; i++) jj_la1[i] = -1; + for (int i = 0; i < 287; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9762,7 +9812,7 @@ public CssParser(java.io.Reader stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 286; i++) jj_la1[i] = -1; + for (int i = 0; i < 287; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9773,7 +9823,7 @@ public void ReInit(java.io.Reader stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 286; i++) jj_la1[i] = -1; + for (int i = 0; i < 287; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9783,7 +9833,7 @@ public CssParser(CssParserTokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 286; i++) jj_la1[i] = -1; + for (int i = 0; i < 287; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9793,7 +9843,7 @@ public void ReInit(CssParserTokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 286; i++) jj_la1[i] = -1; + for (int i = 0; i < 287; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9911,7 +9961,7 @@ public ParseException generateParseException() { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 286; i++) { + for (int i = 0; i < 287; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< Date: Wed, 28 Jul 2021 16:54:38 +0200 Subject: [PATCH 3/7] aspect-ratio per https://www.w3.org/TR/2021/WD-css-sizing-4-20210520/#propdef-aspect-ratio --- .../css/properties/CSS3Properties.properties | 1 + .../css/properties/css/CssAspectRatio.java | 112 ++++++++++++++++++ org/w3c/css/properties/css3/Css3Style.java | 11 ++ .../css/properties/css3/CssAspectRatio.java | 103 ++++++++++++++++ 4 files changed, 227 insertions(+) create mode 100644 org/w3c/css/properties/css/CssAspectRatio.java create mode 100644 org/w3c/css/properties/css3/CssAspectRatio.java diff --git a/org/w3c/css/properties/CSS3Properties.properties b/org/w3c/css/properties/CSS3Properties.properties index c4ea382f9..05c0232b6 100644 --- a/org/w3c/css/properties/CSS3Properties.properties +++ b/org/w3c/css/properties/CSS3Properties.properties @@ -330,6 +330,7 @@ cursor: org.w3c.css.properties.css3.CssCursor caret: org.w3c.css.properties.css3.CssCaret caret-color: org.w3c.css.properties.css3.CssCaretColor caret-shape: org.w3c.css.properties.css3.CssCaretShape +aspect-ratio: org.w3c.css.properties.css3.CssAspectRatio word-spacing: org.w3c.css.properties.css3.CssWordSpacing letter-spacing: org.w3c.css.properties.css3.CssLetterSpacing diff --git a/org/w3c/css/properties/css/CssAspectRatio.java b/org/w3c/css/properties/css/CssAspectRatio.java new file mode 100644 index 000000000..76d42d3e7 --- /dev/null +++ b/org/w3c/css/properties/css/CssAspectRatio.java @@ -0,0 +1,112 @@ +// +// Author: Yves Lafon +// +// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2021. +// Please first read the full copyright statement in file COPYRIGHT.html +package org.w3c.css.properties.css; + +import org.w3c.css.parser.CssStyle; +import org.w3c.css.properties.css3.Css3Style; +import org.w3c.css.util.ApplContext; +import org.w3c.css.util.InvalidParamException; +import org.w3c.css.values.CssExpression; +import org.w3c.css.values.CssValue; + +/** + * @since CSS3 + */ +public class CssAspectRatio extends CssProperty { + + public CssValue value; + + /** + * Create a new CssAspectRatio + */ + public CssAspectRatio() { + } + + /** + * Creates a new CssAspectRatio + * + * @param expression The expression for this property + * @throws InvalidParamException Expressions are incorrect + */ + public CssAspectRatio(ApplContext ac, CssExpression expression, boolean check) + throws InvalidParamException { + throw new InvalidParamException("value", + expression.getValue().toString(), + getPropertyName(), ac); + } + + public CssAspectRatio(ApplContext ac, CssExpression expression) + throws InvalidParamException { + this(ac, expression, false); + } + + /** + * Returns the value of this property + */ + public Object get() { + return value; + } + + + /** + * Returns the name of this property + */ + public final String getPropertyName() { + return "aspect-ratio"; + } + + /** + * Returns true if this property is "softly" inherited + * e.g. his value is equals to inherit + */ + public boolean isSoftlyInherited() { + return inherit.equals(value); + } + + /** + * Returns a string representation of the object. + */ + public String toString() { + return value.toString(); + } + + /** + * Add this property to the CssStyle. + * + * @param style The CssStyle + */ + public void addToStyle(ApplContext ac, CssStyle style) { + if (((Css3Style) style).cssAspectRatio != null) + style.addRedefinitionWarning(ac, this); + ((Css3Style) style).cssAspectRatio = this; + } + + /** + * Compares two properties for equality. + * + * @param property The other property. + */ + public boolean equals(CssProperty property) { + return (property instanceof CssAspectRatio && + value.equals(((CssAspectRatio) property).value)); + } + + + /** + * Get this property in the style. + * + * @param style The style where the property is + * @param resolve if true, resolve the style to find this property + */ + public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) { + if (resolve) { + return ((Css3Style) style).getAspectRatio(); + } else { + return ((Css3Style) style).cssAspectRatio; + } + } +} + diff --git a/org/w3c/css/properties/css3/Css3Style.java b/org/w3c/css/properties/css3/Css3Style.java index 60c4ebda7..18a7d06f6 100644 --- a/org/w3c/css/properties/css3/Css3Style.java +++ b/org/w3c/css/properties/css3/Css3Style.java @@ -25,6 +25,7 @@ import org.w3c.css.properties.css.CssAnimationPlayState; import org.w3c.css.properties.css.CssAnimationTimingFunction; import org.w3c.css.properties.css.CssAppearance; +import org.w3c.css.properties.css.CssAspectRatio; import org.w3c.css.properties.css.CssBackfaceVisibility; import org.w3c.css.properties.css.CssBackgroundBlendMode; import org.w3c.css.properties.css.CssBackgroundClip; @@ -603,7 +604,17 @@ public class Css3Style extends ATSCStyle { public CssBorderStartEndRadius cssBorderStartEndRadius; public CssBorderEndStartRadius cssBorderEndStartRadius; public CssBorderEndEndRadius cssBorderEndEndRadius; + public CssAspectRatio cssAspectRatio; + public CssAspectRatio getAspectRatio() { + if (cssAspectRatio == null) { + cssAspectRatio = + (CssAspectRatio) style.CascadingOrder(new CssAspectRatio(), + style, selector); + } + return cssAspectRatio; + } + public CssBorderEndEndRadius getBorderEndEndRadius() { if (cssBorderEndEndRadius == null) { cssBorderEndEndRadius = diff --git a/org/w3c/css/properties/css3/CssAspectRatio.java b/org/w3c/css/properties/css3/CssAspectRatio.java new file mode 100644 index 000000000..694988b13 --- /dev/null +++ b/org/w3c/css/properties/css3/CssAspectRatio.java @@ -0,0 +1,103 @@ +// +// Author: Yves Lafon +// +// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2021. +// Please first read the full copyright statement in file COPYRIGHT.html +package org.w3c.css.properties.css3; + +import org.w3c.css.util.ApplContext; +import org.w3c.css.util.InvalidParamException; +import org.w3c.css.values.CssExpression; +import org.w3c.css.values.CssIdent; +import org.w3c.css.values.CssTypes; +import org.w3c.css.values.CssValue; +import org.w3c.css.values.CssValueList; + +import java.util.ArrayList; + +import static org.w3c.css.values.CssOperator.SPACE; + +/** + * @spec https://www.w3.org/TR/2021/WD-css-sizing-4-20210520/#propdef-aspect-ratio + */ +public class CssAspectRatio extends org.w3c.css.properties.css.CssAspectRatio { + + public static final CssIdent auto = CssIdent.getIdent("auto"); + + /** + * Create a new CssAspectRatio + */ + public CssAspectRatio() { + value = initial; + } + + /** + * Creates a new CssAspectRatio + * + * @param expression The expression for this property + * @throws InvalidParamException + * Expressions are incorrect + */ + public CssAspectRatio(ApplContext ac, CssExpression expression, boolean check) + throws InvalidParamException { + if (check && expression.getCount() > 2) { + throw new InvalidParamException("unrecognize", ac); + } + CssValue val; + ArrayList v = new ArrayList<>(); + char op; + + setByUser(); + + while(!expression.end()) { + val = expression.getValue(); + op = expression.getOperator(); + + switch (val.getType()) { + case CssTypes.CSS_RATIO: + v.add(val); + break; + case CssTypes.CSS_IDENT: + if (inherit.equals(val)) { + if (expression.getCount() > 1) { + throw new InvalidParamException("value", val.toString(), + getPropertyName(), ac); + } + v.add(inherit); + break; + } + if (auto.equals(val)) { + v.add(auto); + break; + } + // unrecognize ident, let it fail + default: + throw new InvalidParamException("value", + val.toString(), + getPropertyName(), ac); + } + if (op != SPACE) { + throw new InvalidParamException("operator", + Character.toString(op), ac); + } + expression.next(); + } + + if (v.size() > 1) { + if (v.get(0).getType() == v.get(1).getType()) { + throw new InvalidParamException("value", v.get(1).toString(), + getPropertyName(), ac); + } + value = new CssValueList(v); + } else { + value = v.get(0); + } + } + + + public CssAspectRatio(ApplContext ac, CssExpression expression) + throws InvalidParamException { + this(ac, expression, false); + } +} + From e2e228df762729f55f0bda87c1c7c391c0cb36d3 Mon Sep 17 00:00:00 2001 From: Yves Lafon Date: Wed, 28 Jul 2021 17:09:19 +0200 Subject: [PATCH 4/7] Revert "change grammar to allow ratio as a value (need testing for interaction with '/')" As it failed on examples like: bimg35 { border-image: 10 5% 20 2% / 10 10 10 10 /10px 20 30 40px } due to the "10/10" parsing leading to a dangling 'px' This reverts commit 6091985f4ed01c40f5658cc003ff856c5489d3d4. --- org/w3c/css/parser/analyzer/CssParser.jj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/org/w3c/css/parser/analyzer/CssParser.jj b/org/w3c/css/parser/analyzer/CssParser.jj index 57f14dd24..00f550db8 100644 --- a/org/w3c/css/parser/analyzer/CssParser.jj +++ b/org/w3c/css/parser/analyzer/CssParser.jj @@ -2821,9 +2821,7 @@ void term(CssExpression exp) : } { ( ( ( operator=unaryOperator() )? - ( ( LOOKAHEAD( ( )* "/" ) ratio(exp, operator) - | n= { setValue(new CssNumber(), exp, operator, n, NUMBER); } - ) + ( n= { setValue(new CssNumber(), exp, operator, n, NUMBER); } | n= { setValue(new CssPercentage(), exp, operator, n, PERCENTAGE); } | n= { setValue(new CssLength(), exp, operator, n, RELFONTLENGTH); } | n= { setValue(new CssLength(), exp, operator, n, RELVIEWLENGTH); } From d856b8cee077321a387f391e3834a32333048a45 Mon Sep 17 00:00:00 2001 From: Yves Lafon Date: Wed, 28 Jul 2021 17:10:21 +0200 Subject: [PATCH 5/7] Revert "regen" This reverts commit e3ef094cf1dcef3c5fa697de558d9e504615bd56. --- org/w3c/css/parser/analyzer/CssParser.java | 675 ++++++++++----------- 1 file changed, 312 insertions(+), 363 deletions(-) diff --git a/org/w3c/css/parser/analyzer/CssParser.java b/org/w3c/css/parser/analyzer/CssParser.java index 06afa5a09..78fb6f96e 100644 --- a/org/w3c/css/parser/analyzer/CssParser.java +++ b/org/w3c/css/parser/analyzer/CssParser.java @@ -5766,21 +5766,8 @@ final public boolean prio() throws ParseException { } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case NUMBER:{ - if (jj_2_9(2147483647)) { - ratio(exp, operator); - } else { - switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { - case NUMBER:{ - n = jj_consume_token(NUMBER); + n = jj_consume_token(NUMBER); setValue(new CssNumber(), exp, operator, n, NUMBER); - break; - } - default: - jj_la1[211] = jj_gen; - jj_consume_token(-1); - throw new ParseException(); - } - } break; } case PERCENTAGE:{ @@ -5880,7 +5867,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[212] = jj_gen; + jj_la1[211] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -5942,7 +5929,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[213] = jj_gen; + jj_la1[212] = jj_gen; break label_142; } jj_consume_token(S); @@ -5956,7 +5943,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[214] = jj_gen; + jj_la1[213] = jj_gen; break label_143; } jj_consume_token(COMMA); @@ -5968,7 +5955,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[215] = jj_gen; + jj_la1[214] = jj_gen; break label_144; } jj_consume_token(S); @@ -5983,7 +5970,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[216] = jj_gen; + jj_la1[215] = jj_gen; break label_145; } jj_consume_token(S); @@ -6018,7 +6005,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[217] = jj_gen; + jj_la1[216] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6072,20 +6059,20 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[218] = jj_gen; + jj_la1[217] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[219] = jj_gen; + jj_la1[218] = jj_gen; jj_consume_token(-1); throw new ParseException(); } label_146: while (true) { - if (jj_2_10(2)) { + if (jj_2_9(2)) { ; } else { break label_146; @@ -6130,12 +6117,12 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[220] = jj_gen; + jj_la1[219] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { case NUMBER:{ - if (jj_2_11(2147483647)) { + if (jj_2_10(2147483647)) { ratio(exp, operator); } else { switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -6145,7 +6132,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[221] = jj_gen; + jj_la1[220] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6271,14 +6258,14 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[222] = jj_gen; + jj_la1[221] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[223] = jj_gen; + jj_la1[222] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6290,7 +6277,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[224] = jj_gen; + jj_la1[223] = jj_gen; break label_147; } jj_consume_token(S); @@ -6361,7 +6348,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[225] = jj_gen; + jj_la1[224] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6373,7 +6360,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[226] = jj_gen; + jj_la1[225] = jj_gen; break label_148; } jj_consume_token(S); @@ -6381,7 +6368,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[227] = jj_gen; + jj_la1[226] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6399,7 +6386,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[228] = jj_gen; + jj_la1[227] = jj_gen; break label_149; } jj_consume_token(S); @@ -6418,7 +6405,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[229] = jj_gen; + jj_la1[228] = jj_gen; break label_150; } jj_consume_token(S); @@ -6431,7 +6418,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[230] = jj_gen; + jj_la1[229] = jj_gen; break label_151; } jj_consume_token(COMMA); @@ -6443,7 +6430,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[231] = jj_gen; + jj_la1[230] = jj_gen; break label_152; } jj_consume_token(S); @@ -6458,7 +6445,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[232] = jj_gen; + jj_la1[231] = jj_gen; break label_153; } jj_consume_token(S); @@ -6482,7 +6469,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[233] = jj_gen; + jj_la1[232] = jj_gen; break label_154; } jj_consume_token(S); @@ -6501,7 +6488,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[234] = jj_gen; + jj_la1[233] = jj_gen; break label_155; } jj_consume_token(S); @@ -6514,7 +6501,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[235] = jj_gen; + jj_la1[234] = jj_gen; break label_156; } jj_consume_token(COMMA); @@ -6526,7 +6513,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[236] = jj_gen; + jj_la1[235] = jj_gen; break label_157; } jj_consume_token(S); @@ -6541,7 +6528,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[237] = jj_gen; + jj_la1[236] = jj_gen; break label_158; } jj_consume_token(S); @@ -6565,7 +6552,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[238] = jj_gen; + jj_la1[237] = jj_gen; break label_159; } jj_consume_token(S); @@ -6579,7 +6566,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[239] = jj_gen; + jj_la1[238] = jj_gen; break label_160; } jj_consume_token(S); @@ -6593,7 +6580,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[240] = jj_gen; + jj_la1[239] = jj_gen; break label_161; } jj_consume_token(S); @@ -6607,7 +6594,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[241] = jj_gen; + jj_la1[240] = jj_gen; break label_162; } jj_consume_token(S); @@ -6621,7 +6608,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[242] = jj_gen; + jj_la1[241] = jj_gen; break label_163; } jj_consume_token(S); @@ -6635,7 +6622,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[243] = jj_gen; + jj_la1[242] = jj_gen; break label_164; } jj_consume_token(S); @@ -6659,7 +6646,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[244] = jj_gen; + jj_la1[243] = jj_gen; break label_165; } jj_consume_token(S); @@ -6673,7 +6660,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[245] = jj_gen; + jj_la1[244] = jj_gen; break label_166; } jj_consume_token(S); @@ -6712,7 +6699,7 @@ final public boolean prio() throws ParseException { nb_pre_sp = 0; label_167: while (true) { - if (jj_2_12(2)) { + if (jj_2_11(2)) { ; } else { break label_167; @@ -6732,7 +6719,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[246] = jj_gen; + jj_la1[245] = jj_gen; break label_168; } jj_consume_token(S); @@ -6742,7 +6729,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[247] = jj_gen; + jj_la1[246] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6758,7 +6745,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[248] = jj_gen; + jj_la1[247] = jj_gen; break label_169; } } @@ -6787,7 +6774,7 @@ final public boolean prio() throws ParseException { c = new CssCalc(ac, v1); label_170: while (true) { - if (jj_2_13(2)) { + if (jj_2_12(2)) { ; } else { break label_170; @@ -6800,7 +6787,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[249] = jj_gen; + jj_la1[248] = jj_gen; break label_171; } jj_consume_token(S); @@ -6816,7 +6803,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[250] = jj_gen; + jj_la1[249] = jj_gen; break label_172; } jj_consume_token(S); @@ -6834,7 +6821,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[251] = jj_gen; + jj_la1[250] = jj_gen; break label_173; } jj_consume_token(S); @@ -6857,7 +6844,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[252] = jj_gen; + jj_la1[251] = jj_gen; break label_174; } jj_consume_token(S); @@ -6871,7 +6858,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[253] = jj_gen; + jj_la1[252] = jj_gen; break label_175; } jj_consume_token(COMMA); @@ -6883,7 +6870,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[254] = jj_gen; + jj_la1[253] = jj_gen; break label_176; } jj_consume_token(S); @@ -6898,7 +6885,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[255] = jj_gen; + jj_la1[254] = jj_gen; break label_177; } jj_consume_token(S); @@ -6907,14 +6894,14 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[256] = jj_gen; + jj_la1[255] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; } default: - jj_la1[257] = jj_gen; + jj_la1[256] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -6945,7 +6932,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[258] = jj_gen; + jj_la1[257] = jj_gen; ; } n = jj_consume_token(NUMBER); @@ -6962,7 +6949,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[259] = jj_gen; + jj_la1[258] = jj_gen; break label_178; } jj_consume_token(S); @@ -6976,7 +6963,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[260] = jj_gen; + jj_la1[259] = jj_gen; break label_179; } jj_consume_token(S); @@ -6986,7 +6973,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[261] = jj_gen; + jj_la1[260] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7005,7 +6992,7 @@ final public boolean prio() throws ParseException { c = new CssCalc(ac, v1); nb_pre_sp = 0; label_180: while (true) { - if (jj_2_14(2)) { + if (jj_2_13(2)) { ; } else { break label_180; @@ -7025,7 +7012,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[262] = jj_gen; + jj_la1[261] = jj_gen; break label_181; } jj_consume_token(S); @@ -7035,7 +7022,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[263] = jj_gen; + jj_la1[262] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7051,7 +7038,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[264] = jj_gen; + jj_la1[263] = jj_gen; break label_182; } } @@ -7080,7 +7067,7 @@ final public boolean prio() throws ParseException { c = new CssCalc(ac, v1); label_183: while (true) { - if (jj_2_15(2)) { + if (jj_2_14(2)) { ; } else { break label_183; @@ -7093,7 +7080,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[265] = jj_gen; + jj_la1[264] = jj_gen; break label_184; } jj_consume_token(S); @@ -7108,7 +7095,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[266] = jj_gen; + jj_la1[265] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7120,7 +7107,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[267] = jj_gen; + jj_la1[266] = jj_gen; break label_185; } jj_consume_token(S); @@ -7161,7 +7148,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[268] = jj_gen; + jj_la1[267] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -7211,7 +7198,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[269] = jj_gen; + jj_la1[268] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7227,7 +7214,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[270] = jj_gen; + jj_la1[269] = jj_gen; break label_186; } jj_consume_token(S); @@ -7241,7 +7228,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[271] = jj_gen; + jj_la1[270] = jj_gen; break label_187; } jj_consume_token(S); @@ -7280,7 +7267,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[272] = jj_gen; + jj_la1[271] = jj_gen; break label_188; } jj_consume_token(S); @@ -7294,7 +7281,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[273] = jj_gen; + jj_la1[272] = jj_gen; break label_189; } jj_consume_token(COMMA); @@ -7306,7 +7293,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[274] = jj_gen; + jj_la1[273] = jj_gen; break label_190; } jj_consume_token(S); @@ -7321,7 +7308,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[275] = jj_gen; + jj_la1[274] = jj_gen; break label_191; } jj_consume_token(S); @@ -7330,7 +7317,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[276] = jj_gen; + jj_la1[275] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7350,7 +7337,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[277] = jj_gen; + jj_la1[276] = jj_gen; break label_192; } jj_consume_token(S); @@ -7364,7 +7351,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[278] = jj_gen; + jj_la1[277] = jj_gen; break label_193; } jj_consume_token(S); @@ -7392,7 +7379,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[279] = jj_gen; + jj_la1[278] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7405,7 +7392,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[280] = jj_gen; + jj_la1[279] = jj_gen; break label_194; } jj_consume_token(S); @@ -7413,7 +7400,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[281] = jj_gen; + jj_la1[280] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) { @@ -7428,7 +7415,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[282] = jj_gen; + jj_la1[281] = jj_gen; break label_195; } jj_consume_token(S); @@ -7437,7 +7424,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[283] = jj_gen; + jj_la1[282] = jj_gen; ; } jj_consume_token(LPARAN); @@ -7462,12 +7449,12 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[284] = jj_gen; + jj_la1[283] = jj_gen; break label_196; } jj_consume_token(S); } - if (jj_2_16(2)) { + if (jj_2_15(2)) { exp = expr(); jj_consume_token(LPARAN); String funcname = n.image.toLowerCase(); @@ -7549,7 +7536,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[285] = jj_gen; + jj_la1[284] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7581,7 +7568,7 @@ final public boolean prio() throws ParseException { break; } default: - jj_la1[286] = jj_gen; + jj_la1[285] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -7957,15 +7944,41 @@ private boolean jj_2_15(int xla) finally { jj_save(14, xla); } } - private boolean jj_2_16(int xla) + private boolean jj_3R_335() { - jj_la = xla; jj_lastpos = jj_scanpos = token; - try { return !jj_3_16(); } - catch(LookaheadSuccess ls) { return true; } - finally { jj_save(15, xla); } + if (jj_scan_token(COMMA)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_326()) return true; + return false; } - private boolean jj_3R_339() + private boolean jj_3R_301() + { + if (jj_scan_token(FUNCTIONCLAMP)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_326()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(COMMA)) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_326()) return true; + return false; + } + + private boolean jj_3R_337() { Token xsp; xsp = jj_scanpos; @@ -8030,16 +8043,16 @@ private boolean jj_3R_339() return false; } - private boolean jj_3R_336() + private boolean jj_3R_334() { Token xsp; xsp = jj_scanpos; - if (jj_3R_339()) jj_scanpos = xsp; + if (jj_3R_337()) jj_scanpos = xsp; if (jj_3R_203()) return true; return false; } - private boolean jj_3R_324() + private boolean jj_3R_322() { if (jj_scan_token(RPARAN)) return true; Token xsp; @@ -8053,16 +8066,16 @@ private boolean jj_3R_324() if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_331()) jj_scanpos = xsp; + if (jj_3R_329()) jj_scanpos = xsp; if (jj_scan_token(LPARAN)) return true; return false; } - private boolean jj_3R_334() + private boolean jj_3R_332() { Token xsp; xsp = jj_scanpos; - if (jj_3R_336()) { + if (jj_3R_334()) { jj_scanpos = xsp; if (jj_scan_token(43)) return true; } @@ -8073,13 +8086,13 @@ private boolean jj_3R_334() return false; } - private boolean jj_3R_332() + private boolean jj_3R_330() { Token xsp; xsp = jj_scanpos; - if (jj_3R_334()) { + if (jj_3R_332()) { jj_scanpos = xsp; - if (jj_3R_335()) return true; + if (jj_3R_333()) return true; } return false; } @@ -8110,13 +8123,30 @@ private boolean jj_3R_230() return false; } - private boolean jj_3R_327() + private boolean jj_3R_325() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_338() + private boolean jj_3R_324() + { + if (jj_scan_token(MINUS)) return true; + return false; + } + + private boolean jj_3R_297() + { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_324()) { + jj_scanpos = xsp; + if (jj_3R_325()) return true; + } + return false; + } + + private boolean jj_3R_336() { if (jj_scan_token(COMMA)) return true; Token xsp; @@ -8124,11 +8154,18 @@ private boolean jj_3R_338() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_329()) return true; + if (jj_3R_326()) return true; return false; } - private boolean jj_3R_301() + private boolean jj_3R_323() + { + if (jj_3R_330()) return true; + if (jj_scan_token(COLON)) return true; + return false; + } + + private boolean jj_3R_299() { if (jj_scan_token(FUNCTIONMAX)) return true; Token xsp; @@ -8136,43 +8173,19 @@ private boolean jj_3R_301() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_329()) return true; + if (jj_3R_326()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; - if (jj_3R_337()) { jj_scanpos = xsp; break; } + if (jj_3R_335()) { jj_scanpos = xsp; break; } } if (jj_scan_token(LPARAN)) return true; return false; } - private boolean jj_3R_326() - { - if (jj_scan_token(MINUS)) return true; - return false; - } - - private boolean jj_3R_297() - { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_326()) { - jj_scanpos = xsp; - if (jj_3R_327()) return true; - } - return false; - } - - private boolean jj_3R_325() - { - if (jj_3R_332()) return true; - if (jj_scan_token(COLON)) return true; - return false; - } - private boolean jj_3R_213() { if (jj_3R_230()) return true; @@ -8202,7 +8215,7 @@ private boolean jj_3R_212() return false; } - private boolean jj_3R_302() + private boolean jj_3R_300() { if (jj_scan_token(FUNCTIONMIN)) return true; Token xsp; @@ -8210,14 +8223,14 @@ private boolean jj_3R_302() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_329()) return true; + if (jj_3R_326()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; - if (jj_3R_338()) { jj_scanpos = xsp; break; } + if (jj_3R_336()) { jj_scanpos = xsp; break; } } if (jj_scan_token(LPARAN)) return true; return false; @@ -8240,12 +8253,6 @@ private boolean jj_3R_218() return false; } - private boolean jj_3R_285() - { - if (jj_scan_token(UNICODERANGE)) return true; - return false; - } - private boolean jj_3R_201() { Token xsp; @@ -8254,6 +8261,12 @@ private boolean jj_3R_201() return false; } + private boolean jj_3R_285() + { + if (jj_scan_token(UNICODERANGE)) return true; + return false; + } + private boolean jj_3R_284() { if (jj_scan_token(URL)) return true; @@ -8262,11 +8275,11 @@ private boolean jj_3R_284() private boolean jj_3R_283() { - if (jj_3R_306()) return true; + if (jj_3R_304()) return true; return false; } - private boolean jj_3R_306() + private boolean jj_3R_304() { Token xsp; xsp = jj_scanpos; @@ -8294,7 +8307,7 @@ private boolean jj_3R_328() return false; } - private boolean jj_3R_330() + private boolean jj_3R_327() { if (jj_3R_203()) return true; if (jj_scan_token(EQ)) return true; @@ -8308,21 +8321,15 @@ private boolean jj_3R_281() return false; } - private boolean jj_3R_313() - { - if (jj_3R_303()) return true; - return false; - } - private boolean jj_3R_282() { if (jj_3R_203()) return true; return false; } - private boolean jj_3R_312() + private boolean jj_3R_311() { - if (jj_3R_302()) return true; + if (jj_3R_301()) return true; return false; } @@ -8350,21 +8357,27 @@ private boolean jj_3R_222() return false; } - private boolean jj_3R_311() + private boolean jj_3R_310() { - if (jj_3R_301()) return true; + if (jj_3R_300()) return true; return false; } - private boolean jj_3R_310() + private boolean jj_3R_309() { - if (jj_3R_300()) return true; + if (jj_3R_299()) return true; return false; } - private boolean jj_3R_309() + private boolean jj_3R_308() { - if (jj_3R_305()) return true; + if (jj_3R_298()) return true; + return false; + } + + private boolean jj_3R_307() + { + if (jj_3R_303()) return true; return false; } @@ -8372,15 +8385,15 @@ private boolean jj_3R_280() { Token xsp; xsp = jj_scanpos; - if (jj_3R_309()) { + if (jj_3R_307()) { jj_scanpos = xsp; - if (jj_3R_310()) { + if (jj_3R_308()) { jj_scanpos = xsp; - if (jj_3R_311()) { + if (jj_3R_309()) { jj_scanpos = xsp; - if (jj_3R_312()) { + if (jj_3R_310()) { jj_scanpos = xsp; - if (jj_3R_313()) return true; + if (jj_3R_311()) return true; } } } @@ -8406,7 +8419,7 @@ private boolean jj_3R_277() return false; } - private boolean jj_3_11() + private boolean jj_3_10() { if (jj_scan_token(NUMBER)) return true; Token xsp; @@ -8466,7 +8479,7 @@ private boolean jj_3R_269() return false; } - private boolean jj_3R_341() + private boolean jj_3R_339() { if (jj_scan_token(COMMA)) return true; return false; @@ -8490,13 +8503,13 @@ private boolean jj_3R_266() return false; } - private boolean jj_3R_307() + private boolean jj_3R_305() { if (jj_3R_328()) return true; return false; } - private boolean jj_3R_308() + private boolean jj_3R_306() { if (jj_scan_token(NUMBER)) return true; return false; @@ -8506,14 +8519,14 @@ private boolean jj_3R_265() { Token xsp; xsp = jj_scanpos; - if (jj_3R_307()) { + if (jj_3R_305()) { jj_scanpos = xsp; - if (jj_3R_308()) return true; + if (jj_3R_306()) return true; } return false; } - private boolean jj_3_16() + private boolean jj_3_15() { if (jj_3R_211()) return true; if (jj_scan_token(LPARAN)) return true; @@ -8596,13 +8609,13 @@ private boolean jj_3R_205() return false; } - private boolean jj_3R_340() + private boolean jj_3R_338() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3_10() + private boolean jj_3_9() { if (jj_scan_token(S)) return true; return false; @@ -8622,17 +8635,17 @@ private boolean jj_3R_262() private boolean jj_3R_261() { - if (jj_3R_306()) return true; + if (jj_3R_304()) return true; return false; } - private boolean jj_3R_343() + private boolean jj_3R_341() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_305() + private boolean jj_3R_303() { if (jj_scan_token(FUNCTION)) return true; Token xsp; @@ -8641,30 +8654,50 @@ private boolean jj_3R_305() if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3_16()) { + if (jj_3_15()) { jj_scanpos = xsp; - if (jj_3R_330()) return true; + if (jj_3R_327()) return true; } return false; } - private boolean jj_3R_344() + private boolean jj_3R_342() { if (jj_3R_203()) return true; return false; } - private boolean jj_3R_342() + private boolean jj_3R_340() { Token xsp; xsp = jj_scanpos; - if (jj_3R_344()) { + if (jj_3R_342()) { jj_scanpos = xsp; if (jj_scan_token(131)) return true; } return false; } + private boolean jj_3R_231() + { + Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(29)) { + jj_scanpos = xsp; + if (jj_scan_token(30)) { + jj_scanpos = xsp; + if (jj_scan_token(48)) { + jj_scanpos = xsp; + if (jj_scan_token(135)) { + jj_scanpos = xsp; + if (jj_scan_token(137)) return true; + } + } + } + } + return false; + } + private boolean jj_3R_260() { if (jj_3R_203()) return true; @@ -8682,32 +8715,12 @@ private boolean jj_3R_259() return false; } - private boolean jj_3R_315() + private boolean jj_3R_313() { if (jj_scan_token(NUMBER)) return true; return false; } - private boolean jj_3R_231() - { - Token xsp; - xsp = jj_scanpos; - if (jj_scan_token(29)) { - jj_scanpos = xsp; - if (jj_scan_token(30)) { - jj_scanpos = xsp; - if (jj_scan_token(48)) { - jj_scanpos = xsp; - if (jj_scan_token(135)) { - jj_scanpos = xsp; - if (jj_scan_token(137)) return true; - } - } - } - } - return false; - } - private boolean jj_3R_258() { if (jj_scan_token(DIV)) return true; @@ -8722,7 +8735,7 @@ private boolean jj_3R_257() private boolean jj_3R_256() { - if (jj_3R_305()) return true; + if (jj_3R_303()) return true; return false; } @@ -8737,7 +8750,7 @@ private boolean jj_3R_255() if (jj_scan_token(CUSTOM_PROPERTY_NAME)) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_341()) { jj_scanpos = xsp; break; } + if (jj_3R_339()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; @@ -8749,17 +8762,17 @@ private boolean jj_3R_255() private boolean jj_3R_254() { - if (jj_3R_304()) return true; + if (jj_3R_302()) return true; return false; } private boolean jj_3R_253() { - if (jj_3R_303()) return true; + if (jj_3R_301()) return true; return false; } - private boolean jj_3R_304() + private boolean jj_3R_302() { if (jj_scan_token(FUNCTIONATTR)) return true; Token xsp; @@ -8773,28 +8786,28 @@ private boolean jj_3R_304() if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_342()) jj_scanpos = xsp; + if (jj_3R_340()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_343()) jj_scanpos = xsp; + if (jj_3R_341()) jj_scanpos = xsp; if (jj_scan_token(LPARAN)) return true; return false; } private boolean jj_3R_252() { - if (jj_3R_302()) return true; + if (jj_3R_300()) return true; return false; } private boolean jj_3R_251() { - if (jj_3R_301()) return true; + if (jj_3R_299()) return true; return false; } private boolean jj_3R_250() { - if (jj_3R_300()) return true; + if (jj_3R_298()) return true; return false; } @@ -8856,7 +8869,7 @@ private boolean jj_3R_293() if (jj_scan_token(CUSTOM_PROPERTY_NAME)) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_340()) { jj_scanpos = xsp; break; } + if (jj_3R_338()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; @@ -8868,7 +8881,7 @@ private boolean jj_3R_293() private boolean jj_3R_292() { - if (jj_3R_304()) return true; + if (jj_3R_302()) return true; return false; } @@ -8880,25 +8893,25 @@ private boolean jj_3R_249() private boolean jj_3R_291() { - if (jj_3R_303()) return true; + if (jj_3R_301()) return true; return false; } private boolean jj_3R_290() { - if (jj_3R_302()) return true; + if (jj_3R_300()) return true; return false; } private boolean jj_3R_289() { - if (jj_3R_301()) return true; + if (jj_3R_299()) return true; return false; } private boolean jj_3R_288() { - if (jj_3R_300()) return true; + if (jj_3R_298()) return true; return false; } @@ -8910,7 +8923,7 @@ private boolean jj_3R_287() xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_329()) return true; + if (jj_3R_326()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } @@ -8919,19 +8932,19 @@ private boolean jj_3R_287() return false; } - private boolean jj_3R_323() + private boolean jj_3R_321() { if (jj_scan_token(FREQ)) return true; return false; } - private boolean jj_3R_322() + private boolean jj_3R_320() { if (jj_scan_token(TIME)) return true; return false; } - private boolean jj_3R_321() + private boolean jj_3R_319() { if (jj_scan_token(ANGLE)) return true; return false; @@ -8943,37 +8956,37 @@ private boolean jj_3R_248() return false; } - private boolean jj_3R_320() + private boolean jj_3R_318() { if (jj_scan_token(FLEX)) return true; return false; } - private boolean jj_3R_319() + private boolean jj_3R_317() { if (jj_scan_token(ABSOLUTLENGTH)) return true; return false; } - private boolean jj_3R_318() + private boolean jj_3R_316() { if (jj_scan_token(RELVIEWLENGTH)) return true; return false; } - private boolean jj_3R_317() + private boolean jj_3R_315() { if (jj_scan_token(RELFONTLENGTH)) return true; return false; } - private boolean jj_3R_314() + private boolean jj_3R_312() { if (jj_3R_297()) return true; return false; } - private boolean jj_3R_316() + private boolean jj_3R_314() { if (jj_scan_token(PERCENTAGE)) return true; return false; @@ -8983,8 +8996,12 @@ private boolean jj_3R_286() { Token xsp; xsp = jj_scanpos; - if (jj_3R_314()) jj_scanpos = xsp; + if (jj_3R_312()) jj_scanpos = xsp; xsp = jj_scanpos; + if (jj_3R_313()) { + jj_scanpos = xsp; + if (jj_3R_314()) { + jj_scanpos = xsp; if (jj_3R_315()) { jj_scanpos = xsp; if (jj_3R_316()) { @@ -8997,11 +9014,7 @@ private boolean jj_3R_286() jj_scanpos = xsp; if (jj_3R_320()) { jj_scanpos = xsp; - if (jj_3R_321()) { - jj_scanpos = xsp; - if (jj_3R_322()) { - jj_scanpos = xsp; - if (jj_3R_323()) return true; + if (jj_3R_321()) return true; } } } @@ -9054,18 +9067,6 @@ private boolean jj_3R_246() return false; } - private boolean jj_3_9() - { - if (jj_scan_token(NUMBER)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(DIV)) return true; - return false; - } - private boolean jj_3R_245() { if (jj_scan_token(SPL)) return true; @@ -9149,13 +9150,7 @@ private boolean jj_3R_235() return false; } - private boolean jj_3R_299() - { - if (jj_scan_token(NUMBER)) return true; - return false; - } - - private boolean jj_3_15() + private boolean jj_3_14() { Token xsp; while (true) { @@ -9175,20 +9170,9 @@ private boolean jj_3_15() return false; } - private boolean jj_3R_298() - { - if (jj_3R_328()) return true; - return false; - } - private boolean jj_3R_234() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_298()) { - jj_scanpos = xsp; - if (jj_3R_299()) return true; - } + if (jj_scan_token(NUMBER)) return true; return false; } @@ -9270,14 +9254,14 @@ private boolean jj_3R_202() } while (true) { xsp = jj_scanpos; - if (jj_3_10()) { jj_scanpos = xsp; break; } + if (jj_3_9()) { jj_scanpos = xsp; break; } } return false; } private boolean jj_3R_295() { - if (jj_3R_324()) return true; + if (jj_3R_322()) return true; return false; } @@ -9292,7 +9276,7 @@ private boolean jj_3R_204() return false; } - private boolean jj_3_14() + private boolean jj_3_13() { Token xsp; xsp = jj_scanpos; @@ -9308,7 +9292,7 @@ private boolean jj_3_14() return false; } - private boolean jj_3_13() + private boolean jj_3_12() { Token xsp; while (true) { @@ -9413,21 +9397,9 @@ private boolean jj_3R_208() return false; } - private boolean jj_3R_207() - { - if (jj_scan_token(ANY)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_224()) return true; - return false; - } - private boolean jj_3R_296() { - if (jj_3R_325()) return true; + if (jj_3R_323()) return true; return false; } @@ -9463,6 +9435,18 @@ private boolean jj_3R_214() return false; } + private boolean jj_3R_207() + { + if (jj_scan_token(ANY)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } + } + if (jj_3R_224()) return true; + return false; + } + private boolean jj_3_4() { if (jj_3R_199()) return true; @@ -9532,13 +9516,13 @@ private boolean jj_3R_206() return false; } - private boolean jj_3R_333() + private boolean jj_3R_331() { if (jj_3R_224()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_13()) { jj_scanpos = xsp; break; } + if (jj_3_12()) { jj_scanpos = xsp; break; } } return false; } @@ -9584,7 +9568,7 @@ private boolean jj_3R_215() return false; } - private boolean jj_3_12() + private boolean jj_3_11() { Token xsp; xsp = jj_scanpos; @@ -9600,13 +9584,13 @@ private boolean jj_3_12() return false; } - private boolean jj_3R_329() + private boolean jj_3R_326() { - if (jj_3R_333()) return true; + if (jj_3R_331()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3_12()) { jj_scanpos = xsp; break; } + if (jj_3_11()) { jj_scanpos = xsp; break; } } return false; } @@ -9631,23 +9615,6 @@ private boolean jj_3R_203() return false; } - private boolean jj_3R_300() - { - if (jj_scan_token(FUNCTIONCALC)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_329()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(LPARAN)) return true; - return false; - } - private boolean jj_3R_217() { if (jj_3R_203()) return true; @@ -9665,37 +9632,42 @@ private boolean jj_3R_200() return false; } - private boolean jj_3R_335() + private boolean jj_3R_298() { + if (jj_scan_token(FUNCTIONCALC)) return true; Token xsp; - xsp = jj_scanpos; - if (jj_scan_token(40)) { - jj_scanpos = xsp; - if (jj_scan_token(117)) { - jj_scanpos = xsp; - if (jj_scan_token(106)) return true; - } + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } + if (jj_3R_326()) return true; while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } + if (jj_scan_token(LPARAN)) return true; return false; } - private boolean jj_3R_337() + private boolean jj_3R_333() { - if (jj_scan_token(COMMA)) return true; Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(40)) { + jj_scanpos = xsp; + if (jj_scan_token(117)) { + jj_scanpos = xsp; + if (jj_scan_token(106)) return true; + } + } while (true) { xsp = jj_scanpos; if (jj_scan_token(21)) { jj_scanpos = xsp; break; } } - if (jj_3R_329()) return true; return false; } - private boolean jj_3R_331() + private boolean jj_3R_329() { if (jj_scan_token(COLON)) return true; return false; @@ -9710,28 +9682,6 @@ private boolean jj_3_5() return false; } - private boolean jj_3R_303() - { - if (jj_scan_token(FUNCTIONCLAMP)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_329()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(COMMA)) return true; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(21)) { jj_scanpos = xsp; break; } - } - if (jj_3R_329()) return true; - return false; - } - /** Generated Token Manager. */ public CssParserTokenManager token_source; SimpleCharStream jj_input_stream; @@ -9743,7 +9693,7 @@ private boolean jj_3R_303() private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[287]; + final private int[] jj_la1 = new int[286]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -9757,21 +9707,21 @@ private boolean jj_3R_303() jj_la1_init_4(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0xc00000,0xc00000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0xa8000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x80000000,0x200000,0x0,0x0,0x0,0x200000,0x18000000,0x18000000,0x18000000,0x200000,0x200000,0x200000,0x200000,0x18000000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x28000000,0x200000,0x200000,0x28200000,0x18000000,0xa8000000,0xa8000000,0xa8000000,0x200000,0x0,0x200000,0xa8000000,0x80000000,0x200000,0x200000,0x200000,0xa8000000,0x0,0x200000,0xa8000000,0x200000,0x28200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x200000,0x3000000,0x200000,0x0,0x200000,0x3000000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x18000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x18000000,0x200000,0x18000000,0x0,0x0,0x200000,0x80000000,0x200000,0x200000,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x18200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x0,0x18000000,0x200000,0x200000,0x18000000,0x200000,0x18200000,0x200000,0x200000,0x0,0x200000,0x18000000,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x80000000,0x200000,0x0,0x0,}; + jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0xc00000,0xc00000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0xa8000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x80000000,0x200000,0x0,0x0,0x0,0x200000,0x18000000,0x18000000,0x18000000,0x200000,0x200000,0x200000,0x200000,0x18000000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x28000000,0x200000,0x200000,0x28200000,0x18000000,0xa8000000,0xa8000000,0xa8000000,0x200000,0x0,0x200000,0xa8000000,0x80000000,0x200000,0x200000,0x200000,0xa8000000,0x0,0x200000,0xa8000000,0x200000,0x28200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x200000,0x3000000,0x200000,0x0,0x200000,0x3000000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x18000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x200000,0x200000,0x60000000,0x200000,0x60000000,0x18000000,0x200000,0x18000000,0x0,0x200000,0x80000000,0x200000,0x200000,0x0,0x0,0x18000000,0x18000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x18000000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x18200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x0,0x18000000,0x200000,0x200000,0x18000000,0x200000,0x18200000,0x200000,0x200000,0x0,0x200000,0x18000000,0x0,0x200000,0x200000,0x200000,0x80000000,0x200000,0x200000,0x18000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x80000000,0x200000,0x0,0x0,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x9e,0x4000020,0x0,0x0,0x0,0x4000020,0x0,0x1000098,0x0,0x0,0x1000098,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x18,0x0,0x0,0x2,0x98,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x2,0x0,0x1000010,0x0,0x0,0x1000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x3bd099f,0x0,0x1000000,0x0,0x9e,0x0,0x0,0x0,0x0,0x200009e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x3bd0001,0x3bd0001,0x3bd089f,0x0,0x100,0x0,0x3bd099f,0x0,0x0,0x0,0x0,0x3bd099f,0x20000,0x0,0x3bd099f,0x0,0x1,0x0,0x0,0xba080300,0xba080300,0xba080300,0xba080300,0xba28039e,0xb8000000,0xb8000000,0x20009e,0x20009e,0x20009e,0x0,0x0,0x1e000,0x0,0xbe,0x0,0x1e000,0x0,0xba28039e,0x0,0x0,0xbe,0x0,0x0,0x0,0x9e,0x2000000,0x300,0x0,0x0,0x2000000,0x0,0x0,0x0,0xbe,0x0,0xbe,0x0,0x0,0x10000,0x0,0x10000,0x0,0x0,0x10000,0x0,0x10000,0xfc0003be,0x0,0x0,0x0,0xf8000400,0x0,0x0,0x0,0x0,0x180000,0x41c03be,0xfc1c07be,0x0,0x0,0x0,0xf8000000,0x0,0x40003be,0x0,0xfc0003be,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x240000,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x240000,0x0,0x0,0xf8000000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9000000,0x0,0x0,0x9e,0x0,0x9e,0x0,0x0,0x0,0x9e,0x300,}; + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x9e,0x4000020,0x0,0x0,0x0,0x4000020,0x0,0x1000098,0x0,0x0,0x1000098,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x0,0x0,0x18,0x0,0x18,0x0,0x0,0x2,0x98,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x2,0x0,0x1000010,0x0,0x0,0x1000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0xba28039e,0xba28039e,0x0,0x0,0x0,0x2,0x0,0x4,0x6,0x6,0x1000010,0x0,0x3bd099f,0x0,0x1000000,0x0,0x9e,0x0,0x0,0x0,0x0,0x200009e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x2000000,0x2000000,0x200009e,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x9e,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x3bd0001,0x3bd0001,0x3bd089f,0x0,0x100,0x0,0x3bd099f,0x0,0x0,0x0,0x0,0x3bd099f,0x20000,0x0,0x3bd099f,0x0,0x1,0x0,0x0,0xba080300,0xba080300,0xba080300,0xba080300,0xba28039e,0xb8000000,0xb8000000,0x20009e,0x20009e,0x20009e,0x0,0x0,0x1e000,0x0,0xbe,0x0,0x1e000,0x0,0xba28039e,0x0,0x0,0xbe,0x0,0x0,0x0,0x9e,0x2000000,0x300,0x0,0x0,0x2000000,0x0,0x0,0x0,0xbe,0x0,0xbe,0x0,0x0,0x10000,0x0,0x10000,0x0,0x0,0x10000,0x0,0x10000,0xfc0003be,0x0,0x0,0xf8000400,0x0,0x0,0x0,0x0,0x180000,0x41c03be,0xfc1c07be,0x0,0x0,0x0,0xf8000000,0x0,0x40003be,0x0,0xfc0003be,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x240000,0x0,0x0,0x0,0x1000000,0x0,0x0,0x0,0x0,0x240000,0x0,0x0,0xf8000000,0x0,0x0,0x0,0x0,0x0,0x0,0xf9000000,0x0,0x0,0x9e,0x0,0x9e,0x0,0x0,0x0,0x9e,0x300,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x1000,0x0,0x0,0x40000000,0x80000000,0x0,0x0,0x0,0x2000,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc000,0x3fffc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x85c,0x85c,0x85c,0x85c,0x5c,0x5c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x200,0x0,0x0,0x200,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x0,0x100,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x100,0x0,0x5ff,0x0,0x0,0x0,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x1000,0x0,0x0,0x40000000,0x80000000,0x0,0x0,0x0,0x2000,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x285c,0x285c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fffc000,0x3fffc000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x85c,0x85c,0x85c,0x85c,0x5c,0x5c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x85c,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x200,0x0,0x0,0x200,0x0,0x1c0,0x0,0x1c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x0,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x5ff,0x0,0x100,0x0,0x5ff,0x0,0x0,0x0,0x5ff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x18c,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x200400,0x0,0x0,0x0,0x0,0x200400,0x0,0x0,0x200400,0x0,0x0,0x0,0x0,0xa00000,0xa00000,0xa00000,0xa00000,0xa00000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x40400000,0x40400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f100000,0x7f100000,0x0,0x0,0x4f000000,0x4f000000,0x0,0x100000,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x80000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa007df,0xa007df,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x40000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200400,0x0,0x200400,0x0,0x0,0x0,0x0,0x200400,0x0,0x0,0x200400,0x0,0x0,0x0,0x0,0xa00000,0xa00000,0xa00000,0xa00000,0xa00000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x0,0x0,0x0,0x40400000,0x40400000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f100000,0x7f100000,0x0,0x0,0x4f000000,0x4f000000,0x0,0x100000,0x0,0x4f100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3f000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } private static void jj_la1_init_4() { - jj_la1_4 = new int[] {0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x1fe,0x1fe,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_4 = new int[] {0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fe,0x1fe,0x1fe,0x0,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x1fe,0x0,0x0,0x1fe,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x280,0x0,0x280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[16]; + final private JJCalls[] jj_2_rtns = new JJCalls[15]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -9786,7 +9736,7 @@ public CssParser(java.io.InputStream stream, String encoding) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 287; i++) jj_la1[i] = -1; + for (int i = 0; i < 286; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9801,7 +9751,7 @@ public void ReInit(java.io.InputStream stream, String encoding) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 287; i++) jj_la1[i] = -1; + for (int i = 0; i < 286; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9812,7 +9762,7 @@ public CssParser(java.io.Reader stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 287; i++) jj_la1[i] = -1; + for (int i = 0; i < 286; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9823,7 +9773,7 @@ public void ReInit(java.io.Reader stream) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 287; i++) jj_la1[i] = -1; + for (int i = 0; i < 286; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9833,7 +9783,7 @@ public CssParser(CssParserTokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 287; i++) jj_la1[i] = -1; + for (int i = 0; i < 286; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9843,7 +9793,7 @@ public void ReInit(CssParserTokenManager tm) { token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 287; i++) jj_la1[i] = -1; + for (int i = 0; i < 286; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -9961,7 +9911,7 @@ public ParseException generateParseException() { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 287; i++) { + for (int i = 0; i < 286; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1< Date: Wed, 28 Jul 2021 17:38:23 +0200 Subject: [PATCH 6/7] rewrite ratio to use BigDecimal like all number-based values --- org/w3c/css/values/CssRatio.java | 53 +++++++++++++------------------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/org/w3c/css/values/CssRatio.java b/org/w3c/css/values/CssRatio.java index 70c28b645..761f7df4f 100644 --- a/org/w3c/css/values/CssRatio.java +++ b/org/w3c/css/values/CssRatio.java @@ -8,7 +8,9 @@ import org.w3c.css.util.ApplContext; import org.w3c.css.util.InvalidParamException; -import org.w3c.css.util.Util; + +import java.math.BigDecimal; +import java.math.RoundingMode; /** * @spec http://www.w3.org/TR/2010/CR-css3-mediaqueries-20100727/#values @@ -22,10 +24,7 @@ public final int getType() { return type; } - float w; - boolean isWInt; - float h; - boolean isHInt; + BigDecimal w, h; /** @@ -34,17 +33,20 @@ public final int getType() { public CssRatio() { } + public CssRatio(BigDecimal w, BigDecimal h) { + this.w = w; + this.h = h; + } + /** * Set the value of this ratio. * * @param s the string representation of the ratio. * @param ac For errors and warnings reports. - * @throws org.w3c.css.util.InvalidParamException - * (incorrect format) + * @throws org.w3c.css.util.InvalidParamException (incorrect format) */ public void set(String s, ApplContext ac) throws InvalidParamException { String sw, sh; - s = s.toLowerCase(); int slash = s.indexOf('/'); if (slash == -1) { @@ -56,37 +58,25 @@ public void set(String s, ApplContext ac) throws InvalidParamException { sw = s.substring(0, slash).trim(); sh = s.substring(slash + 1).trim(); try { - w = Integer.parseInt(sw); - isWInt = true; + w = new BigDecimal(sw); } catch (NumberFormatException nex) { - try { - w = Float.parseFloat(sw); - } catch (NumberFormatException ne) { - // not an int, not a float... bail out - throw new InvalidParamException("value", s, ac); - } + // not an int, not a float... bail out + throw new InvalidParamException("value", s, ac); } // sanity check - if (w <= 0.f) { + if (w.signum() != 1) { throw new InvalidParamException("strictly-positive", s, ac); } try { - h = Integer.parseInt(sh); - isHInt = true; + h = new BigDecimal(sh); } catch (NumberFormatException nex) { - try { - h = Float.parseFloat(sh); - } catch (NumberFormatException ne) { - // not an int, not a float... bail out - throw new InvalidParamException("value", s, ac); - } + throw new InvalidParamException("value", s, ac); } // sanity check - if (h <= 0.f) { + if (h.signum() != 1) { throw new InvalidParamException("strictly-positive", s, ac); } - } /** @@ -101,9 +91,7 @@ public Object get() { */ public String toString() { StringBuilder sb = new StringBuilder(); - sb.append((isWInt) ? Integer.toString((int) w) : Util.displayFloat(w)); - sb.append('/'); - sb.append((isHInt) ? Integer.toString((int) h) : Util.displayFloat(h)); + sb.append(w.toPlainString()).append('/').append(h.toPlainString()); return sb.toString(); } @@ -116,7 +104,10 @@ public boolean equals(Object value) { try { CssRatio other = (CssRatio) value; // check that the ratio are the same - return (Float.compare(w / h, other.w / other.h) == 0); + BigDecimal ratio, other_ratio; + ratio = w.divide(h, RoundingMode.CEILING); + other_ratio = other.w.divide(other.h, RoundingMode.CEILING); + return (ratio.compareTo(other_ratio) == 0); } catch (ClassCastException cce) { return false; } From 75c34d9a80bdc831c50aaa0209fe4b2d71a6b173 Mon Sep 17 00:00:00 2001 From: Yves Lafon Date: Wed, 28 Jul 2021 17:39:26 +0200 Subject: [PATCH 7/7] fake the CssRatio parsing to avoid conflict with / as a switch --- .../css/properties/css3/CssAspectRatio.java | 44 +++++++++++++++---- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/org/w3c/css/properties/css3/CssAspectRatio.java b/org/w3c/css/properties/css3/CssAspectRatio.java index 694988b13..fe909d41e 100644 --- a/org/w3c/css/properties/css3/CssAspectRatio.java +++ b/org/w3c/css/properties/css3/CssAspectRatio.java @@ -9,10 +9,12 @@ import org.w3c.css.util.InvalidParamException; import org.w3c.css.values.CssExpression; import org.w3c.css.values.CssIdent; +import org.w3c.css.values.CssRatio; import org.w3c.css.values.CssTypes; import org.w3c.css.values.CssValue; import org.w3c.css.values.CssValueList; +import java.math.BigDecimal; import java.util.ArrayList; import static org.w3c.css.values.CssOperator.SPACE; @@ -35,28 +37,47 @@ public CssAspectRatio() { * Creates a new CssAspectRatio * * @param expression The expression for this property - * @throws InvalidParamException - * Expressions are incorrect + * @throws InvalidParamException Expressions are incorrect */ public CssAspectRatio(ApplContext ac, CssExpression expression, boolean check) throws InvalidParamException { - if (check && expression.getCount() > 2) { + if (check && expression.getCount() > 4) { throw new InvalidParamException("unrecognize", ac); } CssValue val; ArrayList v = new ArrayList<>(); char op; - + int ratio_state = 0; setByUser(); + BigDecimal dividend = null; + BigDecimal divisor = null; - while(!expression.end()) { + while (!expression.end()) { val = expression.getValue(); op = expression.getOperator(); switch (val.getType()) { - case CssTypes.CSS_RATIO: - v.add(val); - break; + // so we are cheating and create a CssRatio when needed. + case CssTypes.CSS_NUMBER: + if (ratio_state == 0) { + dividend = val.getNumber().getBigDecimalValue(); + ratio_state++; + break; + } else if (ratio_state == 2) { + divisor = val.getNumber().getBigDecimalValue(); + ratio_state++; + v.add(new CssRatio(dividend, divisor)) ; + break; + } + throw new InvalidParamException("value", val.toString(), + getPropertyName(), ac); + case CssTypes.CSS_SWITCH: + if (ratio_state == 1) { + ratio_state++; + break; + } + throw new InvalidParamException("value", val.toString(), + getPropertyName(), ac); case CssTypes.CSS_IDENT: if (inherit.equals(val)) { if (expression.getCount() > 1) { @@ -82,7 +103,12 @@ public CssAspectRatio(ApplContext ac, CssExpression expression, boolean check) } expression.next(); } - + // if things are not entirely parsed + if (v.size() == 0) { + throw new InvalidParamException("value", + expression.toString(), + getPropertyName(), ac); + } if (v.size() > 1) { if (v.get(0).getType() == v.get(1).getType()) { throw new InvalidParamException("value", v.get(1).toString(),