diff options
26 files changed, 4240 insertions, 2893 deletions
diff --git a/WebContent/VAADIN/themes/base/datefield/datefield.scss b/WebContent/VAADIN/themes/base/datefield/datefield.scss index 4099123764..1d3d408ed2 100644 --- a/WebContent/VAADIN/themes/base/datefield/datefield.scss +++ b/WebContent/VAADIN/themes/base/datefield/datefield.scss @@ -3,7 +3,6 @@ .#{$primaryStyleName} { white-space: nowrap; display: inline-block; /* Force minimum width */ - line-height:0; /* Force minimum height */ } .#{$primaryStyleName}-textfield { vertical-align: top; diff --git a/WebContent/VAADIN/themes/base/select/select.scss b/WebContent/VAADIN/themes/base/select/select.scss index 80957b16a3..69d3c07272 100644 --- a/WebContent/VAADIN/themes/base/select/select.scss +++ b/WebContent/VAADIN/themes/base/select/select.scss @@ -105,9 +105,6 @@ $select-button-negative-width : -1em; border: none; vertical-align:top; } -.v-filterselect-suggestmenu tr{ - line-height:0; -} .v-filterselect-suggestmenu .gwt-MenuItem { white-space: nowrap; } diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss index 75ce9e1094..a3c8afdcf4 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss @@ -107,7 +107,7 @@ .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close { margin-top: 1px; } -.v-ff & .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close { +.v-ff & .#{$primaryStyleName}-tabs-minimal .v-icon + .#{$primaryStyleName}-caption-close { margin-top: -15px; } .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:hover, diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html index 99001cca2c..77217f9d68 100644 --- a/WebContent/release-notes.html +++ b/WebContent/release-notes.html @@ -460,6 +460,15 @@ <li>Android 2.3 and later</li> </ul> + <p>Vaadin SQL Container supports the following databases:</p> + <ul> + <li>HSQLDB</li> + <li>MySQL</li> + <li>MSSQL</li> + <li>Oracle</li> + <li>PostgreSQL</li> + </ul> + <h2 id="vaadinontheweb">Vaadin on the Web</h2> <ul> diff --git a/server/src/com/vaadin/ui/ComboBox.java b/server/src/com/vaadin/ui/ComboBox.java index 4a82cf27e2..0f42749acd 100644 --- a/server/src/com/vaadin/ui/ComboBox.java +++ b/server/src/com/vaadin/ui/ComboBox.java @@ -82,10 +82,10 @@ public class ComboBox extends AbstractSelect implements private boolean optionRequest; /** - * True if the container is being filtered temporarily and item set change - * notifications should be suppressed. + * True while painting to suppress item set change notifications that could + * be caused by temporary filtering. */ - private boolean filteringContainer; + private boolean isPainting; /** * Flag to indicate whether to scroll the selected item visible (select the @@ -147,141 +147,151 @@ public class ComboBox extends AbstractSelect implements @Override public void paintContent(PaintTarget target) throws PaintException { - if (inputPrompt != null) { - target.addAttribute(ComboBoxConstants.ATTR_INPUTPROMPT, inputPrompt); - } + isPainting = true; + try { + if (inputPrompt != null) { + target.addAttribute(ComboBoxConstants.ATTR_INPUTPROMPT, + inputPrompt); + } - if (!textInputAllowed) { - target.addAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT, true); - } + if (!textInputAllowed) { + target.addAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT, true); + } - // clear caption change listeners - getCaptionChangeListener().clear(); + // clear caption change listeners + getCaptionChangeListener().clear(); - // The tab ordering number - if (getTabIndex() != 0) { - target.addAttribute("tabindex", getTabIndex()); - } + // The tab ordering number + if (getTabIndex() != 0) { + target.addAttribute("tabindex", getTabIndex()); + } - // If the field is modified, but not committed, set modified attribute - if (isModified()) { - target.addAttribute("modified", true); - } + // If the field is modified, but not committed, set modified + // attribute + if (isModified()) { + target.addAttribute("modified", true); + } - if (isNewItemsAllowed()) { - target.addAttribute("allownewitem", true); - } + if (isNewItemsAllowed()) { + target.addAttribute("allownewitem", true); + } - boolean needNullSelectOption = false; - if (isNullSelectionAllowed()) { - target.addAttribute("nullselect", true); - needNullSelectOption = (getNullSelectionItemId() == null); - if (!needNullSelectOption) { - target.addAttribute("nullselectitem", true); + boolean needNullSelectOption = false; + if (isNullSelectionAllowed()) { + target.addAttribute("nullselect", true); + needNullSelectOption = (getNullSelectionItemId() == null); + if (!needNullSelectOption) { + target.addAttribute("nullselectitem", true); + } } - } - // Constructs selected keys array - String[] selectedKeys = new String[(getValue() == null - && getNullSelectionItemId() == null ? 0 : 1)]; + // Constructs selected keys array + String[] selectedKeys = new String[(getValue() == null + && getNullSelectionItemId() == null ? 0 : 1)]; - target.addAttribute("pagelength", pageLength); + target.addAttribute("pagelength", pageLength); - target.addAttribute("filteringmode", getFilteringMode().toString()); + target.addAttribute("filteringmode", getFilteringMode().toString()); - // Paints the options and create array of selected id keys - int keyIndex = 0; + // Paints the options and create array of selected id keys + int keyIndex = 0; - target.startTag("options"); + target.startTag("options"); - if (currentPage < 0) { - optionRequest = false; - currentPage = 0; - filterstring = ""; - } + if (currentPage < 0) { + optionRequest = false; + currentPage = 0; + filterstring = ""; + } - boolean nullFilteredOut = filterstring != null - && !"".equals(filterstring) - && filteringMode != FilteringMode.OFF; - // null option is needed and not filtered out, even if not on current - // page - boolean nullOptionVisible = needNullSelectOption && !nullFilteredOut; - - // first try if using container filters is possible - List<?> options = getOptionsWithFilter(nullOptionVisible); - if (null == options) { - // not able to use container filters, perform explicit in-memory - // filtering - options = getFilteredOptions(); - filteredSize = options.size(); - options = sanitetizeList(options, nullOptionVisible); - } + boolean nullFilteredOut = filterstring != null + && !"".equals(filterstring) + && filteringMode != FilteringMode.OFF; + // null option is needed and not filtered out, even if not on + // current + // page + boolean nullOptionVisible = needNullSelectOption + && !nullFilteredOut; + + // first try if using container filters is possible + List<?> options = getOptionsWithFilter(nullOptionVisible); + if (null == options) { + // not able to use container filters, perform explicit in-memory + // filtering + options = getFilteredOptions(); + filteredSize = options.size(); + options = sanitetizeList(options, nullOptionVisible); + } - final boolean paintNullSelection = needNullSelectOption - && currentPage == 0 && !nullFilteredOut; + final boolean paintNullSelection = needNullSelectOption + && currentPage == 0 && !nullFilteredOut; - if (paintNullSelection) { - target.startTag("so"); - target.addAttribute("caption", ""); - target.addAttribute("key", ""); - target.endTag("so"); - } + if (paintNullSelection) { + target.startTag("so"); + target.addAttribute("caption", ""); + target.addAttribute("key", ""); + target.endTag("so"); + } - final Iterator<?> i = options.iterator(); - // Paints the available selection options from data source + final Iterator<?> i = options.iterator(); + // Paints the available selection options from data source - while (i.hasNext()) { + while (i.hasNext()) { - final Object id = i.next(); + final Object id = i.next(); - if (!isNullSelectionAllowed() && id != null - && id.equals(getNullSelectionItemId()) && !isSelected(id)) { - continue; - } + if (!isNullSelectionAllowed() && id != null + && id.equals(getNullSelectionItemId()) + && !isSelected(id)) { + continue; + } - // Gets the option attribute values - final String key = itemIdMapper.key(id); - final String caption = getItemCaption(id); - final Resource icon = getItemIcon(id); - getCaptionChangeListener().addNotifierForItem(id); + // Gets the option attribute values + final String key = itemIdMapper.key(id); + final String caption = getItemCaption(id); + final Resource icon = getItemIcon(id); + getCaptionChangeListener().addNotifierForItem(id); - // Paints the option - target.startTag("so"); - if (icon != null) { - target.addAttribute("icon", icon); - } - target.addAttribute("caption", caption); - if (id != null && id.equals(getNullSelectionItemId())) { - target.addAttribute("nullselection", true); - } - target.addAttribute("key", key); - if (isSelected(id) && keyIndex < selectedKeys.length) { - target.addAttribute("selected", true); - selectedKeys[keyIndex++] = key; + // Paints the option + target.startTag("so"); + if (icon != null) { + target.addAttribute("icon", icon); + } + target.addAttribute("caption", caption); + if (id != null && id.equals(getNullSelectionItemId())) { + target.addAttribute("nullselection", true); + } + target.addAttribute("key", key); + if (isSelected(id) && keyIndex < selectedKeys.length) { + target.addAttribute("selected", true); + selectedKeys[keyIndex++] = key; + } + target.endTag("so"); } - target.endTag("so"); - } - target.endTag("options"); + target.endTag("options"); - target.addAttribute("totalitems", size() - + (needNullSelectOption ? 1 : 0)); - if (filteredSize > 0 || nullOptionVisible) { - target.addAttribute("totalMatches", filteredSize - + (nullOptionVisible ? 1 : 0)); - } + target.addAttribute("totalitems", size() + + (needNullSelectOption ? 1 : 0)); + if (filteredSize > 0 || nullOptionVisible) { + target.addAttribute("totalMatches", filteredSize + + (nullOptionVisible ? 1 : 0)); + } - // Paint variables - target.addVariable(this, "selected", selectedKeys); - if (isNewItemsAllowed()) { - target.addVariable(this, "newitem", ""); - } + // Paint variables + target.addVariable(this, "selected", selectedKeys); + if (isNewItemsAllowed()) { + target.addVariable(this, "newitem", ""); + } - target.addVariable(this, "filter", filterstring); - target.addVariable(this, "page", currentPage); + target.addVariable(this, "filter", filterstring); + target.addVariable(this, "page", currentPage); - currentPage = -1; // current page is always set by client + currentPage = -1; // current page is always set by client - optionRequest = true; + optionRequest = true; + } finally { + isPainting = false; + } } @@ -355,7 +365,6 @@ public class ComboBox extends AbstractSelect implements // change events from the underlying container, but the ComboBox does // not process or propagate them based on the flag filteringContainer if (filter != null) { - filteringContainer = true; filterable.addContainerFilter(filter); } @@ -395,7 +404,6 @@ public class ComboBox extends AbstractSelect implements // to the outside, filtering should not be visible if (filter != null) { filterable.removeContainerFilter(filter); - filteringContainer = false; } } } @@ -435,7 +443,7 @@ public class ComboBox extends AbstractSelect implements @Override public void containerItemSetChange(Container.ItemSetChangeEvent event) { - if (!filteringContainer) { + if (!isPainting) { super.containerItemSetChange(event); } } diff --git a/server/src/com/vaadin/ui/UniqueSerializable.java b/server/src/com/vaadin/ui/UniqueSerializable.java index 070b366408..2bcc7c2028 100644 --- a/server/src/com/vaadin/ui/UniqueSerializable.java +++ b/server/src/com/vaadin/ui/UniqueSerializable.java @@ -24,7 +24,7 @@ import java.io.Serializable; * an anonymous inner class. Otherwise each instance will not be unique. * * @author Vaadin Ltd - * @since 7.0 + * @since 6.8.0 * */ public abstract class UniqueSerializable implements Serializable { diff --git a/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java index e915bdca7e..fd00dbff2c 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java +++ b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java @@ -58,6 +58,8 @@ public class ScssStylesheet extends Node { private String fileName; + private String charset; + /** * Read in a file SCSS and parse it into a ScssStylesheet * @@ -69,7 +71,7 @@ public class ScssStylesheet extends Node { } /** - * Main entry point for the SASS compiler. Takes in a file and builds upp a + * Main entry point for the SASS compiler. Takes in a file and builds up a * ScssStylesheet tree out of it. Calling compile() on it will transform * SASS into CSS. Calling toString() will print out the SCSS/CSS. * @@ -80,6 +82,29 @@ public class ScssStylesheet extends Node { */ public static ScssStylesheet get(String identifier) throws CSSException, IOException { + return get(identifier, null); + } + + /** + * Main entry point for the SASS compiler. Takes in a file and encoding then + * builds up a ScssStylesheet tree out of it. Calling compile() on it will + * transform SASS into CSS. Calling toString() will print out the SCSS/CSS. + * + * @param file + * @param encoding + * @return + * @throws CSSException + * @throws IOException + */ + public static ScssStylesheet get(String identifier, String encoding) + throws CSSException, IOException { + /* + * The encoding to be used is passed through "encoding" parameter. the + * imported children scss node will have the same encoding as their + * parent, ultimately the root scss file. The root scss node has this + * "encoding" parameter to be null. Its encoding is determined by the + * @charset declaration, the default one is ASCII. + */ File file = new File(identifier); file = file.getCanonicalFile(); @@ -90,12 +115,14 @@ public class ScssStylesheet extends Node { if (source == null) { return null; } + source.setEncoding(encoding); Parser parser = new Parser(); parser.setErrorHandler(new SCSSErrorHandler()); parser.setDocumentHandler(handler); parser.parseStyleSheet(source); + stylesheet.setCharset(parser.getInputSource().getEncoding()); return stylesheet; } @@ -169,10 +196,15 @@ public class ScssStylesheet extends Node { @Override public String toString() { StringBuilder string = new StringBuilder(""); + String delimeter = "\n\n"; + // add charset declaration, if it is not default "ASCII". + if (!"ASCII".equals(getCharset())) { + string.append("@charset \"").append(getCharset()).append("\";") + .append(delimeter); + } if (children.size() > 0) { string.append(children.get(0).toString()); } - String delimeter = "\n\n"; if (children.size() > 1) { for (int i = 1; i < children.size(); i++) { String childString = children.get(i).toString(); @@ -318,4 +350,12 @@ public class ScssStylesheet extends Node { public static final void warning(String msg) { Logger.getLogger(ScssStylesheet.class.getName()).warning(msg); } + + public String getCharset() { + return charset; + } + + public void setCharset(String charset) { + this.charset = charset; + } } diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java index abad48456e..9dc6e33873 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java +++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandler.java @@ -88,4 +88,12 @@ public interface SCSSDocumentHandler extends DocumentHandler { void containsDirective(String variable, String list, String contains, String separator); + void startKeyFrames(String keyframeName, String animationname); + + void endKeyFrames(); + + void startKeyframeSelector(String selector); + + void endKeyframeSelector(); + } diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java index 7e5e84c52b..d155d8522f 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java +++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java @@ -34,6 +34,8 @@ import com.vaadin.sass.internal.tree.ExtendNode; import com.vaadin.sass.internal.tree.FontFaceNode; import com.vaadin.sass.internal.tree.ForNode; import com.vaadin.sass.internal.tree.ImportNode; +import com.vaadin.sass.internal.tree.KeyframeSelectorNode; +import com.vaadin.sass.internal.tree.KeyframesNode; import com.vaadin.sass.internal.tree.ListAppendNode; import com.vaadin.sass.internal.tree.ListContainsNode; import com.vaadin.sass.internal.tree.ListRemoveNode; @@ -336,4 +338,31 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler { separator); nodeStack.peek().appendChild(node); } + + @Override + public void startKeyFrames(String keyframeName, String animationName) { + KeyframesNode node = new KeyframesNode(keyframeName, animationName); + nodeStack.peek().appendChild(node); + nodeStack.push(node); + + } + + @Override + public void endKeyFrames() { + nodeStack.pop(); + + } + + @Override + public void startKeyframeSelector(String selector) { + KeyframeSelectorNode node = new KeyframeSelectorNode(selector); + nodeStack.peek().appendChild(node); + nodeStack.push(node); + + } + + @Override + public void endKeyframeSelector() { + nodeStack.pop(); + } } diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java index ee0af7705c..70fab6413a 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java @@ -70,6 +70,10 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { throw new CSSException(CSSException.SAC_NOT_SUPPORTED_ERR); } + public InputSource getInputSource(){ + return source; + } + /** * Set the document handler for this parser */ @@ -278,65 +282,70 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { } } } - String encoding = "ASCII"; + //use UTF-8 as the default encoding. + String encoding = source.getEncoding(); InputStream input = source.getByteStream(); - char c = ' '; - if (!input.markSupported()) { input = new BufferedInputStream(input); source.setByteStream(input); + input.mark(100); } - input.mark(100); - c = (char) input.read(); - - if (c == '@') { - // hum, is it a charset ? - int size = 100; - byte[] buf = new byte[size]; - input.read(buf, 0, 7); - String keyword = new String(buf, 0, 7); - if (keyword.equals("charset")) { - // Yes, this is the charset declaration ! - - // here I don't use the right declaration : white space are ' '. - while ((c = (char) input.read()) == ' ') { - // find the first quote - } - char endChar = c; - int i = 0; + if(encoding == null){ + encoding = "ASCII"; - if ((endChar != '"') && (endChar != '\u005c'')) { - // hum this is not a quote. - throw new CSSException("invalid charset declaration"); - } + char c = ' '; + + c = (char) input.read(); + + if (c == '@') { + // hum, is it a charset ? + int size = 100; + byte[] buf = new byte[size]; + input.read(buf, 0, 7); + String keyword = new String(buf, 0, 7); + if (keyword.equals("charset")) { + // Yes, this is the charset declaration ! - while ((c = (char) input.read()) != endChar) { - buf[i++] = (byte) c; - if (i == size) { - byte[] old = buf; - buf = new byte[size + 100]; - System.arraycopy(old, 0, buf, 0, size); - size += 100; + // here I don't use the right declaration : white space are ' '. + while ((c = (char) input.read()) == ' ') { + // find the first quote } - } - while ((c = (char) input.read()) == ' ') { - // find the next relevant character - } - if (c != ';') { - // no semi colon at the end ? - throw new CSSException("invalid charset declaration: " + char endChar = c; + int i = 0; + + if ((endChar != '"') && (endChar != '\u005c'')) { + // hum this is not a quote. + throw new CSSException("invalid charset declaration"); + } + + while ((c = (char) input.read()) != endChar) { + buf[i++] = (byte) c; + if (i == size) { + byte[] old = buf; + buf = new byte[size + 100]; + System.arraycopy(old, 0, buf, 0, size); + size += 100; + } + } + while ((c = (char) input.read()) == ' ') { + // find the next relevant character + } + if (c != ';') { + // no semi colon at the end ? + throw new CSSException("invalid charset declaration: " + "missing semi colon"); - } - encoding = new String(buf, 0, i); - if (source.getEncoding() != null) { - // compare the two encoding informations. - // For example, I don't accept to have ASCII and after UTF-8. - // Is it really good ? That is the question. - if (!encoding.equals(source.getEncoding())) { - throw new CSSException("invalid encoding information."); } - } - } // else no charset declaration available + encoding = new String(buf, 0, i); + if (source.getEncoding() != null) { + // compare the two encoding informations. + // For example, I don't accept to have ASCII and after UTF-8. + // Is it really good ? That is the question. + if (!encoding.equals(source.getEncoding())) { + throw new CSSException("invalid encoding information."); + } + } + } // else no charset declaration available + } } // ok set the real encoding of this source. source.setEncoding(encoding); @@ -592,6 +601,9 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { case FONT_FACE_SYM: fontFace(); break; + case KEY_FRAME_SYM: + keyframes(); + break; default: jj_la1[8] = jj_gen; l = getLocator(); @@ -746,40 +758,278 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { /** * @exception ParseException exception during the parse */ + final public void keyframes() throws ParseException { + Token n; + boolean start = false; + String keyframeName = null; + String animationname = ""; + try { + n = jj_consume_token(KEY_FRAME_SYM); + label_13: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[17] = jj_gen; + break label_13; + } + jj_consume_token(S); + } + keyframeName = n.image; + label_14: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case IDENT: + n = jj_consume_token(IDENT); + animationname += n.image; + break; + case INTERPOLATION: + n = jj_consume_token(INTERPOLATION); + animationname += n.image; + break; + default: + jj_la1[18] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case INTERPOLATION: + case IDENT: + ; + break; + default: + jj_la1[19] = jj_gen; + break label_14; + } + } + label_15: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[20] = jj_gen; + break label_15; + } + jj_consume_token(S); + } + start = true; documentHandler.startKeyFrames(keyframeName, animationname); + jj_consume_token(LBRACE); + label_16: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[21] = jj_gen; + break label_16; + } + jj_consume_token(S); + } + label_17: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case TO: + case FROM: + case PERCENTAGE: + ; + break; + default: + jj_la1[22] = jj_gen; + break label_17; + } + keyframeSelector(); + } + jj_consume_token(RBRACE); + label_18: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[23] = jj_gen; + break label_18; + } + jj_consume_token(S); + } + } catch (ParseException e) { + reportError(getLocator(), e); + skipStatement(); + } finally { + if (start) { + documentHandler.endKeyFrames(); + } + } + } + + final public void keyframeSelector() throws ParseException { + Token n; + boolean start = false; + try { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case FROM: + n = jj_consume_token(FROM); + break; + case TO: + n = jj_consume_token(TO); + break; + case PERCENTAGE: + n = jj_consume_token(PERCENTAGE); + break; + default: + jj_la1[24] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + label_19: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[25] = jj_gen; + break label_19; + } + jj_consume_token(S); + } + jj_consume_token(LBRACE); + label_20: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[26] = jj_gen; + break label_20; + } + jj_consume_token(S); + } + start = true; + documentHandler.startKeyframeSelector(n.image); + label_21: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case LBRACKET: + case ANY: + case PARENT: + case DOT: + case COLON: + case INTERPOLATION: + case INCLUDE_SYM: + case DEBUG_SYM: + case WARN_SYM: + case EACH_SYM: + case IF_SYM: + case EXTEND_SYM: + case MICROSOFT_RULE: + case IDENT: + case VARIABLE: + case HASH: + case MEDIA_SYM: + case KEY_FRAME_SYM: + case CONTAINS: + ; + break; + default: + jj_la1[27] = jj_gen; + break label_21; + } + if (jj_2_2(5)) { + ifContentStatement(); + } else { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case EACH_SYM: + case IF_SYM: + controlDirective(); + break; + case MICROSOFT_RULE: + microsoftExtension(); + break; + default: + jj_la1[28] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } + } + } + jj_consume_token(RBRACE); + label_22: + while (true) { + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case S: + ; + break; + default: + jj_la1[29] = jj_gen; + break label_22; + } + jj_consume_token(S); + } + } catch (ThrowedParseException e) { + if (errorHandler != null) { + LocatorImpl li = new LocatorImpl(this, + e.e.currentToken.next.beginLine, + e.e.currentToken.next.beginColumn-1); + reportError(li, e.e); + } + } catch (ParseException e) { + reportError(getLocator(), e); + skipStatement(); + // reportWarningSkipText(getLocator(), skipStatement()); + + } catch (TokenMgrError e) { + reportWarningSkipText(getLocator(), skipStatement()); + } finally { + if (start) { + documentHandler.endKeyframeSelector(); + } + } + } + +/** + * @exception ParseException exception during the parse + */ final public void media() throws ParseException { boolean start = false; String ret; MediaListImpl ml = new MediaListImpl(); try { jj_consume_token(MEDIA_SYM); - label_13: + label_23: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[17] = jj_gen; - break label_13; + jj_la1[30] = jj_gen; + break label_23; } jj_consume_token(S); } mediaStatement(ml); start = true; documentHandler.startMedia(ml); jj_consume_token(LBRACE); - label_14: + label_24: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[18] = jj_gen; - break label_14; + jj_la1[31] = jj_gen; + break label_24; } jj_consume_token(S); } - label_15: + label_25: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case CDO: @@ -820,8 +1070,8 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { ; break; default: - jj_la1[19] = jj_gen; - break label_15; + jj_la1[32] = jj_gen; + break label_25; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DEBUG_SYM: @@ -866,21 +1116,21 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { skipUnknownRule(); break; default: - jj_la1[20] = jj_gen; + jj_la1[33] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } jj_consume_token(RBRACE); - label_16: + label_26: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[21] = jj_gen; - break label_16; + jj_la1[34] = jj_gen; + break label_26; } jj_consume_token(S); } @@ -899,26 +1149,26 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public void mediaStatement(MediaListImpl ml) throws ParseException { String m; m = medium(); - label_17: + label_27: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[22] = jj_gen; - break label_17; + jj_la1[35] = jj_gen; + break label_27; } jj_consume_token(COMMA); - label_18: + label_28: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[23] = jj_gen; - break label_18; + jj_la1[36] = jj_gen; + break label_28; } jj_consume_token(S); } @@ -934,15 +1184,15 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { final public String medium() throws ParseException { Token n; n = jj_consume_token(IDENT); - label_19: + label_29: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[24] = jj_gen; - break label_19; + jj_la1[37] = jj_gen; + break label_29; } jj_consume_token(S); } @@ -960,36 +1210,36 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { String pseudo = null; try { jj_consume_token(PAGE_SYM); - label_20: + label_30: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[25] = jj_gen; - break label_20; + jj_la1[38] = jj_gen; + break label_30; } jj_consume_token(S); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: n = jj_consume_token(IDENT); - label_21: + label_31: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[26] = jj_gen; - break label_21; + jj_la1[39] = jj_gen; + break label_31; } jj_consume_token(S); } break; default: - jj_la1[27] = jj_gen; + jj_la1[40] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -997,22 +1247,22 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { pseudo = pseudo_page(); break; default: - jj_la1[28] = jj_gen; + jj_la1[41] = jj_gen; ; } if (n != null) { page = convertIdent(n.image); } jj_consume_token(LBRACE); - label_22: + label_32: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[29] = jj_gen; - break label_22; + jj_la1[42] = jj_gen; + break label_32; } jj_consume_token(S); } @@ -1024,29 +1274,29 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[30] = jj_gen; + jj_la1[43] = jj_gen; ; } - label_23: + label_33: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[31] = jj_gen; - break label_23; + jj_la1[44] = jj_gen; + break label_33; } jj_consume_token(SEMICOLON); - label_24: + label_34: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[32] = jj_gen; - break label_24; + jj_la1[45] = jj_gen; + break label_34; } jj_consume_token(S); } @@ -1056,20 +1306,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[33] = jj_gen; + jj_la1[46] = jj_gen; ; } } jj_consume_token(RBRACE); - label_25: + label_35: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[34] = jj_gen; - break label_25; + jj_la1[47] = jj_gen; + break label_35; } jj_consume_token(S); } @@ -1095,15 +1345,15 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { Token n; jj_consume_token(COLON); n = jj_consume_token(IDENT); - label_26: + label_36: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[35] = jj_gen; - break label_26; + jj_la1[48] = jj_gen; + break label_36; } jj_consume_token(S); } @@ -1115,28 +1365,28 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { boolean start = false; try { jj_consume_token(FONT_FACE_SYM); - label_27: + label_37: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[36] = jj_gen; - break label_27; + jj_la1[49] = jj_gen; + break label_37; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_28: + label_38: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[37] = jj_gen; - break label_28; + jj_la1[50] = jj_gen; + break label_38; } jj_consume_token(S); } @@ -1147,29 +1397,29 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[38] = jj_gen; + jj_la1[51] = jj_gen; ; } - label_29: + label_39: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[39] = jj_gen; - break label_29; + jj_la1[52] = jj_gen; + break label_39; } jj_consume_token(SEMICOLON); - label_30: + label_40: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[40] = jj_gen; - break label_30; + jj_la1[53] = jj_gen; + break label_40; } jj_consume_token(S); } @@ -1179,20 +1429,20 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { declaration(); break; default: - jj_la1[41] = jj_gen; + jj_la1[54] = jj_gen; ; } } jj_consume_token(RBRACE); - label_31: + label_41: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[42] = jj_gen; - break label_31; + jj_la1[55] = jj_gen; + break label_41; } jj_consume_token(S); } @@ -1302,7 +1552,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants { n = jj_consume_token(UNKNOWN); break; default: - jj_la1[43] = jj_gen; + jj_la1[56] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1324,15 +1574,15 @@ char connector = ' '; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: jj_consume_token(PLUS); - label_32: + label_42: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[44] = jj_gen; - break label_32; + jj_la1[57] = jj_gen; + break label_42; } jj_consume_token(S); } @@ -1340,15 +1590,15 @@ char connector = ' '; break; case PRECEDES: jj_consume_token(PRECEDES); - label_33: + label_43: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[45] = jj_gen; - break label_33; + jj_la1[58] = jj_gen; + break label_43; } jj_consume_token(S); } @@ -1356,15 +1606,15 @@ char connector = ' '; break; case SIBLING: jj_consume_token(SIBLING); - label_34: + label_44: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[46] = jj_gen; - break label_34; + jj_la1[59] = jj_gen; + break label_44; } jj_consume_token(S); } @@ -1390,31 +1640,31 @@ char connector = ' '; connector = '~'; break; default: - jj_la1[47] = jj_gen; + jj_la1[60] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_35: + label_45: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[48] = jj_gen; - break label_35; + jj_la1[61] = jj_gen; + break label_45; } jj_consume_token(S); } break; default: - jj_la1[49] = jj_gen; + jj_la1[62] = jj_gen; ; } {if (true) return connector;} break; default: - jj_la1[50] = jj_gen; + jj_la1[63] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1427,21 +1677,21 @@ char connector = ' '; String value = ""; // This is not really taking the syntax of filter rules into account n = jj_consume_token(MICROSOFT_RULE); - label_36: + label_46: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[51] = jj_gen; - break label_36; + jj_la1[64] = jj_gen; + break label_46; } jj_consume_token(S); } name = n.image; jj_consume_token(COLON); - label_37: + label_47: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: @@ -1490,7 +1740,7 @@ char connector = ' '; { value += n.image; } break; default: - jj_la1[52] = jj_gen; + jj_la1[65] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1509,20 +1759,20 @@ char connector = ' '; ; break; default: - jj_la1[53] = jj_gen; - break label_37; + jj_la1[66] = jj_gen; + break label_47; } } jj_consume_token(SEMICOLON); - label_38: + label_48: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[54] = jj_gen; - break label_38; + jj_la1[67] = jj_gen; + break label_48; } jj_consume_token(S); } @@ -1534,7 +1784,7 @@ char connector = ' '; */ final public String property() throws ParseException { Token t;String s = ""; - label_39: + label_49: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: @@ -1546,7 +1796,7 @@ char connector = ' '; s += t.image; break; default: - jj_la1[55] = jj_gen; + jj_la1[68] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1556,19 +1806,19 @@ char connector = ' '; ; break; default: - jj_la1[56] = jj_gen; - break label_39; + jj_la1[69] = jj_gen; + break label_49; } } - label_40: + label_50: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[57] = jj_gen; - break label_40; + jj_la1[70] = jj_gen; + break label_50; } jj_consume_token(S); } @@ -1579,15 +1829,15 @@ char connector = ' '; final public String variableName() throws ParseException { Token n; n = jj_consume_token(VARIABLE); - label_41: + label_51: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[58] = jj_gen; - break label_41; + jj_la1[71] = jj_gen; + break label_51; } jj_consume_token(S); } @@ -1598,15 +1848,15 @@ char connector = ' '; final public String functionName() throws ParseException { Token n; n = jj_consume_token(FUNCTION); - label_42: + label_52: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[59] = jj_gen; - break label_42; + jj_la1[72] = jj_gen; + break label_52; } jj_consume_token(S); } @@ -1626,21 +1876,21 @@ char connector = ' '; l = selectorList(); save = token; jj_consume_token(LBRACE); - label_43: + label_53: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[60] = jj_gen; - break label_43; + jj_la1[73] = jj_gen; + break label_53; } jj_consume_token(S); } start = true; documentHandler.startSelector(l); - label_44: + label_54: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1660,14 +1910,15 @@ char connector = ' '; case VARIABLE: case HASH: case MEDIA_SYM: + case KEY_FRAME_SYM: case CONTAINS: ; break; default: - jj_la1[61] = jj_gen; - break label_44; + jj_la1[74] = jj_gen; + break label_54; } - if (jj_2_2(5)) { + if (jj_2_3(5)) { ifContentStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -1679,22 +1930,22 @@ char connector = ' '; microsoftExtension(); break; default: - jj_la1[62] = jj_gen; + jj_la1[75] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } } jj_consume_token(RBRACE); - label_45: + label_55: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[63] = jj_gen; - break label_45; + jj_la1[76] = jj_gen; + break label_55; } jj_consume_token(S); } @@ -1723,26 +1974,26 @@ char connector = ' '; ArrayList<String> selectors = new ArrayList<String>(); String selector; selector = selector(); - label_46: + label_56: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[64] = jj_gen; - break label_46; + jj_la1[77] = jj_gen; + break label_56; } jj_consume_token(COMMA); - label_47: + label_57: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[65] = jj_gen; - break label_47; + jj_la1[78] = jj_gen; + break label_57; } jj_consume_token(S); } @@ -1762,25 +2013,25 @@ char connector = ' '; char comb; try { selector = simple_selector(null, ' '); - label_48: + label_58: while (true) { - if (jj_2_3(2)) { + if (jj_2_4(2)) { ; } else { - break label_48; + break label_58; } comb = combinator(); selector = simple_selector(selector, comb); } - label_49: + label_59: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[66] = jj_gen; - break label_49; + jj_la1[79] = jj_gen; + break label_59; } jj_consume_token(S); } @@ -1824,7 +2075,7 @@ char connector = ' '; case INTERPOLATION: case IDENT: simple_current = element_name(); - label_50: + label_60: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1834,8 +2085,8 @@ char connector = ' '; ; break; default: - jj_la1[67] = jj_gen; - break label_50; + jj_la1[80] = jj_gen; + break label_60; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1851,7 +2102,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[68] = jj_gen; + jj_la1[81] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1859,7 +2110,7 @@ char connector = ' '; break; case HASH: cond = hash(cond); - label_51: + label_61: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1868,8 +2119,8 @@ char connector = ' '; ; break; default: - jj_la1[69] = jj_gen; - break label_51; + jj_la1[82] = jj_gen; + break label_61; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DOT: @@ -1882,7 +2133,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[70] = jj_gen; + jj_la1[83] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1890,7 +2141,7 @@ char connector = ' '; break; case DOT: cond = _class(cond); - label_52: + label_62: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1900,8 +2151,8 @@ char connector = ' '; ; break; default: - jj_la1[71] = jj_gen; - break label_52; + jj_la1[84] = jj_gen; + break label_62; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1917,7 +2168,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[72] = jj_gen; + jj_la1[85] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1925,7 +2176,7 @@ char connector = ' '; break; case COLON: cond = pseudo(cond); - label_53: + label_63: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1935,8 +2186,8 @@ char connector = ' '; ; break; default: - jj_la1[73] = jj_gen; - break label_53; + jj_la1[86] = jj_gen; + break label_63; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1952,7 +2203,7 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[74] = jj_gen; + jj_la1[87] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -1960,7 +2211,7 @@ char connector = ' '; break; case LBRACKET: cond = attrib(cond); - label_54: + label_64: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -1970,8 +2221,8 @@ char connector = ' '; ; break; default: - jj_la1[75] = jj_gen; - break label_54; + jj_la1[88] = jj_gen; + break label_64; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case HASH: @@ -1987,14 +2238,14 @@ char connector = ' '; cond = pseudo(cond); break; default: - jj_la1[76] = jj_gen; + jj_la1[89] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } break; default: - jj_la1[77] = jj_gen; + jj_la1[90] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2034,7 +2285,7 @@ char connector = ' '; Token t; String s = "."; jj_consume_token(DOT); - label_55: + label_65: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: @@ -2046,7 +2297,7 @@ String s = "."; s += t.image; break; default: - jj_la1[78] = jj_gen; + jj_la1[91] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2056,8 +2307,8 @@ String s = "."; ; break; default: - jj_la1[79] = jj_gen; - break label_55; + jj_la1[92] = jj_gen; + break label_65; } } if (pred == null) { @@ -2076,7 +2327,7 @@ String s = "."; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case INTERPOLATION: case IDENT: - label_56: + label_66: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IDENT: @@ -2088,7 +2339,7 @@ String s = "."; s += t.image; break; default: - jj_la1[80] = jj_gen; + jj_la1[93] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2098,8 +2349,8 @@ String s = "."; ; break; default: - jj_la1[81] = jj_gen; - break label_56; + jj_la1[94] = jj_gen; + break label_66; } } {if (true) return s;} @@ -2113,7 +2364,7 @@ String s = "."; {if (true) return "&";} break; default: - jj_la1[82] = jj_gen; + jj_la1[95] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2129,28 +2380,28 @@ String s = "."; Token val = null; String attValue = null; jj_consume_token(LBRACKET); - label_57: + label_67: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[83] = jj_gen; - break label_57; + jj_la1[96] = jj_gen; + break label_67; } jj_consume_token(S); } att = jj_consume_token(IDENT); - label_58: + label_68: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[84] = jj_gen; - break label_58; + jj_la1[97] = jj_gen; + break label_68; } jj_consume_token(S); } @@ -2187,19 +2438,19 @@ String s = "."; cases = 6; break; default: - jj_la1[85] = jj_gen; + jj_la1[98] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_59: + label_69: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[86] = jj_gen; - break label_59; + jj_la1[99] = jj_gen; + break label_69; } jj_consume_token(S); } @@ -2213,25 +2464,25 @@ String s = "."; attValue = val.image; break; default: - jj_la1[87] = jj_gen; + jj_la1[100] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_60: + label_70: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[88] = jj_gen; - break label_60; + jj_la1[101] = jj_gen; + break label_70; } jj_consume_token(S); } break; default: - jj_la1[89] = jj_gen; + jj_la1[102] = jj_gen; ; } jj_consume_token(RBRACKET); @@ -2287,7 +2538,7 @@ boolean isPseudoElement = false; isPseudoElement=true; break; default: - jj_la1[90] = jj_gen; + jj_la1[103] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2313,15 +2564,15 @@ boolean isPseudoElement = false; break; case FUNCTION: n = jj_consume_token(FUNCTION); - label_61: + label_71: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[91] = jj_gen; - break label_61; + jj_la1[104] = jj_gen; + break label_71; } jj_consume_token(S); } @@ -2338,7 +2589,7 @@ boolean isPseudoElement = false; } break; default: - jj_la1[92] = jj_gen; + jj_la1[105] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2368,15 +2619,15 @@ boolean isPseudoElement = false; try { name = variableName(); jj_consume_token(COLON); - label_62: + label_72: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[93] = jj_gen; - break label_62; + jj_la1[106] = jj_gen; + break label_72; } jj_consume_token(S); } @@ -2386,21 +2637,21 @@ boolean isPseudoElement = false; guarded = guarded(); break; default: - jj_la1[94] = jj_gen; + jj_la1[107] = jj_gen; ; } - label_63: + label_73: while (true) { jj_consume_token(SEMICOLON); - label_64: + label_74: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[95] = jj_gen; - break label_64; + jj_la1[108] = jj_gen; + break label_74; } jj_consume_token(S); } @@ -2409,8 +2660,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[96] = jj_gen; - break label_63; + jj_la1[109] = jj_gen; + break label_73; } } documentHandler.variable(name, exp, guarded); @@ -2450,14 +2701,14 @@ boolean isPseudoElement = false; eachDirective(); break; default: - jj_la1[97] = jj_gen; + jj_la1[110] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } final public void ifContentStatement() throws ParseException { - if (jj_2_4(5)) { + if (jj_2_5(5)) { listModifyDirective(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2485,8 +2736,11 @@ boolean isPseudoElement = false; case HASH: styleRuleOrDeclarationOrNestedProperties(); break; + case KEY_FRAME_SYM: + keyframes(); + break; default: - jj_la1[98] = jj_gen; + jj_la1[111] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2498,7 +2752,7 @@ boolean isPseudoElement = false; String s = null; String evaluator = ""; jj_consume_token(IF_SYM); - label_65: + label_75: while (true) { s = booleanExpressionToken(); evaluator += s; @@ -2524,26 +2778,26 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[99] = jj_gen; - break label_65; + jj_la1[112] = jj_gen; + break label_75; } } jj_consume_token(LBRACE); - label_66: + label_76: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[100] = jj_gen; - break label_66; + jj_la1[113] = jj_gen; + break label_76; } jj_consume_token(S); } documentHandler.startIfElseDirective(); documentHandler.ifDirective(evaluator); - label_67: + label_77: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -2560,37 +2814,38 @@ boolean isPseudoElement = false; case VARIABLE: case HASH: case MEDIA_SYM: + case KEY_FRAME_SYM: case CONTAINS: ; break; default: - jj_la1[101] = jj_gen; - break label_67; + jj_la1[114] = jj_gen; + break label_77; } ifContentStatement(); } jj_consume_token(RBRACE); - label_68: + label_78: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[102] = jj_gen; - break label_68; + jj_la1[115] = jj_gen; + break label_78; } jj_consume_token(S); } - label_69: + label_79: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case ELSE_SYM: ; break; default: - jj_la1[103] = jj_gen; - break label_69; + jj_la1[116] = jj_gen; + break label_79; } elseDirective(); } @@ -2602,22 +2857,22 @@ boolean isPseudoElement = false; Token n = null; String s = null; jj_consume_token(ELSE_SYM); - label_70: + label_80: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[104] = jj_gen; - break label_70; + jj_la1[117] = jj_gen; + break label_80; } jj_consume_token(S); } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case IF: jj_consume_token(IF); - label_71: + label_81: while (true) { s = booleanExpressionToken(); evaluator += s; @@ -2643,31 +2898,31 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[105] = jj_gen; - break label_71; + jj_la1[118] = jj_gen; + break label_81; } } break; default: - jj_la1[106] = jj_gen; + jj_la1[119] = jj_gen; ; } jj_consume_token(LBRACE); - label_72: + label_82: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[107] = jj_gen; - break label_72; + jj_la1[120] = jj_gen; + break label_82; } jj_consume_token(S); } if(!evaluator.trim().equals("")){ documentHandler.ifDirective(evaluator); } else{ documentHandler.elseDirective(); } - label_73: + label_83: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -2684,25 +2939,26 @@ boolean isPseudoElement = false; case VARIABLE: case HASH: case MEDIA_SYM: + case KEY_FRAME_SYM: case CONTAINS: ; break; default: - jj_la1[108] = jj_gen; - break label_73; + jj_la1[121] = jj_gen; + break label_83; } ifContentStatement(); } jj_consume_token(RBRACE); - label_74: + label_84: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[109] = jj_gen; - break label_74; + jj_la1[122] = jj_gen; + break label_84; } jj_consume_token(S); } @@ -2711,7 +2967,7 @@ boolean isPseudoElement = false; final public String booleanExpressionToken() throws ParseException { Token n = null; String s = null; - if (jj_2_5(2)) { + if (jj_2_6(2)) { s = containsDirective(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -2767,7 +3023,7 @@ boolean isPseudoElement = false; n = jj_consume_token(NOT_EQ); break; default: - jj_la1[110] = jj_gen; + jj_la1[123] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -2782,41 +3038,41 @@ boolean isPseudoElement = false; ArrayList<String> list = null; String listVariable = null; jj_consume_token(EACH_SYM); - label_75: + label_85: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[111] = jj_gen; - break label_75; + jj_la1[124] = jj_gen; + break label_85; } jj_consume_token(S); } var = jj_consume_token(VARIABLE); - label_76: + label_86: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[112] = jj_gen; - break label_76; + jj_la1[125] = jj_gen; + break label_86; } jj_consume_token(S); } jj_consume_token(EACH_IN); - label_77: + label_87: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[113] = jj_gen; - break label_77; + jj_la1[126] = jj_gen; + break label_87; } jj_consume_token(S); } @@ -2830,24 +3086,24 @@ boolean isPseudoElement = false; documentHandler.startEachDirective(var.image, listVariable); break; default: - jj_la1[114] = jj_gen; + jj_la1[127] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_78: + label_88: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[115] = jj_gen; - break label_78; + jj_la1[128] = jj_gen; + break label_88; } jj_consume_token(S); } - label_79: + label_89: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -2864,25 +3120,26 @@ boolean isPseudoElement = false; case VARIABLE: case HASH: case MEDIA_SYM: + case KEY_FRAME_SYM: case CONTAINS: ; break; default: - jj_la1[116] = jj_gen; - break label_79; + jj_la1[129] = jj_gen; + break label_89; } ifContentStatement(); } jj_consume_token(RBRACE); - label_80: + label_90: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[117] = jj_gen; - break label_80; + jj_la1[130] = jj_gen; + break label_90; } jj_consume_token(S); } @@ -2893,53 +3150,53 @@ boolean isPseudoElement = false; ArrayList<String > strings = new ArrayList<String >(); Token input; input = jj_consume_token(IDENT); - label_81: + label_91: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[118] = jj_gen; - break label_81; + jj_la1[131] = jj_gen; + break label_91; } jj_consume_token(S); } strings.add(input.image); - label_82: + label_92: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[119] = jj_gen; - break label_82; + jj_la1[132] = jj_gen; + break label_92; } jj_consume_token(COMMA); - label_83: + label_93: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[120] = jj_gen; - break label_83; + jj_la1[133] = jj_gen; + break label_93; } jj_consume_token(S); } input = jj_consume_token(IDENT); strings.add(input.image); - label_84: + label_94: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[121] = jj_gen; - break label_84; + jj_la1[134] = jj_gen; + break label_94; } jj_consume_token(S); } @@ -2953,15 +3210,15 @@ boolean isPseudoElement = false; ArrayList<VariableNode> args = null; String body; jj_consume_token(MIXIN_SYM); - label_85: + label_95: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[122] = jj_gen; - break label_85; + jj_la1[135] = jj_gen; + break label_95; } jj_consume_token(S); } @@ -2974,39 +3231,39 @@ boolean isPseudoElement = false; name = functionName(); args = arglist(); jj_consume_token(RPARAN); - label_86: + label_96: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[123] = jj_gen; - break label_86; + jj_la1[136] = jj_gen; + break label_96; } jj_consume_token(S); } break; default: - jj_la1[124] = jj_gen; + jj_la1[137] = jj_gen; jj_consume_token(-1); throw new ParseException(); } jj_consume_token(LBRACE); - label_87: + label_97: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[125] = jj_gen; - break label_87; + jj_la1[138] = jj_gen; + break label_97; } jj_consume_token(S); } documentHandler.startMixinDirective(name, args); - label_88: + label_98: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case LBRACKET: @@ -3027,14 +3284,15 @@ boolean isPseudoElement = false; case MEDIA_SYM: case PAGE_SYM: case FONT_FACE_SYM: + case KEY_FRAME_SYM: case CONTAINS: ; break; default: - jj_la1[126] = jj_gen; - break label_88; + jj_la1[139] = jj_gen; + break label_98; } - if (jj_2_6(5)) { + if (jj_2_7(5)) { ifContentStatement(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -3049,22 +3307,22 @@ boolean isPseudoElement = false; page(); break; default: - jj_la1[127] = jj_gen; + jj_la1[140] = jj_gen; jj_consume_token(-1); throw new ParseException(); } } } jj_consume_token(RBRACE); - label_89: + label_99: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[128] = jj_gen; - break label_89; + jj_la1[141] = jj_gen; + break label_99; } jj_consume_token(S); } @@ -3076,26 +3334,26 @@ boolean isPseudoElement = false; VariableNode arg; boolean hasNonOptionalArgument = false; arg = mixinArg(); - label_90: + label_100: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[129] = jj_gen; - break label_90; + jj_la1[142] = jj_gen; + break label_100; } jj_consume_token(COMMA); - label_91: + label_101: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[130] = jj_gen; - break label_91; + jj_la1[143] = jj_gen; + break label_101; } jj_consume_token(S); } @@ -3136,45 +3394,45 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_92: + label_102: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[131] = jj_gen; - break label_92; + jj_la1[144] = jj_gen; + break label_102; } jj_consume_token(S); } first = nonVariableTerm(null); prev = first; - label_93: + label_103: while (true) { - if (jj_2_7(3)) { + if (jj_2_8(3)) { ; } else { - break label_93; + break label_103; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_94: + label_104: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[132] = jj_gen; - break label_94; + jj_la1[145] = jj_gen; + break label_104; } jj_consume_token(S); } break; default: - jj_la1[133] = jj_gen; + jj_la1[146] = jj_gen; ; } prev = nonVariableTerm(prev); @@ -3186,13 +3444,13 @@ boolean isPseudoElement = false; prev, variable.image); break; default: - jj_la1[134] = jj_gen; + jj_la1[147] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[135] = jj_gen; + jj_la1[148] = jj_gen; ; } VariableNode arg = new VariableNode(name, first, false); @@ -3207,7 +3465,7 @@ boolean isPseudoElement = false; LexicalUnitImpl prev = null; first = term(null); args.add(first); prev = first; - label_95: + label_105: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3242,58 +3500,58 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[136] = jj_gen; - break label_95; + jj_la1[149] = jj_gen; + break label_105; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_96: + label_106: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[137] = jj_gen; - break label_96; + jj_la1[150] = jj_gen; + break label_106; } jj_consume_token(S); } break; default: - jj_la1[138] = jj_gen; + jj_la1[151] = jj_gen; ; } next = term(prev); prev.setNextLexicalUnit(next); prev = next; } - label_97: + label_107: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: ; break; default: - jj_la1[139] = jj_gen; - break label_97; + jj_la1[152] = jj_gen; + break label_107; } jj_consume_token(COMMA); - label_98: + label_108: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[140] = jj_gen; - break label_98; + jj_la1[153] = jj_gen; + break label_108; } jj_consume_token(S); } first = term(null); args.add(first); prev = first; - label_99: + label_109: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case PLUS: @@ -3328,27 +3586,27 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[141] = jj_gen; - break label_99; + jj_la1[154] = jj_gen; + break label_109; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COLON: jj_consume_token(COLON); - label_100: + label_110: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[142] = jj_gen; - break label_100; + jj_la1[155] = jj_gen; + break label_110; } jj_consume_token(S); } break; default: - jj_la1[143] = jj_gen; + jj_la1[156] = jj_gen; ; } next = term(prev); @@ -3363,15 +3621,15 @@ boolean isPseudoElement = false; String name; ArrayList<LexicalUnitImpl> args=null; jj_consume_token(INCLUDE_SYM); - label_101: + label_111: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[144] = jj_gen; - break label_101; + jj_la1[157] = jj_gen; + break label_111; } jj_consume_token(S); } @@ -3390,22 +3648,22 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[145] = jj_gen; + jj_la1[158] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_102: + label_112: while (true) { jj_consume_token(SEMICOLON); - label_103: + label_113: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[146] = jj_gen; - break label_103; + jj_la1[159] = jj_gen; + break label_113; } jj_consume_token(S); } @@ -3414,8 +3672,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[147] = jj_gen; - break label_102; + jj_la1[160] = jj_gen; + break label_112; } } documentHandler.includeDirective(name, args); @@ -3429,38 +3687,38 @@ boolean isPseudoElement = false; } final public void listModifyDirective() throws ParseException { - if (jj_2_8(5)) { + if (jj_2_9(5)) { removeDirective(); - } else if (jj_2_9(5)) { - appendDirective(); } else if (jj_2_10(5)) { + appendDirective(); + } else if (jj_2_11(5)) { containsDirective(); } else { jj_consume_token(-1); throw new ParseException(); } - label_104: + label_114: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[148] = jj_gen; - break label_104; + jj_la1[161] = jj_gen; + break label_114; } jj_consume_token(S); } jj_consume_token(SEMICOLON); - label_105: + label_115: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[149] = jj_gen; - break label_105; + jj_la1[162] = jj_gen; + break label_115; } jj_consume_token(S); } @@ -3477,41 +3735,41 @@ boolean isPseudoElement = false; Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_106: + label_116: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[150] = jj_gen; - break label_106; + jj_la1[163] = jj_gen; + break label_116; } jj_consume_token(S); } jj_consume_token(COLON); - label_107: + label_117: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[151] = jj_gen; - break label_107; + jj_la1[164] = jj_gen; + break label_117; } jj_consume_token(S); } jj_consume_token(APPEND); - label_108: + label_118: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[152] = jj_gen; - break label_108; + jj_la1[165] = jj_gen; + break label_118; } jj_consume_token(S); } @@ -3521,19 +3779,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[153] = jj_gen; + jj_la1[166] = jj_gen; ; } jj_consume_token(COMMA); - label_109: + label_119: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[154] = jj_gen; - break label_109; + jj_la1[167] = jj_gen; + break label_119; } jj_consume_token(S); } @@ -3541,35 +3799,35 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_110: + label_120: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[155] = jj_gen; - break label_110; + jj_la1[168] = jj_gen; + break label_120; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_111: + label_121: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[156] = jj_gen; - break label_111; + jj_la1[169] = jj_gen; + break label_121; } jj_consume_token(S); } break; default: - jj_la1[157] = jj_gen; + jj_la1[170] = jj_gen; ; } jj_consume_token(RPARAN); @@ -3587,41 +3845,41 @@ boolean isPseudoElement = false; Token n = null; n = jj_consume_token(VARIABLE); variable = n.image; - label_112: + label_122: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[158] = jj_gen; - break label_112; + jj_la1[171] = jj_gen; + break label_122; } jj_consume_token(S); } jj_consume_token(COLON); - label_113: + label_123: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[159] = jj_gen; - break label_113; + jj_la1[172] = jj_gen; + break label_123; } jj_consume_token(S); } jj_consume_token(REMOVE); - label_114: + label_124: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[160] = jj_gen; - break label_114; + jj_la1[173] = jj_gen; + break label_124; } jj_consume_token(S); } @@ -3631,19 +3889,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[161] = jj_gen; + jj_la1[174] = jj_gen; ; } jj_consume_token(COMMA); - label_115: + label_125: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[162] = jj_gen; - break label_115; + jj_la1[175] = jj_gen; + break label_125; } jj_consume_token(S); } @@ -3651,35 +3909,35 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_116: + label_126: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[163] = jj_gen; - break label_116; + jj_la1[176] = jj_gen; + break label_126; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_117: + label_127: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[164] = jj_gen; - break label_117; + jj_la1[177] = jj_gen; + break label_127; } jj_consume_token(S); } break; default: - jj_la1[165] = jj_gen; + jj_la1[178] = jj_gen; ; } jj_consume_token(RPARAN); @@ -3699,46 +3957,46 @@ boolean isPseudoElement = false; case VARIABLE: n = jj_consume_token(VARIABLE); variable = n.image; - label_118: + label_128: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[166] = jj_gen; - break label_118; + jj_la1[179] = jj_gen; + break label_128; } jj_consume_token(S); } jj_consume_token(COLON); - label_119: + label_129: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[167] = jj_gen; - break label_119; + jj_la1[180] = jj_gen; + break label_129; } jj_consume_token(S); } break; default: - jj_la1[168] = jj_gen; + jj_la1[181] = jj_gen; ; } jj_consume_token(CONTAINS); - label_120: + label_130: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[169] = jj_gen; - break label_120; + jj_la1[182] = jj_gen; + break label_130; } jj_consume_token(S); } @@ -3748,19 +4006,19 @@ boolean isPseudoElement = false; jj_consume_token(RPARAN); break; default: - jj_la1[170] = jj_gen; + jj_la1[183] = jj_gen; ; } jj_consume_token(COMMA); - label_121: + label_131: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[171] = jj_gen; - break label_121; + jj_la1[184] = jj_gen; + break label_131; } jj_consume_token(S); } @@ -3768,35 +4026,35 @@ boolean isPseudoElement = false; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: jj_consume_token(COMMA); - label_122: + label_132: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[172] = jj_gen; - break label_122; + jj_la1[185] = jj_gen; + break label_132; } jj_consume_token(S); } n = jj_consume_token(IDENT); separator = n.image; - label_123: + label_133: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[173] = jj_gen; - break label_123; + jj_la1[186] = jj_gen; + break label_133; } jj_consume_token(S); } break; default: - jj_la1[174] = jj_gen; + jj_la1[187] = jj_gen; ; } jj_consume_token(RPARAN); @@ -3901,7 +4159,7 @@ boolean isPseudoElement = false; warnDirective(); break; default: - jj_la1[175] = jj_gen; + jj_la1[188] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -3912,15 +4170,15 @@ boolean isPseudoElement = false; String content = skipStatementUntilSemiColon(); // TODO should evaluate the content expression, call documentHandler.debugDirective() etc. System.out.println(content); - label_124: + label_134: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[176] = jj_gen; - break label_124; + jj_la1[189] = jj_gen; + break label_134; } jj_consume_token(S); } @@ -3931,15 +4189,15 @@ boolean isPseudoElement = false; String content = skipStatementUntilSemiColon(); // TODO should evaluate the content expression, call documentHandler.warnDirective() etc. System.err.println(content); - label_125: + label_135: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[177] = jj_gen; - break label_125; + jj_la1[190] = jj_gen; + break label_135; } jj_consume_token(S); } @@ -3965,20 +4223,20 @@ boolean isPseudoElement = false; exclusive = false; break; default: - jj_la1[178] = jj_gen; + jj_la1[191] = jj_gen; jj_consume_token(-1); throw new ParseException(); } to = skipStatementUntilLeftBrace(); - label_126: + label_136: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[179] = jj_gen; - break label_126; + jj_la1[192] = jj_gen; + break label_136; } jj_consume_token(S); } @@ -3999,31 +4257,31 @@ boolean isPseudoElement = false; final public void extendDirective() throws ParseException { ArrayList<String> list; jj_consume_token(EXTEND_SYM); - label_127: + label_137: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[180] = jj_gen; - break label_127; + jj_la1[193] = jj_gen; + break label_137; } jj_consume_token(S); } list = selectorList(); - label_128: + label_138: while (true) { jj_consume_token(SEMICOLON); - label_129: + label_139: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[181] = jj_gen; - break label_129; + jj_la1[194] = jj_gen; + break label_139; } jj_consume_token(S); } @@ -4032,8 +4290,8 @@ boolean isPseudoElement = false; ; break; default: - jj_la1[182] = jj_gen; - break label_128; + jj_la1[195] = jj_gen; + break label_138; } } documentHandler.extendDirective(list); @@ -4060,28 +4318,28 @@ boolean isPseudoElement = false; LexicalUnit exp; name = property(); jj_consume_token(COLON); - label_130: + label_140: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[183] = jj_gen; - break label_130; + jj_la1[196] = jj_gen; + break label_140; } jj_consume_token(S); } jj_consume_token(LBRACE); - label_131: + label_141: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[184] = jj_gen; - break label_131; + jj_la1[197] = jj_gen; + break label_141; } jj_consume_token(S); } @@ -4092,29 +4350,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[185] = jj_gen; + jj_la1[198] = jj_gen; ; } - label_132: + label_142: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[186] = jj_gen; - break label_132; + jj_la1[199] = jj_gen; + break label_142; } jj_consume_token(SEMICOLON); - label_133: + label_143: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[187] = jj_gen; - break label_133; + jj_la1[200] = jj_gen; + break label_143; } jj_consume_token(S); } @@ -4124,21 +4382,21 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[188] = jj_gen; + jj_la1[201] = jj_gen; ; } } jj_consume_token(RBRACE); documentHandler.endNestedProperties(name); - label_134: + label_144: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[189] = jj_gen; - break label_134; + jj_la1[202] = jj_gen; + break label_144; } jj_consume_token(S); } @@ -4149,7 +4407,7 @@ LexicalUnit exp; */ final public void styleRuleOrDeclarationOrNestedProperties() throws ParseException { try { - if (jj_2_11(5)) { + if (jj_2_12(5)) { styleRule(); } else { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4162,7 +4420,7 @@ LexicalUnit exp; declarationOrNestedProperties(); break; default: - jj_la1[190] = jj_gen; + jj_la1[203] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4206,15 +4464,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_135: + label_145: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[191] = jj_gen; - break label_135; + jj_la1[204] = jj_gen; + break label_145; } jj_consume_token(S); } @@ -4253,7 +4511,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[192] = jj_gen; + jj_la1[205] = jj_gen; ; } Token next = getToken(1); @@ -4271,15 +4529,15 @@ LexicalUnit exp; break; case LBRACE: jj_consume_token(LBRACE); - label_136: + label_146: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[193] = jj_gen; - break label_136; + jj_la1[206] = jj_gen; + break label_146; } jj_consume_token(S); } @@ -4290,29 +4548,29 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[194] = jj_gen; + jj_la1[207] = jj_gen; ; } - label_137: + label_147: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[195] = jj_gen; - break label_137; + jj_la1[208] = jj_gen; + break label_147; } jj_consume_token(SEMICOLON); - label_138: + label_148: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[196] = jj_gen; - break label_138; + jj_la1[209] = jj_gen; + break label_148; } jj_consume_token(S); } @@ -4322,27 +4580,27 @@ LexicalUnit exp; declaration(); break; default: - jj_la1[197] = jj_gen; + jj_la1[210] = jj_gen; ; } } jj_consume_token(RBRACE); - label_139: + label_149: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[198] = jj_gen; - break label_139; + jj_la1[211] = jj_gen; + break label_149; } jj_consume_token(S); } documentHandler.endNestedProperties(name); break; default: - jj_la1[199] = jj_gen; + jj_la1[212] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4392,15 +4650,15 @@ LexicalUnit exp; name = property(); save = token; jj_consume_token(COLON); - label_140: + label_150: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[200] = jj_gen; - break label_140; + jj_la1[213] = jj_gen; + break label_150; } jj_consume_token(S); } @@ -4410,7 +4668,7 @@ LexicalUnit exp; important = prio(); break; default: - jj_la1[201] = jj_gen; + jj_la1[214] = jj_gen; ; } documentHandler.property(name, exp, important); @@ -4453,15 +4711,15 @@ LexicalUnit exp; */ final public boolean prio() throws ParseException { jj_consume_token(IMPORTANT_SYM); - label_141: + label_151: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[202] = jj_gen; - break label_141; + jj_la1[215] = jj_gen; + break label_151; } jj_consume_token(S); } @@ -4471,15 +4729,15 @@ LexicalUnit exp; final public boolean guarded() throws ParseException { jj_consume_token(GUARDED_SYM); - label_142: + label_152: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[203] = jj_gen; - break label_142; + jj_la1[216] = jj_gen; + break label_152; } jj_consume_token(S); } @@ -4495,15 +4753,15 @@ LexicalUnit exp; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case DIV: n = jj_consume_token(DIV); - label_143: + label_153: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[204] = jj_gen; - break label_143; + jj_la1[217] = jj_gen; + break label_153; } jj_consume_token(S); } @@ -4513,15 +4771,15 @@ LexicalUnit exp; break; case COMMA: n = jj_consume_token(COMMA); - label_144: + label_154: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[205] = jj_gen; - break label_144; + jj_la1[218] = jj_gen; + break label_154; } jj_consume_token(S); } @@ -4530,7 +4788,7 @@ LexicalUnit exp; prev);} break; default: - jj_la1[206] = jj_gen; + jj_la1[219] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4545,12 +4803,12 @@ LexicalUnit exp; char op; first = term(null); res = first; - label_145: + label_155: while (true) { - if (jj_2_12(2)) { + if (jj_2_13(2)) { ; } else { - break label_145; + break label_155; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case COMMA: @@ -4558,7 +4816,7 @@ LexicalUnit exp; res = operator(res); break; default: - jj_la1[207] = jj_gen; + jj_la1[220] = jj_gen; ; } res = term(res); @@ -4581,7 +4839,7 @@ LexicalUnit exp; {if (true) return '+';} break; default: - jj_la1[208] = jj_gen; + jj_la1[221] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4629,7 +4887,7 @@ LexicalUnit exp; result = variableTerm(prev); break; default: - jj_la1[209] = jj_gen; + jj_la1[222] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4680,7 +4938,7 @@ LexicalUnitImpl result = null; op = unaryOperator(); break; default: - jj_la1[210] = jj_gen; + jj_la1[223] = jj_gen; ; } switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { @@ -4785,7 +5043,7 @@ LexicalUnitImpl result = null; result = function(op, prev); break; default: - jj_la1[211] = jj_gen; + jj_la1[224] = jj_gen; jj_consume_token(-1); throw new ParseException(); } @@ -4812,7 +5070,7 @@ LexicalUnitImpl result = null; s+="."; break; default: - jj_la1[212] = jj_gen; + jj_la1[225] = jj_gen; ; } n = jj_consume_token(IDENT); @@ -4859,25 +5117,25 @@ LexicalUnitImpl result = null; result = unicode(prev); break; default: - jj_la1[213] = jj_gen; + jj_la1[226] = jj_gen; jj_consume_token(-1); throw new ParseException(); } break; default: - jj_la1[214] = jj_gen; + jj_la1[227] = jj_gen; jj_consume_token(-1); throw new ParseException(); } - label_146: + label_156: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[215] = jj_gen; - break label_146; + jj_la1[228] = jj_gen; + break label_156; } jj_consume_token(S); } @@ -4893,15 +5151,15 @@ LexicalUnitImpl result = null; Token n; LexicalUnit params = null; n = jj_consume_token(FUNCTION); - label_147: + label_157: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[216] = jj_gen; - break label_147; + jj_la1[229] = jj_gen; + break label_157; } jj_consume_token(S); } @@ -4943,7 +5201,7 @@ LexicalUnitImpl result = null; params = expr(); break; default: - jj_la1[217] = jj_gen; + jj_la1[230] = jj_gen; ; } jj_consume_token(RPARAN); @@ -5322,26 +5580,10 @@ LexicalUnitImpl result = null; case '5': case '6': case '7': case '8': case '9': case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': - int numValue = Character.digit(c, 16); - int count = 0; - int p = 16; - - while (index + 1 < len && count < 6) { - c = s.charAt(index+1); - - if (Character.digit(c, 16) != -1) { - numValue = (numValue * 16) + Character.digit(c, 16); - p *= 16; - index++; - } else { - if (c == ' ') { - // skip the latest white space - index++; - } - break; - } + buf.append('\u005c\u005c'); + while (index < len) { + buf.append(s.charAt(index++)); } - buf.append((char) numValue); break; case '\u005cn': case '\u005cf': @@ -5414,15 +5656,15 @@ LexicalUnitImpl result = null; */ final public void _parseRule() throws ParseException { String ret = null; - label_148: + label_158: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[218] = jj_gen; - break label_148; + jj_la1[231] = jj_gen; + break label_158; } jj_consume_token(S); } @@ -5454,7 +5696,7 @@ LexicalUnitImpl result = null; fontFace(); break; default: - jj_la1[219] = jj_gen; + jj_la1[232] = jj_gen; ret = skipStatement(); if ((ret == null) || (ret.length() == 0)) { {if (true) return;} @@ -5469,15 +5711,15 @@ LexicalUnitImpl result = null; } final public void _parseImportRule() throws ParseException { - label_149: + label_159: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[220] = jj_gen; - break label_149; + jj_la1[233] = jj_gen; + break label_159; } jj_consume_token(S); } @@ -5485,15 +5727,15 @@ LexicalUnitImpl result = null; } final public void _parseMediaRule() throws ParseException { - label_150: + label_160: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[221] = jj_gen; - break label_150; + jj_la1[234] = jj_gen; + break label_160; } jj_consume_token(S); } @@ -5501,15 +5743,15 @@ LexicalUnitImpl result = null; } final public void _parseDeclarationBlock() throws ParseException { - label_151: + label_161: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[222] = jj_gen; - break label_151; + jj_la1[235] = jj_gen; + break label_161; } jj_consume_token(S); } @@ -5519,29 +5761,29 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[223] = jj_gen; + jj_la1[236] = jj_gen; ; } - label_152: + label_162: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case SEMICOLON: ; break; default: - jj_la1[224] = jj_gen; - break label_152; + jj_la1[237] = jj_gen; + break label_162; } jj_consume_token(SEMICOLON); - label_153: + label_163: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[225] = jj_gen; - break label_153; + jj_la1[238] = jj_gen; + break label_163; } jj_consume_token(S); } @@ -5551,7 +5793,7 @@ LexicalUnitImpl result = null; declaration(); break; default: - jj_la1[226] = jj_gen; + jj_la1[239] = jj_gen; ; } } @@ -5560,15 +5802,15 @@ LexicalUnitImpl result = null; final public ArrayList<String> _parseSelectors() throws ParseException { ArrayList<String> p = null; try { - label_154: + label_164: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case S: ; break; default: - jj_la1[227] = jj_gen; - break label_154; + jj_la1[240] = jj_gen; + break label_164; } jj_consume_token(S); } @@ -5664,228 +5906,24 @@ LexicalUnitImpl result = null; finally { jj_save(11, xla); } } - private boolean jj_3R_252() { - if (jj_scan_token(FUNCTION)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - xsp = jj_scanpos; - if (jj_3R_273()) jj_scanpos = xsp; - if (jj_scan_token(RPARAN)) return true; - return false; - } - - private boolean jj_3_1() { - if (jj_3R_155()) return true; - return false; - } - - private boolean jj_3R_228() { - if (jj_3R_258()) return true; - return false; - } - - private boolean jj_3R_224() { - if (jj_3R_256()) return true; - return false; - } - - private boolean jj_3R_171() { - if (jj_3R_193()) return true; - return false; - } - - private boolean jj_3R_223() { - if (jj_3R_255()) return true; - return false; - } - - private boolean jj_3R_222() { - if (jj_3R_254()) return true; - return false; - } - - private boolean jj_3_3() { - if (jj_3R_157()) return true; - if (jj_3R_158()) return true; - return false; - } - - private boolean jj_3R_226() { - if (jj_scan_token(COMMA)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - if (jj_3R_225()) return true; - return false; - } - - private boolean jj_3R_225() { - if (jj_3R_158()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3_3()) { jj_scanpos = xsp; break; } - } - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_170() { - if (jj_3R_192()) return true; - return false; - } - - private boolean jj_3R_227() { - if (jj_3R_257()) return true; - return false; - } - - private boolean jj_3R_238() { - if (jj_scan_token(SEMICOLON)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_191() { - if (jj_scan_token(EXTEND_SYM)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - if (jj_3R_184()) return true; - if (jj_3R_238()) return true; - while (true) { - xsp = jj_scanpos; - if (jj_3R_238()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_293() { - if (jj_scan_token(EACH_SYM)) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(VARIABLE)) return true; - while (true) { - xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } - } - if (jj_scan_token(EACH_IN)) return true; - return false; - } - - private boolean jj_3R_184() { - if (jj_3R_225()) return true; - Token xsp; - while (true) { - xsp = jj_scanpos; - if (jj_3R_226()) { jj_scanpos = xsp; break; } - } - return false; - } - - private boolean jj_3R_169() { - if (jj_3R_191()) return true; - return false; - } - - private boolean jj_3R_253() { - if (jj_scan_token(DOT)) return true; - return false; - } - - private boolean jj_3R_221() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_253()) jj_scanpos = xsp; - if (jj_scan_token(IDENT)) return true; - return false; - } - - private boolean jj_3R_168() { - if (jj_3R_190()) return true; - return false; - } - - private boolean jj_3R_220() { - if (jj_scan_token(STRING)) return true; - return false; - } - - private boolean jj_3R_219() { - if (jj_3R_252()) return true; - return false; - } - - private boolean jj_3R_183() { - Token xsp; - xsp = jj_scanpos; - if (jj_3R_220()) { - jj_scanpos = xsp; - if (jj_3R_221()) { - jj_scanpos = xsp; - if (jj_3R_222()) { - jj_scanpos = xsp; - if (jj_3R_223()) { - jj_scanpos = xsp; - if (jj_3R_224()) return true; - } - } - } - } - return false; - } - - private boolean jj_3R_185() { - Token xsp; - xsp = jj_scanpos; - if (jj_3_2()) { - jj_scanpos = xsp; - if (jj_3R_227()) { - jj_scanpos = xsp; - if (jj_3R_228()) return true; - } - } - return false; - } - - private boolean jj_3_2() { - if (jj_3R_156()) return true; - return false; - } - - private boolean jj_3_5() { - if (jj_3R_159()) return true; - return false; + private boolean jj_2_13(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_13(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(12, xla); } } - private boolean jj_3R_351() { + private boolean jj_3R_368() { Token xsp; xsp = jj_scanpos; - if (jj_3_5()) { + if (jj_3_6()) { jj_scanpos = xsp; - if (jj_scan_token(75)) { - jj_scanpos = xsp; - if (jj_scan_token(71)) { + if (jj_scan_token(76)) { jj_scanpos = xsp; if (jj_scan_token(72)) { jj_scanpos = xsp; + if (jj_scan_token(73)) { + jj_scanpos = xsp; if (jj_scan_token(33)) { jj_scanpos = xsp; if (jj_scan_token(34)) { @@ -5933,23 +5971,23 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_218() { + private boolean jj_3R_230() { if (jj_scan_token(DIMEN)) return true; return false; } - private boolean jj_3R_306() { + private boolean jj_3R_323() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_217() { + private boolean jj_3R_229() { if (jj_scan_token(KHZ)) return true; return false; } - private boolean jj_3R_164() { - if (jj_3R_184()) return true; + private boolean jj_3R_174() { + if (jj_3R_195()) return true; if (jj_scan_token(LBRACE)) return true; Token xsp; while (true) { @@ -5958,7 +5996,7 @@ LexicalUnitImpl result = null; } while (true) { xsp = jj_scanpos; - if (jj_3R_185()) { jj_scanpos = xsp; break; } + if (jj_3R_196()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; while (true) { @@ -5968,17 +6006,17 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_216() { + private boolean jj_3R_228() { if (jj_scan_token(HZ)) return true; return false; } - private boolean jj_3R_167() { - if (jj_3R_189()) return true; + private boolean jj_3R_177() { + if (jj_3R_200()) return true; return false; } - private boolean jj_3R_309() { + private boolean jj_3R_326() { if (jj_scan_token(WARN_SYM)) return true; Token xsp; while (true) { @@ -5988,27 +6026,27 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_215() { + private boolean jj_3R_227() { if (jj_scan_token(MS)) return true; return false; } - private boolean jj_3R_282() { - if (jj_3R_309()) return true; + private boolean jj_3R_299() { + if (jj_3R_326()) return true; return false; } - private boolean jj_3R_214() { + private boolean jj_3R_226() { if (jj_scan_token(SECOND)) return true; return false; } - private boolean jj_3R_213() { + private boolean jj_3R_225() { if (jj_scan_token(GRAD)) return true; return false; } - private boolean jj_3R_260() { + private boolean jj_3R_274() { if (jj_scan_token(FUNCTION)) return true; Token xsp; while (true) { @@ -6018,12 +6056,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_212() { + private boolean jj_3R_224() { if (jj_scan_token(RAD)) return true; return false; } - private boolean jj_3R_308() { + private boolean jj_3R_325() { if (jj_scan_token(DEBUG_SYM)) return true; Token xsp; while (true) { @@ -6033,12 +6071,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_211() { + private boolean jj_3R_223() { if (jj_scan_token(DEG)) return true; return false; } - private boolean jj_3R_239() { + private boolean jj_3R_251() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -6048,7 +6086,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_242() { + private boolean jj_3R_254() { if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { @@ -6058,62 +6096,62 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_210() { + private boolean jj_3R_222() { if (jj_scan_token(EXS)) return true; return false; } - private boolean jj_3R_209() { + private boolean jj_3R_221() { if (jj_scan_token(EMS)) return true; return false; } - private boolean jj_3R_268() { + private boolean jj_3R_298() { + if (jj_3R_325()) return true; + return false; + } + + private boolean jj_3R_282() { Token xsp; xsp = jj_scanpos; - if (jj_3R_281()) { + if (jj_3R_298()) { jj_scanpos = xsp; - if (jj_3R_282()) return true; + if (jj_3R_299()) return true; } return false; } - private boolean jj_3R_281() { - if (jj_3R_308()) return true; - return false; - } - - private boolean jj_3R_305() { + private boolean jj_3R_322() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_277() { + private boolean jj_3R_294() { Token xsp; xsp = jj_scanpos; - if (jj_3R_305()) { + if (jj_3R_322()) { jj_scanpos = xsp; - if (jj_3R_306()) return true; + if (jj_3R_323()) return true; } return false; } - private boolean jj_3R_208() { + private boolean jj_3R_220() { if (jj_scan_token(PX)) return true; return false; } - private boolean jj_3R_337() { - if (jj_3R_351()) return true; + private boolean jj_3R_354() { + if (jj_3R_368()) return true; return false; } - private boolean jj_3R_259() { + private boolean jj_3R_273() { Token xsp; - if (jj_3R_277()) return true; + if (jj_3R_294()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_277()) { jj_scanpos = xsp; break; } + if (jj_3R_294()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; @@ -6122,82 +6160,85 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_207() { + private boolean jj_3R_219() { if (jj_scan_token(IN)) return true; return false; } - private boolean jj_3R_292() { + private boolean jj_3R_309() { if (jj_scan_token(IF_SYM)) return true; Token xsp; - if (jj_3R_337()) return true; + if (jj_3R_354()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_337()) { jj_scanpos = xsp; break; } + if (jj_3R_354()) { jj_scanpos = xsp; break; } } if (jj_scan_token(LBRACE)) return true; return false; } - private boolean jj_3R_275() { - if (jj_3R_293()) return true; + private boolean jj_3R_292() { + if (jj_3R_310()) return true; return false; } - private boolean jj_3R_206() { + private boolean jj_3R_218() { if (jj_scan_token(PC)) return true; return false; } - private boolean jj_3R_205() { + private boolean jj_3R_217() { if (jj_scan_token(MM)) return true; return false; } - private boolean jj_3R_304() { + private boolean jj_3R_321() { if (jj_scan_token(S)) return true; return false; } - private boolean jj_3R_303() { + private boolean jj_3R_320() { if (jj_scan_token(DOT)) return true; return false; } - private boolean jj_3R_302() { + private boolean jj_3R_319() { if (jj_scan_token(EQ)) return true; return false; } - private boolean jj_3R_204() { + private boolean jj_3R_216() { if (jj_scan_token(CM)) return true; return false; } - private boolean jj_3R_301() { + private boolean jj_3R_318() { if (jj_scan_token(RPARAN)) return true; return false; } - private boolean jj_3R_300() { + private boolean jj_3R_317() { if (jj_scan_token(FUNCTION)) return true; return false; } - private boolean jj_3R_156() { + private boolean jj_3R_166() { Token xsp; xsp = jj_scanpos; - if (jj_3_4()) { + if (jj_3_5()) { jj_scanpos = xsp; - if (jj_3R_167()) { + if (jj_3R_177()) { jj_scanpos = xsp; - if (jj_3R_168()) { + if (jj_3R_178()) { jj_scanpos = xsp; - if (jj_3R_169()) { + if (jj_3R_179()) { jj_scanpos = xsp; - if (jj_3R_170()) { + if (jj_3R_180()) { jj_scanpos = xsp; - if (jj_3R_171()) return true; + if (jj_3R_181()) { + jj_scanpos = xsp; + if (jj_3R_182()) return true; + } } } } @@ -6206,100 +6247,100 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_4() { - if (jj_3R_155()) return true; + private boolean jj_3_5() { + if (jj_3R_165()) return true; return false; } - private boolean jj_3R_299() { + private boolean jj_3R_316() { if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_241() { - if (jj_3R_267()) return true; + private boolean jj_3R_253() { + if (jj_3R_281()) return true; return false; } - private boolean jj_3R_203() { + private boolean jj_3R_215() { if (jj_scan_token(PT)) return true; return false; } - private boolean jj_3R_298() { + private boolean jj_3R_315() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_297() { + private boolean jj_3R_314() { if (jj_scan_token(COMMA)) return true; return false; } - private boolean jj_3R_296() { + private boolean jj_3R_313() { if (jj_scan_token(STRING)) return true; return false; } - private boolean jj_3R_202() { + private boolean jj_3R_214() { if (jj_scan_token(PERCENTAGE)) return true; return false; } - private boolean jj_3R_295() { + private boolean jj_3R_312() { if (jj_scan_token(NUMBER)) return true; return false; } - private boolean jj_3R_257() { + private boolean jj_3R_271() { Token xsp; xsp = jj_scanpos; - if (jj_3R_274()) { + if (jj_3R_291()) { jj_scanpos = xsp; - if (jj_3R_275()) return true; + if (jj_3R_292()) return true; } return false; } - private boolean jj_3R_274() { - if (jj_3R_292()) return true; + private boolean jj_3R_291() { + if (jj_3R_309()) return true; return false; } - private boolean jj_3R_188() { - if (jj_3R_231()) return true; + private boolean jj_3R_199() { + if (jj_3R_243()) return true; return false; } - private boolean jj_3R_294() { + private boolean jj_3R_311() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_276() { + private boolean jj_3R_293() { Token xsp; xsp = jj_scanpos; - if (jj_3R_294()) { + if (jj_3R_311()) { jj_scanpos = xsp; - if (jj_3R_295()) { + if (jj_3R_312()) { jj_scanpos = xsp; - if (jj_3R_296()) { + if (jj_3R_313()) { jj_scanpos = xsp; - if (jj_3R_297()) { + if (jj_3R_314()) { jj_scanpos = xsp; - if (jj_3R_298()) { + if (jj_3R_315()) { jj_scanpos = xsp; - if (jj_3R_299()) { + if (jj_3R_316()) { jj_scanpos = xsp; - if (jj_3R_300()) { + if (jj_3R_317()) { jj_scanpos = xsp; - if (jj_3R_301()) { + if (jj_3R_318()) { jj_scanpos = xsp; - if (jj_3R_302()) { + if (jj_3R_319()) { jj_scanpos = xsp; - if (jj_3R_303()) { + if (jj_3R_320()) { jj_scanpos = xsp; - if (jj_3R_304()) return true; + if (jj_3R_321()) return true; } } } @@ -6313,58 +6354,58 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_201() { + private boolean jj_3R_213() { if (jj_scan_token(NUMBER)) return true; return false; } - private boolean jj_3R_200() { - if (jj_3R_251()) return true; + private boolean jj_3R_212() { + if (jj_3R_265()) return true; return false; } - private boolean jj_3R_182() { + private boolean jj_3R_193() { Token xsp; xsp = jj_scanpos; - if (jj_3R_200()) jj_scanpos = xsp; + if (jj_3R_212()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_201()) { + if (jj_3R_213()) { jj_scanpos = xsp; - if (jj_3R_202()) { + if (jj_3R_214()) { jj_scanpos = xsp; - if (jj_3R_203()) { + if (jj_3R_215()) { jj_scanpos = xsp; - if (jj_3R_204()) { + if (jj_3R_216()) { jj_scanpos = xsp; - if (jj_3R_205()) { + if (jj_3R_217()) { jj_scanpos = xsp; - if (jj_3R_206()) { + if (jj_3R_218()) { jj_scanpos = xsp; - if (jj_3R_207()) { + if (jj_3R_219()) { jj_scanpos = xsp; - if (jj_3R_208()) { + if (jj_3R_220()) { jj_scanpos = xsp; - if (jj_3R_209()) { + if (jj_3R_221()) { jj_scanpos = xsp; - if (jj_3R_210()) { + if (jj_3R_222()) { jj_scanpos = xsp; - if (jj_3R_211()) { + if (jj_3R_223()) { jj_scanpos = xsp; - if (jj_3R_212()) { + if (jj_3R_224()) { jj_scanpos = xsp; - if (jj_3R_213()) { + if (jj_3R_225()) { jj_scanpos = xsp; - if (jj_3R_214()) { + if (jj_3R_226()) { jj_scanpos = xsp; - if (jj_3R_215()) { + if (jj_3R_227()) { jj_scanpos = xsp; - if (jj_3R_216()) { + if (jj_3R_228()) { jj_scanpos = xsp; - if (jj_3R_217()) { + if (jj_3R_229()) { jj_scanpos = xsp; - if (jj_3R_218()) { + if (jj_3R_230()) { jj_scanpos = xsp; - if (jj_3R_219()) return true; + if (jj_3R_231()) return true; } } } @@ -6386,12 +6427,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_161() { + private boolean jj_3R_171() { Token xsp; xsp = jj_scanpos; - if (jj_3R_182()) { + if (jj_3R_193()) { jj_scanpos = xsp; - if (jj_3R_183()) return true; + if (jj_3R_194()) return true; } while (true) { xsp = jj_scanpos; @@ -6400,7 +6441,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_258() { + private boolean jj_3R_272() { if (jj_scan_token(MICROSOFT_RULE)) return true; Token xsp; while (true) { @@ -6408,37 +6449,37 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } if (jj_scan_token(COLON)) return true; - if (jj_3R_276()) return true; + if (jj_3R_293()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_276()) { jj_scanpos = xsp; break; } + if (jj_3R_293()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_247() { + private boolean jj_3R_261() { if (jj_scan_token(SIBLING)) return true; return false; } - private boolean jj_3R_246() { + private boolean jj_3R_260() { if (jj_scan_token(PRECEDES)) return true; return false; } - private boolean jj_3R_245() { + private boolean jj_3R_259() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_194() { + private boolean jj_3R_206() { Token xsp; xsp = jj_scanpos; - if (jj_3R_245()) { + if (jj_3R_259()) { jj_scanpos = xsp; - if (jj_3R_246()) { + if (jj_3R_260()) { jj_scanpos = xsp; - if (jj_3R_247()) return true; + if (jj_3R_261()) return true; } } while (true) { @@ -6448,17 +6489,17 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_254() { + private boolean jj_3R_268() { if (jj_scan_token(HASH)) return true; return false; } - private boolean jj_3R_231() { - if (jj_3R_239()) return true; + private boolean jj_3R_243() { + if (jj_3R_251()) return true; return false; } - private boolean jj_3R_174() { + private boolean jj_3R_185() { if (jj_scan_token(SIBLING)) return true; Token xsp; while (true) { @@ -6468,7 +6509,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_173() { + private boolean jj_3R_184() { if (jj_scan_token(PRECEDES)) return true; Token xsp; while (true) { @@ -6478,31 +6519,31 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_175() { + private boolean jj_3R_186() { if (jj_scan_token(S)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_194()) jj_scanpos = xsp; + if (jj_3R_206()) jj_scanpos = xsp; return false; } - private boolean jj_3R_157() { + private boolean jj_3R_167() { Token xsp; xsp = jj_scanpos; - if (jj_3R_172()) { + if (jj_3R_183()) { jj_scanpos = xsp; - if (jj_3R_173()) { + if (jj_3R_184()) { jj_scanpos = xsp; - if (jj_3R_174()) { + if (jj_3R_185()) { jj_scanpos = xsp; - if (jj_3R_175()) return true; + if (jj_3R_186()) return true; } } } return false; } - private boolean jj_3R_172() { + private boolean jj_3R_183() { if (jj_scan_token(PLUS)) return true; Token xsp; while (true) { @@ -6512,104 +6553,104 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_192() { - if (jj_3R_239()) return true; + private boolean jj_3R_203() { + if (jj_3R_251()) return true; if (jj_scan_token(COLON)) return true; Token xsp; while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } - if (jj_3R_240()) return true; + if (jj_3R_252()) return true; xsp = jj_scanpos; - if (jj_3R_241()) jj_scanpos = xsp; - if (jj_3R_242()) return true; + if (jj_3R_253()) jj_scanpos = xsp; + if (jj_3R_254()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_242()) { jj_scanpos = xsp; break; } + if (jj_3R_254()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_187() { - if (jj_3R_161()) return true; + private boolean jj_3R_198() { + if (jj_3R_171()) return true; return false; } - private boolean jj_3R_166() { + private boolean jj_3R_176() { Token xsp; xsp = jj_scanpos; - if (jj_3R_187()) { + if (jj_3R_198()) { jj_scanpos = xsp; - if (jj_3R_188()) return true; + if (jj_3R_199()) return true; } return false; } - private boolean jj_3R_255() { + private boolean jj_3R_269() { if (jj_scan_token(URL)) return true; return false; } - private boolean jj_3R_165() { - if (jj_3R_186()) return true; + private boolean jj_3R_175() { + if (jj_3R_197()) return true; return false; } - private boolean jj_3R_272() { + private boolean jj_3R_289() { if (jj_scan_token(PLUS)) return true; return false; } - private boolean jj_3R_251() { + private boolean jj_3R_265() { Token xsp; xsp = jj_scanpos; - if (jj_3R_271()) { + if (jj_3R_288()) { jj_scanpos = xsp; - if (jj_3R_272()) return true; + if (jj_3R_289()) return true; } return false; } - private boolean jj_3R_271() { + private boolean jj_3R_288() { if (jj_scan_token(MINUS)) return true; return false; } - private boolean jj_3_12() { + private boolean jj_3_13() { Token xsp; xsp = jj_scanpos; - if (jj_3R_165()) jj_scanpos = xsp; - if (jj_3R_166()) return true; + if (jj_3R_175()) jj_scanpos = xsp; + if (jj_3R_176()) return true; return false; } - private boolean jj_3R_240() { - if (jj_3R_166()) return true; + private boolean jj_3R_252() { + if (jj_3R_176()) 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; } - private boolean jj_3R_196() { + private boolean jj_3R_208() { if (jj_scan_token(HASH)) return true; return false; } - private boolean jj_3R_256() { + private boolean jj_3R_270() { if (jj_scan_token(UNICODERANGE)) return true; return false; } - private boolean jj_3R_326() { + private boolean jj_3R_343() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_327() { + private boolean jj_3R_344() { if (jj_scan_token(FUNCTION)) return true; Token xsp; while (true) { @@ -6620,7 +6661,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_230() { + private boolean jj_3R_242() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { @@ -6630,46 +6671,46 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_280() { + private boolean jj_3R_297() { Token xsp; xsp = jj_scanpos; - if (jj_scan_token(99)) { + if (jj_scan_token(101)) { jj_scanpos = xsp; if (jj_scan_token(10)) { jj_scanpos = xsp; - if (jj_scan_token(96)) { + if (jj_scan_token(97)) { jj_scanpos = xsp; if (jj_scan_token(22)) { jj_scanpos = xsp; if (jj_scan_token(14)) { jj_scanpos = xsp; - if (jj_scan_token(98)) { + if (jj_scan_token(99)) { jj_scanpos = xsp; - if (jj_scan_token(114)) { + if (jj_scan_token(116)) { jj_scanpos = xsp; - if (jj_scan_token(100)) { + if (jj_scan_token(102)) { jj_scanpos = xsp; - if (jj_scan_token(94)) { + if (jj_scan_token(95)) { jj_scanpos = xsp; if (jj_scan_token(18)) { jj_scanpos = xsp; if (jj_scan_token(12)) { jj_scanpos = xsp; - if (jj_scan_token(95)) { + if (jj_scan_token(96)) { jj_scanpos = xsp; if (jj_scan_token(41)) { jj_scanpos = xsp; - if (jj_scan_token(72)) { + if (jj_scan_token(73)) { jj_scanpos = xsp; - if (jj_scan_token(97)) { + if (jj_scan_token(98)) { jj_scanpos = xsp; - if (jj_scan_token(76)) { + if (jj_scan_token(77)) { jj_scanpos = xsp; - if (jj_scan_token(70)) { + if (jj_scan_token(71)) { jj_scanpos = xsp; - if (jj_scan_token(110)) { + if (jj_scan_token(112)) { jj_scanpos = xsp; - if (jj_scan_token(74)) { + if (jj_scan_token(75)) { jj_scanpos = xsp; if (jj_scan_token(23)) { jj_scanpos = xsp; @@ -6681,7 +6722,7 @@ LexicalUnitImpl result = null; jj_scanpos = xsp; if (jj_scan_token(21)) { jj_scanpos = xsp; - if (jj_scan_token(115)) return true; + if (jj_scan_token(117)) return true; } } } @@ -6709,17 +6750,17 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_186() { + private boolean jj_3R_197() { Token xsp; xsp = jj_scanpos; - if (jj_3R_229()) { + if (jj_3R_241()) { jj_scanpos = xsp; - if (jj_3R_230()) return true; + if (jj_3R_242()) return true; } return false; } - private boolean jj_3R_229() { + private boolean jj_3R_241() { if (jj_scan_token(DIV)) return true; Token xsp; while (true) { @@ -6729,7 +6770,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_267() { + private boolean jj_3R_281() { if (jj_scan_token(GUARDED_SYM)) return true; Token xsp; while (true) { @@ -6739,7 +6780,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_181() { + private boolean jj_3R_192() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -6754,10 +6795,10 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_159() { + private boolean jj_3R_169() { Token xsp; xsp = jj_scanpos; - if (jj_3R_181()) jj_scanpos = xsp; + if (jj_3R_192()) jj_scanpos = xsp; if (jj_scan_token(CONTAINS)) return true; while (true) { xsp = jj_scanpos; @@ -6767,7 +6808,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_338() { + private boolean jj_3R_355() { if (jj_scan_token(IMPORTANT_SYM)) return true; Token xsp; while (true) { @@ -6777,30 +6818,30 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_10() { - if (jj_3R_159()) return true; + private boolean jj_3_11() { + if (jj_3R_169()) return true; return false; } - private boolean jj_3R_325() { + private boolean jj_3R_342() { if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_198() { + private boolean jj_3R_210() { if (jj_scan_token(COLON)) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_325()) jj_scanpos = xsp; + if (jj_3R_342()) jj_scanpos = xsp; xsp = jj_scanpos; - if (jj_3R_326()) { + if (jj_3R_343()) { jj_scanpos = xsp; - if (jj_3R_327()) return true; + if (jj_3R_344()) return true; } return false; } - private boolean jj_3R_162() { + private boolean jj_3R_172() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -6821,12 +6862,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3_9() { - if (jj_3R_163()) return true; + private boolean jj_3_10() { + if (jj_3R_173()) return true; return false; } - private boolean jj_3R_235() { + private boolean jj_3R_247() { if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { @@ -6836,7 +6877,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_307() { + private boolean jj_3R_324() { if (jj_scan_token(COLON)) return true; Token xsp; while (true) { @@ -6846,15 +6887,15 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_278() { + private boolean jj_3R_295() { Token xsp; xsp = jj_scanpos; - if (jj_3R_307()) jj_scanpos = xsp; - if (jj_3R_166()) return true; + if (jj_3R_324()) jj_scanpos = xsp; + if (jj_3R_176()) return true; return false; } - private boolean jj_3R_163() { + private boolean jj_3R_173() { if (jj_scan_token(VARIABLE)) return true; Token xsp; while (true) { @@ -6875,104 +6916,104 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_339() { - if (jj_3R_259()) return true; + private boolean jj_3R_356() { + if (jj_3R_273()) return true; if (jj_scan_token(COLON)) return true; return false; } - private boolean jj_3R_266() { - if (jj_3R_280()) return true; + private boolean jj_3R_280() { + if (jj_3R_297()) return true; return false; } - private boolean jj_3R_350() { + private boolean jj_3R_367() { if (jj_scan_token(STRING)) return true; return false; } - private boolean jj_3R_348() { + private boolean jj_3R_365() { if (jj_scan_token(STARMATCH)) return true; return false; } - private boolean jj_3R_349() { + private boolean jj_3R_366() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_347() { + private boolean jj_3R_364() { if (jj_scan_token(DOLLARMATCH)) return true; return false; } - private boolean jj_3R_346() { + private boolean jj_3R_363() { if (jj_scan_token(CARETMATCH)) return true; return false; } - private boolean jj_3R_345() { + private boolean jj_3R_362() { if (jj_scan_token(DASHMATCH)) return true; return false; } - private boolean jj_3R_344() { + private boolean jj_3R_361() { if (jj_scan_token(INCLUDES)) return true; return false; } - private boolean jj_3R_340() { - if (jj_3R_339()) return true; + private boolean jj_3R_357() { + if (jj_3R_356()) return true; return false; } - private boolean jj_3R_286() { + private boolean jj_3R_303() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_233() { - if (jj_3R_239()) return true; + private boolean jj_3R_245() { + if (jj_3R_251()) return true; return false; } - private boolean jj_3R_343() { + private boolean jj_3R_360() { if (jj_scan_token(EQ)) return true; return false; } - private boolean jj_3_8() { - if (jj_3R_162()) return true; + private boolean jj_3_9() { + if (jj_3R_172()) return true; return false; } - private boolean jj_3R_155() { + private boolean jj_3R_165() { Token xsp; xsp = jj_scanpos; - if (jj_3_8()) { - jj_scanpos = xsp; if (jj_3_9()) { jj_scanpos = xsp; - if (jj_3_10()) return true; + if (jj_3_10()) { + jj_scanpos = xsp; + if (jj_3_11()) return true; } } return false; } - private boolean jj_3R_332() { + private boolean jj_3R_349() { Token xsp; xsp = jj_scanpos; - if (jj_3R_343()) { + if (jj_3R_360()) { jj_scanpos = xsp; - if (jj_3R_344()) { + if (jj_3R_361()) { jj_scanpos = xsp; - if (jj_3R_345()) { + if (jj_3R_362()) { jj_scanpos = xsp; - if (jj_3R_346()) { + if (jj_3R_363()) { jj_scanpos = xsp; - if (jj_3R_347()) { + if (jj_3R_364()) { jj_scanpos = xsp; - if (jj_3R_348()) return true; + if (jj_3R_365()) return true; } } } @@ -6983,9 +7024,9 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_349()) { + if (jj_3R_366()) { jj_scanpos = xsp; - if (jj_3R_350()) return true; + if (jj_3R_367()) return true; } while (true) { xsp = jj_scanpos; @@ -6994,12 +7035,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_265() { - if (jj_3R_164()) return true; + private boolean jj_3R_279() { + if (jj_3R_174()) return true; return false; } - private boolean jj_3R_199() { + private boolean jj_3R_211() { if (jj_scan_token(LBRACKET)) return true; Token xsp; while (true) { @@ -7012,19 +7053,19 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_332()) jj_scanpos = xsp; + if (jj_3R_349()) jj_scanpos = xsp; if (jj_scan_token(RBRACKET)) return true; return false; } - private boolean jj_3R_234() { - if (jj_3R_260()) return true; - if (jj_3R_261()) return true; + private boolean jj_3R_246() { + if (jj_3R_274()) return true; + if (jj_3R_275()) return true; if (jj_scan_token(RPARAN)) return true; return false; } - private boolean jj_3R_312() { + private boolean jj_3R_329() { if (jj_scan_token(SEMICOLON)) return true; Token xsp; while (true) { @@ -7032,37 +7073,37 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_340()) jj_scanpos = xsp; + if (jj_3R_357()) jj_scanpos = xsp; return false; } - private boolean jj_3R_342() { + private boolean jj_3R_359() { if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_263() { + private boolean jj_3R_277() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } - if (jj_3R_262()) return true; + if (jj_3R_276()) return true; return false; } - private boolean jj_3R_232() { - if (jj_3R_259()) return true; + private boolean jj_3R_244() { + if (jj_3R_273()) return true; return false; } - private boolean jj_3R_250() { + private boolean jj_3R_264() { if (jj_scan_token(PARENT)) return true; return false; } - private boolean jj_3R_262() { + private boolean jj_3R_276() { if (jj_scan_token(IDENT)) return true; Token xsp; while (true) { @@ -7072,12 +7113,12 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_249() { + private boolean jj_3R_263() { if (jj_scan_token(ANY)) return true; return false; } - private boolean jj_3R_189() { + private boolean jj_3R_200() { if (jj_scan_token(INCLUDE_SYM)) return true; Token xsp; while (true) { @@ -7085,118 +7126,118 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_232()) { + if (jj_3R_244()) { jj_scanpos = xsp; - if (jj_3R_233()) { + if (jj_3R_245()) { jj_scanpos = xsp; - if (jj_3R_234()) return true; + if (jj_3R_246()) return true; } } - if (jj_3R_235()) return true; + if (jj_3R_247()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_235()) { jj_scanpos = xsp; break; } + if (jj_3R_247()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_285() { + private boolean jj_3R_302() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_237() { + private boolean jj_3R_249() { Token xsp; xsp = jj_scanpos; - if (jj_3R_264()) { + if (jj_3R_278()) { jj_scanpos = xsp; - if (jj_3R_265()) { + if (jj_3R_279()) { jj_scanpos = xsp; - if (jj_3R_266()) return true; + if (jj_3R_280()) return true; } } return false; } - private boolean jj_3R_264() { - if (jj_3R_268()) return true; + private boolean jj_3R_278() { + if (jj_3R_282()) return true; return false; } - private boolean jj_3R_270() { + private boolean jj_3R_287() { Token xsp; xsp = jj_scanpos; - if (jj_3R_285()) { + if (jj_3R_302()) { jj_scanpos = xsp; - if (jj_3R_286()) return true; + if (jj_3R_303()) return true; } return false; } - private boolean jj_3R_195() { + private boolean jj_3R_207() { Token xsp; xsp = jj_scanpos; - if (jj_3R_248()) { + if (jj_3R_262()) { jj_scanpos = xsp; - if (jj_3R_249()) { + if (jj_3R_263()) { jj_scanpos = xsp; - if (jj_3R_250()) return true; + if (jj_3R_264()) return true; } } return false; } - private boolean jj_3R_248() { + private boolean jj_3R_262() { Token xsp; - if (jj_3R_270()) return true; + if (jj_3R_287()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_270()) { jj_scanpos = xsp; break; } + if (jj_3R_287()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_236() { - if (jj_3R_262()) return true; + private boolean jj_3R_296() { + if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_263()) { jj_scanpos = xsp; break; } + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } + if (jj_3R_176()) return true; return false; } - private boolean jj_3R_279() { - if (jj_scan_token(COMMA)) return true; + private boolean jj_3R_248() { + if (jj_3R_276()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + if (jj_3R_277()) { jj_scanpos = xsp; break; } } - if (jj_3R_166()) return true; return false; } - private boolean jj_3R_311() { - if (jj_3R_339()) return true; + private boolean jj_3R_328() { + if (jj_3R_356()) return true; return false; } - private boolean jj_3R_261() { - if (jj_3R_166()) return true; + private boolean jj_3R_275() { + if (jj_3R_176()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_278()) { jj_scanpos = xsp; break; } + if (jj_3R_295()) { jj_scanpos = xsp; break; } } while (true) { xsp = jj_scanpos; - if (jj_3R_279()) { jj_scanpos = xsp; break; } + if (jj_3R_296()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_160() { + private boolean jj_3R_170() { if (jj_scan_token(COMMA)) return true; Token xsp; while (true) { @@ -7206,7 +7247,7 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_284() { + private boolean jj_3R_301() { if (jj_scan_token(LBRACE)) return true; Token xsp; while (true) { @@ -7214,10 +7255,10 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_311()) jj_scanpos = xsp; + if (jj_3R_328()) jj_scanpos = xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_312()) { jj_scanpos = xsp; break; } + if (jj_3R_329()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; while (true) { @@ -7227,101 +7268,101 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_310() { - if (jj_3R_338()) return true; + private boolean jj_3R_327() { + if (jj_3R_355()) return true; return false; } - private boolean jj_3R_336() { - if (jj_3R_198()) return true; + private boolean jj_3R_353() { + if (jj_3R_210()) return true; return false; } - private boolean jj_3R_341() { + private boolean jj_3R_358() { if (jj_scan_token(IDENT)) return true; return false; } - private boolean jj_3R_320() { + private boolean jj_3R_337() { Token xsp; xsp = jj_scanpos; - if (jj_3R_341()) { + if (jj_3R_358()) { jj_scanpos = xsp; - if (jj_3R_342()) return true; + if (jj_3R_359()) return true; } return false; } - private boolean jj_3R_244() { - if (jj_3R_269()) return true; + private boolean jj_3R_256() { + if (jj_3R_283()) return true; return false; } - private boolean jj_3R_334() { - if (jj_3R_197()) return true; + private boolean jj_3R_351() { + if (jj_3R_209()) return true; return false; } - private boolean jj_3R_331() { - if (jj_3R_198()) return true; + private boolean jj_3R_348() { + if (jj_3R_210()) return true; return false; } - private boolean jj_3R_329() { - if (jj_3R_197()) return true; + private boolean jj_3R_346() { + if (jj_3R_209()) return true; return false; } - private boolean jj_3R_319() { - if (jj_3R_198()) return true; + private boolean jj_3R_336() { + if (jj_3R_210()) return true; return false; } - private boolean jj_3R_197() { + private boolean jj_3R_209() { if (jj_scan_token(DOT)) return true; Token xsp; - if (jj_3R_320()) return true; + if (jj_3R_337()) return true; while (true) { xsp = jj_scanpos; - if (jj_3R_320()) { jj_scanpos = xsp; break; } + if (jj_3R_337()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_7() { + private boolean jj_3_8() { Token xsp; xsp = jj_scanpos; - if (jj_3R_160()) jj_scanpos = xsp; - if (jj_3R_161()) return true; + if (jj_3R_170()) jj_scanpos = xsp; + if (jj_3R_171()) return true; return false; } - private boolean jj_3R_324() { - if (jj_3R_198()) return true; + private boolean jj_3R_341() { + if (jj_3R_210()) return true; return false; } - private boolean jj_3R_322() { - if (jj_3R_197()) return true; + private boolean jj_3R_339() { + if (jj_3R_209()) return true; return false; } - private boolean jj_3R_283() { - if (jj_3R_240()) return true; + private boolean jj_3R_300() { + if (jj_3R_252()) return true; Token xsp; xsp = jj_scanpos; - if (jj_3R_310()) jj_scanpos = xsp; + if (jj_3R_327()) jj_scanpos = xsp; return false; } - private boolean jj_3R_190() { + private boolean jj_3R_201() { if (jj_scan_token(MEDIA_SYM)) return true; Token xsp; while (true) { xsp = jj_scanpos; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } - if (jj_3R_236()) return true; + if (jj_3R_248()) return true; if (jj_scan_token(LBRACE)) return true; while (true) { xsp = jj_scanpos; @@ -7329,7 +7370,7 @@ LexicalUnitImpl result = null; } while (true) { xsp = jj_scanpos; - if (jj_3R_237()) { jj_scanpos = xsp; break; } + if (jj_3R_249()) { jj_scanpos = xsp; break; } } if (jj_scan_token(RBRACE)) return true; while (true) { @@ -7339,13 +7380,13 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_335() { - if (jj_3R_199()) return true; + private boolean jj_3R_352() { + if (jj_3R_211()) return true; return false; } - private boolean jj_3R_269() { - if (jj_3R_259()) return true; + private boolean jj_3R_283() { + if (jj_3R_273()) return true; if (jj_scan_token(COLON)) return true; Token xsp; while (true) { @@ -7353,217 +7394,509 @@ LexicalUnitImpl result = null; if (jj_scan_token(1)) { jj_scanpos = xsp; break; } } xsp = jj_scanpos; - if (jj_3R_283()) { + if (jj_3R_300()) { jj_scanpos = xsp; - if (jj_3R_284()) return true; + if (jj_3R_301()) return true; } return false; } - private boolean jj_3R_333() { - if (jj_3R_196()) return true; + private boolean jj_3R_350() { + if (jj_3R_208()) return true; return false; } - private boolean jj_3R_291() { + private boolean jj_3R_308() { Token xsp; xsp = jj_scanpos; - if (jj_3R_333()) { + if (jj_3R_350()) { jj_scanpos = xsp; - if (jj_3R_334()) { + if (jj_3R_351()) { jj_scanpos = xsp; - if (jj_3R_335()) { + if (jj_3R_352()) { jj_scanpos = xsp; - if (jj_3R_336()) return true; + if (jj_3R_353()) return true; } } } return false; } - private boolean jj_3R_328() { - if (jj_3R_196()) return true; + private boolean jj_3R_345() { + if (jj_3R_208()) return true; return false; } - private boolean jj_3R_290() { + private boolean jj_3R_307() { Token xsp; xsp = jj_scanpos; - if (jj_3R_328()) { + if (jj_3R_345()) { jj_scanpos = xsp; - if (jj_3R_329()) { + if (jj_3R_346()) { jj_scanpos = xsp; - if (jj_3R_330()) { + if (jj_3R_347()) { jj_scanpos = xsp; - if (jj_3R_331()) return true; + if (jj_3R_348()) return true; } } } return false; } - private boolean jj_3R_316() { - if (jj_3R_198()) return true; + private boolean jj_3R_333() { + if (jj_3R_210()) return true; return false; } - private boolean jj_3R_243() { - if (jj_3R_268()) return true; + private boolean jj_3R_255() { + if (jj_3R_282()) return true; return false; } - private boolean jj_3R_330() { - if (jj_3R_199()) return true; + private boolean jj_3R_347() { + if (jj_3R_211()) return true; return false; } - private boolean jj_3R_321() { - if (jj_3R_196()) return true; + private boolean jj_3R_338() { + if (jj_3R_208()) return true; return false; } - private boolean jj_3R_289() { + private boolean jj_3R_306() { Token xsp; xsp = jj_scanpos; - if (jj_3R_321()) { + if (jj_3R_338()) { jj_scanpos = xsp; - if (jj_3R_322()) { + if (jj_3R_339()) { jj_scanpos = xsp; - if (jj_3R_323()) { + if (jj_3R_340()) { jj_scanpos = xsp; - if (jj_3R_324()) return true; + if (jj_3R_341()) return true; } } } return false; } - private boolean jj_3R_318() { - if (jj_3R_199()) return true; + private boolean jj_3R_335() { + if (jj_3R_211()) return true; return false; } - private boolean jj_3R_323() { - if (jj_3R_199()) return true; + private boolean jj_3R_340() { + if (jj_3R_211()) return true; return false; } - private boolean jj_3R_317() { - if (jj_3R_197()) return true; + private boolean jj_3R_285() { + if (jj_scan_token(INTERPOLATION)) return true; return false; } - private boolean jj_3R_314() { - if (jj_3R_197()) return true; + private boolean jj_3R_334() { + if (jj_3R_209()) return true; return false; } - private boolean jj_3R_288() { + private boolean jj_3R_331() { + if (jj_3R_209()) return true; + return false; + } + + private boolean jj_3R_305() { Token xsp; xsp = jj_scanpos; - if (jj_3R_317()) { + if (jj_3R_334()) { jj_scanpos = xsp; - if (jj_3R_318()) { + if (jj_3R_335()) { jj_scanpos = xsp; - if (jj_3R_319()) return true; + if (jj_3R_336()) return true; } } return false; } - private boolean jj_3R_180() { - if (jj_3R_199()) return true; + private boolean jj_3_2() { + if (jj_3R_166()) return true; + return false; + } + + private boolean jj_3R_191() { + if (jj_3R_211()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_291()) { jj_scanpos = xsp; break; } + if (jj_3R_308()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_179() { - if (jj_3R_198()) return true; + private boolean jj_3R_182() { + if (jj_3R_205()) return true; + return false; + } + + private boolean jj_3R_190() { + if (jj_3R_210()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_290()) { jj_scanpos = xsp; break; } + if (jj_3R_307()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_315() { - if (jj_3R_199()) return true; + private boolean jj_3R_332() { + if (jj_3R_211()) return true; return false; } - private boolean jj_3R_178() { - if (jj_3R_197()) return true; + private boolean jj_3R_189() { + if (jj_3R_209()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_289()) { jj_scanpos = xsp; break; } + if (jj_3R_306()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_313() { - if (jj_3R_196()) return true; + private boolean jj_3R_258() { + if (jj_3R_286()) return true; return false; } - private boolean jj_3R_287() { + private boolean jj_3R_330() { + if (jj_3R_208()) return true; + return false; + } + + private boolean jj_3R_304() { Token xsp; xsp = jj_scanpos; - if (jj_3R_313()) { + if (jj_3R_330()) { jj_scanpos = xsp; - if (jj_3R_314()) { + if (jj_3R_331()) { jj_scanpos = xsp; - if (jj_3R_315()) { + if (jj_3R_332()) { jj_scanpos = xsp; - if (jj_3R_316()) return true; + if (jj_3R_333()) return true; } } } return false; } - private boolean jj_3R_177() { - if (jj_3R_196()) return true; + private boolean jj_3R_188() { + if (jj_3R_208()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_288()) { jj_scanpos = xsp; break; } + if (jj_3R_305()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3_11() { - if (jj_3R_164()) return true; + private boolean jj_3R_286() { + Token xsp; + xsp = jj_scanpos; + if (jj_scan_token(53)) { + jj_scanpos = xsp; + if (jj_scan_token(50)) { + jj_scanpos = xsp; + if (jj_scan_token(77)) return true; + } + } + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(LBRACE)) return true; return false; } - private boolean jj_3R_176() { + private boolean jj_3_12() { + if (jj_3R_174()) return true; + return false; + } + + private boolean jj_3R_187() { + if (jj_3R_207()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_304()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_168() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_187()) { + jj_scanpos = xsp; + if (jj_3R_188()) { + jj_scanpos = xsp; + if (jj_3R_189()) { + jj_scanpos = xsp; + if (jj_3R_190()) { + jj_scanpos = xsp; + if (jj_3R_191()) return true; + } + } + } + } + return false; + } + + private boolean jj_3R_204() { + Token xsp; + xsp = jj_scanpos; + if (jj_3_12()) { + jj_scanpos = xsp; + if (jj_3R_255()) { + jj_scanpos = xsp; + if (jj_3R_256()) return true; + } + } + return false; + } + + private boolean jj_3_7() { + if (jj_3R_166()) return true; + return false; + } + + private boolean jj_3R_290() { + if (jj_3R_252()) return true; + return false; + } + + private boolean jj_3R_257() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_284()) { + jj_scanpos = xsp; + if (jj_3R_285()) return true; + } + return false; + } + + private boolean jj_3R_284() { + if (jj_scan_token(IDENT)) return true; + return false; + } + + private boolean jj_3R_205() { + if (jj_scan_token(KEY_FRAME_SYM)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + if (jj_3R_257()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_257()) { jj_scanpos = xsp; break; } + } + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(LBRACE)) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + while (true) { + xsp = jj_scanpos; + if (jj_3R_258()) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(RBRACE)) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_266() { + if (jj_scan_token(FUNCTION)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + xsp = jj_scanpos; + if (jj_3R_290()) jj_scanpos = xsp; + if (jj_scan_token(RPARAN)) return true; + return false; + } + + private boolean jj_3R_240() { + if (jj_3R_272()) return true; + return false; + } + + private boolean jj_3R_236() { + if (jj_3R_270()) return true; + return false; + } + + private boolean jj_3R_181() { + if (jj_3R_204()) return true; + return false; + } + + private boolean jj_3R_235() { + if (jj_3R_269()) return true; + return false; + } + + private boolean jj_3R_234() { + if (jj_3R_268()) return true; + return false; + } + + private boolean jj_3_4() { + if (jj_3R_167()) return true; + if (jj_3R_168()) return true; + return false; + } + + private boolean jj_3R_238() { + if (jj_scan_token(COMMA)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + if (jj_3R_237()) return true; + return false; + } + + private boolean jj_3R_237() { + if (jj_3R_168()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_4()) { jj_scanpos = xsp; break; } + } + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_180() { + if (jj_3R_203()) return true; + return false; + } + + private boolean jj_3R_239() { + if (jj_3R_271()) return true; + return false; + } + + private boolean jj_3R_250() { + if (jj_scan_token(SEMICOLON)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_202() { + if (jj_scan_token(EXTEND_SYM)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } if (jj_3R_195()) return true; + if (jj_3R_250()) return true; + while (true) { + xsp = jj_scanpos; + if (jj_3R_250()) { jj_scanpos = xsp; break; } + } + return false; + } + + private boolean jj_3R_310() { + if (jj_scan_token(EACH_SYM)) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_287()) { jj_scanpos = xsp; break; } + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(VARIABLE)) return true; + while (true) { + xsp = jj_scanpos; + if (jj_scan_token(1)) { jj_scanpos = xsp; break; } + } + if (jj_scan_token(EACH_IN)) return true; + return false; + } + + private boolean jj_3R_195() { + if (jj_3R_237()) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3R_238()) { jj_scanpos = xsp; break; } } return false; } - private boolean jj_3R_158() { + private boolean jj_3R_179() { + if (jj_3R_202()) return true; + return false; + } + + private boolean jj_3R_267() { + if (jj_scan_token(DOT)) return true; + return false; + } + + private boolean jj_3R_233() { Token xsp; xsp = jj_scanpos; - if (jj_3R_176()) { + if (jj_3R_267()) jj_scanpos = xsp; + if (jj_scan_token(IDENT)) return true; + return false; + } + + private boolean jj_3R_178() { + if (jj_3R_201()) return true; + return false; + } + + private boolean jj_3R_232() { + if (jj_scan_token(STRING)) return true; + return false; + } + + private boolean jj_3R_231() { + if (jj_3R_266()) return true; + return false; + } + + private boolean jj_3R_194() { + Token xsp; + xsp = jj_scanpos; + if (jj_3R_232()) { jj_scanpos = xsp; - if (jj_3R_177()) { + if (jj_3R_233()) { jj_scanpos = xsp; - if (jj_3R_178()) { + if (jj_3R_234()) { jj_scanpos = xsp; - if (jj_3R_179()) { + if (jj_3R_235()) { jj_scanpos = xsp; - if (jj_3R_180()) return true; + if (jj_3R_236()) return true; } } } @@ -7571,26 +7904,31 @@ LexicalUnitImpl result = null; return false; } - private boolean jj_3R_193() { + private boolean jj_3R_196() { Token xsp; xsp = jj_scanpos; - if (jj_3_11()) { + if (jj_3_3()) { jj_scanpos = xsp; - if (jj_3R_243()) { + if (jj_3R_239()) { jj_scanpos = xsp; - if (jj_3R_244()) return true; + if (jj_3R_240()) return true; } } return false; } + private boolean jj_3_3() { + if (jj_3R_166()) return true; + return false; + } + private boolean jj_3_6() { - if (jj_3R_156()) return true; + if (jj_3R_169()) return true; return false; } - private boolean jj_3R_273() { - if (jj_3R_240()) return true; + private boolean jj_3_1() { + if (jj_3R_165()) return true; return false; } @@ -7604,7 +7942,7 @@ LexicalUnitImpl result = null; private Token jj_scanpos, jj_lastpos; private int jj_la; private int jj_gen; - final private int[] jj_la1 = new int[228]; + final private int[] jj_la1 = new int[241]; static private int[] jj_la1_0; static private int[] jj_la1_1; static private int[] jj_la1_2; @@ -7616,18 +7954,18 @@ LexicalUnitImpl result = null; jj_la1_init_3(); } private static void jj_la1_init_0() { - jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0xd0000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0xd3f45400,0xd3f45400,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x3f45400,0x2,0x2,0x2,0x3100000,0x2,0x3100000,0x3100002,0x2,0x480002,0x480002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd0000000,0x0,0x2,0x400000,0x2,0x2,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0xd0000000,0x0,0x0,0x0,0x0,0xc0000000,0x2,0x2,0xfc000,0x2,0x0,0x2,0xfc000,0x0,0x2,0x0,0x2,0x0,0x2,0x800000,0x0,0xd0000000,0x4d380002,0x2,0xd0000000,0x2,0x0,0x2,0x4d380002,0x0,0x2,0xd0000000,0x2,0x4d380002,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0x2,0x400000,0x2,0x2,0x2,0x400000,0x0,0x0,0x300000,0x2,0x0,0x400000,0x2,0x300000,0x2,0x0,0x2,0x0,0x2,0x800000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x400000,0x0,0x2,0x2,0x0,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x301000,0x2,0x0,0x2,0x2,0x2,0x2,0x8400000,0x8400000,0x300000,0x300000,0x300000,0x0,0x0,0x0,0x300000,0x2,0x2,0x300000,0x2,0xd0000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,}; + jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0xd0000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x2,0x2,0xd0000000,0x0,0x2,0x2,0x2,0xd3f45400,0xd3f45400,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x3f45400,0x2,0x2,0x2,0x3100000,0x2,0x3100000,0x3100002,0x2,0x480002,0x480002,0x2,0x0,0x0,0x2,0x2,0x2,0x2,0xd0000000,0x0,0x2,0x400000,0x2,0x2,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0xd0000000,0x0,0x0,0x0,0x0,0xc0000000,0x2,0x2,0xfc000,0x2,0x0,0x2,0xfc000,0x0,0x2,0x0,0x2,0x0,0x2,0x800000,0x0,0xd0000000,0x4d380002,0x2,0xd0000000,0x2,0x0,0x2,0x4d380002,0x0,0x2,0xd0000000,0x2,0x4d380002,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0x2,0x400000,0x2,0x2,0x2,0x400000,0x0,0x0,0x300000,0x2,0x0,0x400000,0x2,0x300000,0x2,0x0,0x2,0x0,0x2,0x800000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0x400000,0x0,0x2,0x2,0x0,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x301000,0x2,0x0,0x2,0x2,0x2,0x2,0x8400000,0x8400000,0x300000,0x300000,0x300000,0x0,0x0,0x0,0x300000,0x2,0x2,0x300000,0x2,0xd0000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,}; } private static void jj_la1_init_1() { - jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x56600181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000381,0x6000381,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x185,0x185,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x56400181,0x50000000,0x0,0x0,0x0,0x0,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x181,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x50000000,0x6400181,0x7e,0x0,0x6400181,0x0,0x80000000,0x0,0x7e,0x0,0x0,0x6400181,0x0,0x7e,0x0,0x0,0x0,0x0,0x0,0x6400181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x56400181,0x50000000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x81,0x0,0x80,0x0,0x0,0x81,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x6000100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x1,0x1,0x0,0x0,0x1,0x0,0x6000181,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,}; + jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xacc00181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x100,0x0,0x0,0x240000,0x0,0x240000,0x0,0x0,0xac800181,0xa0000000,0x0,0x0,0x0,0xc000381,0xc000381,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x185,0x185,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0xac800181,0xa0000000,0x0,0x0,0x0,0x0,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x181,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000000,0xc800181,0x7e,0x0,0xc800181,0x0,0x0,0x0,0x7e,0x0,0x0,0xc800181,0x0,0x7e,0x0,0x0,0x0,0x0,0x0,0xc800181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0xac800181,0xa0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x81,0x0,0x80,0x0,0x0,0x81,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0xc000000,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0xc000100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x1,0x1,0x0,0x0,0x1,0x0,0xc000181,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,}; } private static void jj_la1_init_2() { - jj_la1_2 = new int[] {0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0xa0000880,0x0,0x0,0x0,0x0,0x440,0x0,0x80,0x0,0x0,0x0,0xe00015c0,0xe00015c0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0xc0001540,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x80,0x80,0x0,0x0,0x0,0x0,0xa0000889,0x8,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x0,0x0,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000080,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x80,0x0,0x20,0x0,0x0,0x0,0xa0000881,0x980,0x0,0xa0000881,0x0,0x0,0x0,0x980,0x10,0x0,0xa0000881,0x0,0x980,0x0,0x0,0x0,0x880,0x0,0xa0000881,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0xa0000881,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x3ffffdc0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x3ffffdc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x1ffff100,0x0,0x200004c0,0x3ffff5c0,0x0,0x0,0x3ffffdc0,0x0,0xe0000080,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,}; + jj_la1_2 = new int[] {0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x40001100,0x0,0x0,0x0,0x0,0x880,0x0,0x100,0x0,0x0,0x100,0x100,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x40001112,0x10,0x0,0x0,0x0,0xc0002b80,0xc0002b80,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x80002a80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x380,0x380,0x0,0x100,0x100,0x0,0x0,0x0,0x0,0x40001112,0x10,0x0,0x0,0x0,0x0,0x40000000,0x40000000,0x0,0x0,0x40000000,0x40000000,0x40000000,0x40000000,0x40000000,0x40000000,0x40000100,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x100,0x0,0x40,0x0,0x0,0x0,0x40001102,0x1300,0x0,0x40001102,0x0,0x1,0x0,0x1300,0x20,0x0,0x40001102,0x0,0x1300,0x0,0x0,0x0,0x1100,0x0,0x40001102,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x40001102,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x1000,0x7ffffb80,0x0,0x0,0x0,0x0,0x7ffffb80,0x0,0x0,0x0,0x1100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,0x7ffffb80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffffb80,0x0,0x3fffe200,0x0,0x40000980,0x7fffeb80,0x0,0x0,0x7ffffb80,0x0,0xc0000100,0x0,0x0,0x0,0x100,0x0,0x0,0x100,0x0,}; } private static void jj_la1_init_3() { - jj_la1_3 = new int[] {0x1,0x8,0x8,0x0,0x8,0x0,0x0,0x0,0x6,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401f,0xc401f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x20000,0x0,0x0,0x0,0x20000,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x20006,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x0,0x0,0x0,0x44000,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x40000,0x0,0x4000,0x44000,0x0,0x0,0x44000,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; + jj_la1_3 = new int[] {0x2,0x20,0x20,0x0,0x20,0x0,0x0,0x0,0x1d,0x20,0x0,0x20,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80011,0x0,0x0,0x0,0x0,0x31006f,0x31006f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x31006f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100000,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80011,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x11,0x80000,0x0,0x80011,0x0,0x0,0x0,0x80000,0x0,0x0,0x80011,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80011,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x100000,0x0,0x8001d,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x0,0x0,0x110000,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x110000,0x0,0x100000,0x0,0x10000,0x110000,0x0,0x0,0x110000,0x0,0xd,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[12]; + final private JJCalls[] jj_2_rtns = new JJCalls[13]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -7637,7 +7975,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 228; i++) jj_la1[i] = -1; + for (int i = 0; i < 241; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7647,7 +7985,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 228; i++) jj_la1[i] = -1; + for (int i = 0; i < 241; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7657,7 +7995,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 228; i++) jj_la1[i] = -1; + for (int i = 0; i < 241; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7667,7 +8005,7 @@ LexicalUnitImpl result = null; token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 228; i++) jj_la1[i] = -1; + for (int i = 0; i < 241; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -7779,12 +8117,12 @@ LexicalUnitImpl result = null; /** Generate ParseException. */ public ParseException generateParseException() { jj_expentries.clear(); - boolean[] la1tokens = new boolean[116]; + boolean[] la1tokens = new boolean[118]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 228; i++) { + for (int i = 0; i < 241; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) { @@ -7802,7 +8140,7 @@ LexicalUnitImpl result = null; } } } - for (int i = 0; i < 116; i++) { + for (int i = 0; i < 118; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; jj_expentry[0] = i; @@ -7829,7 +8167,7 @@ LexicalUnitImpl result = null; private void jj_rescan_token() { jj_rescan = true; - for (int i = 0; i < 12; i++) { + for (int i = 0; i < 13; i++) { try { JJCalls p = jj_2_rtns[i]; do { @@ -7848,6 +8186,7 @@ LexicalUnitImpl result = null; case 9: jj_3_10(); break; case 10: jj_3_11(); break; case 11: jj_3_12(); break; + case 12: jj_3_13(); break; } } p = p.next; diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj index 6569fe1bdd..4e76022ae1 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -87,6 +87,10 @@ public class Parser implements org.w3c.css.sac.Parser { public void setLocale(Locale locale) throws CSSException { throw new CSSException(CSSException.SAC_NOT_SUPPORTED_ERR); } + + public InputSource getInputSource(){ + return source; + } /** * Set the document handler for this parser @@ -296,65 +300,70 @@ public class Parser implements org.w3c.css.sac.Parser { } } } - String encoding = "ASCII"; + //use UTF-8 as the default encoding. + String encoding = source.getEncoding(); InputStream input = source.getByteStream(); - char c = ' '; - if (!input.markSupported()) { - input = new BufferedInputStream(input); - source.setByteStream(input); - } - input.mark(100); - c = (char) input.read(); - - if (c == '@') { - // hum, is it a charset ? - int size = 100; - byte[] buf = new byte[size]; - input.read(buf, 0, 7); - String keyword = new String(buf, 0, 7); - if (keyword.equals("charset")) { - // Yes, this is the charset declaration ! - - // here I don't use the right declaration : white space are ' '. - while ((c = (char) input.read()) == ' ') { - // find the first quote - } - char endChar = c; - int i = 0; + input = new BufferedInputStream(input); + source.setByteStream(input); + input.mark(100); + } + if(encoding == null){ + encoding = "ASCII"; + + char c = ' '; + + c = (char) input.read(); + + if (c == '@') { + // hum, is it a charset ? + int size = 100; + byte[] buf = new byte[size]; + input.read(buf, 0, 7); + String keyword = new String(buf, 0, 7); + if (keyword.equals("charset")) { + // Yes, this is the charset declaration ! + + // here I don't use the right declaration : white space are ' '. + while ((c = (char) input.read()) == ' ') { + // find the first quote + } + char endChar = c; + int i = 0; - if ((endChar != '"') && (endChar != '\'')) { - // hum this is not a quote. - throw new CSSException("invalid charset declaration"); - } + if ((endChar != '"') && (endChar != '\'')) { + // hum this is not a quote. + throw new CSSException("invalid charset declaration"); + } - while ((c = (char) input.read()) != endChar) { - buf[i++] = (byte) c; - if (i == size) { - byte[] old = buf; - buf = new byte[size + 100]; - System.arraycopy(old, 0, buf, 0, size); - size += 100; + while ((c = (char) input.read()) != endChar) { + buf[i++] = (byte) c; + if (i == size) { + byte[] old = buf; + buf = new byte[size + 100]; + System.arraycopy(old, 0, buf, 0, size); + size += 100; + } } - } - while ((c = (char) input.read()) == ' ') { - // find the next relevant character - } - if (c != ';') { - // no semi colon at the end ? - throw new CSSException("invalid charset declaration: " + while ((c = (char) input.read()) == ' ') { + // find the next relevant character + } + if (c != ';') { + // no semi colon at the end ? + throw new CSSException("invalid charset declaration: " + "missing semi colon"); - } - encoding = new String(buf, 0, i); - if (source.getEncoding() != null) { - // compare the two encoding informations. - // For example, I don't accept to have ASCII and after UTF-8. - // Is it really good ? That is the question. - if (!encoding.equals(source.getEncoding())) { - throw new CSSException("invalid encoding information."); } - } - } // else no charset declaration available + encoding = new String(buf, 0, i); + if (source.getEncoding() != null) { + // compare the two encoding informations. + // For example, I don't accept to have ASCII and after UTF-8. + // Is it really good ? That is the question. + if (!encoding.equals(source.getEncoding())) { + throw new CSSException("invalid encoding information."); + } + } + } // else no charset declaration available + } } // ok set the real encoding of this source. source.setEncoding(encoding); @@ -556,6 +565,7 @@ TOKEN : <TO : "to"> |<THROUGH : "through"> |<EACH_IN : "in"> + |<FROM : "from"> } /* DERECTIVES */ @@ -651,6 +661,7 @@ TOKEN : | < CHARSET_SYM : "@charset" > | < PAGE_SYM : "@page" > | < FONT_FACE_SYM: "@font-face" > + | < KEY_FRAME_SYM: "@keyframes" | "@-moz-keyframes" | "@-o-keyframes" | "@-webkit-keyframes" | "@-ms-keyframes"> | < ATKEYWORD : "@" <IDENT> > } @@ -744,7 +755,7 @@ void afterImportDeclaration() : } { ( - ( LOOKAHEAD(5)listModifyDirective() | variable() | debuggingDirective() | mixinDirective() | controlDirective() | includeDirective() | styleRule() | media() | page() | fontFace() + ( LOOKAHEAD(5)listModifyDirective() | variable() | debuggingDirective() | mixinDirective() | controlDirective() | includeDirective() | styleRule() | media() | page() | fontFace() | keyframes() | { l = getLocator(); } ret=skipStatement() { if ((ret == null) || (ret.length() == 0)) { @@ -811,6 +822,67 @@ void importDeclaration() : /** * @exception ParseException exception during the parse */ +void keyframes() : +{ + Token n; + boolean start = false; + String keyframeName = null; + String animationname = ""; +} +{ + try { + n=<KEY_FRAME_SYM> ( <S> )* {keyframeName = n.image;} + (n = <IDENT>{animationname += n.image; }|n = < INTERPOLATION >{ animationname += n.image; })+(<S>)* + {start = true; documentHandler.startKeyFrames(keyframeName, animationname); } + <LBRACE> ( <S> )* ( keyframeSelector() )* <RBRACE> ( <S> )* + } catch (ParseException e) { + reportError(getLocator(), e); + skipStatement(); + } finally { + if (start) { + documentHandler.endKeyFrames(); + } + } +} + +void keyframeSelector(): +{ + Token n; + boolean start = false; +} +{ + try{ + (n = <FROM> | n = <TO> | n = <PERCENTAGE>) (<S>)* <LBRACE> (<S>)* + { + start = true; + documentHandler.startKeyframeSelector(n.image); + } + ( LOOKAHEAD(5)ifContentStatement() | controlDirective() | microsoftExtension() )* + <RBRACE> (<S>)* + } + catch (ThrowedParseException e) { + if (errorHandler != null) { + LocatorImpl li = new LocatorImpl(this, + e.e.currentToken.next.beginLine, + e.e.currentToken.next.beginColumn-1); + reportError(li, e.e); + } + } catch (ParseException e) { + reportError(getLocator(), e); + skipStatement(); + // reportWarningSkipText(getLocator(), skipStatement()); + } catch (TokenMgrError e) { + reportWarningSkipText(getLocator(), skipStatement()); + } finally { + if (start) { + documentHandler.endKeyframeSelector(); + } + } +} + +/** + * @exception ParseException exception during the parse + */ void media() : { boolean start = false; @@ -1408,7 +1480,7 @@ void controlDirective() : void ifContentStatement() : {} { - LOOKAHEAD(5)listModifyDirective() | includeDirective() | media() | extendDirective() | variable() | styleRuleOrDeclarationOrNestedProperties() + LOOKAHEAD(5)listModifyDirective() | includeDirective() | media() | extendDirective() | variable() | styleRuleOrDeclarationOrNestedProperties() | keyframes() } void ifDirective() : @@ -1503,15 +1575,15 @@ void eachDirective() : ArrayList<String > stringList(): { ArrayList<String > strings = new ArrayList<String >(); - Token input; + Token input; } { - (input = < IDENT > (< S >)*) + (input = < IDENT > (< S >)*) { strings.add(input.image); } - + (< COMMA >(< S >)* input = < IDENT > { strings.add(input.image); } (< S >)*)* { return strings; } - + } void mixinDirective() : @@ -2647,26 +2719,10 @@ String convertStringIndex(String s, int start, int len) { case '5': case '6': case '7': case '8': case '9': case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': - int numValue = Character.digit(c, 16); - int count = 0; - int p = 16; - - while (index + 1 < len && count < 6) { - c = s.charAt(index+1); - - if (Character.digit(c, 16) != -1) { - numValue = (numValue * 16) + Character.digit(c, 16); - p *= 16; - index++; - } else { - if (c == ' ') { - // skip the latest white space - index++; - } - break; - } + buf.append('\\'); + while (index < len) { + buf.append(s.charAt(index++)); } - buf.append((char) numValue); break; case '\n': case '\f': diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java index 4a04851a5d..a764598cb6 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserConstants.java @@ -103,131 +103,135 @@ public interface ParserConstants { /** RegularExpression Id. */ int EACH_IN = 52; /** RegularExpression Id. */ - int MIXIN_SYM = 53; + int FROM = 53; /** RegularExpression Id. */ - int INCLUDE_SYM = 54; + int MIXIN_SYM = 54; /** RegularExpression Id. */ - int FUNCTION_SYM = 55; + int INCLUDE_SYM = 55; /** RegularExpression Id. */ - int RETURN_SYM = 56; + int FUNCTION_SYM = 56; /** RegularExpression Id. */ - int DEBUG_SYM = 57; + int RETURN_SYM = 57; /** RegularExpression Id. */ - int WARN_SYM = 58; + int DEBUG_SYM = 58; /** RegularExpression Id. */ - int FOR_SYM = 59; + int WARN_SYM = 59; /** RegularExpression Id. */ - int EACH_SYM = 60; + int FOR_SYM = 60; /** RegularExpression Id. */ - int WHILE_SYM = 61; + int EACH_SYM = 61; /** RegularExpression Id. */ - int IF_SYM = 62; + int WHILE_SYM = 62; /** RegularExpression Id. */ - int ELSE_SYM = 63; + int IF_SYM = 63; /** RegularExpression Id. */ - int EXTEND_SYM = 64; + int ELSE_SYM = 64; /** RegularExpression Id. */ - int MOZ_DOCUMENT_SYM = 65; + int EXTEND_SYM = 65; /** RegularExpression Id. */ - int SUPPORTS_SYM = 66; + int MOZ_DOCUMENT_SYM = 66; /** RegularExpression Id. */ - int MICROSOFT_RULE = 67; + int SUPPORTS_SYM = 67; /** RegularExpression Id. */ - int IF = 68; + int MICROSOFT_RULE = 68; /** RegularExpression Id. */ - int GUARDED_SYM = 69; + int IF = 69; /** RegularExpression Id. */ - int STRING = 70; + int GUARDED_SYM = 70; /** RegularExpression Id. */ - int IDENT = 71; + int STRING = 71; /** RegularExpression Id. */ - int NUMBER = 72; + int IDENT = 72; /** RegularExpression Id. */ - int _URL = 73; + int NUMBER = 73; /** RegularExpression Id. */ - int URL = 74; + int _URL = 74; /** RegularExpression Id. */ - int VARIABLE = 75; + int URL = 75; /** RegularExpression Id. */ - int PERCENTAGE = 76; + int VARIABLE = 76; /** RegularExpression Id. */ - int PT = 77; + int PERCENTAGE = 77; /** RegularExpression Id. */ - int MM = 78; + int PT = 78; /** RegularExpression Id. */ - int CM = 79; + int MM = 79; /** RegularExpression Id. */ - int PC = 80; + int CM = 80; /** RegularExpression Id. */ - int IN = 81; + int PC = 81; /** RegularExpression Id. */ - int PX = 82; + int IN = 82; /** RegularExpression Id. */ - int EMS = 83; + int PX = 83; /** RegularExpression Id. */ - int EXS = 84; + int EMS = 84; /** RegularExpression Id. */ - int DEG = 85; + int EXS = 85; /** RegularExpression Id. */ - int RAD = 86; + int DEG = 86; /** RegularExpression Id. */ - int GRAD = 87; + int RAD = 87; /** RegularExpression Id. */ - int MS = 88; + int GRAD = 88; /** RegularExpression Id. */ - int SECOND = 89; + int MS = 89; /** RegularExpression Id. */ - int HZ = 90; + int SECOND = 90; /** RegularExpression Id. */ - int KHZ = 91; + int HZ = 91; /** RegularExpression Id. */ - int DIMEN = 92; + int KHZ = 92; /** RegularExpression Id. */ - int HASH = 93; + int DIMEN = 93; /** RegularExpression Id. */ - int IMPORT_SYM = 94; + int HASH = 94; /** RegularExpression Id. */ - int MEDIA_SYM = 95; + int IMPORT_SYM = 95; /** RegularExpression Id. */ - int CHARSET_SYM = 96; + int MEDIA_SYM = 96; /** RegularExpression Id. */ - int PAGE_SYM = 97; + int CHARSET_SYM = 97; /** RegularExpression Id. */ - int FONT_FACE_SYM = 98; + int PAGE_SYM = 98; /** RegularExpression Id. */ - int ATKEYWORD = 99; + int FONT_FACE_SYM = 99; /** RegularExpression Id. */ - int IMPORTANT_SYM = 100; + int KEY_FRAME_SYM = 100; /** RegularExpression Id. */ - int RANGE0 = 101; + int ATKEYWORD = 101; /** RegularExpression Id. */ - int RANGE1 = 102; + int IMPORTANT_SYM = 102; /** RegularExpression Id. */ - int RANGE2 = 103; + int RANGE0 = 103; /** RegularExpression Id. */ - int RANGE3 = 104; + int RANGE1 = 104; /** RegularExpression Id. */ - int RANGE4 = 105; + int RANGE2 = 105; /** RegularExpression Id. */ - int RANGE5 = 106; + int RANGE3 = 106; /** RegularExpression Id. */ - int RANGE6 = 107; + int RANGE4 = 107; /** RegularExpression Id. */ - int RANGE = 108; + int RANGE5 = 108; /** RegularExpression Id. */ - int UNI = 109; + int RANGE6 = 109; /** RegularExpression Id. */ - int UNICODERANGE = 110; + int RANGE = 110; /** RegularExpression Id. */ - int REMOVE = 111; + int UNI = 111; /** RegularExpression Id. */ - int APPEND = 112; + int UNICODERANGE = 112; /** RegularExpression Id. */ - int CONTAINS = 113; + int REMOVE = 113; /** RegularExpression Id. */ - int FUNCTION = 114; + int APPEND = 114; /** RegularExpression Id. */ - int UNKNOWN = 115; + int CONTAINS = 115; + /** RegularExpression Id. */ + int FUNCTION = 116; + /** RegularExpression Id. */ + int UNKNOWN = 117; /** Lexical state. */ int DEFAULT = 0; @@ -293,6 +297,7 @@ public interface ParserConstants { "\"to\"", "\"through\"", "\"in\"", + "\"from\"", "\"@mixin\"", "\"@include\"", "\"@function\"", @@ -339,6 +344,7 @@ public interface ParserConstants { "\"@charset\"", "\"@page\"", "\"@font-face\"", + "<KEY_FRAME_SYM>", "<ATKEYWORD>", "<IMPORTANT_SYM>", "<RANGE0>", diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java index a5eeb88c77..e058251cbd 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java @@ -38,172 +38,203 @@ private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1) switch (pos) { case 0: - if ((active0 & 0xffe0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) - return 111; + if ((active0 & 0x1c000000000000L) != 0L || (active1 & 0x20L) != 0L) + { + jjmatchedKind = 72; + return 503; + } + if ((active0 & 0x4000000000L) != 0L) + return 504; + if ((active0 & 0x100000000L) != 0L) + return 505; if ((active0 & 0x10000L) != 0L) return 79; - if ((active0 & 0x100000000L) != 0L) - return 441; - if ((active0 & 0x4000000000L) != 0L) - return 442; - if ((active0 & 0x1c000000000000L) != 0L || (active1 & 0x10L) != 0L) + if ((active0 & 0x200800L) != 0L) + return 42; + if ((active0 & 0x20000000000000L) != 0L) { - jjmatchedKind = 71; - return 443; + jjmatchedKind = 72; + return 33; } if ((active0 & 0x8000044L) != 0L) return 3; - if ((active0 & 0x200800L) != 0L) - return 42; + if ((active0 & 0xffc0000000000000L) != 0L || (active1 & 0xf8000000fL) != 0L) + return 166; return -1; case 1: - if ((active0 & 0xffe0000000000000L) != 0L || (active1 & 0x7c0000005L) != 0L) + if ((active0 & 0xffc0000000000000L) != 0L || (active1 & 0xf8000000bL) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 1; - return 444; + return 506; } - if ((active0 & 0x8000000000000L) != 0L) + if ((active1 & 0x4L) != 0L) + return 178; + if ((active0 & 0x40L) != 0L) + return 1; + if ((active0 & 0x28000000000000L) != 0L) { - jjmatchedKind = 71; + jjmatchedKind = 72; jjmatchedPos = 1; - return 443; + return 503; } - if ((active1 & 0x2L) != 0L) - return 112; - if ((active0 & 0x14000000000000L) != 0L || (active1 & 0x10L) != 0L) - return 443; - if ((active0 & 0x40L) != 0L) - return 1; + if ((active0 & 0x14000000000000L) != 0L || (active1 & 0x20L) != 0L) + return 503; return -1; case 2: - if ((active0 & 0x4000000000000000L) != 0L) - return 444; - if ((active0 & 0x8000000000000L) != 0L) + if ((active0 & 0x7fc0000000000000L) != 0L || (active1 & 0xf8000000bL) != 0L) { - jjmatchedKind = 71; + jjmatchedKind = 101; jjmatchedPos = 2; - return 443; + return 506; } - if ((active0 & 0xbfe0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) + if ((active0 & 0x8000000000000000L) != 0L) + return 506; + if ((active0 & 0x28000000000000L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 72; jjmatchedPos = 2; - return 444; + return 503; + } + if ((active1 & 0x4L) != 0L) + { + jjmatchedKind = 101; + jjmatchedPos = 2; + return 177; } return -1; case 3: - if ((active0 & 0x8000000000000L) != 0L) + if ((active0 & 0x1000000000000000L) != 0L) + return 506; + if ((active0 & 0x6fc0000000000000L) != 0L || (active1 & 0xf8000000bL) != 0L) { - jjmatchedKind = 71; + jjmatchedKind = 101; jjmatchedPos = 3; - return 443; + return 506; } - if ((active0 & 0x800000000000000L) != 0L) - return 444; - if ((active0 & 0xb7e0000000000000L) != 0L || (active1 & 0x7c0000007L) != 0L) + if ((active0 & 0x20000000000000L) != 0L) + return 503; + if ((active1 & 0x4L) != 0L) + { + jjmatchedKind = 101; + jjmatchedPos = 3; + return 176; + } + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 72; jjmatchedPos = 3; - return 444; + return 503; } return -1; case 4: - if ((active0 & 0x9400000000000000L) != 0L || (active1 & 0x200000000L) != 0L) - return 444; - if ((active0 & 0x23e0000000000000L) != 0L || (active1 & 0x5c0000007L) != 0L) + if ((active0 & 0x8000000000000L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 72; jjmatchedPos = 4; - return 444; + return 503; } - if ((active0 & 0x8000000000000L) != 0L) + if ((active1 & 0x4L) != 0L) + { + jjmatchedKind = 101; + jjmatchedPos = 4; + return 175; + } + if ((active0 & 0x2800000000000000L) != 0L || (active1 & 0x400000001L) != 0L) + return 506; + if ((active0 & 0x47c0000000000000L) != 0L || (active1 & 0xb8000000aL) != 0L) { - jjmatchedKind = 71; + jjmatchedKind = 101; jjmatchedPos = 4; - return 443; + return 506; } return -1; case 5: - if ((active0 & 0x8000000000000L) != 0L) + if ((active1 & 0x4L) != 0L) { - jjmatchedKind = 71; + jjmatchedKind = 101; jjmatchedPos = 5; - return 443; + return 174; } - if ((active0 & 0x1c0000000000000L) != 0L || (active1 & 0x540000007L) != 0L) + if ((active0 & 0x380000000000000L) != 0L || (active1 & 0xa8000000aL) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 5; - return 444; + return 506; + } + if ((active0 & 0x4440000000000000L) != 0L || (active1 & 0x100000000L) != 0L) + return 506; + if ((active0 & 0x8000000000000L) != 0L) + { + jjmatchedKind = 72; + jjmatchedPos = 5; + return 503; } - if ((active0 & 0x2220000000000000L) != 0L || (active1 & 0x80000000L) != 0L) - return 444; return -1; case 6: - if ((active0 & 0xc0000000000000L) != 0L || (active1 & 0x500000006L) != 0L) + if ((active0 & 0x180000000000000L) != 0L || (active1 & 0xa0000000cL) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 6; - return 444; + return 506; } + if ((active0 & 0x200000000000000L) != 0L || (active1 & 0x80000002L) != 0L) + return 506; if ((active0 & 0x8000000000000L) != 0L) - return 443; - if ((active0 & 0x100000000000000L) != 0L || (active1 & 0x40000001L) != 0L) - return 444; + return 503; return -1; case 7: - if ((active0 & 0x80000000000000L) != 0L || (active1 & 0x400000006L) != 0L) + if ((active0 & 0x100000000000000L) != 0L || (active1 & 0x80000000cL) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 7; - return 444; + return 506; } - if ((active0 & 0x40000000000000L) != 0L || (active1 & 0x100000000L) != 0L) - return 444; + if ((active0 & 0x80000000000000L) != 0L || (active1 & 0x200000000L) != 0L) + return 506; return -1; case 8: - if ((active0 & 0x80000000000000L) != 0L || (active1 & 0x4L) != 0L) - return 444; - if ((active1 & 0x400000002L) != 0L) + if ((active1 & 0x800000004L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 8; - return 444; + return 506; } + if ((active0 & 0x100000000000000L) != 0L || (active1 & 0x8L) != 0L) + return 506; return -1; case 9: - if ((active1 & 0x400000000L) != 0L) - return 444; - if ((active1 & 0x2L) != 0L) + if ((active1 & 0x800000000L) != 0L) + return 506; + if ((active1 & 0x4L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 9; - return 444; + return 506; } return -1; case 10: - if ((active1 & 0x2L) != 0L) + if ((active1 & 0x4L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 10; - return 444; + return 506; } return -1; case 11: - if ((active1 & 0x2L) != 0L) + if ((active1 & 0x4L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 11; - return 444; + return 506; } return -1; case 12: - if ((active1 & 0x2L) != 0L) + if ((active1 & 0x4L) != 0L) { - jjmatchedKind = 99; + jjmatchedKind = 101; jjmatchedPos = 12; - return 444; + return 506; } return -1; default : @@ -246,7 +277,7 @@ private int jjMoveStringLiteralDfa0_0() jjmatchedKind = 21; return jjMoveStringLiteralDfa1_0(0x800L, 0x0L); case 46: - return jjStartNfaWithStates_0(0, 32, 441); + return jjStartNfaWithStates_0(0, 32, 505); case 47: jjmatchedKind = 27; return jjMoveStringLiteralDfa1_0(0x44L, 0x0L); @@ -263,16 +294,19 @@ private int jjMoveStringLiteralDfa0_0() case 62: return jjStopAtPos(0, 24); case 64: - return jjMoveStringLiteralDfa1_0(0xffe0000000000000L, 0x7c0000007L); + return jjMoveStringLiteralDfa1_0(0xffc0000000000000L, 0xf8000000fL); case 91: return jjStopAtPos(0, 28); case 93: return jjStopAtPos(0, 29); case 94: return jjMoveStringLiteralDfa1_0(0x8000L, 0x0L); + case 70: + case 102: + return jjMoveStringLiteralDfa1_0(0x20000000000000L, 0x0L); case 73: case 105: - return jjMoveStringLiteralDfa1_0(0x10000000000000L, 0x10L); + return jjMoveStringLiteralDfa1_0(0x10000000000000L, 0x20L); case 84: case 116: return jjMoveStringLiteralDfa1_0(0xc000000000000L, 0x0L); @@ -309,7 +343,7 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) return jjStartNfaWithStates_0(1, 6, 1); break; case 45: - return jjMoveStringLiteralDfa2_0(active0, 0x800L, active1, 0x2L); + return jjMoveStringLiteralDfa2_0(active0, 0x800L, active1, 0x4L); case 47: if ((active0 & 0x4L) != 0L) return jjStopAtPos(1, 2); @@ -332,49 +366,49 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1) break; case 67: case 99: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000L); case 68: case 100: - return jjMoveStringLiteralDfa2_0(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L, active1, 0L); case 69: case 101: - return jjMoveStringLiteralDfa2_0(active0, 0x9000000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L, active1, 0x3L); case 70: case 102: - if ((active1 & 0x10L) != 0L) - return jjStartNfaWithStates_0(1, 68, 443); - return jjMoveStringLiteralDfa2_0(active0, 0x880000000000000L, active1, 0x400000000L); + if ((active1 & 0x20L) != 0L) + return jjStartNfaWithStates_0(1, 69, 503); + return jjMoveStringLiteralDfa2_0(active0, 0x1100000000000000L, active1, 0x800000000L); case 72: case 104: return jjMoveStringLiteralDfa2_0(active0, 0x8000000000000L, active1, 0L); case 73: case 105: - return jjMoveStringLiteralDfa2_0(active0, 0x4040000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa2_0(active0, 0x8080000000000000L, active1, 0x80000000L); case 77: case 109: - return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0x80000000L); + return jjMoveStringLiteralDfa2_0(active0, 0x40000000000000L, active1, 0x100000000L); case 78: case 110: if ((active0 & 0x10000000000000L) != 0L) - return jjStartNfaWithStates_0(1, 52, 443); + return jjStartNfaWithStates_0(1, 52, 503); break; case 79: case 111: if ((active0 & 0x4000000000000L) != 0L) - return jjStartNfaWithStates_0(1, 50, 443); + return jjStartNfaWithStates_0(1, 50, 503); break; case 80: case 112: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000000L); case 82: case 114: - return jjMoveStringLiteralDfa2_0(active0, 0x100000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x220000000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8L); case 87: case 119: - return jjMoveStringLiteralDfa2_0(active0, 0x2400000000000000L, active1, 0L); + return jjMoveStringLiteralDfa2_0(active0, 0x4800000000000000L, active1, 0L); case 124: if ((active0 & 0x1000000000L) != 0L) return jjStopAtPos(1, 36); @@ -403,42 +437,42 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a break; case 65: case 97: - return jjMoveStringLiteralDfa3_0(active0, 0x1400000000000000L, active1, 0x200000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x2800000000000000L, active1, 0x400000000L); case 69: case 101: - return jjMoveStringLiteralDfa3_0(active0, 0x300000000000000L, active1, 0x80000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x600000000000000L, active1, 0x100000000L); case 70: case 102: - if ((active0 & 0x4000000000000000L) != 0L) - return jjStartNfaWithStates_0(2, 62, 444); + if ((active0 & 0x8000000000000000L) != 0L) + return jjStartNfaWithStates_0(2, 63, 506); break; case 72: case 104: - return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000000L, active1, 0x100000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x4000000000000000L, active1, 0x200000000L); case 73: case 105: - return jjMoveStringLiteralDfa3_0(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L); case 76: case 108: - return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1L); case 77: case 109: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000002L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000004L); case 78: case 110: - return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0L); case 79: case 111: - return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L, active1, 0x400000000L); + return jjMoveStringLiteralDfa3_0(active0, 0x1020000000000000L, active1, 0x800000000L); case 82: case 114: return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L, active1, 0x4L); + return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L, active1, 0x8L); case 88: case 120: - return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1L); + return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2L); default : break; } @@ -461,45 +495,50 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a break; case 65: case 97: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L); case 66: case 98: - return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0L); case 67: case 99: - return jjMoveStringLiteralDfa4_0(active0, 0x1040000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x2080000000000000L, active1, 0L); case 68: case 100: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L); case 71: case 103: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200000000L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400000000L); case 73: case 105: - return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0L); + case 77: + case 109: + if ((active0 & 0x20000000000000L) != 0L) + return jjStartNfaWithStates_0(3, 53, 503); + break; case 78: case 110: - return jjMoveStringLiteralDfa4_0(active0, 0x80000000000000L, active1, 0x400000000L); + return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x800000000L); case 79: case 111: - return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x2L); + return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000L, active1, 0x4L); case 80: case 112: - return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40000004L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000008L); case 82: case 114: - if ((active0 & 0x800000000000000L) != 0L) - return jjStartNfaWithStates_0(3, 59, 444); - return jjMoveStringLiteralDfa4_0(active0, 0x400000000000000L, active1, 0L); + if ((active0 & 0x1000000000000000L) != 0L) + return jjStartNfaWithStates_0(3, 60, 506); + return jjMoveStringLiteralDfa4_0(active0, 0x800000000000000L, active1, 0L); case 83: case 115: - return jjMoveStringLiteralDfa4_0(active0, 0x8000000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x1L); case 84: case 116: - return jjMoveStringLiteralDfa4_0(active0, 0x100000000000000L, active1, 0x1L); + return jjMoveStringLiteralDfa4_0(active0, 0x200000000000000L, active1, 0x2L); case 88: case 120: - return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L); + return jjMoveStringLiteralDfa4_0(active0, 0x40000000000000L, active1, 0L); default : break; } @@ -518,48 +557,48 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x100000000000000L, active1, 0L); case 69: case 101: - if ((active0 & 0x8000000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 63, 444); - else if ((active1 & 0x200000000L) != 0L) - return jjStartNfaWithStates_0(4, 97, 444); - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1L); + if ((active1 & 0x1L) != 0L) + return jjStartNfaWithStates_0(4, 64, 506); + else if ((active1 & 0x400000000L) != 0L) + return jjStartNfaWithStates_0(4, 98, 506); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L); case 72: case 104: - if ((active0 & 0x1000000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 60, 444); + if ((active0 & 0x2000000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 61, 506); break; case 73: case 105: - return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L, active1, 0x80000000L); + return jjMoveStringLiteralDfa5_0(active0, 0x40000000000000L, active1, 0x100000000L); case 76: case 108: - return jjMoveStringLiteralDfa5_0(active0, 0x2040000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x4080000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x400000000000000L) != 0L) - return jjStartNfaWithStates_0(4, 58, 444); + if ((active0 & 0x800000000000000L) != 0L) + return jjStartNfaWithStates_0(4, 59, 506); break; case 79: case 111: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x40000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000000L); case 80: case 112: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8L); case 82: case 114: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x200000000L); case 84: case 116: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x400000000L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x800000000L); case 85: case 117: - return jjMoveStringLiteralDfa5_0(active0, 0x308000000000000L, active1, 0L); + return jjMoveStringLiteralDfa5_0(active0, 0x608000000000000L, active1, 0L); case 90: case 122: - return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x2L); + return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x4L); default : break; } @@ -577,42 +616,42 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a switch(curChar) { case 45: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x400000002L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x800000004L); case 65: case 97: - if ((active1 & 0x80000000L) != 0L) - return jjStartNfaWithStates_0(5, 95, 444); + if ((active1 & 0x100000000L) != 0L) + return jjStartNfaWithStates_0(5, 96, 506); break; case 69: case 101: - if ((active0 & 0x2000000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 61, 444); + if ((active0 & 0x4000000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 62, 506); break; case 71: case 103: - if ((active0 & 0x200000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 57, 444); + if ((active0 & 0x400000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 58, 506); return jjMoveStringLiteralDfa6_0(active0, 0x8000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x20000000000000L) != 0L) - return jjStartNfaWithStates_0(5, 53, 444); - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1L); + if ((active0 & 0x40000000000000L) != 0L) + return jjStartNfaWithStates_0(5, 54, 506); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2L); case 79: case 111: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x8L); case 82: case 114: - return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0x40000000L); + return jjMoveStringLiteralDfa6_0(active0, 0x200000000000000L, active1, 0x80000000L); case 83: case 115: - return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x200000000L); case 84: case 116: - return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x100000000000000L, active1, 0L); case 85: case 117: - return jjMoveStringLiteralDfa6_0(active0, 0x40000000000000L, active1, 0L); + return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L, active1, 0L); default : break; } @@ -631,35 +670,35 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a { case 68: case 100: - if ((active1 & 0x1L) != 0L) - return jjStartNfaWithStates_0(6, 64, 444); - return jjMoveStringLiteralDfa7_0(active0, 0x40000000000000L, active1, 0x2L); + if ((active1 & 0x2L) != 0L) + return jjStartNfaWithStates_0(6, 65, 506); + return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0x4L); case 69: case 101: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100000000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x200000000L); case 70: case 102: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x400000000L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x800000000L); case 72: case 104: if ((active0 & 0x8000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 51, 443); + return jjStartNfaWithStates_0(6, 51, 503); break; case 73: case 105: - return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L, active1, 0L); + return jjMoveStringLiteralDfa7_0(active0, 0x100000000000000L, active1, 0L); case 78: case 110: - if ((active0 & 0x100000000000000L) != 0L) - return jjStartNfaWithStates_0(6, 56, 444); + if ((active0 & 0x200000000000000L) != 0L) + return jjStartNfaWithStates_0(6, 57, 506); break; case 82: case 114: - return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x4L); + return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x8L); case 84: case 116: - if ((active1 & 0x40000000L) != 0L) - return jjStartNfaWithStates_0(6, 94, 444); + if ((active1 & 0x80000000L) != 0L) + return jjStartNfaWithStates_0(6, 95, 506); break; default : break; @@ -679,20 +718,20 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a { case 65: case 97: - return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x400000000L); + return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x800000000L); case 69: case 101: - if ((active0 & 0x40000000000000L) != 0L) - return jjStartNfaWithStates_0(7, 54, 444); + if ((active0 & 0x80000000000000L) != 0L) + return jjStartNfaWithStates_0(7, 55, 506); break; case 79: case 111: - return jjMoveStringLiteralDfa8_0(active0, 0x80000000000000L, active1, 0x2L); + return jjMoveStringLiteralDfa8_0(active0, 0x100000000000000L, active1, 0x4L); case 84: case 116: - if ((active1 & 0x100000000L) != 0L) - return jjStartNfaWithStates_0(7, 96, 444); - return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x4L); + if ((active1 & 0x200000000L) != 0L) + return jjStartNfaWithStates_0(7, 97, 506); + return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x8L); default : break; } @@ -711,16 +750,16 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a { case 67: case 99: - return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x400000002L); + return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x800000004L); case 78: case 110: - if ((active0 & 0x80000000000000L) != 0L) - return jjStartNfaWithStates_0(8, 55, 444); + if ((active0 & 0x100000000000000L) != 0L) + return jjStartNfaWithStates_0(8, 56, 506); break; case 83: case 115: - if ((active1 & 0x4L) != 0L) - return jjStartNfaWithStates_0(8, 66, 444); + if ((active1 & 0x8L) != 0L) + return jjStartNfaWithStates_0(8, 67, 506); break; default : break; @@ -740,12 +779,12 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long a { case 69: case 101: - if ((active1 & 0x400000000L) != 0L) - return jjStartNfaWithStates_0(9, 98, 444); + if ((active1 & 0x800000000L) != 0L) + return jjStartNfaWithStates_0(9, 99, 506); break; case 85: case 117: - return jjMoveStringLiteralDfa10_0(active1, 0x2L); + return jjMoveStringLiteralDfa10_0(active1, 0x4L); default : break; } @@ -764,7 +803,7 @@ private int jjMoveStringLiteralDfa10_0(long old1, long active1) { case 77: case 109: - return jjMoveStringLiteralDfa11_0(active1, 0x2L); + return jjMoveStringLiteralDfa11_0(active1, 0x4L); default : break; } @@ -783,7 +822,7 @@ private int jjMoveStringLiteralDfa11_0(long old1, long active1) { case 69: case 101: - return jjMoveStringLiteralDfa12_0(active1, 0x2L); + return jjMoveStringLiteralDfa12_0(active1, 0x4L); default : break; } @@ -802,7 +841,7 @@ private int jjMoveStringLiteralDfa12_0(long old1, long active1) { case 78: case 110: - return jjMoveStringLiteralDfa13_0(active1, 0x2L); + return jjMoveStringLiteralDfa13_0(active1, 0x4L); default : break; } @@ -821,8 +860,8 @@ private int jjMoveStringLiteralDfa13_0(long old1, long active1) { case 84: case 116: - if ((active1 & 0x2L) != 0L) - return jjStartNfaWithStates_0(13, 65, 444); + if ((active1 & 0x4L) != 0L) + return jjStartNfaWithStates_0(13, 66, 506); break; default : break; @@ -843,7 +882,7 @@ static final long[] jjbitVec0 = { private int jjMoveNfa_0(int startState, int curPos) { int startsAt = 0; - jjnewStateCnt = 441; + jjnewStateCnt = 503; int i = 1; jjstateSet[0] = startState; int kind = 0x7fffffff; @@ -858,93 +897,62 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 441: - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(0, 4); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(252, 255); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(249, 251); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(247, 248); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(244, 246); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(239, 243); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(235, 238); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(231, 234); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(228, 230); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(225, 227); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(222, 224); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(219, 221); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(216, 218); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(213, 215); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(210, 212); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(207, 209); - if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(205, 206); - if ((0x3ff000000000000L & l) != 0L) - { - if (kind > 72) - kind = 72; - jjCheckNAdd(204); - } + case 506: + case 113: + if ((0x3ff200000000000L & l) == 0L) + break; + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); break; - case 79: + case 166: if (curChar == 45) - jjCheckNAdd(80); - break; - case 442: - if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(189, 198); - if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(181, 188); + jjstateSet[jjnewStateCnt++] = 112; + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 217; + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 205; + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 189; + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 178; break; - case 444: - case 113: + case 174: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); break; - case 443: + case 504: + if ((0x100003600L & l) != 0L) + jjCheckNAddTwoStates(251, 260); + if ((0x100003600L & l) != 0L) + jjCheckNAddTwoStates(243, 250); + break; + case 503: if ((0x3ff200000000000L & l) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); else if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(169, 170); + jjCheckNAddTwoStates(231, 232); else if (curChar == 40) { - if (kind > 114) - kind = 114; + if (kind > 116) + kind = 116; } if ((0x3ff200000000000L & l) != 0L) { - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); } break; - case 111: - if (curChar == 45) - jjstateSet[jjnewStateCnt++] = 112; - break; case 4: if ((0x3ff000000000000L & l) != 0L) { - if (kind > 72) - kind = 72; - jjCheckNAddStates(9, 82); + if (kind > 73) + kind = 73; + jjCheckNAddStates(4, 77); } else if ((0x100003600L & l) != 0L) { @@ -953,19 +961,19 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAdd(0); } else if (curChar == 46) - jjCheckNAddStates(83, 100); + jjCheckNAddStates(78, 95); else if (curChar == 45) - jjAddStates(101, 102); + jjAddStates(96, 97); else if (curChar == 33) - jjCheckNAddStates(103, 106); + jjCheckNAddStates(98, 101); else if (curChar == 35) jjCheckNAddTwoStates(100, 101); else if (curChar == 36) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(102, 105); else if (curChar == 39) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); else if (curChar == 34) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); else if (curChar == 47) jjstateSet[jjnewStateCnt++] = 3; if (curChar == 45) @@ -973,6 +981,93 @@ private int jjMoveNfa_0(int startState, int curPos) else if (curChar == 35) jjstateSet[jjnewStateCnt++] = 5; break; + case 175: + if ((0x3ff200000000000L & l) != 0L) + { + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + } + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 174; + break; + case 33: + if ((0x3ff200000000000L & l) != 0L) + jjCheckNAddStates(0, 3); + else if ((0x100003600L & l) != 0L) + jjCheckNAddTwoStates(231, 232); + else if (curChar == 40) + { + if (kind > 116) + kind = 116; + } + if ((0x3ff200000000000L & l) != 0L) + { + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); + } + break; + case 505: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddStates(114, 118); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(314, 317); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(311, 313); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(309, 310); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(306, 308); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(301, 305); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(297, 300); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(293, 296); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(290, 292); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(287, 289); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(284, 286); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(281, 283); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(278, 280); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(275, 277); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(272, 274); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(269, 271); + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(267, 268); + if ((0x3ff000000000000L & l) != 0L) + { + if (kind > 73) + kind = 73; + jjCheckNAdd(266); + } + break; + case 176: + if ((0x3ff200000000000L & l) == 0L) + break; + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + break; + case 177: + if ((0x3ff200000000000L & l) == 0L) + break; + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + break; + case 79: + if (curChar == 45) + jjCheckNAdd(80); + break; case 0: if ((0x100003600L & l) == 0L) break; @@ -1074,23 +1169,23 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 44: if (curChar == 34) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 45: if ((0xfffffffb00000200L & l) != 0L) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 46: - if (curChar == 34 && kind > 70) - kind = 70; + if (curChar == 34 && kind > 71) + kind = 71; break; case 48: if (curChar == 12) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 50: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 51: if ((0x3ff000000000000L & l) != 0L) @@ -1098,7 +1193,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 52: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 53: if ((0x3ff000000000000L & l) != 0L) @@ -1122,11 +1217,11 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 58: if (curChar == 13) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 59: if (curChar == 10) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 60: if (curChar == 13) @@ -1134,23 +1229,23 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 61: if (curChar == 39) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 62: if ((0xffffff7f00000200L & l) != 0L) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 63: - if (curChar == 39 && kind > 70) - kind = 70; + if (curChar == 39 && kind > 71) + kind = 71; break; case 65: if (curChar == 12) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 67: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 68: if ((0x3ff000000000000L & l) != 0L) @@ -1158,7 +1253,7 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 69: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 70: if ((0x3ff000000000000L & l) != 0L) @@ -1182,11 +1277,11 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 75: if (curChar == 13) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 76: if (curChar == 10) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 77: if (curChar == 13) @@ -1194,111 +1289,111 @@ private int jjMoveNfa_0(int startState, int curPos) break; case 78: if (curChar == 36) - jjCheckNAddStates(107, 110); + jjCheckNAddStates(102, 105); break; case 81: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(81, 82); break; case 83: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(81, 82); break; case 84: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(278, 281); break; case 85: if ((0x100003600L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(81, 82); break; case 86: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(282, 288); break; case 87: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(289, 291); break; case 88: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(292, 295); break; case 89: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(296, 300); break; case 90: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(301, 306); break; case 93: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(307, 310); break; case 94: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(311, 317); break; case 95: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(318, 320); break; case 96: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(321, 324); break; case 97: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(325, 329); break; case 98: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(330, 335); break; case 99: @@ -1308,162 +1403,166 @@ private int jjMoveNfa_0(int startState, int curPos) case 100: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddTwoStates(100, 101); break; case 102: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddTwoStates(100, 101); break; case 103: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(336, 339); break; case 104: if ((0x100003600L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddTwoStates(100, 101); break; case 105: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(340, 346); break; case 106: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(347, 349); break; case 107: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(350, 353); break; case 108: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(354, 358); break; case 109: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(359, 364); break; + case 111: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 112; + break; case 115: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); break; case 116: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(365, 368); break; case 117: if ((0x100003600L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); break; case 118: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(369, 375); break; case 119: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(376, 378); break; case 120: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(379, 382); break; case 121: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(383, 387); break; case 122: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(388, 393); break; case 125: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(394, 397); break; case 126: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(398, 404); break; case 127: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(405, 407); break; case 128: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(408, 411); break; case 129: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(412, 416); break; case 130: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(417, 422); break; case 132: @@ -1471,1031 +1570,1059 @@ private int jjMoveNfa_0(int startState, int curPos) jjAddStates(423, 424); break; case 133: - if (curChar == 40 && kind > 111) - kind = 111; + if (curChar == 40 && kind > 113) + kind = 113; break; case 140: if ((0x100003600L & l) != 0L) jjAddStates(425, 426); break; case 141: - if (curChar == 40 && kind > 112) - kind = 112; + if (curChar == 40 && kind > 114) + kind = 114; break; case 148: if ((0x100003600L & l) != 0L) jjAddStates(427, 428); break; case 149: - if (curChar == 40 && kind > 113) - kind = 113; + if (curChar == 40 && kind > 115) + kind = 115; break; - case 158: + case 179: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 178; + break; + case 188: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 187; + break; + case 190: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 189; + break; + case 199: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 198; + break; + case 206: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 205; + break; + case 215: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 214; + break; + case 218: + if (curChar == 45) + jjstateSet[jjnewStateCnt++] = 217; + break; + case 220: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); break; - case 160: + case 222: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); break; - case 161: + case 223: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(429, 432); break; - case 162: + case 224: if ((0x100003600L & l) == 0L) break; - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); break; - case 163: + case 225: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(433, 439); break; - case 164: + case 226: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(440, 442); break; - case 165: + case 227: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(443, 446); break; - case 166: + case 228: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(447, 451); break; - case 167: + case 229: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(452, 457); break; - case 168: + case 230: if ((0x3ff200000000000L & l) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); break; - case 169: + case 231: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(169, 170); + jjCheckNAddTwoStates(231, 232); break; - case 170: - if (curChar == 40 && kind > 114) - kind = 114; + case 232: + if (curChar == 40 && kind > 116) + kind = 116; break; - case 172: + case 234: if ((0xffffffff00000000L & l) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); break; - case 173: + case 235: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(458, 462); break; - case 174: + case 236: if ((0x100003600L & l) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); break; - case 175: + case 237: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(463, 470); break; - case 176: - case 382: + case 238: + case 444: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(471, 474); break; - case 177: + case 239: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(475, 479); break; - case 178: + case 240: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(480, 485); break; - case 179: + case 241: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(486, 492); break; - case 180: + case 242: if (curChar == 33) - jjCheckNAddStates(103, 106); + jjCheckNAddStates(98, 101); break; - case 181: + case 243: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(181, 188); + jjCheckNAddTwoStates(243, 250); break; - case 189: + case 251: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(189, 198); + jjCheckNAddTwoStates(251, 260); break; - case 199: + case 261: if (curChar == 45) - jjAddStates(101, 102); + jjAddStates(96, 97); break; - case 203: + case 265: if (curChar == 46) - jjCheckNAddStates(83, 100); + jjCheckNAddStates(78, 95); break; - case 204: + case 266: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 72) - kind = 72; - jjCheckNAdd(204); + if (kind > 73) + kind = 73; + jjCheckNAdd(266); break; - case 205: + case 267: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(205, 206); + jjCheckNAddTwoStates(267, 268); break; - case 206: - if (curChar == 37 && kind > 76) - kind = 76; + case 268: + if (curChar == 37 && kind > 77) + kind = 77; break; - case 207: + case 269: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(207, 209); + jjCheckNAddTwoStates(269, 271); break; - case 210: + case 272: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(210, 212); + jjCheckNAddTwoStates(272, 274); break; - case 213: + case 275: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(213, 215); + jjCheckNAddTwoStates(275, 277); break; - case 216: + case 278: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(216, 218); + jjCheckNAddTwoStates(278, 280); break; - case 219: + case 281: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(219, 221); + jjCheckNAddTwoStates(281, 283); break; - case 222: + case 284: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(222, 224); + jjCheckNAddTwoStates(284, 286); break; - case 225: + case 287: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(225, 227); + jjCheckNAddTwoStates(287, 289); break; - case 228: + case 290: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(228, 230); + jjCheckNAddTwoStates(290, 292); break; - case 231: + case 293: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(231, 234); + jjCheckNAddTwoStates(293, 296); break; - case 235: + case 297: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(235, 238); + jjCheckNAddTwoStates(297, 300); break; - case 239: + case 301: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(239, 243); + jjCheckNAddTwoStates(301, 305); break; - case 244: + case 306: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(244, 246); + jjCheckNAddTwoStates(306, 308); break; - case 247: + case 309: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(247, 248); + jjCheckNAddTwoStates(309, 310); break; - case 249: + case 311: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(249, 251); + jjCheckNAddTwoStates(311, 313); break; - case 252: + case 314: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(252, 255); + jjCheckNAddTwoStates(314, 317); break; - case 256: + case 318: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddStates(0, 4); + jjCheckNAddStates(114, 118); break; - case 257: + case 319: if (curChar == 45) - jjCheckNAdd(258); + jjCheckNAdd(320); break; - case 259: + case 321: if ((0x3ff200000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; - jjCheckNAddTwoStates(259, 260); + if (kind > 93) + kind = 93; + jjCheckNAddTwoStates(321, 322); break; - case 261: + case 323: if ((0xffffffff00000000L & l) == 0L) break; - if (kind > 92) - kind = 92; - jjCheckNAddTwoStates(259, 260); + if (kind > 93) + kind = 93; + jjCheckNAddTwoStates(321, 322); break; - case 262: + case 324: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(493, 496); break; - case 263: + case 325: if ((0x100003600L & l) == 0L) break; - if (kind > 92) - kind = 92; - jjCheckNAddTwoStates(259, 260); + if (kind > 93) + kind = 93; + jjCheckNAddTwoStates(321, 322); break; - case 264: + case 326: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(497, 503); break; - case 265: + case 327: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(504, 506); break; - case 266: + case 328: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(507, 510); break; - case 267: + case 329: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(511, 515); break; - case 268: + case 330: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(516, 521); break; - case 271: + case 333: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(522, 525); break; - case 272: + case 334: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(526, 532); break; - case 273: + case 335: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(533, 535); break; - case 274: + case 336: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(536, 539); break; - case 275: + case 337: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(540, 544); break; - case 276: + case 338: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(545, 550); break; - case 278: + case 340: if (curChar == 40) jjCheckNAddStates(551, 556); break; - case 279: + case 341: if ((0xfffffc7a00000000L & l) != 0L) jjCheckNAddStates(557, 560); break; - case 280: + case 342: if ((0x100003600L & l) != 0L) - jjCheckNAddTwoStates(280, 281); + jjCheckNAddTwoStates(342, 343); break; - case 281: - if (curChar == 41 && kind > 74) - kind = 74; + case 343: + if (curChar == 41 && kind > 75) + kind = 75; break; - case 283: + case 345: if ((0xffffffff00000000L & l) != 0L) jjCheckNAddStates(557, 560); break; - case 284: + case 346: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(561, 565); break; - case 285: + case 347: if ((0x100003600L & l) != 0L) jjCheckNAddStates(557, 560); break; - case 286: + case 348: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(566, 573); break; - case 287: + case 349: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(574, 577); break; - case 288: + case 350: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(578, 582); break; - case 289: + case 351: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(583, 588); break; - case 290: + case 352: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(589, 595); break; - case 291: + case 353: if (curChar == 39) jjCheckNAddStates(596, 599); break; - case 292: + case 354: if ((0xffffff7f00000200L & l) != 0L) jjCheckNAddStates(596, 599); break; - case 293: + case 355: if (curChar == 39) - jjCheckNAddTwoStates(280, 281); + jjCheckNAddTwoStates(342, 343); break; - case 295: + case 357: if (curChar == 12) jjCheckNAddStates(596, 599); break; - case 297: + case 359: if ((0xffffffff00000000L & l) != 0L) jjCheckNAddStates(596, 599); break; - case 298: + case 360: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(600, 605); break; - case 299: + case 361: if ((0x100003600L & l) != 0L) jjCheckNAddStates(596, 599); break; - case 300: + case 362: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(606, 614); break; - case 301: + case 363: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(615, 619); break; - case 302: + case 364: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(620, 625); break; - case 303: + case 365: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(626, 632); break; - case 304: + case 366: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(633, 640); break; - case 305: + case 367: if (curChar == 13) jjCheckNAddStates(596, 599); break; - case 306: + case 368: if (curChar == 10) jjCheckNAddStates(596, 599); break; - case 307: + case 369: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 306; + jjstateSet[jjnewStateCnt++] = 368; break; - case 308: + case 370: if (curChar == 34) jjCheckNAddStates(641, 644); break; - case 309: + case 371: if ((0xfffffffb00000200L & l) != 0L) jjCheckNAddStates(641, 644); break; - case 310: + case 372: if (curChar == 34) - jjCheckNAddTwoStates(280, 281); + jjCheckNAddTwoStates(342, 343); break; - case 312: + case 374: if (curChar == 12) jjCheckNAddStates(641, 644); break; - case 314: + case 376: if ((0xffffffff00000000L & l) != 0L) jjCheckNAddStates(641, 644); break; - case 315: + case 377: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(645, 650); break; - case 316: + case 378: if ((0x100003600L & l) != 0L) jjCheckNAddStates(641, 644); break; - case 317: + case 379: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(651, 659); break; - case 318: + case 380: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(660, 664); break; - case 319: + case 381: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(665, 670); break; - case 320: + case 382: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(671, 677); break; - case 321: + case 383: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(678, 685); break; - case 322: + case 384: if (curChar == 13) jjCheckNAddStates(641, 644); break; - case 323: + case 385: if (curChar == 10) jjCheckNAddStates(641, 644); break; - case 324: + case 386: if (curChar == 13) - jjstateSet[jjnewStateCnt++] = 323; + jjstateSet[jjnewStateCnt++] = 385; break; - case 325: + case 387: if ((0x100003600L & l) != 0L) jjCheckNAddStates(686, 692); break; - case 328: + case 390: if (curChar == 43) jjAddStates(693, 694); break; - case 329: + case 391: if (curChar != 63) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 330; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 392; break; - case 330: + case 392: if (curChar != 63) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(695, 698); break; - case 331: - if (curChar == 63 && kind > 110) - kind = 110; + case 393: + if (curChar == 63 && kind > 112) + kind = 112; break; - case 332: - case 347: - case 351: - case 354: - case 357: + case 394: + case 409: + case 413: + case 416: + case 419: if (curChar != 63) break; - if (kind > 110) - kind = 110; - jjCheckNAdd(331); + if (kind > 112) + kind = 112; + jjCheckNAdd(393); break; - case 333: + case 395: if (curChar != 63) break; - if (kind > 110) - kind = 110; - jjCheckNAddTwoStates(331, 332); + if (kind > 112) + kind = 112; + jjCheckNAddTwoStates(393, 394); break; - case 334: + case 396: if (curChar != 63) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(699, 701); break; - case 335: + case 397: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjAddStates(702, 707); break; - case 336: + case 398: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 337; + jjstateSet[jjnewStateCnt++] = 399; break; - case 337: + case 399: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 338; + jjstateSet[jjnewStateCnt++] = 400; break; - case 338: + case 400: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(339); + jjCheckNAdd(401); break; - case 339: - if ((0x3ff000000000000L & l) != 0L && kind > 110) - kind = 110; + case 401: + if ((0x3ff000000000000L & l) != 0L && kind > 112) + kind = 112; break; - case 340: + case 402: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 341; + jjstateSet[jjnewStateCnt++] = 403; break; - case 341: + case 403: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 342; + jjstateSet[jjnewStateCnt++] = 404; break; - case 342: + case 404: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 343; + jjstateSet[jjnewStateCnt++] = 405; break; - case 343: + case 405: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; - jjCheckNAdd(331); + if (kind > 112) + kind = 112; + jjCheckNAdd(393); break; - case 344: + case 406: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 345; + jjstateSet[jjnewStateCnt++] = 407; break; - case 345: + case 407: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 346; + jjstateSet[jjnewStateCnt++] = 408; break; - case 346: + case 408: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 347; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 409; break; - case 348: + case 410: if ((0x3ff000000000000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 349; + jjstateSet[jjnewStateCnt++] = 411; break; - case 349: + case 411: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 350; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 412; break; - case 350: + case 412: if (curChar != 63) break; - if (kind > 110) - kind = 110; - jjCheckNAddTwoStates(331, 351); + if (kind > 112) + kind = 112; + jjCheckNAddTwoStates(393, 413); break; - case 352: + case 414: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 353; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 415; break; - case 353: + case 415: if (curChar != 63) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(708, 710); break; - case 355: + case 417: if (curChar != 63) break; - if (kind > 110) - kind = 110; - jjCheckNAddTwoStates(331, 354); + if (kind > 112) + kind = 112; + jjCheckNAddTwoStates(393, 416); break; - case 356: + case 418: if (curChar != 63) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(711, 714); break; - case 358: + case 420: if (curChar != 63) break; - if (kind > 110) - kind = 110; - jjCheckNAddTwoStates(331, 357); + if (kind > 112) + kind = 112; + jjCheckNAddTwoStates(393, 419); break; - case 359: + case 421: if (curChar != 63) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(715, 717); break; - case 360: + case 422: if (curChar == 43) - jjstateSet[jjnewStateCnt++] = 361; + jjstateSet[jjnewStateCnt++] = 423; break; - case 361: + case 423: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(362, 368); + jjCheckNAddTwoStates(424, 430); break; - case 362: + case 424: if (curChar == 45) - jjstateSet[jjnewStateCnt++] = 363; + jjstateSet[jjnewStateCnt++] = 425; break; - case 363: + case 425: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 364; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 426; break; - case 364: + case 426: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(718, 721); break; - case 365: + case 427: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; - jjCheckNAdd(339); + if (kind > 112) + kind = 112; + jjCheckNAdd(401); break; - case 366: + case 428: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; - jjCheckNAddTwoStates(339, 365); + if (kind > 112) + kind = 112; + jjCheckNAddTwoStates(401, 427); break; - case 367: + case 429: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(722, 724); break; - case 368: + case 430: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(725, 729); break; - case 369: + case 431: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAdd(362); + jjCheckNAdd(424); break; - case 370: + case 432: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(369, 362); + jjCheckNAddTwoStates(431, 424); break; - case 371: + case 433: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(730, 732); break; - case 372: + case 434: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(733, 736); break; - case 374: + case 436: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(737, 740); break; - case 375: + case 437: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(741, 747); break; - case 376: + case 438: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(748, 750); break; - case 377: + case 439: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(751, 754); break; - case 378: + case 440: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(755, 759); break; - case 379: + case 441: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(760, 765); break; - case 380: + case 442: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(766, 770); break; - case 381: + case 443: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(771, 778); break; - case 383: + case 445: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(779, 783); break; - case 384: + case 446: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(784, 789); break; - case 385: + case 447: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(790, 796); break; - case 386: + case 448: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 72) - kind = 72; - jjCheckNAddStates(9, 82); + if (kind > 73) + kind = 73; + jjCheckNAddStates(4, 77); break; - case 387: + case 449: if ((0x3ff000000000000L & l) == 0L) break; - if (kind > 72) - kind = 72; - jjCheckNAdd(387); + if (kind > 73) + kind = 73; + jjCheckNAdd(449); break; - case 388: + case 450: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(388, 389); + jjCheckNAddTwoStates(450, 451); break; - case 389: + case 451: if (curChar == 46) - jjCheckNAdd(204); + jjCheckNAdd(266); break; - case 390: + case 452: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(390, 206); + jjCheckNAddTwoStates(452, 268); break; - case 391: + case 453: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(391, 392); + jjCheckNAddTwoStates(453, 454); break; - case 392: + case 454: if (curChar == 46) - jjCheckNAdd(205); + jjCheckNAdd(267); break; - case 393: + case 455: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(393, 209); + jjCheckNAddTwoStates(455, 271); break; - case 394: + case 456: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(394, 395); + jjCheckNAddTwoStates(456, 457); break; - case 395: + case 457: if (curChar == 46) - jjCheckNAdd(207); + jjCheckNAdd(269); break; - case 396: + case 458: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(396, 212); + jjCheckNAddTwoStates(458, 274); break; - case 397: + case 459: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(397, 398); + jjCheckNAddTwoStates(459, 460); break; - case 398: + case 460: if (curChar == 46) - jjCheckNAdd(210); + jjCheckNAdd(272); break; - case 399: + case 461: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(399, 215); + jjCheckNAddTwoStates(461, 277); break; - case 400: + case 462: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(400, 401); + jjCheckNAddTwoStates(462, 463); break; - case 401: + case 463: if (curChar == 46) - jjCheckNAdd(213); + jjCheckNAdd(275); break; - case 402: + case 464: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(402, 218); + jjCheckNAddTwoStates(464, 280); break; - case 403: + case 465: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(403, 404); + jjCheckNAddTwoStates(465, 466); break; - case 404: + case 466: if (curChar == 46) - jjCheckNAdd(216); + jjCheckNAdd(278); break; - case 405: + case 467: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(405, 221); + jjCheckNAddTwoStates(467, 283); break; - case 406: + case 468: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(406, 407); + jjCheckNAddTwoStates(468, 469); break; - case 407: + case 469: if (curChar == 46) - jjCheckNAdd(219); + jjCheckNAdd(281); break; - case 408: + case 470: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(408, 224); + jjCheckNAddTwoStates(470, 286); break; - case 409: + case 471: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(409, 410); + jjCheckNAddTwoStates(471, 472); break; - case 410: + case 472: if (curChar == 46) - jjCheckNAdd(222); + jjCheckNAdd(284); break; - case 411: + case 473: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(411, 227); + jjCheckNAddTwoStates(473, 289); break; - case 412: + case 474: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(412, 413); + jjCheckNAddTwoStates(474, 475); break; - case 413: + case 475: if (curChar == 46) - jjCheckNAdd(225); + jjCheckNAdd(287); break; - case 414: + case 476: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(414, 230); + jjCheckNAddTwoStates(476, 292); break; - case 415: + case 477: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(415, 416); + jjCheckNAddTwoStates(477, 478); break; - case 416: + case 478: if (curChar == 46) - jjCheckNAdd(228); + jjCheckNAdd(290); break; - case 417: + case 479: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(417, 234); + jjCheckNAddTwoStates(479, 296); break; - case 418: + case 480: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(418, 419); + jjCheckNAddTwoStates(480, 481); break; - case 419: + case 481: if (curChar == 46) - jjCheckNAdd(231); + jjCheckNAdd(293); break; - case 420: + case 482: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(420, 238); + jjCheckNAddTwoStates(482, 300); break; - case 421: + case 483: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(421, 422); + jjCheckNAddTwoStates(483, 484); break; - case 422: + case 484: if (curChar == 46) - jjCheckNAdd(235); + jjCheckNAdd(297); break; - case 423: + case 485: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(423, 243); + jjCheckNAddTwoStates(485, 305); break; - case 424: + case 486: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(424, 425); + jjCheckNAddTwoStates(486, 487); break; - case 425: + case 487: if (curChar == 46) - jjCheckNAdd(239); + jjCheckNAdd(301); break; - case 426: + case 488: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(426, 246); + jjCheckNAddTwoStates(488, 308); break; - case 427: + case 489: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(427, 428); + jjCheckNAddTwoStates(489, 490); break; - case 428: + case 490: if (curChar == 46) - jjCheckNAdd(244); + jjCheckNAdd(306); break; - case 429: + case 491: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(429, 248); + jjCheckNAddTwoStates(491, 310); break; - case 430: + case 492: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(430, 431); + jjCheckNAddTwoStates(492, 493); break; - case 431: + case 493: if (curChar == 46) - jjCheckNAdd(247); + jjCheckNAdd(309); break; - case 432: + case 494: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(432, 251); + jjCheckNAddTwoStates(494, 313); break; - case 433: + case 495: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(433, 434); + jjCheckNAddTwoStates(495, 496); break; - case 434: + case 496: if (curChar == 46) - jjCheckNAdd(249); + jjCheckNAdd(311); break; - case 435: + case 497: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(435, 255); + jjCheckNAddTwoStates(497, 317); break; - case 436: + case 498: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(436, 437); + jjCheckNAddTwoStates(498, 499); break; - case 437: + case 499: if (curChar == 46) - jjCheckNAdd(252); + jjCheckNAdd(314); break; - case 438: + case 500: if ((0x3ff000000000000L & l) != 0L) jjCheckNAddStates(797, 801); break; - case 439: + case 501: if ((0x3ff000000000000L & l) != 0L) - jjCheckNAddTwoStates(439, 440); + jjCheckNAddTwoStates(501, 502); break; - case 440: + case 502: if (curChar == 46) - jjCheckNAdd(256); + jjCheckNAdd(318); break; default : break; } @@ -2508,81 +2635,89 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 42: - if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(5, 8); - if ((0x7fffffe07fffffeL & l) != 0L) + case 506: + if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); } - if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 41; + else if (curChar == 92) + jjCheckNAddTwoStates(115, 116); break; - case 79: + case 166: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 75) - kind = 75; - jjCheckNAddTwoStates(81, 82); + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); } else if (curChar == 92) - jjCheckNAddTwoStates(83, 93); - break; - case 442: - if ((0x20000000200L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 197; - else if ((0x1000000010L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 187; + jjCheckNAddTwoStates(115, 125); + if ((0x80000000800L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 165; break; - case 444: + case 174: if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); } else if (curChar == 92) jjCheckNAddTwoStates(115, 116); + if ((0x80000000800L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 173; break; - case 443: - if ((0x7fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(5, 8); - else if (curChar == 92) - jjCheckNAddTwoStates(160, 161); - if ((0x7fffffe87fffffeL & l) != 0L) - { - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); - } - else if (curChar == 92) - jjCheckNAddTwoStates(172, 173); + case 504: + if ((0x20000000200L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 259; + else if ((0x1000000010L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 249; break; - case 111: + case 178: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); } + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 216; + else if ((0x80000000800000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 204; + else if ((0x800000008000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 188; + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 177; + break; + case 503: + if ((0x7fffffe87fffffeL & l) != 0L) + jjCheckNAddStates(0, 3); else if (curChar == 92) - jjCheckNAddTwoStates(115, 125); + jjCheckNAddTwoStates(222, 223); + if ((0x7fffffe87fffffeL & l) != 0L) + { + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); + } + else if (curChar == 92) + jjCheckNAddTwoStates(234, 235); break; case 4: if ((0x7fffffe07fffffeL & l) != 0L) { - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(802, 807); } else if (curChar == 92) jjCheckNAddStates(808, 811); else if (curChar == 64) - jjAddStates(812, 815); + jjAddStates(812, 816); if ((0x20000000200000L & l) != 0L) - jjAddStates(816, 818); + jjAddStates(817, 819); else if ((0x800000008L & l) != 0L) jjstateSet[jjnewStateCnt++] = 155; else if ((0x200000002L & l) != 0L) @@ -2591,6 +2726,82 @@ private int jjMoveNfa_0(int startState, int curPos) jjstateSet[jjnewStateCnt++] = 137; else if ((0x4000000040L & l) != 0L) jjstateSet[jjnewStateCnt++] = 33; + else if (curChar == 64) + jjAddStates(820, 823); + break; + case 175: + if ((0x7fffffe87fffffeL & l) != 0L) + { + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + } + else if (curChar == 92) + jjCheckNAddTwoStates(115, 116); + break; + case 33: + if ((0x7fffffe87fffffeL & l) != 0L) + jjCheckNAddStates(0, 3); + else if (curChar == 92) + jjCheckNAddTwoStates(222, 223); + if ((0x7fffffe87fffffeL & l) != 0L) + { + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); + } + else if (curChar == 92) + jjCheckNAddTwoStates(234, 235); + if ((0x20000000200L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 32; + break; + case 176: + if ((0x7fffffe87fffffeL & l) != 0L) + { + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + } + else if (curChar == 92) + jjCheckNAddTwoStates(115, 116); + if ((0x400000004000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 175; + break; + case 42: + if ((0x7fffffe07fffffeL & l) != 0L) + jjCheckNAddStates(0, 3); + if ((0x7fffffe07fffffeL & l) != 0L) + { + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); + } + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 41; + break; + case 177: + if ((0x7fffffe87fffffeL & l) != 0L) + { + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + } + else if (curChar == 92) + jjCheckNAddTwoStates(115, 116); + if ((0x8000000080000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 215; + else if ((0x800000008000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 176; + break; + case 79: + if ((0x7fffffe07fffffeL & l) != 0L) + { + if (kind > 76) + kind = 76; + jjCheckNAddTwoStates(81, 82); + } + else if (curChar == 92) + jjCheckNAddTwoStates(83, 93); break; case 2: if (kind > 5) @@ -2673,8 +2884,8 @@ private int jjMoveNfa_0(int startState, int curPos) jjCheckNAddStates(189, 195); break; case 29: - if ((0x4000000040000L & l) != 0L && kind > 67) - kind = 67; + if ((0x4000000040000L & l) != 0L && kind > 68) + kind = 68; break; case 30: case 35: @@ -2689,10 +2900,6 @@ private int jjMoveNfa_0(int startState, int curPos) if ((0x100000001000L & l) != 0L) jjstateSet[jjnewStateCnt++] = 31; break; - case 33: - if ((0x20000000200L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 32; - break; case 34: if ((0x4000000040L & l) != 0L) jjstateSet[jjnewStateCnt++] = 33; @@ -2720,15 +2927,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 45: case 50: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 47: if (curChar == 92) - jjAddStates(819, 822); + jjAddStates(824, 827); break; case 49: if (curChar == 92) - jjAddStates(823, 824); + jjAddStates(828, 829); break; case 51: if ((0x7e0000007eL & l) != 0L) @@ -2757,15 +2964,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 62: case 67: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 64: if (curChar == 92) - jjAddStates(825, 828); + jjAddStates(830, 833); break; case 66: if (curChar == 92) - jjAddStates(829, 830); + jjAddStates(834, 835); break; case 68: if ((0x7e0000007eL & l) != 0L) @@ -2794,15 +3001,15 @@ private int jjMoveNfa_0(int startState, int curPos) case 80: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(81, 82); break; case 81: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(81, 82); break; case 82: @@ -2812,50 +3019,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 83: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddTwoStates(81, 82); break; case 84: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(278, 281); break; case 86: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(282, 288); break; case 87: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(289, 291); break; case 88: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(292, 295); break; case 89: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(296, 300); break; case 90: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(301, 306); break; case 92: @@ -2865,121 +3072,121 @@ private int jjMoveNfa_0(int startState, int curPos) case 93: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(307, 310); break; case 94: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(311, 317); break; case 95: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(318, 320); break; case 96: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(321, 324); break; case 97: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(325, 329); break; case 98: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 75) - kind = 75; + if (kind > 76) + kind = 76; jjCheckNAddStates(330, 335); break; case 100: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddTwoStates(100, 101); break; case 101: if (curChar == 92) - jjAddStates(831, 832); + jjAddStates(836, 837); break; case 102: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddTwoStates(100, 101); break; case 103: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(336, 339); break; case 105: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(340, 346); break; case 106: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(347, 349); break; case 107: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(350, 353); break; case 108: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(354, 358); break; case 109: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddStates(359, 364); break; case 110: if (curChar == 64) - jjAddStates(812, 815); + jjAddStates(820, 823); break; case 112: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); break; case 113: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); break; case 114: @@ -2989,50 +3196,50 @@ private int jjMoveNfa_0(int startState, int curPos) case 115: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); break; case 116: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(365, 368); break; case 118: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(369, 375); break; case 119: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(376, 378); break; case 120: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(379, 382); break; case 121: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(383, 387); break; case 122: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(388, 393); break; case 124: @@ -3042,43 +3249,43 @@ private int jjMoveNfa_0(int startState, int curPos) case 125: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(394, 397); break; case 126: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(398, 404); break; case 127: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(405, 407); break; case 128: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(408, 411); break; case 129: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(412, 416); break; case 130: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddStates(417, 422); break; case 131: @@ -3161,750 +3368,934 @@ private int jjMoveNfa_0(int startState, int curPos) if ((0x800000008L & l) != 0L) jjstateSet[jjnewStateCnt++] = 155; break; + case 157: + if (curChar == 64) + jjAddStates(812, 816); + break; case 158: + if ((0x8000000080000L & l) != 0L && kind > 100) + kind = 100; + break; + case 159: + case 167: + case 180: + case 191: + case 207: + if ((0x2000000020L & l) != 0L) + jjCheckNAdd(158); + break; + case 160: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 159; + break; + case 161: + if ((0x200000002L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 160; + break; + case 162: + if ((0x4000000040000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 161; + break; + case 163: + if ((0x4000000040L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 162; + break; + case 164: + if ((0x200000002000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 163; + break; + case 165: + if ((0x2000000020L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 164; + break; + case 168: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 167; + break; + case 169: + if ((0x200000002L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 168; + break; + case 170: + if ((0x4000000040000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 169; + break; + case 171: + if ((0x4000000040L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 170; + break; + case 172: + if ((0x200000002000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 171; + break; + case 173: + if ((0x2000000020L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 172; + break; + case 181: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 180; + break; + case 182: + if ((0x200000002L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 181; + break; + case 183: + if ((0x4000000040000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 182; + break; + case 184: + if ((0x4000000040L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 183; + break; + case 185: + if ((0x200000002000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 184; + break; + case 186: + if ((0x2000000020L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 185; + break; + case 187: + if ((0x80000000800L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 186; + break; + case 189: + if ((0x800000008000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 188; + break; + case 192: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 191; + break; + case 193: + if ((0x200000002L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 192; + break; + case 194: + if ((0x4000000040000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 193; + break; + case 195: + if ((0x4000000040L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 194; + break; + case 196: + if ((0x200000002000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 195; + break; + case 197: + if ((0x2000000020L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 196; + break; + case 198: + if ((0x80000000800L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 197; + break; + case 200: + if ((0x10000000100000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 199; + break; + case 201: + if ((0x20000000200L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 200; + break; + case 202: + if ((0x80000000800L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 201; + break; + case 203: + if ((0x400000004L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 202; + break; + case 204: + if ((0x2000000020L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 203; + break; + case 205: + if ((0x80000000800000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 204; + break; + case 208: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 207; + break; + case 209: + if ((0x200000002L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 208; + break; + case 210: + if ((0x4000000040000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 209; + break; + case 211: + if ((0x4000000040L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 210; + break; + case 212: + if ((0x200000002000000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 211; + break; + case 213: + if ((0x2000000020L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 212; + break; + case 214: + if ((0x80000000800L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 213; + break; + case 216: + if ((0x8000000080000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 215; + break; + case 217: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 216; + break; + case 220: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); break; - case 159: + case 221: if (curChar == 92) - jjCheckNAddTwoStates(160, 161); + jjCheckNAddTwoStates(222, 223); break; - case 160: + case 222: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); break; - case 161: + case 223: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(429, 432); break; - case 163: + case 225: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(433, 439); break; - case 164: + case 226: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(440, 442); break; - case 165: + case 227: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(443, 446); break; - case 166: + case 228: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(447, 451); break; - case 167: + case 229: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(452, 457); break; - case 168: + case 230: if ((0x7fffffe87fffffeL & l) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); break; - case 171: + case 233: if (curChar == 92) - jjCheckNAddTwoStates(172, 173); + jjCheckNAddTwoStates(234, 235); break; - case 172: + case 234: if ((0x7fffffffffffffffL & l) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); break; - case 173: + case 235: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(458, 462); break; - case 175: + case 237: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(463, 470); break; - case 176: - case 382: + case 238: + case 444: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(471, 474); break; - case 177: + case 239: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(475, 479); break; - case 178: + case 240: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(480, 485); break; - case 179: + case 241: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(486, 492); break; - case 182: - if ((0x10000000100000L & l) != 0L && kind > 69) - kind = 69; + case 244: + if ((0x10000000100000L & l) != 0L && kind > 70) + kind = 70; break; - case 183: + case 245: if ((0x100000001000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 182; + jjstateSet[jjnewStateCnt++] = 244; break; - case 184: + case 246: if ((0x20000000200000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 183; + jjstateSet[jjnewStateCnt++] = 245; break; - case 185: + case 247: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 184; + jjstateSet[jjnewStateCnt++] = 246; break; - case 186: + case 248: if ((0x4000000040L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 185; + jjstateSet[jjnewStateCnt++] = 247; break; - case 187: + case 249: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 186; + jjstateSet[jjnewStateCnt++] = 248; break; - case 188: + case 250: if ((0x1000000010L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 187; + jjstateSet[jjnewStateCnt++] = 249; break; - case 190: - if ((0x10000000100000L & l) != 0L && kind > 100) - kind = 100; + case 252: + if ((0x10000000100000L & l) != 0L && kind > 102) + kind = 102; break; - case 191: + case 253: if ((0x400000004000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 190; + jjstateSet[jjnewStateCnt++] = 252; break; - case 192: + case 254: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 191; + jjstateSet[jjnewStateCnt++] = 253; break; - case 193: + case 255: if ((0x10000000100000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 192; + jjstateSet[jjnewStateCnt++] = 254; break; - case 194: + case 256: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 193; + jjstateSet[jjnewStateCnt++] = 255; break; - case 195: + case 257: if ((0x800000008000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 194; + jjstateSet[jjnewStateCnt++] = 256; break; - case 196: + case 258: if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 195; + jjstateSet[jjnewStateCnt++] = 257; break; - case 197: + case 259: if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 196; + jjstateSet[jjnewStateCnt++] = 258; break; - case 198: + case 260: if ((0x20000000200L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 197; + jjstateSet[jjnewStateCnt++] = 259; break; - case 200: + case 262: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); break; - case 201: + case 263: if ((0x7fffffe07fffffeL & l) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); break; - case 202: + case 264: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(802, 807); break; - case 208: - if ((0x10000000100000L & l) != 0L && kind > 77) - kind = 77; - break; - case 209: - if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 208; - break; - case 211: - if ((0x200000002000L & l) != 0L && kind > 78) + case 270: + if ((0x10000000100000L & l) != 0L && kind > 78) kind = 78; break; - case 212: - if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 211; + case 271: + if ((0x1000000010000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 270; break; - case 214: + case 273: if ((0x200000002000L & l) != 0L && kind > 79) kind = 79; break; - case 215: - if ((0x800000008L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 214; + case 274: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 273; break; - case 217: - if ((0x800000008L & l) != 0L && kind > 80) + case 276: + if ((0x200000002000L & l) != 0L && kind > 80) kind = 80; break; - case 218: - if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 217; + case 277: + if ((0x800000008L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 276; break; - case 220: - if ((0x400000004000L & l) != 0L && kind > 81) + case 279: + if ((0x800000008L & l) != 0L && kind > 81) kind = 81; break; - case 221: - if ((0x20000000200L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 220; + case 280: + if ((0x1000000010000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 279; break; - case 223: - if ((0x100000001000000L & l) != 0L && kind > 82) + case 282: + if ((0x400000004000L & l) != 0L && kind > 82) kind = 82; break; - case 224: - if ((0x1000000010000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 223; + case 283: + if ((0x20000000200L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 282; break; - case 226: - if ((0x200000002000L & l) != 0L && kind > 83) + case 285: + if ((0x100000001000000L & l) != 0L && kind > 83) kind = 83; break; - case 227: - if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 226; + case 286: + if ((0x1000000010000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 285; break; - case 229: - if ((0x100000001000000L & l) != 0L && kind > 84) + case 288: + if ((0x200000002000L & l) != 0L && kind > 84) kind = 84; break; - case 230: + case 289: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 229; + jjstateSet[jjnewStateCnt++] = 288; break; - case 232: - if ((0x8000000080L & l) != 0L && kind > 85) + case 291: + if ((0x100000001000000L & l) != 0L && kind > 85) kind = 85; break; - case 233: + case 292: if ((0x2000000020L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 232; - break; - case 234: - if ((0x1000000010L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 233; + jjstateSet[jjnewStateCnt++] = 291; break; - case 236: - if ((0x1000000010L & l) != 0L && kind > 86) + case 294: + if ((0x8000000080L & l) != 0L && kind > 86) kind = 86; break; - case 237: - if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 236; + case 295: + if ((0x2000000020L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 294; break; - case 238: - if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 237; + case 296: + if ((0x1000000010L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 295; break; - case 240: + case 298: if ((0x1000000010L & l) != 0L && kind > 87) kind = 87; break; - case 241: + case 299: if ((0x200000002L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 240; + jjstateSet[jjnewStateCnt++] = 298; break; - case 242: + case 300: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 241; + jjstateSet[jjnewStateCnt++] = 299; break; - case 243: - if ((0x8000000080L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 242; - break; - case 245: - if ((0x8000000080000L & l) != 0L && kind > 88) + case 302: + if ((0x1000000010L & l) != 0L && kind > 88) kind = 88; break; - case 246: - if ((0x200000002000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 245; + case 303: + if ((0x200000002L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 302; break; - case 248: + case 304: + if ((0x4000000040000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 303; + break; + case 305: + if ((0x8000000080L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 304; + break; + case 307: if ((0x8000000080000L & l) != 0L && kind > 89) kind = 89; break; - case 250: - if ((0x400000004000000L & l) != 0L && kind > 90) - kind = 90; + case 308: + if ((0x200000002000L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 307; break; - case 251: - if ((0x10000000100L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 250; + case 310: + if ((0x8000000080000L & l) != 0L && kind > 90) + kind = 90; break; - case 253: + case 312: if ((0x400000004000000L & l) != 0L && kind > 91) kind = 91; break; - case 254: + case 313: if ((0x10000000100L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 253; + jjstateSet[jjnewStateCnt++] = 312; break; - case 255: + case 315: + if ((0x400000004000000L & l) != 0L && kind > 92) + kind = 92; + break; + case 316: + if ((0x10000000100L & l) != 0L) + jjstateSet[jjnewStateCnt++] = 315; + break; + case 317: if ((0x80000000800L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 254; + jjstateSet[jjnewStateCnt++] = 316; break; - case 258: + case 320: if ((0x7fffffe07fffffeL & l) == 0L) break; - if (kind > 92) - kind = 92; - jjCheckNAddTwoStates(259, 260); + if (kind > 93) + kind = 93; + jjCheckNAddTwoStates(321, 322); break; - case 259: + case 321: if ((0x7fffffe87fffffeL & l) == 0L) break; - if (kind > 92) - kind = 92; - jjCheckNAddTwoStates(259, 260); + if (kind > 93) + kind = 93; + jjCheckNAddTwoStates(321, 322); break; - case 260: + case 322: if (curChar == 92) - jjCheckNAddTwoStates(261, 262); + jjCheckNAddTwoStates(323, 324); break; - case 261: + case 323: if ((0x7fffffffffffffffL & l) == 0L) break; - if (kind > 92) - kind = 92; - jjCheckNAddTwoStates(259, 260); + if (kind > 93) + kind = 93; + jjCheckNAddTwoStates(321, 322); break; - case 262: + case 324: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(493, 496); break; - case 264: + case 326: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(497, 503); break; - case 265: + case 327: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(504, 506); break; - case 266: + case 328: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(507, 510); break; - case 267: + case 329: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(511, 515); break; - case 268: + case 330: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(516, 521); break; - case 270: + case 332: if (curChar == 92) - jjCheckNAddTwoStates(261, 271); + jjCheckNAddTwoStates(323, 333); break; - case 271: + case 333: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(522, 525); break; - case 272: + case 334: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(526, 532); break; - case 273: + case 335: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(533, 535); break; - case 274: + case 336: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(536, 539); break; - case 275: + case 337: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(540, 544); break; - case 276: + case 338: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 92) - kind = 92; + if (kind > 93) + kind = 93; jjCheckNAddStates(545, 550); break; - case 277: + case 339: if ((0x20000000200000L & l) != 0L) - jjAddStates(816, 818); + jjAddStates(817, 819); break; - case 279: - case 283: + case 341: + case 345: if ((0x7fffffffffffffffL & l) != 0L) jjCheckNAddStates(557, 560); break; - case 282: + case 344: if (curChar == 92) - jjAddStates(833, 834); + jjAddStates(838, 839); break; - case 284: + case 346: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(561, 565); break; - case 286: + case 348: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(566, 573); break; - case 287: + case 349: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(574, 577); break; - case 288: + case 350: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(578, 582); break; - case 289: + case 351: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(583, 588); break; - case 290: + case 352: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(589, 595); break; - case 292: - case 297: + case 354: + case 359: if ((0x7fffffffffffffffL & l) != 0L) jjCheckNAddStates(596, 599); break; - case 294: + case 356: if (curChar == 92) - jjAddStates(835, 838); + jjAddStates(840, 843); break; - case 296: + case 358: if (curChar == 92) - jjAddStates(839, 840); + jjAddStates(844, 845); break; - case 298: + case 360: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(600, 605); break; - case 300: + case 362: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(606, 614); break; - case 301: + case 363: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(615, 619); break; - case 302: + case 364: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(620, 625); break; - case 303: + case 365: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(626, 632); break; - case 304: + case 366: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(633, 640); break; - case 309: - case 314: + case 371: + case 376: if ((0x7fffffffffffffffL & l) != 0L) jjCheckNAddStates(641, 644); break; - case 311: + case 373: if (curChar == 92) - jjAddStates(841, 844); + jjAddStates(846, 849); break; - case 313: + case 375: if (curChar == 92) - jjAddStates(845, 846); + jjAddStates(850, 851); break; - case 315: + case 377: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(645, 650); break; - case 317: + case 379: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(651, 659); break; - case 318: + case 380: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(660, 664); break; - case 319: + case 381: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(665, 670); break; - case 320: + case 382: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(671, 677); break; - case 321: + case 383: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(678, 685); break; - case 326: + case 388: if ((0x100000001000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 278; + jjstateSet[jjnewStateCnt++] = 340; break; - case 327: + case 389: if ((0x4000000040000L & l) != 0L) - jjstateSet[jjnewStateCnt++] = 326; + jjstateSet[jjnewStateCnt++] = 388; break; - case 335: + case 397: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjAddStates(702, 707); break; - case 336: + case 398: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 337; + jjstateSet[jjnewStateCnt++] = 399; break; - case 337: + case 399: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 338; + jjstateSet[jjnewStateCnt++] = 400; break; - case 338: + case 400: if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(339); + jjCheckNAdd(401); break; - case 339: - if ((0x7e0000007eL & l) != 0L && kind > 110) - kind = 110; + case 401: + if ((0x7e0000007eL & l) != 0L && kind > 112) + kind = 112; break; - case 340: + case 402: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 341; + jjstateSet[jjnewStateCnt++] = 403; break; - case 341: + case 403: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 342; + jjstateSet[jjnewStateCnt++] = 404; break; - case 342: + case 404: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 343; + jjstateSet[jjnewStateCnt++] = 405; break; - case 343: + case 405: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 331; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 393; break; - case 344: + case 406: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 345; + jjstateSet[jjnewStateCnt++] = 407; break; - case 345: + case 407: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 346; + jjstateSet[jjnewStateCnt++] = 408; break; - case 346: + case 408: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 347; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 409; break; - case 348: + case 410: if ((0x7e0000007eL & l) != 0L) - jjstateSet[jjnewStateCnt++] = 349; + jjstateSet[jjnewStateCnt++] = 411; break; - case 349: + case 411: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 350; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 412; break; - case 352: + case 414: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 353; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 415; break; - case 361: + case 423: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(362, 368); + jjCheckNAddTwoStates(424, 430); break; - case 363: + case 425: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; - jjstateSet[jjnewStateCnt++] = 364; + if (kind > 112) + kind = 112; + jjstateSet[jjnewStateCnt++] = 426; break; - case 364: + case 426: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(718, 721); break; - case 365: + case 427: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; - jjCheckNAdd(339); + if (kind > 112) + kind = 112; + jjCheckNAdd(401); break; - case 366: + case 428: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; - jjCheckNAddTwoStates(339, 365); + if (kind > 112) + kind = 112; + jjCheckNAddTwoStates(401, 427); break; - case 367: + case 429: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 110) - kind = 110; + if (kind > 112) + kind = 112; jjCheckNAddStates(722, 724); break; - case 368: + case 430: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(725, 729); break; - case 369: + case 431: if ((0x7e0000007eL & l) != 0L) - jjCheckNAdd(362); + jjCheckNAdd(424); break; - case 370: + case 432: if ((0x7e0000007eL & l) != 0L) - jjCheckNAddTwoStates(369, 362); + jjCheckNAddTwoStates(431, 424); break; - case 371: + case 433: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(730, 732); break; - case 372: + case 434: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(733, 736); break; - case 373: + case 435: if (curChar == 92) jjCheckNAddStates(808, 811); break; - case 374: + case 436: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(737, 740); break; - case 375: + case 437: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(741, 747); break; - case 376: + case 438: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(748, 750); break; - case 377: + case 439: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(751, 754); break; - case 378: + case 440: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(755, 759); break; - case 379: + case 441: if ((0x7e0000007eL & l) == 0L) break; - if (kind > 71) - kind = 71; + if (kind > 72) + kind = 72; jjCheckNAddStates(760, 765); break; - case 380: + case 442: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(766, 770); break; - case 381: + case 443: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(771, 778); break; - case 383: + case 445: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(779, 783); break; - case 384: + case 446: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(784, 789); break; - case 385: + case 447: if ((0x7e0000007eL & l) != 0L) jjCheckNAddStates(790, 796); break; @@ -3920,40 +4311,38 @@ private int jjMoveNfa_0(int startState, int curPos) { switch(jjstateSet[--i]) { - case 79: - case 81: - case 83: + case 506: + case 113: + case 115: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 75) - kind = 75; - jjCheckNAddTwoStates(81, 82); + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); break; - case 444: - case 113: - case 115: + case 166: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 99) - kind = 99; + if (kind > 101) + kind = 101; jjCheckNAddTwoStates(113, 114); break; - case 443: + case 174: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + break; + case 503: if ((jjbitVec0[i2] & l2) != 0L) { - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); } if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(5, 8); - break; - case 111: - if ((jjbitVec0[i2] & l2) == 0L) - break; - if (kind > 99) - kind = 99; - jjCheckNAddTwoStates(113, 114); + jjCheckNAddStates(0, 3); break; case 4: if ((jjbitVec0[i2] & l2) == 0L) @@ -3962,6 +4351,46 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 41; jjCheckNAddStates(802, 807); break; + case 175: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + break; + case 33: + if ((jjbitVec0[i2] & l2) != 0L) + { + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); + } + if ((jjbitVec0[i2] & l2) != 0L) + jjCheckNAddStates(0, 3); + break; + case 176: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + break; + case 177: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 101) + kind = 101; + jjCheckNAddTwoStates(113, 114); + break; + case 79: + case 81: + case 83: + if ((jjbitVec0[i2] & l2) == 0L) + break; + if (kind > 76) + kind = 76; + jjCheckNAddTwoStates(81, 82); + break; case 2: if ((jjbitVec0[i2] & l2) != 0L && kind > 5) kind = 5; @@ -3975,55 +4404,55 @@ private int jjMoveNfa_0(int startState, int curPos) case 45: case 50: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(115, 118); + jjCheckNAddStates(110, 113); break; case 62: case 67: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(111, 114); + jjCheckNAddStates(106, 109); break; case 100: case 102: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 93) - kind = 93; + if (kind > 94) + kind = 94; jjCheckNAddTwoStates(100, 101); break; - case 158: - case 160: + case 220: + case 222: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 71) - kind = 71; - jjCheckNAddTwoStates(158, 159); + if (kind > 72) + kind = 72; + jjCheckNAddTwoStates(220, 221); break; - case 168: - case 172: + case 230: + case 234: if ((jjbitVec0[i2] & l2) != 0L) - jjCheckNAddStates(5, 8); + jjCheckNAddStates(0, 3); break; - case 259: - case 261: - case 269: + case 321: + case 323: + case 331: if ((jjbitVec0[i2] & l2) == 0L) break; - if (kind > 92) - kind = 92; - jjCheckNAddTwoStates(259, 260); + if (kind > 93) + kind = 93; + jjCheckNAddTwoStates(321, 322); break; - case 279: - case 283: + case 341: + case 345: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(557, 560); break; - case 292: - case 297: + case 354: + case 359: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(596, 599); break; - case 309: - case 314: + case 371: + case 376: if ((jjbitVec0[i2] & l2) != 0L) jjCheckNAddStates(641, 644); break; @@ -4038,7 +4467,7 @@ private int jjMoveNfa_0(int startState, int curPos) kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 441 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 503 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } @@ -4194,14 +4623,14 @@ private int jjMoveStringLiteralDfa1_2(long active0) return 2; } static final int[] jjnextStates = { - 256, 257, 258, 269, 270, 168, 169, 170, 171, 387, 388, 389, 390, 391, 392, 206, - 393, 394, 395, 209, 396, 397, 398, 212, 399, 400, 401, 215, 402, 403, 404, 218, - 405, 406, 407, 221, 408, 409, 410, 224, 411, 412, 413, 227, 414, 415, 416, 230, - 417, 418, 419, 234, 420, 421, 422, 238, 423, 424, 425, 243, 426, 427, 428, 246, - 429, 430, 431, 248, 432, 433, 434, 251, 435, 436, 437, 255, 438, 439, 440, 257, - 258, 269, 270, 204, 205, 207, 210, 213, 216, 219, 222, 225, 228, 231, 235, 239, - 244, 247, 249, 252, 256, 200, 201, 181, 188, 189, 198, 79, 80, 91, 92, 62, - 63, 64, 66, 45, 46, 47, 49, 7, 8, 20, 21, 9, 10, 11, 9, 14, + 230, 231, 232, 233, 449, 450, 451, 452, 453, 454, 268, 455, 456, 457, 271, 458, + 459, 460, 274, 461, 462, 463, 277, 464, 465, 466, 280, 467, 468, 469, 283, 470, + 471, 472, 286, 473, 474, 475, 289, 476, 477, 478, 292, 479, 480, 481, 296, 482, + 483, 484, 300, 485, 486, 487, 305, 488, 489, 490, 308, 491, 492, 493, 310, 494, + 495, 496, 313, 497, 498, 499, 317, 500, 501, 502, 319, 320, 331, 332, 266, 267, + 269, 272, 275, 278, 281, 284, 287, 290, 293, 297, 301, 306, 309, 311, 314, 318, + 262, 263, 243, 250, 251, 260, 79, 80, 91, 92, 62, 63, 64, 66, 45, 46, + 47, 49, 318, 319, 320, 331, 332, 7, 8, 20, 21, 9, 10, 11, 9, 14, 10, 11, 15, 9, 16, 14, 10, 11, 17, 18, 19, 9, 14, 10, 11, 9, 16, 14, 10, 11, 9, 16, 14, 10, 11, 17, 9, 16, 14, 10, 11, 17, 18, 14, 9, 10, 11, 23, 24, 14, 9, 10, 11, 25, 26, 27, 14, 9, @@ -4220,33 +4649,34 @@ static final int[] jjnextStates = { 118, 113, 119, 117, 114, 120, 121, 122, 113, 117, 114, 113, 119, 117, 114, 113, 119, 117, 114, 120, 113, 119, 117, 114, 120, 121, 117, 113, 114, 126, 127, 117, 113, 114, 128, 129, 130, 117, 113, 114, 127, 117, 113, 114, 127, 117, 113, 114, - 128, 127, 117, 113, 114, 128, 129, 132, 133, 140, 141, 148, 149, 158, 162, 159, - 163, 158, 164, 162, 159, 165, 166, 167, 158, 162, 159, 158, 164, 162, 159, 158, - 164, 162, 159, 165, 158, 164, 162, 159, 165, 166, 168, 170, 171, 174, 175, 168, - 176, 170, 171, 174, 177, 178, 179, 168, 170, 171, 174, 168, 176, 170, 171, 174, - 168, 176, 170, 171, 174, 177, 168, 176, 170, 171, 174, 177, 178, 259, 263, 260, - 264, 259, 265, 263, 260, 266, 267, 268, 259, 263, 260, 259, 265, 263, 260, 259, - 265, 263, 260, 266, 259, 265, 263, 260, 266, 267, 263, 259, 260, 272, 273, 263, - 259, 260, 274, 275, 276, 263, 259, 260, 273, 263, 259, 260, 273, 263, 259, 260, - 274, 273, 263, 259, 260, 274, 275, 279, 291, 308, 281, 282, 325, 279, 280, 281, - 282, 279, 281, 282, 285, 286, 279, 287, 281, 282, 285, 288, 289, 290, 279, 281, - 282, 285, 279, 287, 281, 282, 285, 279, 287, 281, 282, 285, 288, 279, 287, 281, - 282, 285, 288, 289, 292, 293, 294, 296, 292, 299, 293, 294, 296, 300, 292, 301, - 299, 293, 294, 296, 302, 303, 304, 292, 299, 293, 294, 296, 292, 301, 299, 293, - 294, 296, 292, 301, 299, 293, 294, 296, 302, 292, 301, 299, 293, 294, 296, 302, - 303, 309, 310, 311, 313, 309, 316, 310, 311, 313, 317, 309, 318, 316, 310, 311, - 313, 319, 320, 321, 309, 316, 310, 311, 313, 309, 318, 316, 310, 311, 313, 309, - 318, 316, 310, 311, 313, 319, 309, 318, 316, 310, 311, 313, 319, 320, 279, 291, - 308, 280, 281, 282, 325, 329, 335, 331, 332, 333, 334, 331, 332, 333, 336, 340, - 344, 348, 352, 356, 331, 354, 355, 331, 357, 358, 359, 331, 357, 358, 339, 365, - 366, 367, 339, 365, 366, 369, 362, 370, 371, 372, 369, 362, 370, 369, 362, 370, - 371, 162, 158, 159, 375, 376, 162, 158, 159, 377, 378, 379, 162, 158, 159, 376, - 162, 158, 159, 376, 162, 158, 159, 377, 376, 162, 158, 159, 377, 378, 168, 170, - 171, 174, 381, 382, 168, 170, 171, 174, 383, 384, 385, 382, 168, 170, 171, 174, - 382, 168, 170, 171, 174, 383, 382, 168, 170, 171, 174, 383, 384, 438, 257, 258, - 269, 270, 158, 168, 169, 170, 171, 159, 160, 374, 172, 380, 111, 112, 123, 124, - 327, 328, 360, 48, 58, 60, 59, 50, 51, 65, 75, 77, 76, 67, 68, 102, - 103, 283, 284, 295, 305, 307, 306, 297, 298, 312, 322, 324, 323, 314, 315, + 128, 127, 117, 113, 114, 128, 129, 132, 133, 140, 141, 148, 149, 220, 224, 221, + 225, 220, 226, 224, 221, 227, 228, 229, 220, 224, 221, 220, 226, 224, 221, 220, + 226, 224, 221, 227, 220, 226, 224, 221, 227, 228, 230, 232, 233, 236, 237, 230, + 238, 232, 233, 236, 239, 240, 241, 230, 232, 233, 236, 230, 238, 232, 233, 236, + 230, 238, 232, 233, 236, 239, 230, 238, 232, 233, 236, 239, 240, 321, 325, 322, + 326, 321, 327, 325, 322, 328, 329, 330, 321, 325, 322, 321, 327, 325, 322, 321, + 327, 325, 322, 328, 321, 327, 325, 322, 328, 329, 325, 321, 322, 334, 335, 325, + 321, 322, 336, 337, 338, 325, 321, 322, 335, 325, 321, 322, 335, 325, 321, 322, + 336, 335, 325, 321, 322, 336, 337, 341, 353, 370, 343, 344, 387, 341, 342, 343, + 344, 341, 343, 344, 347, 348, 341, 349, 343, 344, 347, 350, 351, 352, 341, 343, + 344, 347, 341, 349, 343, 344, 347, 341, 349, 343, 344, 347, 350, 341, 349, 343, + 344, 347, 350, 351, 354, 355, 356, 358, 354, 361, 355, 356, 358, 362, 354, 363, + 361, 355, 356, 358, 364, 365, 366, 354, 361, 355, 356, 358, 354, 363, 361, 355, + 356, 358, 354, 363, 361, 355, 356, 358, 364, 354, 363, 361, 355, 356, 358, 364, + 365, 371, 372, 373, 375, 371, 378, 372, 373, 375, 379, 371, 380, 378, 372, 373, + 375, 381, 382, 383, 371, 378, 372, 373, 375, 371, 380, 378, 372, 373, 375, 371, + 380, 378, 372, 373, 375, 381, 371, 380, 378, 372, 373, 375, 381, 382, 341, 353, + 370, 342, 343, 344, 387, 391, 397, 393, 394, 395, 396, 393, 394, 395, 398, 402, + 406, 410, 414, 418, 393, 416, 417, 393, 419, 420, 421, 393, 419, 420, 401, 427, + 428, 429, 401, 427, 428, 431, 424, 432, 433, 434, 431, 424, 432, 431, 424, 432, + 433, 224, 220, 221, 437, 438, 224, 220, 221, 439, 440, 441, 224, 220, 221, 438, + 224, 220, 221, 438, 224, 220, 221, 439, 438, 224, 220, 221, 439, 440, 230, 232, + 233, 236, 443, 444, 230, 232, 233, 236, 445, 446, 447, 444, 230, 232, 233, 236, + 444, 230, 232, 233, 236, 445, 444, 230, 232, 233, 236, 445, 446, 500, 319, 320, + 331, 332, 220, 230, 231, 232, 233, 221, 222, 436, 234, 442, 166, 179, 190, 206, + 218, 389, 390, 422, 111, 112, 123, 124, 48, 58, 60, 59, 50, 51, 65, 75, + 77, 76, 67, 68, 102, 103, 345, 346, 357, 367, 369, 368, 359, 360, 374, 384, + 386, 385, 376, 377, }; /** Token literal values. */ @@ -4260,7 +4690,7 @@ null, null, null, null, null, null, null, null, null, null, null, null, null, nu null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, -null, null, null, null, null, }; +null, null, null, null, null, null, null, }; /** Lexer state names. */ public static final String[] lexStateNames = { @@ -4276,10 +4706,10 @@ public static final int[] jjnewLexState = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, }; static final long[] jjtoToken = { - 0xfffc03fffffffc03L, 0xfc01ffffffdffL, + 0xfffc03fffffffc03L, 0x3f007ffffffbffL, }; static final long[] jjtoSkip = { 0x190L, 0x0L, @@ -4291,8 +4721,8 @@ static final long[] jjtoMore = { 0x26cL, 0x0L, }; protected CharStream input_stream; -private final int[] jjrounds = new int[441]; -private final int[] jjstateSet = new int[882]; +private final int[] jjrounds = new int[503]; +private final int[] jjstateSet = new int[1006]; private final StringBuilder jjimage = new StringBuilder(); private StringBuilder image = jjimage; private int jjimageLen; @@ -4321,7 +4751,7 @@ private void ReInitRounds() { int i; jjround = 0x80000001; - for (i = 441; i-- > 0;) + for (i = 503; i-- > 0;) jjrounds[i] = 0x80000000; } @@ -4405,9 +4835,9 @@ public Token getNextToken() jjmatchedKind = 0x7fffffff; jjmatchedPos = 0; curPos = jjMoveStringLiteralDfa0_0(); - if (jjmatchedPos == 0 && jjmatchedKind > 115) + if (jjmatchedPos == 0 && jjmatchedKind > 117) { - jjmatchedKind = 115; + jjmatchedKind = 117; } break; case 1: diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframeSelectorNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframeSelectorNode.java new file mode 100644 index 0000000000..52fbac0dec --- /dev/null +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframeSelectorNode.java @@ -0,0 +1,26 @@ +package com.vaadin.sass.internal.tree; + +public class KeyframeSelectorNode extends Node { + private String selector; + + public KeyframeSelectorNode(String selector) { + this.selector = selector; + } + + @Override + public String toString() { + StringBuilder string = new StringBuilder(); + string.append(selector).append(" {\n"); + for (Node child : children) { + string.append("\t\t").append(child.toString()).append("\n"); + } + string.append("\t}"); + return string.toString(); + } + + @Override + public void traverse() { + + } + +} diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java new file mode 100644 index 0000000000..b9984bc647 --- /dev/null +++ b/theme-compiler/src/com/vaadin/sass/internal/tree/KeyframesNode.java @@ -0,0 +1,47 @@ +package com.vaadin.sass.internal.tree; + +import java.util.ArrayList; +import java.util.regex.Pattern; + +import com.vaadin.sass.internal.ScssStylesheet; + +public class KeyframesNode extends Node implements IVariableNode { + private String keyframeName; + private String animationName; + + public KeyframesNode(String keyframeName, String animationName) { + this.keyframeName = keyframeName; + this.animationName = animationName; + } + + @Override + public String toString() { + StringBuilder string = new StringBuilder(); + string.append(keyframeName).append(" ").append(animationName) + .append(" {\n"); + for (Node child : children) { + string.append("\t\t").append(child.toString()).append("\n"); + } + string.append("\t}"); + return string.toString(); + } + + @Override + public void traverse() { + replaceVariables(ScssStylesheet.getVariables()); + } + + @Override + public void replaceVariables(ArrayList<VariableNode> variables) { + for (final VariableNode node : variables) { + String interpolation = "#{$" + node.getName() + "}"; + if (animationName != null && animationName.contains(interpolation)) { + if (animationName.contains(interpolation)) { + animationName = animationName.replaceAll(Pattern + .quote(interpolation), node.getExpr().toString()); + } + } + } + } + +} diff --git a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java index 946d56ba89..5593241297 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java +++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java @@ -48,8 +48,9 @@ public class ImportNodeHandler { filePathBuilder.append(".scss"); } - ScssStylesheet imported = ScssStylesheet - .get(filePathBuilder.toString()); + // set parent's charset to imported node. + ScssStylesheet imported = ScssStylesheet.get( + filePathBuilder.toString(), node.getCharset()); if (imported == null) { imported = ScssStylesheet.get(importNode.getUri()); } diff --git a/theme-compiler/tests/resources/automatic/css/keyframe.css b/theme-compiler/tests/resources/automatic/css/keyframe.css new file mode 100644 index 0000000000..70dab44177 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/keyframe.css @@ -0,0 +1,38 @@ +@-webkit-keyframes bgcolor { + 0% { + background-color: #ffccf2; + } + 100% { + background-color: #ccffff; + } +} +@-moz-keyframes bgcolor { + from { + background-color: #ffccf2; + } + to { + background-color: #ccffff; + } +} +@-ms-keyframes bgcolor { + from { + background-color: #ffccf2; + } + 100% { + background-color: #ccffff; + } +} +@keyframes bgcolor { + 0% { + background-color: #ffccf2; + } + to { + background-color: #ccffff; + } +} + +@keyframes mymove { + from { top: 0px; } + to { top: 200px; } + 50% { top: 100px; } +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/css/utf8.css b/theme-compiler/tests/resources/automatic/css/utf8.css new file mode 100644 index 0000000000..b27d6cedf9 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/css/utf8.css @@ -0,0 +1,5 @@ +@charset "UTF-8"; +.imported { content: "\1f4c5"; } +.imported_raw_utf { content: "♥"; } +.bar { content: "\1f4c5"; } +.raw_utf { content: "📈"; }
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/keyframe.scss b/theme-compiler/tests/resources/automatic/scss/keyframe.scss new file mode 100644 index 0000000000..9c30493e41 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/keyframe.scss @@ -0,0 +1,46 @@ +// keyframes mixin +@mixin keyframes($name) { + @-webkit-keyframes #{$name} { + 0% { + background-color: #ffccf2; + } + 100% { + background-color: #ccffff; + } + } + @-moz-keyframes #{$name} { + from { + background-color: #ffccf2; + } + to { + background-color: #ccffff; + } + } + @-ms-keyframes #{$name} { + from { + background-color: #ffccf2; + } + 100% { + background-color: #ccffff; + } + } + @keyframes #{$name} { + 0% { + background-color: #ffccf2; + } + to { + background-color: #ccffff; + } + } +} + +// use of keyframes mixin +@include keyframes(bgcolor); + +// use of keyframes outside mixin. pure css +@keyframes mymove +{ + from {top:0px;} + to {top:200px;} + 50% {top: 100px;} +}
\ No newline at end of file diff --git a/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss b/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss new file mode 100644 index 0000000000..f8a08a4a96 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/utf8-imported/to-be-imported-scss-file-contains-utf8.scss @@ -0,0 +1,3 @@ +@charset "abc"; +.imported{content: '\1f4c5';} +.imported_raw_utf{content: "♥";} diff --git a/theme-compiler/tests/resources/automatic/scss/utf8.scss b/theme-compiler/tests/resources/automatic/scss/utf8.scss new file mode 100644 index 0000000000..b568674073 --- /dev/null +++ b/theme-compiler/tests/resources/automatic/scss/utf8.scss @@ -0,0 +1,4 @@ +@charset "UTF-8"; +@import "utf8-imported/to-be-imported-scss-file-contains-utf8"; +.bar {content: "\1f4c5";} +.raw_utf {content: "📈";}
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html new file mode 100644 index 0000000000..f3f44a5d90 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.html @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8888/" /> +<title>ComboBoxSQLContainerFilteredValueChange</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">ComboBoxSQLContainerFilteredValueChange</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.combobox.ComboBoxSQLContainerFilteredValueChange?restartApplication</td> + <td></td> +</tr> +<tr> + <td>enterCharacter</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSQLContainerFilteredValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]#textbox</td> + <td>a</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSQLContainerFilteredValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]#textbox</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSQLContainerFilteredValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]#textbox</td> + <td>enter</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxSQLContainerFilteredValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td> + <td>Selected: 1</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java new file mode 100644 index 0000000000..23a75ae56e --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java @@ -0,0 +1,123 @@ +package com.vaadin.tests.components.combobox; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; + +import com.vaadin.data.Property; +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.util.sqlcontainer.SQLContainer; +import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; +import com.vaadin.data.util.sqlcontainer.query.TableQuery; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.AbstractSelect.Filtering; +import com.vaadin.ui.ComboBox; +import com.vaadin.ui.Label; +import com.vaadin.ui.VerticalLayout; + +public class ComboBoxSQLContainerFilteredValueChange extends TestBase { + + @Override + protected void setup() { + VerticalLayout layout = new VerticalLayout(); + addComponent(layout); + + final ComboBox myCombo = new ComboBox("MyCaption"); + layout.addComponent(myCombo); + + final Label selectedLabel = new Label("Selected: null"); + layout.addComponent(selectedLabel); + + try { + JDBCConnectionPool connectionPool = new SimpleJDBCConnectionPool( + "org.hsqldb.jdbc.JDBCDriver", + "jdbc:hsqldb:mem:sqlcontainer", "SA", "", 2, 20); + + createTestTable(connectionPool); + insertTestData(connectionPool); + + TableQuery q = new TableQuery("mytable", connectionPool); + q.setVersionColumn("version"); + SQLContainer myContainer = new SQLContainer(q); + + myCombo.setContainerDataSource(myContainer); + + } catch (SQLException e) { + e.printStackTrace(); + } + + myCombo.setItemCaptionPropertyId("MYFIELD"); + myCombo.setFilteringMode(Filtering.FILTERINGMODE_CONTAINS); + myCombo.setImmediate(true); + myCombo.setWidth("100.0%"); + myCombo.setHeight("-1px"); + myCombo.addListener(new Property.ValueChangeListener() { + public void valueChange(ValueChangeEvent event) { + selectedLabel.setValue("Selected: " + + event.getProperty().getValue()); + } + }); + } + + @Override + protected String getDescription() { + return "Selecting the first filtered item should change the value of the label under the ComboBox to 'Selected: 1'."; + } + + @Override + protected Integer getTicketNumber() { + return 10471; + } + + /** + * (Re)creates the test table + * @param connectionPool + */ + private void createTestTable(JDBCConnectionPool connectionPool) { + Connection conn = null; + try { + conn = connectionPool.reserveConnection(); + Statement statement = conn.createStatement(); + try { + statement.executeUpdate("DROP TABLE mytable"); + } catch (SQLException e) { + } + statement.execute("CREATE TABLE mytable " + + "(id INTEGER GENERATED BY DEFAULT AS IDENTITY, " + + "MYFIELD VARCHAR(45), " + "PRIMARY KEY(ID))"); + statement.close(); + conn.commit(); + } catch (SQLException e) { + e.printStackTrace(); + } finally { + connectionPool.releaseConnection(conn); + } + } + + /** + * Adds test data to the test table + * @param connectionPool + * @throws SQLException + */ + private void insertTestData(JDBCConnectionPool connectionPool) + throws SQLException { + Connection conn = null; + try { + conn = connectionPool.reserveConnection(); + Statement statement = conn.createStatement(); + + statement.executeUpdate("INSERT INTO mytable VALUES(1, 'A0')"); + statement.executeUpdate("INSERT INTO mytable VALUES(2, 'A1')"); + statement.executeUpdate("INSERT INTO mytable VALUES(3, 'B0')"); + statement.executeUpdate("INSERT INTO mytable VALUES(4, 'B1')"); + + statement.close(); + conn.commit(); + } catch (SQLException e) { + e.printStackTrace(); + } finally { + connectionPool.releaseConnection(conn); + } + } +}
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html new file mode 100644 index 0000000000..799e844e04 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.html @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8888/" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.tabsheet.TabsheetMinimalClosableTabs?restartApplication</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java new file mode 100644 index 0000000000..ebfee0adb0 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/tabsheet/TabsheetMinimalClosableTabs.java @@ -0,0 +1,44 @@ +package com.vaadin.tests.components.tabsheet; + +import com.vaadin.server.ExternalResource; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Label; +import com.vaadin.ui.TabSheet; +import com.vaadin.ui.TabSheet.Tab; +import com.vaadin.ui.themes.Reindeer; + +public class TabsheetMinimalClosableTabs extends TestBase { + + @Override + protected void setup() { + TabSheet ts = new TabSheet(); + for (int tab = 0; tab < 5; tab++) { + String tabCaption = "Tab"; + for (int c = 0; c < tab; c++) { + tabCaption += tabCaption; + } + tabCaption += " " + tab; + + Tab t = ts.addTab(new Label("Content " + tab), tabCaption); + t.setClosable(true); + + if (tab % 2 == 0) { + t.setIcon(new ExternalResource( + "/VAADIN/themes/tests-tickets/icons/fi.gif")); + } + } + + ts.addStyleName(Reindeer.TABSHEET_MINIMAL); + addComponent(ts); + } + + @Override + protected String getDescription() { + return "Minimal theme should also show the close button in all browsers"; + } + + @Override + protected Integer getTicketNumber() { + return 10610; + } +} diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html index 499c30c86a..d9366385ce 100644 --- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html +++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdate.html @@ -168,7 +168,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -219,7 +219,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -238,6 +238,11 @@ <td>9,-995</td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::PID_SLog_row_0</td> <td>20. Row Item TestBean [col1=40 (children), col2=AN] expanded. Row index: 39</td> @@ -288,6 +293,11 @@ <td>9,-998</td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::PID_SLog_row_0</td> <td>25. Row Item TestBean [col1=40 (children), col2=AN] collapsed. Row index: 39</td> @@ -313,6 +323,11 @@ <td>27. Button Item TestBean [col1=35, col2=AI]/col3 clicked. Row index: 34</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[42]/VNativeButton[0]</td> + <td></td> +</tr> +<tr> <td>mouseClick</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[42]/VNativeButton[0]</td> <td>98,-998</td> @@ -339,7 +354,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -388,6 +403,11 @@ <td>10,-2461</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[43]/VNativeButton[0]</td> + <td></td> +</tr> +<tr> <td>mouseClick</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[43]/VNativeButton[0]</td> <td>65,-2456</td> @@ -429,7 +449,7 @@ </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -484,13 +504,13 @@ <td>42. Row Item TestBean [col1=99 (children), col2=CU] collapsed. Row index: 98</td> </tr> <tr> - <td>pause</td> + <td>waitForElementPresent</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[40]/VNativeButton[0]</td> <td></td> - <td>300</td> </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[43]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[40]/VNativeButton[0]</td> <td>71,-2465</td> </tr> <tr> @@ -500,7 +520,7 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[44]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[41]/VNativeButton[0]</td> <td>81,-2459</td> </tr> <tr> @@ -510,7 +530,7 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[42]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[39]/VNativeButton[0]</td> <td>80,-2458</td> </tr> <tr> @@ -520,13 +540,13 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[30]/VNativeButton[0]</td> + <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VTreeTable[0]/FocusableScrollPanel[0]/VTreeTable$VTreeTableScrollBody[0]/VTreeTable$VTreeTableScrollBody$VTreeTableRow[28]/VNativeButton[0]</td> <td>86,-2462</td> </tr> <tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTableCacheOnPartialUpdates::PID_SLog_row_0</td> - <td>46. Button Item TestBean [col1=86, col2=CH]/col3 clicked. Row index: 85</td> + <td>46. Button Item TestBean [col1=87, col2=CI]/col3 clicked. Row index: 86</td> </tr> </tbody></table> </body> |