diff options
author | Tom Schindl | 2014-07-04 22:17:30 +0000 |
---|---|---|
committer | Tom Schindl | 2014-07-04 22:17:30 +0000 |
commit | 7a993997ca83bc3bbdb420bcef2a00b51c6b548e (patch) | |
tree | f1cf42b6a00d2e5cc3bf6a5705a88877682be166 /experimental | |
parent | f6ddca7b0e1af5466edcc87f1ce8a9ea79eba60a (diff) | |
download | org.eclipse.efxclipse-7a993997ca83bc3bbdb420bcef2a00b51c6b548e.tar.gz org.eclipse.efxclipse-7a993997ca83bc3bbdb420bcef2a00b51c6b548e.tar.xz org.eclipse.efxclipse-7a993997ca83bc3bbdb420bcef2a00b51c6b548e.zip |
use HSL to deal with XML editor
Diffstat (limited to 'experimental')
48 files changed, 2765 insertions, 2359 deletions
diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.classpath b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.classpath new file mode 100644 index 000000000..eca7bdba8 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="output" path="bin"/> +</classpath> diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.gitignore b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.gitignore new file mode 100644 index 000000000..ae3c17260 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.gitignore @@ -0,0 +1 @@ +/bin/ diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.project b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.project new file mode 100644 index 000000000..3df2e9ace --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.fx.code.compensator.editor.hsl</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.settings/org.eclipse.jdt.core.prefs b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..0c68a61dc --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/META-INF/MANIFEST.MF b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/META-INF/MANIFEST.MF new file mode 100644 index 000000000..94186426b --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/META-INF/MANIFEST.MF @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: Hsl +Bundle-SymbolicName: org.eclipse.fx.code.compensator.editor.hsl +Bundle-Version: 1.0.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Bundle: org.eclipse.fx.code.compensator.editor;bundle-version="1.0.0", + org.eclipse.fx.text;bundle-version="1.0.0", + org.eclipse.text, + org.eclipse.fx.text.ui;bundle-version="1.0.0", + org.eclipse.fx.code.compensator.hsl;bundle-version="1.0.0", + org.eclipse.fx.ui.controls;bundle-version="1.0.0" +Export-Package: org.eclipse.fx.code.compensator.editor.hsl diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/build.properties b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/build.properties new file mode 100644 index 000000000..34d2e4d2d --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/build.properties @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLComponent.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLComponent.java new file mode 100644 index 000000000..a110309ed --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLComponent.java @@ -0,0 +1,29 @@ +package org.eclipse.fx.code.compensator.editor.hsl; + +import org.eclipse.fx.code.compensator.editor.Input; +import org.eclipse.fx.code.compensator.editor.services.PartitionerFactory; +import org.eclipse.fx.code.compensator.editor.services.SourceViewerConfigurationFactory; +import org.eclipse.jface.text.IDocumentPartitioner; +import org.eclipse.jface.text.source.SourceViewerConfiguration; + +public class HSLComponent implements PartitionerFactory, SourceViewerConfigurationFactory { + + @Override + public SourceViewerConfiguration createConfiguration(Input<?> input) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean applies(Input<?> input) { + // TODO Auto-generated method stub + return false; + } + + @Override + public IDocumentPartitioner createPartitioner(Input<?> input) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java new file mode 100644 index 000000000..86975e165 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLConfiguration.java @@ -0,0 +1,61 @@ +package org.eclipse.fx.code.compensator.editor.hsl; + +import java.io.IOException; +import java.io.InputStreamReader; + +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; + +import org.eclipse.fx.code.compensator.hsl.hSL.Damager; +import org.eclipse.fx.code.compensator.hsl.hSL.JSDamager; +import org.eclipse.fx.code.compensator.hsl.hSL.Model; +import org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager; +import org.eclipse.jface.text.presentation.IPresentationDamager; +import org.eclipse.jface.text.presentation.IPresentationReconciler; +import org.eclipse.jface.text.presentation.IPresentationRepairer; +import org.eclipse.jface.text.presentation.PresentationReconciler; +import org.eclipse.jface.text.rules.DefaultDamagerRepairer; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.jface.text.source.SourceViewerConfiguration; + +public class HSLConfiguration extends SourceViewerConfiguration { + private Model model; + private ClassLoader cl; + + public HSLConfiguration(ClassLoader cl, Model model) { + this.cl = cl; + this.model = model; + } + + public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { + PresentationReconciler reconciler = new PresentationReconciler(); + + for( Damager sc : model.getDamagers() ) { + if( sc instanceof RuleDamager ) { + RuleDamager rs = (RuleDamager) sc; + HSLRuleScanner s = new HSLRuleScanner(rs); + DefaultDamagerRepairer dr = new DefaultDamagerRepairer(s); + reconciler.setDamager(dr, rs.getPartition().getName()); + reconciler.setRepairer(dr, rs.getPartition().getName()); + } else { + JSDamager js = (JSDamager) sc; + ScriptEngineManager m = new ScriptEngineManager(cl); + ScriptEngine engine = m.getEngineByName("nashorn"); + try(InputStreamReader r = new InputStreamReader(cl.getResourceAsStream(js.getFileURI()))) { + Object o = engine.eval(r); + reconciler.setDamager((IPresentationDamager) o, js.getPartition().getName()); + reconciler.setRepairer((IPresentationRepairer) o, js.getPartition().getName()); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ScriptException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + + return reconciler; + } +} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleBasedPartitionScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleBasedPartitionScanner.java new file mode 100644 index 000000000..c5dff8178 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleBasedPartitionScanner.java @@ -0,0 +1,51 @@ +package org.eclipse.fx.code.compensator.editor.hsl; + +import java.io.IOException; +import java.io.InputStreamReader; + +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; + +import org.eclipse.fx.code.compensator.hsl.hSL.ParitionRule; +import org.eclipse.fx.code.compensator.hsl.hSL.PartitionJSRule; +import org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule; +import org.eclipse.fx.code.compensator.hsl.hSL.PartitionSingleLineRule; +import org.eclipse.fx.code.compensator.hsl.hSL.RulePartitioner; +import org.eclipse.jface.text.rules.IPredicateRule; +import org.eclipse.jface.text.rules.MultiLineRule; +import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; +import org.eclipse.jface.text.rules.SingleLineRule; +import org.eclipse.jface.text.rules.Token; + +public class HSLRuleBasedPartitionScanner extends RuleBasedPartitionScanner { + public HSLRuleBasedPartitionScanner(ClassLoader cl, RulePartitioner paritioner) { + IPredicateRule[] pr = new IPredicateRule[paritioner.getRules().size()]; + int i = 0; + + for( ParitionRule r : paritioner.getRules() ) { + if( r instanceof PartitionSingleLineRule ) { + PartitionSingleLineRule sr = (PartitionSingleLineRule) r; + pr[i] = new SingleLineRule(sr.getStartSeq(), sr.getEndSeq(), new Token(sr.getParition().getName()), sr.getEscapeSeq() != null ? sr.getEndSeq().charAt(0) : 0, false); + } else if( r instanceof PartitionMultiLineRule ) { + PartitionMultiLineRule mr = (PartitionMultiLineRule) r; + pr[i] = new MultiLineRule(mr.getStartSeq(), mr.getEndSeq(), new Token(mr.getParition().getName()), mr.getEscapeSeq() != null ? mr.getEscapeSeq().charAt(0) : 0, false); + } else if( r instanceof PartitionJSRule ) { + PartitionJSRule js = (PartitionJSRule) r; + ScriptEngineManager mgr = new ScriptEngineManager(cl); + ScriptEngine engine = mgr.getEngineByName("nashorn"); + try( InputStreamReader reader = new InputStreamReader(cl.getResourceAsStream(js.getFileURI())) ) { + pr[i] = (IPredicateRule) engine.eval(reader); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ScriptException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + i++; + } + setPredicateRules(pr); + } +} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleScanner.java new file mode 100644 index 000000000..0afe06f15 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/HSLRuleScanner.java @@ -0,0 +1,117 @@ +package org.eclipse.fx.code.compensator.editor.hsl; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javafx.scene.paint.Color; +import javafx.scene.text.Font; +import javafx.scene.text.FontPosture; +import javafx.scene.text.FontWeight; + +import org.eclipse.fx.code.compensator.hsl.hSL.FontType; +import org.eclipse.fx.code.compensator.hsl.hSL.RGBColor; +import org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager; +import org.eclipse.fx.code.compensator.hsl.hSL.ScannerCharacterRule; +import org.eclipse.fx.code.compensator.hsl.hSL.ScannerJSRule; +import org.eclipse.fx.code.compensator.hsl.hSL.ScannerMultiLineRule; +import org.eclipse.fx.code.compensator.hsl.hSL.ScannerRule; +import org.eclipse.fx.code.compensator.hsl.hSL.ScannerSingleLineRule; +import org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken; +import org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule; +import org.eclipse.jface.text.TextAttribute; +import org.eclipse.jface.text.rules.IRule; +import org.eclipse.jface.text.rules.IToken; +import org.eclipse.jface.text.rules.IWhitespaceDetector; +import org.eclipse.jface.text.rules.RuleBasedScanner; +import org.eclipse.jface.text.rules.SingleLineRule; +import org.eclipse.jface.text.rules.Token; +import org.eclipse.jface.text.rules.WhitespaceRule; + +public class HSLRuleScanner extends RuleBasedScanner { + public HSLRuleScanner(RuleDamager scanner) { + Map<String, IToken> tokenMap = new HashMap<String, IToken>(); + for( ScannerToken st : scanner.getTokens() ) { + Token token = new Token(new TextAttribute(createColor(st.getFgColor()), createColor(st.getFgColor()), 0, createFont(st.getFont()))); + if( st.isDefault() ) { + setDefaultReturnToken(token); + } + tokenMap.put(st.getName(), token); + } + + IRule[] rules = new IRule[scanner.getRules().size()]; + + int i = 0; + for( ScannerRule ru : scanner.getRules() ) { + if( ru instanceof ScannerSingleLineRule ) { + ScannerSingleLineRule sru = (ScannerSingleLineRule) ru; + System.err.println("SL-TOKEN: " + ru + " ===> " + tokenMap.get(sru.getToken().getName())); + rules[i] = new SingleLineRule( + sru.getStartSeq(), + sru.getEndSeq(), + tokenMap.get(sru.getToken().getName()), + sru.getEscapeSeq() != null ? sru.getEscapeSeq().charAt(0) : 0, + false); + } else if( ru instanceof ScannerMultiLineRule ) { + throw new UnsupportedOperationException(); + } else if( ru instanceof ScannerWhitespaceRule ) { + ScannerWhitespaceRule wru = (ScannerWhitespaceRule) ru; + rules[i] = new WhitespaceRule(wru.getJsDetector() != null ? new JSWSDectector() : new FixedCharacterWSDetector(wru.getCharacters())); + } else if( ru instanceof ScannerCharacterRule ) { + throw new UnsupportedOperationException(); + } else if( ru instanceof ScannerJSRule ) { + throw new UnsupportedOperationException(); + } + i++; + } + setRules(rules); + } + + private static Font createFont(org.eclipse.fx.code.compensator.hsl.hSL.Font font) { + if( font == null ) { + return null; + } + + return Font.font(font.getName(), font.getAttributes().contains(FontType.BOLD) ? FontWeight.BOLD : FontWeight.NORMAL, font.getAttributes().contains(FontType.ITALIC) ? FontPosture.ITALIC : FontPosture.ITALIC, font.getSize()); + } + + private static Color createColor(org.eclipse.fx.code.compensator.hsl.hSL.Color color) { + if( color instanceof RGBColor ) { + RGBColor rcolor = (RGBColor) color; + return Color.rgb(rcolor.getR(), rcolor.getG(), rcolor.getB()); + } + return null; + } + + static class JSWSDectector implements IWhitespaceDetector { + + @Override + public boolean isWhitespace(char c) { + // TODO Auto-generated method stub + return false; + } + + } + + static class FixedCharacterWSDetector implements IWhitespaceDetector { + private final char[] chars; + + public FixedCharacterWSDetector(List<String> list) { + chars = new char[list.size()]; + int i = 0; + for( String s : list ) { + chars[i++] = s.charAt(0); + } + } + + @Override + public boolean isWhitespace(char c) { + for( char ch : chars ) { + if( ch == c ) { + return true; + } + } + return false; + } + } +} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/META-INF/MANIFEST.MF b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/META-INF/MANIFEST.MF index 988395dc2..373c40bbf 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/META-INF/MANIFEST.MF +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/META-INF/MANIFEST.MF @@ -9,7 +9,9 @@ Require-Bundle: org.eclipse.fx.code.compensator.editor;bundle-version="1.0.0", org.eclipse.fx.text.ui;bundle-version="1.0.0", org.eclipse.fx.ui.controls;bundle-version="1.0.0", org.eclipse.emf.common;bundle-version="2.10.0", - org.eclipse.emf.ecore + org.eclipse.emf.ecore, + org.eclipse.fx.code.compensator.hsl;bundle-version="1.0.0", + org.eclipse.fx.code.compensator.editor.hsl;bundle-version="1.0.0" Service-Component: OSGI-INF/services/xmlcomponent.xml Bundle-ActivationPolicy: lazy Import-Package: javafx.animation;version="2.2.0", diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/IXMLColorConstants.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/IXMLColorConstants.java deleted file mode 100644 index 3d56b75e4..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/IXMLColorConstants.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import javafx.scene.paint.Color; - -public interface IXMLColorConstants { - Color XML_COMMENT = Color.rgb(128, 0, 0); - Color PROC_INSTR = Color.rgb(128, 128, 128); - Color STRING = Color.rgb(0, 128, 0); - Color DEFAULT = Color.rgb(0, 0, 0); - Color TAG = Color.rgb(0, 0, 128); -} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/NonRuleBasedDamagerRepairer.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/NonRuleBasedDamagerRepairer.java deleted file mode 100644 index 1bfe309c8..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/NonRuleBasedDamagerRepairer.java +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import org.eclipse.fx.ui.controls.styledtext.StyleRange; -import org.eclipse.jface.text.Assert; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.DocumentEvent; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextAttribute; -import org.eclipse.jface.text.TextPresentation; -import org.eclipse.jface.text.presentation.IPresentationDamager; -import org.eclipse.jface.text.presentation.IPresentationRepairer; - -public class NonRuleBasedDamagerRepairer - implements IPresentationDamager, IPresentationRepairer { - - /** The document this object works on */ - protected IDocument fDocument; - /** The default text attribute if non is returned as data by the current token */ - protected TextAttribute fDefaultTextAttribute; - - /** - * Constructor for NonRuleBasedDamagerRepairer. - */ - public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) { - Assert.isNotNull(defaultTextAttribute); - - fDefaultTextAttribute = defaultTextAttribute; - } - - /** - * @see IPresentationRepairer#setDocument(IDocument) - */ - public void setDocument(IDocument document) { - fDocument = document; - } - - /** - * Returns the end offset of the line that contains the specified offset or - * if the offset is inside a line delimiter, the end offset of the next line. - * - * @param offset the offset whose line end offset must be computed - * @return the line end offset for the given offset - * @exception BadLocationException if offset is invalid in the current document - */ - protected int endOfLineOf(int offset) throws BadLocationException { - - IRegion info = fDocument.getLineInformationOfOffset(offset); - if (offset <= info.getOffset() + info.getLength()) - return info.getOffset() + info.getLength(); - - int line = fDocument.getLineOfOffset(offset); - try { - info = fDocument.getLineInformation(line + 1); - return info.getOffset() + info.getLength(); - } catch (BadLocationException x) { - return fDocument.getLength(); - } - } - - /** - * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean) - */ - public IRegion getDamageRegion( - ITypedRegion partition, - DocumentEvent event, - boolean documentPartitioningChanged) { - if (!documentPartitioningChanged) { - try { - - IRegion info = - fDocument.getLineInformationOfOffset(event.getOffset()); - int start = Math.max(partition.getOffset(), info.getOffset()); - - int end = - event.getOffset() - + (event.getText() == null - ? event.getLength() - : event.getText().length()); - - if (info.getOffset() <= end - && end <= info.getOffset() + info.getLength()) { - // optimize the case of the same line - end = info.getOffset() + info.getLength(); - } else - end = endOfLineOf(end); - - end = - Math.min( - partition.getOffset() + partition.getLength(), - end); - return new Region(start, end - start); - - } catch (BadLocationException x) { - } - } - - return partition; - } - - /** - * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion) - */ - public void createPresentation( - TextPresentation presentation, - ITypedRegion region) { - addRange( - presentation, - region.getOffset(), - region.getLength(), - fDefaultTextAttribute); - } - - /** - * Adds style information to the given text presentation. - * - * @param presentation the text presentation to be extended - * @param offset the offset of the range to be styled - * @param length the length of the range to be styled - * @param attr the attribute describing the style of the range to be styled - */ - protected void addRange( - TextPresentation presentation, - int offset, - int length, - TextAttribute attr) { - if (attr != null) - presentation.addStyleRange( - new StyleRange( - offset, - length, - attr.getForeground(), - attr.getBackground(), - attr.getStyle())); - } -}
\ No newline at end of file diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/TagRule.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/TagRule.java deleted file mode 100644 index ba497f708..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/TagRule.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import org.eclipse.jface.text.rules.*; - -public class TagRule extends MultiLineRule { - - public TagRule(IToken token) { - super("<", ">", token); - } - protected boolean sequenceDetected( - ICharacterScanner scanner, - char[] sequence, - boolean eofAllowed) { - int c = scanner.read(); - if (sequence[0] == '<') { - if (c == '?') { - // processing instruction - abort - scanner.unread(); - return false; - } - if (c == '!') { - scanner.unread(); - // comment - abort - return false; - } - } else if (sequence[0] == '>') { - scanner.unread(); - } - return super.sequenceDetected(scanner, sequence, eofAllowed); - } -} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLComponent.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLComponent.java index 4e9cc9642..c9fd64b27 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLComponent.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLComponent.java @@ -10,19 +10,40 @@ *******************************************************************************/ package org.eclipse.fx.code.compensator.editor.xml; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.resource.ResourceSet; +import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.fx.code.compensator.editor.ContentTypeProvider; import org.eclipse.fx.code.compensator.editor.Input; +import org.eclipse.fx.code.compensator.editor.hsl.HSLConfiguration; +import org.eclipse.fx.code.compensator.editor.hsl.HSLRuleBasedPartitionScanner; import org.eclipse.fx.code.compensator.editor.services.PartitionerFactory; import org.eclipse.fx.code.compensator.editor.services.SourceViewerConfigurationFactory; +import org.eclipse.fx.code.compensator.hsl.HSLStandaloneSetup; +import org.eclipse.fx.code.compensator.hsl.hSL.Model; +import org.eclipse.fx.code.compensator.hsl.hSL.RulePartitioner; +import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.text.rules.FastPartitioner; +import org.eclipse.jface.text.rules.IPartitionTokenScanner; import org.eclipse.jface.text.source.SourceViewerConfiguration; public class XMLComponent implements PartitionerFactory, SourceViewerConfigurationFactory { - + private Model model; + + public XMLComponent() { + HSLStandaloneSetup.doSetup(); + + ResourceSet rs = new ResourceSetImpl(); + Resource resource = rs.getResource(URI.createPlatformPluginURI("/org.eclipse.fx.code.compensator.editor.xml/xml.hsl", true), true); + model = (Model) resource.getContents().get(0); +// System.err.println(resource.getContents().get(0)); + } + @Override public SourceViewerConfiguration createConfiguration(Input<?> input) { - return new XMLConfiguration(); + return new HSLConfiguration(getClass().getClassLoader(),model); } @Override @@ -33,14 +54,26 @@ public class XMLComponent implements PartitionerFactory, SourceViewerConfigurati } return false; } + + private IPartitionTokenScanner getParitionScanner() { + if( model.getPartitioner() instanceof RulePartitioner ) { + return new HSLRuleBasedPartitionScanner(getClass().getClassLoader(), (RulePartitioner) model.getPartitioner()); + } else { + throw new UnsupportedOperationException(); + } + } + + private String[] getParitions() { + return model.getPartitions().stream().filter((p) -> { return ! p.getName().equals(IDocument.DEFAULT_CONTENT_TYPE); }) + .map((p) -> p.getName()) + .toArray((size) -> new String[size]); + } @Override public IDocumentPartitioner createPartitioner(Input<?> input) { return new FastPartitioner( - new XMLPartitionScanner(), - new String[] { - XMLPartitionScanner.XML_TAG, - XMLPartitionScanner.XML_COMMENT }); + getParitionScanner(), + getParitions()); } } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLConfiguration.java deleted file mode 100644 index cc977d8f9..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLConfiguration.java +++ /dev/null @@ -1,83 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.TextAttribute; -import org.eclipse.jface.text.presentation.IPresentationReconciler; -import org.eclipse.jface.text.presentation.PresentationReconciler; -import org.eclipse.jface.text.rules.DefaultDamagerRepairer; -import org.eclipse.jface.text.rules.Token; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.jface.text.source.SourceViewerConfiguration; - -public class XMLConfiguration extends SourceViewerConfiguration { -// private XMLDoubleClickStrategy doubleClickStrategy; - private XMLTagScanner tagScanner; - private XMLScanner scanner; - - public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) { - return new String[] { - IDocument.DEFAULT_CONTENT_TYPE, - XMLPartitionScanner.XML_COMMENT, - XMLPartitionScanner.XML_TAG }; - } -// public ITextDoubleClickStrategy getDoubleClickStrategy( -// ISourceViewer sourceViewer, -// String contentType) { -// if (doubleClickStrategy == null) -// doubleClickStrategy = new XMLDoubleClickStrategy(); -// return doubleClickStrategy; -// } - - protected XMLScanner getXMLScanner() { - if (scanner == null) { - scanner = new XMLScanner(); - scanner.setDefaultReturnToken( - new Token( - new TextAttribute(IXMLColorConstants.DEFAULT))); - } - return scanner; - } - protected XMLTagScanner getXMLTagScanner() { - if (tagScanner == null) { - tagScanner = new XMLTagScanner(); - tagScanner.setDefaultReturnToken( - new Token( - new TextAttribute( - IXMLColorConstants.TAG))); - } - return tagScanner; - } - - public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { - PresentationReconciler reconciler = new PresentationReconciler(); - - DefaultDamagerRepairer dr = - new DefaultDamagerRepairer(getXMLTagScanner()); - reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG); - reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG); - - dr = new DefaultDamagerRepairer(getXMLScanner()); - reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE); - reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE); - - NonRuleBasedDamagerRepairer ndr = - new NonRuleBasedDamagerRepairer( - new TextAttribute( - IXMLColorConstants.XML_COMMENT)); - reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT); - reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT); - - return reconciler; - } - -}
\ No newline at end of file diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLPartitionScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLPartitionScanner.java deleted file mode 100644 index e8926989f..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLPartitionScanner.java +++ /dev/null @@ -1,54 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import java.io.InputStreamReader; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; - -import org.eclipse.jface.text.rules.IPredicateRule; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.MultiLineRule; -import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; -import org.eclipse.jface.text.rules.Token; - - -public class XMLPartitionScanner extends RuleBasedPartitionScanner { - public final static String XML_COMMENT = "__xml_comment"; - public final static String XML_TAG = "__xml_tag"; - - public XMLPartitionScanner() { - - IToken xmlComment = new Token(XML_COMMENT); - IToken tag = new Token(XML_TAG); - - IPredicateRule[] rules = new IPredicateRule[2]; - - rules[0] = new MultiLineRule("<!--", "-->", xmlComment); - rules[1] = new TagRule(tag); -// ScriptEngineManager mgr = new ScriptEngineManager(); -// ScriptEngine engine = mgr.getEngineByName("nashorn"); -// try { -// Object o = engine.eval(new InputStreamReader(getClass().getClassLoader().getResourceAsStream("tag-rule.js"))); -// rules[1] = (IPredicateRule)o; -// } catch (Throwable e) { -// // TODO Auto-generated catch block -// e.printStackTrace(); -// } - - - setPredicateRules(rules); - } -} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLScanner.java deleted file mode 100644 index 9fc1e1b0b..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLScanner.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import org.eclipse.jface.text.rules.*; -import org.eclipse.jface.text.*; - -public class XMLScanner extends RuleBasedScanner { - - public XMLScanner() { - IToken procInstr = - new Token( - new TextAttribute( - IXMLColorConstants.PROC_INSTR)); - - IRule[] rules = new IRule[2]; - //Add rule for processing instructions - rules[0] = new SingleLineRule("<?", "?>", procInstr); - // Add generic whitespace rule. - rules[1] = new WhitespaceRule(new XMLWhitespaceDetector()); - - setRules(rules); - } -} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLTagScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLTagScanner.java deleted file mode 100644 index 7b51b8cfa..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLTagScanner.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import org.eclipse.jface.text.*; -import org.eclipse.jface.text.rules.*; - -public class XMLTagScanner extends RuleBasedScanner { - - public XMLTagScanner() { - IToken string = - new Token( - new TextAttribute(IXMLColorConstants.STRING)); - - IRule[] rules = new IRule[3]; - - // Add rule for double quotes - rules[0] = new SingleLineRule("\"", "\"", string, '\\'); - // Add a rule for single quotes - rules[1] = new SingleLineRule("'", "'", string, '\\'); - // Add generic whitespace rule. - rules[2] = new WhitespaceRule(new XMLWhitespaceDetector()); - - setRules(rules); - } -} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLWhitespaceDetector.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLWhitespaceDetector.java deleted file mode 100644 index 8e74c7f4f..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/org/eclipse/fx/code/compensator/editor/xml/XMLWhitespaceDetector.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2014 BestSolution.at and others. -* All rights reserved. This program and the accompanying materials -* are made available under the terms of the Eclipse Public License v1.0 -* which accompanies this distribution, and is available at -* http://www.eclipse.org/legal/epl-v10.html -* -* Contributors: -* Tom Schindl<tom.schindl@bestsolution.at> - initial API and implementation -*******************************************************************************/ -package org.eclipse.fx.code.compensator.editor.xml; - -import org.eclipse.jface.text.rules.IWhitespaceDetector; - -public class XMLWhitespaceDetector implements IWhitespaceDetector { - - public boolean isWhitespace(char c) { - return (c == ' ' || c == '\t' || c == '\n' || c == '\r'); - } -} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/xml-comment-damager.js b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/xml-comment-damager.js new file mode 100644 index 000000000..c9ab0a2a6 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/xml-comment-damager.js @@ -0,0 +1,74 @@ +var f = function() { + var IPresentationDamager = Java.type("org.eclipse.jface.text.presentation.IPresentationDamager"); + var IPresentationRepairer = Java.type("org.eclipse.jface.text.presentation.IPresentationRepairer"); + var StyleRange = Java.type("org.eclipse.fx.ui.controls.styledtext.StyleRange"); + var Color = Java.type("javafx.scene.paint.Color"); + var Math = Java.type("java.lang.Math"); + var Region = Java.type("org.eclipse.jface.text.Region"); + + var XMLDamagerRepairer = Java.extend( IPresentationDamager, IPresentationRepairer ); + return xmlDamagerRepairer = new XMLDamagerRepairer() { + document : 0, + setDocument : function(document) { + this.fDocument = document; + }, + endOfLineOf : function() { + var info = this.fDocument.getLineInformationOfOffset(offset); + if (offset <= info.getOffset() + info.getLength()) { + return info.getOffset() + info.getLength(); + } + var line = this.fDocument.getLineOfOffset(offset); + try { + info = this.fDocument.getLineInformation(line + 1); + return info.getOffset() + info.getLength(); + } catch (x) { + return this.fDocument.getLength(); + } + }, + getDamageRegion : function(partition, event, documentPartitioningChanged) { + if (!documentPartitioningChanged) { + try { + var info = + this.fDocument.getLineInformationOfOffset(event.getOffset()); + var start = Math.max(partition.getOffset(), info.getOffset()); + + var end = + event.getOffset() + + (event.getText() == null + ? event.getLength() + : event.getText().length()); + + if (info.getOffset() <= end + && end <= info.getOffset() + info.getLength()) { + // optimize the case of the same line + end = info.getOffset() + info.getLength(); + } else + end = endOfLineOf(end); + + end = + Math.min( + partition.getOffset() + partition.getLength(), + end); + return new Region(start, end - start); + + } catch (x) { + x.printStackTrace(); + } + } + + return partition; + }, + createPresentation : function(presentation, region) { + presentation.addStyleRange( + new StyleRange( + region.getOffset(), + region.getLength(), + Color.rgb(128, 0, 0), + null + ) + ); + } + }; +}; + +f();
\ No newline at end of file diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/xml.hsl b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/xml.hsl index cd36ece48..24b4115d9 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/xml.hsl +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.xml/src/xml.hsl @@ -1,19 +1,21 @@ XML { + partition __dftl_partition_content_type partition __xml_comment partition __xml_tag - partition __dftl_partition_content_type - scanner __dftl_partition_content_type { - default token default_xmltoken { fgcolor : rgb(0, 0, 0) } - token proc_instruction { fgcolor : rgb(128, 128, 128) } - single-line proc_instruction "<?" => "?>" - } - scanner __xml_tag { + rule-damager __xml_tag { default token default_tagtoken { fgcolor : rgb(0, 0, 128) } token string { fgcolor : rgb(0, 128, 0) } single-line string "\"" => "\"" escaped by '\\' single-line string "'" => "'" escaped by '\\' whitespace-rule [" ", "\t", "\n", "\r"] } + rule-damager __dftl_partition_content_type { + default token default_xmltoken { fgcolor : rgb(0, 0, 0) } + token proc_instruction { fgcolor : rgb(128, 128, 128) } + single-line proc_instruction "<?" => "?>" + whitespace-rule [" ", "\t", "\n", "\r"] + } + js-damager __xml_comment "xml-comment-damager.js" rule-partitioner { multi-line __xml_comment "<!--" => "-->" javascript-rule __xml_tag "tag-rule.js" diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/META-INF/MANIFEST.MF b/experimental/compensator/org.eclipse.fx.code.compensator.editor/META-INF/MANIFEST.MF index a54c995ec..895078411 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor/META-INF/MANIFEST.MF +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor/META-INF/MANIFEST.MF @@ -44,7 +44,8 @@ Import-Package: javafx.animation;version="2.2.0", Require-Bundle: org.eclipse.fx.ui.controls;bundle-version="1.0.0", org.eclipse.text;bundle-version="3.5.300", org.eclipse.fx.text;bundle-version="1.0.0", - org.eclipse.fx.text.ui;bundle-version="1.0.0" + org.eclipse.fx.text.ui;bundle-version="1.0.0", + org.eclipse.emf.common;bundle-version="2.10.0" Export-Package: org.eclipse.fx.code.compensator.editor, org.eclipse.fx.code.compensator.editor.services Service-Component: OSGI-INF/services/fileinputprovider.xml, diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/services/HSLConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/services/HSLConfiguration.java new file mode 100644 index 000000000..f331331a9 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/services/HSLConfiguration.java @@ -0,0 +1,7 @@ +package org.eclipse.fx.code.compensator.editor.services; + +import org.eclipse.emf.common.util.URI; + +public interface HSLConfiguration { + public URI getHSLURI(); +} diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore index 481dfba93..d57322693 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.ecore @@ -6,8 +6,8 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EReference" name="partitions" upperBound="-1" eType="#//Partition" containment="true"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="scanner" upperBound="-1" - eType="#//Scanner" containment="true"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="damagers" upperBound="-1" + eType="#//Damager" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="partitioner" eType="#//Partitioner" containment="true"/> </eClassifiers> @@ -22,8 +22,13 @@ <eClassifiers xsi:type="ecore:EClass" name="JSParitioner" eSuperTypes="#//Partitioner"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Scanner"> + <eClassifiers xsi:type="ecore:EClass" name="Damager"> <eStructuralFeatures xsi:type="ecore:EReference" name="partition" eType="#//Partition"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="JSDamager" eSuperTypes="#//Damager"> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="fileURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="RuleDamager" eSuperTypes="#//Damager"> <eStructuralFeatures xsi:type="ecore:EReference" name="tokens" upperBound="-1" eType="#//ScannerToken" containment="true"/> <eStructuralFeatures xsi:type="ecore:EReference" name="keywordGroups" upperBound="-1" @@ -70,7 +75,7 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapeSeq" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="PartitionMultiLineRule" eSuperTypes="#//ParitionRule"> - <eStructuralFeatures xsi:type="ecore:EReference" name="token" eType="#//Partition"/> + <eStructuralFeatures xsi:type="ecore:EReference" name="parition" eType="#//Partition"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="startSeq" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="endSeq" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapeSeq" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -89,7 +94,7 @@ <eClassifiers xsi:type="ecore:EClass" name="ScannerWhitespaceRule" eSuperTypes="#//ScannerRule"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="characters" unique="false" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="jsMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="jsDetector" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="Color"/> <eClassifiers xsi:type="ecore:EClass" name="RGBColor" eSuperTypes="#//Color"> diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel index 6accc98c7..eaa0f49a6 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/model/generated/HSL.genmodel @@ -16,7 +16,7 @@ <genClasses ecoreClass="HSL.ecore#//Model"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//Model/name"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//Model/partitions"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//Model/scanner"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//Model/damagers"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//Model/partitioner"/> </genClasses> <genClasses ecoreClass="HSL.ecore#//Partition"> @@ -29,11 +29,16 @@ <genClasses ecoreClass="HSL.ecore#//JSParitioner"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//JSParitioner/fileURI"/> </genClasses> - <genClasses ecoreClass="HSL.ecore#//Scanner"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference HSL.ecore#//Scanner/partition"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//Scanner/tokens"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//Scanner/keywordGroups"/> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//Scanner/rules"/> + <genClasses ecoreClass="HSL.ecore#//Damager"> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference HSL.ecore#//Damager/partition"/> + </genClasses> + <genClasses ecoreClass="HSL.ecore#//JSDamager"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//JSDamager/fileURI"/> + </genClasses> + <genClasses ecoreClass="HSL.ecore#//RuleDamager"> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//RuleDamager/tokens"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//RuleDamager/keywordGroups"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference HSL.ecore#//RuleDamager/rules"/> </genClasses> <genClasses ecoreClass="HSL.ecore#//ScannerToken"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//ScannerToken/default"/> @@ -71,7 +76,7 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//ScannerMultiLineRule/escapeSeq"/> </genClasses> <genClasses ecoreClass="HSL.ecore#//PartitionMultiLineRule"> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference HSL.ecore#//PartitionMultiLineRule/token"/> + <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference HSL.ecore#//PartitionMultiLineRule/parition"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//PartitionMultiLineRule/startSeq"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//PartitionMultiLineRule/endSeq"/> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//PartitionMultiLineRule/escapeSeq"/> @@ -88,7 +93,7 @@ </genClasses> <genClasses ecoreClass="HSL.ecore#//ScannerWhitespaceRule"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//ScannerWhitespaceRule/characters"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//ScannerWhitespaceRule/jsMethod"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute HSL.ecore#//ScannerWhitespaceRule/jsDetector"/> </genClasses> <genClasses ecoreClass="HSL.ecore#//Color"/> <genClasses ecoreClass="HSL.ecore#//RGBColor"> diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin Binary files differindex 5d9e8910d..969e8110c 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/HSL.xtextbin diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLFactory.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLFactory.java index 83be32d8c..fd1ef2ab4 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLFactory.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLFactory.java @@ -68,13 +68,31 @@ public interface HSLFactory extends EFactory JSParitioner createJSParitioner(); /** - * Returns a new object of class '<em>Scanner</em>'. + * Returns a new object of class '<em>Damager</em>'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return a new object of class '<em>Scanner</em>'. + * @return a new object of class '<em>Damager</em>'. * @generated */ - Scanner createScanner(); + Damager createDamager(); + + /** + * Returns a new object of class '<em>JS Damager</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>JS Damager</em>'. + * @generated + */ + JSDamager createJSDamager(); + + /** + * Returns a new object of class '<em>Rule Damager</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Rule Damager</em>'. + * @generated + */ + RuleDamager createRuleDamager(); /** * Returns a new object of class '<em>Scanner Token</em>'. diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java index 5b7092293..802520c3a 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/HSLPackage.java @@ -86,13 +86,13 @@ public interface HSLPackage extends EPackage int MODEL__PARTITIONS = 1; /** - * The feature id for the '<em><b>Scanner</b></em>' containment reference list. + * The feature id for the '<em><b>Damagers</b></em>' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int MODEL__SCANNER = 2; + int MODEL__DAMAGERS = 2; /** * The feature id for the '<em><b>Partitioner</b></em>' containment reference. @@ -216,14 +216,14 @@ public interface HSLPackage extends EPackage int JS_PARITIONER_FEATURE_COUNT = PARTITIONER_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl <em>Scanner</em>}' class. + * The meta object id for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.DamagerImpl <em>Damager</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl - * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScanner() + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.DamagerImpl + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getDamager() * @generated */ - int SCANNER = 5; + int DAMAGER = 5; /** * The feature id for the '<em><b>Partition</b></em>' reference. @@ -232,7 +232,72 @@ public interface HSLPackage extends EPackage * @generated * @ordered */ - int SCANNER__PARTITION = 0; + int DAMAGER__PARTITION = 0; + + /** + * The number of structural features of the '<em>Damager</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int DAMAGER_FEATURE_COUNT = 1; + + /** + * The meta object id for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.JSDamagerImpl <em>JS Damager</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.JSDamagerImpl + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getJSDamager() + * @generated + */ + int JS_DAMAGER = 6; + + /** + * The feature id for the '<em><b>Partition</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JS_DAMAGER__PARTITION = DAMAGER__PARTITION; + + /** + * The feature id for the '<em><b>File URI</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JS_DAMAGER__FILE_URI = DAMAGER_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>JS Damager</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int JS_DAMAGER_FEATURE_COUNT = DAMAGER_FEATURE_COUNT + 1; + + /** + * The meta object id for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.RuleDamagerImpl <em>Rule Damager</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.RuleDamagerImpl + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getRuleDamager() + * @generated + */ + int RULE_DAMAGER = 7; + + /** + * The feature id for the '<em><b>Partition</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int RULE_DAMAGER__PARTITION = DAMAGER__PARTITION; /** * The feature id for the '<em><b>Tokens</b></em>' containment reference list. @@ -241,7 +306,7 @@ public interface HSLPackage extends EPackage * @generated * @ordered */ - int SCANNER__TOKENS = 1; + int RULE_DAMAGER__TOKENS = DAMAGER_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Keyword Groups</b></em>' containment reference list. @@ -250,7 +315,7 @@ public interface HSLPackage extends EPackage * @generated * @ordered */ - int SCANNER__KEYWORD_GROUPS = 2; + int RULE_DAMAGER__KEYWORD_GROUPS = DAMAGER_FEATURE_COUNT + 1; /** * The feature id for the '<em><b>Rules</b></em>' containment reference list. @@ -259,16 +324,16 @@ public interface HSLPackage extends EPackage * @generated * @ordered */ - int SCANNER__RULES = 3; + int RULE_DAMAGER__RULES = DAMAGER_FEATURE_COUNT + 2; /** - * The number of structural features of the '<em>Scanner</em>' class. + * The number of structural features of the '<em>Rule Damager</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SCANNER_FEATURE_COUNT = 4; + int RULE_DAMAGER_FEATURE_COUNT = DAMAGER_FEATURE_COUNT + 3; /** * The meta object id for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerTokenImpl <em>Scanner Token</em>}' class. @@ -278,7 +343,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScannerToken() * @generated */ - int SCANNER_TOKEN = 6; + int SCANNER_TOKEN = 8; /** * The feature id for the '<em><b>Default</b></em>' attribute. @@ -342,7 +407,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getKeywordGroup() * @generated */ - int KEYWORD_GROUP = 7; + int KEYWORD_GROUP = 9; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -379,7 +444,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getKeyword() * @generated */ - int KEYWORD = 8; + int KEYWORD = 10; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -416,7 +481,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScannerRule() * @generated */ - int SCANNER_RULE = 9; + int SCANNER_RULE = 11; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -444,7 +509,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getParitionRule() * @generated */ - int PARITION_RULE = 10; + int PARITION_RULE = 12; /** * The number of structural features of the '<em>Parition Rule</em>' class. @@ -463,7 +528,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScannerSingleLineRule() * @generated */ - int SCANNER_SINGLE_LINE_RULE = 11; + int SCANNER_SINGLE_LINE_RULE = 13; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -518,7 +583,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getPartitionSingleLineRule() * @generated */ - int PARTITION_SINGLE_LINE_RULE = 12; + int PARTITION_SINGLE_LINE_RULE = 14; /** * The feature id for the '<em><b>Parition</b></em>' reference. @@ -573,7 +638,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScannerMultiLineRule() * @generated */ - int SCANNER_MULTI_LINE_RULE = 13; + int SCANNER_MULTI_LINE_RULE = 15; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -628,16 +693,16 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getPartitionMultiLineRule() * @generated */ - int PARTITION_MULTI_LINE_RULE = 14; + int PARTITION_MULTI_LINE_RULE = 16; /** - * The feature id for the '<em><b>Token</b></em>' reference. + * The feature id for the '<em><b>Parition</b></em>' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PARTITION_MULTI_LINE_RULE__TOKEN = PARITION_RULE_FEATURE_COUNT + 0; + int PARTITION_MULTI_LINE_RULE__PARITION = PARITION_RULE_FEATURE_COUNT + 0; /** * The feature id for the '<em><b>Start Seq</b></em>' attribute. @@ -683,7 +748,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScannerCharacterRule() * @generated */ - int SCANNER_CHARACTER_RULE = 15; + int SCANNER_CHARACTER_RULE = 17; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -720,7 +785,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScannerJSRule() * @generated */ - int SCANNER_JS_RULE = 16; + int SCANNER_JS_RULE = 18; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -757,7 +822,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getPartitionJSRule() * @generated */ - int PARTITION_JS_RULE = 17; + int PARTITION_JS_RULE = 19; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -794,7 +859,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScannerWhitespaceRule() * @generated */ - int SCANNER_WHITESPACE_RULE = 18; + int SCANNER_WHITESPACE_RULE = 20; /** * The feature id for the '<em><b>Token</b></em>' reference. @@ -815,13 +880,13 @@ public interface HSLPackage extends EPackage int SCANNER_WHITESPACE_RULE__CHARACTERS = SCANNER_RULE_FEATURE_COUNT + 0; /** - * The feature id for the '<em><b>Js Method</b></em>' attribute. + * The feature id for the '<em><b>Js Detector</b></em>' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int SCANNER_WHITESPACE_RULE__JS_METHOD = SCANNER_RULE_FEATURE_COUNT + 1; + int SCANNER_WHITESPACE_RULE__JS_DETECTOR = SCANNER_RULE_FEATURE_COUNT + 1; /** * The number of structural features of the '<em>Scanner Whitespace Rule</em>' class. @@ -840,7 +905,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getColor() * @generated */ - int COLOR = 19; + int COLOR = 21; /** * The number of structural features of the '<em>Color</em>' class. @@ -859,7 +924,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getRGBColor() * @generated */ - int RGB_COLOR = 20; + int RGB_COLOR = 22; /** * The feature id for the '<em><b>R</b></em>' attribute. @@ -905,7 +970,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getFont() * @generated */ - int FONT = 21; + int FONT = 23; /** * The feature id for the '<em><b>Name</b></em>' attribute. @@ -951,7 +1016,7 @@ public interface HSLPackage extends EPackage * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getFontType() * @generated */ - int FONT_TYPE = 22; + int FONT_TYPE = 24; /** @@ -987,15 +1052,15 @@ public interface HSLPackage extends EPackage EReference getModel_Partitions(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getScanner <em>Scanner</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getDamagers <em>Damagers</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the containment reference list '<em>Scanner</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.Model#getScanner() + * @return the meta object for the containment reference list '<em>Damagers</em>'. + * @see org.eclipse.fx.code.compensator.hsl.hSL.Model#getDamagers() * @see #getModel() * @generated */ - EReference getModel_Scanner(); + EReference getModel_Damagers(); /** * Returns the meta object for the containment reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getPartitioner <em>Partitioner</em>}'. @@ -1082,58 +1147,89 @@ public interface HSLPackage extends EPackage EAttribute getJSParitioner_FileURI(); /** - * Returns the meta object for class '{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner <em>Scanner</em>}'. + * Returns the meta object for class '{@link org.eclipse.fx.code.compensator.hsl.hSL.Damager <em>Damager</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for class '<em>Scanner</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.Scanner + * @return the meta object for class '<em>Damager</em>'. + * @see org.eclipse.fx.code.compensator.hsl.hSL.Damager * @generated */ - EClass getScanner(); + EClass getDamager(); /** - * Returns the meta object for the reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getPartition <em>Partition</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.Damager#getPartition <em>Partition</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference '<em>Partition</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getPartition() - * @see #getScanner() + * @see org.eclipse.fx.code.compensator.hsl.hSL.Damager#getPartition() + * @see #getDamager() + * @generated + */ + EReference getDamager_Partition(); + + /** + * Returns the meta object for class '{@link org.eclipse.fx.code.compensator.hsl.hSL.JSDamager <em>JS Damager</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>JS Damager</em>'. + * @see org.eclipse.fx.code.compensator.hsl.hSL.JSDamager + * @generated + */ + EClass getJSDamager(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.fx.code.compensator.hsl.hSL.JSDamager#getFileURI <em>File URI</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>File URI</em>'. + * @see org.eclipse.fx.code.compensator.hsl.hSL.JSDamager#getFileURI() + * @see #getJSDamager() + * @generated + */ + EAttribute getJSDamager_FileURI(); + + /** + * Returns the meta object for class '{@link org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager <em>Rule Damager</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Rule Damager</em>'. + * @see org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager * @generated */ - EReference getScanner_Partition(); + EClass getRuleDamager(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getTokens <em>Tokens</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager#getTokens <em>Tokens</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Tokens</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getTokens() - * @see #getScanner() + * @see org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager#getTokens() + * @see #getRuleDamager() * @generated */ - EReference getScanner_Tokens(); + EReference getRuleDamager_Tokens(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getKeywordGroups <em>Keyword Groups</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager#getKeywordGroups <em>Keyword Groups</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Keyword Groups</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getKeywordGroups() - * @see #getScanner() + * @see org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager#getKeywordGroups() + * @see #getRuleDamager() * @generated */ - EReference getScanner_KeywordGroups(); + EReference getRuleDamager_KeywordGroups(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getRules <em>Rules</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager#getRules <em>Rules</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Rules</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getRules() - * @see #getScanner() + * @see org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager#getRules() + * @see #getRuleDamager() * @generated */ - EReference getScanner_Rules(); + EReference getRuleDamager_Rules(); /** * Returns the meta object for class '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken <em>Scanner Token</em>}'. @@ -1446,15 +1542,15 @@ public interface HSLPackage extends EPackage EClass getPartitionMultiLineRule(); /** - * Returns the meta object for the reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getToken <em>Token</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getParition <em>Parition</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the reference '<em>Token</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getToken() + * @return the meta object for the reference '<em>Parition</em>'. + * @see org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getParition() * @see #getPartitionMultiLineRule() * @generated */ - EReference getPartitionMultiLineRule_Token(); + EReference getPartitionMultiLineRule_Parition(); /** * Returns the meta object for the attribute '{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getStartSeq <em>Start Seq</em>}'. @@ -1585,15 +1681,15 @@ public interface HSLPackage extends EPackage EAttribute getScannerWhitespaceRule_Characters(); /** - * Returns the meta object for the attribute '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsMethod <em>Js Method</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsDetector <em>Js Detector</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @return the meta object for the attribute '<em>Js Method</em>'. - * @see org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsMethod() + * @return the meta object for the attribute '<em>Js Detector</em>'. + * @see org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsDetector() * @see #getScannerWhitespaceRule() * @generated */ - EAttribute getScannerWhitespaceRule_JsMethod(); + EAttribute getScannerWhitespaceRule_JsDetector(); /** * Returns the meta object for class '{@link org.eclipse.fx.code.compensator.hsl.hSL.Color <em>Color</em>}'. @@ -1751,12 +1847,12 @@ public interface HSLPackage extends EPackage EReference MODEL__PARTITIONS = eINSTANCE.getModel_Partitions(); /** - * The meta object literal for the '<em><b>Scanner</b></em>' containment reference list feature. + * The meta object literal for the '<em><b>Damagers</b></em>' containment reference list feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference MODEL__SCANNER = eINSTANCE.getModel_Scanner(); + EReference MODEL__DAMAGERS = eINSTANCE.getModel_Damagers(); /** * The meta object literal for the '<em><b>Partitioner</b></em>' containment reference feature. @@ -1831,14 +1927,14 @@ public interface HSLPackage extends EPackage EAttribute JS_PARITIONER__FILE_URI = eINSTANCE.getJSParitioner_FileURI(); /** - * The meta object literal for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl <em>Scanner</em>}' class. + * The meta object literal for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.DamagerImpl <em>Damager</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl - * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getScanner() + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.DamagerImpl + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getDamager() * @generated */ - EClass SCANNER = eINSTANCE.getScanner(); + EClass DAMAGER = eINSTANCE.getDamager(); /** * The meta object literal for the '<em><b>Partition</b></em>' reference feature. @@ -1846,7 +1942,35 @@ public interface HSLPackage extends EPackage * <!-- end-user-doc --> * @generated */ - EReference SCANNER__PARTITION = eINSTANCE.getScanner_Partition(); + EReference DAMAGER__PARTITION = eINSTANCE.getDamager_Partition(); + + /** + * The meta object literal for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.JSDamagerImpl <em>JS Damager</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.JSDamagerImpl + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getJSDamager() + * @generated + */ + EClass JS_DAMAGER = eINSTANCE.getJSDamager(); + + /** + * The meta object literal for the '<em><b>File URI</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute JS_DAMAGER__FILE_URI = eINSTANCE.getJSDamager_FileURI(); + + /** + * The meta object literal for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.RuleDamagerImpl <em>Rule Damager</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.RuleDamagerImpl + * @see org.eclipse.fx.code.compensator.hsl.hSL.impl.HSLPackageImpl#getRuleDamager() + * @generated + */ + EClass RULE_DAMAGER = eINSTANCE.getRuleDamager(); /** * The meta object literal for the '<em><b>Tokens</b></em>' containment reference list feature. @@ -1854,7 +1978,7 @@ public interface HSLPackage extends EPackage * <!-- end-user-doc --> * @generated */ - EReference SCANNER__TOKENS = eINSTANCE.getScanner_Tokens(); + EReference RULE_DAMAGER__TOKENS = eINSTANCE.getRuleDamager_Tokens(); /** * The meta object literal for the '<em><b>Keyword Groups</b></em>' containment reference list feature. @@ -1862,7 +1986,7 @@ public interface HSLPackage extends EPackage * <!-- end-user-doc --> * @generated */ - EReference SCANNER__KEYWORD_GROUPS = eINSTANCE.getScanner_KeywordGroups(); + EReference RULE_DAMAGER__KEYWORD_GROUPS = eINSTANCE.getRuleDamager_KeywordGroups(); /** * The meta object literal for the '<em><b>Rules</b></em>' containment reference list feature. @@ -1870,7 +1994,7 @@ public interface HSLPackage extends EPackage * <!-- end-user-doc --> * @generated */ - EReference SCANNER__RULES = eINSTANCE.getScanner_Rules(); + EReference RULE_DAMAGER__RULES = eINSTANCE.getRuleDamager_Rules(); /** * The meta object literal for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerTokenImpl <em>Scanner Token</em>}' class. @@ -2123,12 +2247,12 @@ public interface HSLPackage extends EPackage EClass PARTITION_MULTI_LINE_RULE = eINSTANCE.getPartitionMultiLineRule(); /** - * The meta object literal for the '<em><b>Token</b></em>' reference feature. + * The meta object literal for the '<em><b>Parition</b></em>' reference feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EReference PARTITION_MULTI_LINE_RULE__TOKEN = eINSTANCE.getPartitionMultiLineRule_Token(); + EReference PARTITION_MULTI_LINE_RULE__PARITION = eINSTANCE.getPartitionMultiLineRule_Parition(); /** * The meta object literal for the '<em><b>Start Seq</b></em>' attribute feature. @@ -2235,12 +2359,12 @@ public interface HSLPackage extends EPackage EAttribute SCANNER_WHITESPACE_RULE__CHARACTERS = eINSTANCE.getScannerWhitespaceRule_Characters(); /** - * The meta object literal for the '<em><b>Js Method</b></em>' attribute feature. + * The meta object literal for the '<em><b>Js Detector</b></em>' attribute feature. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - EAttribute SCANNER_WHITESPACE_RULE__JS_METHOD = eINSTANCE.getScannerWhitespaceRule_JsMethod(); + EAttribute SCANNER_WHITESPACE_RULE__JS_DETECTOR = eINSTANCE.getScannerWhitespaceRule_JsDetector(); /** * The meta object literal for the '{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ColorImpl <em>Color</em>}' class. diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/Model.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/Model.java index f3fd5702b..a2a94bc24 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/Model.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/Model.java @@ -16,7 +16,7 @@ import org.eclipse.emf.ecore.EObject; * <ul> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getName <em>Name</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getPartitions <em>Partitions</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getScanner <em>Scanner</em>}</li> + * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getDamagers <em>Damagers</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Model#getPartitioner <em>Partitioner</em>}</li> * </ul> * </p> @@ -70,20 +70,20 @@ public interface Model extends EObject EList<Partition> getPartitions(); /** - * Returns the value of the '<em><b>Scanner</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner}. + * Returns the value of the '<em><b>Damagers</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.fx.code.compensator.hsl.hSL.Damager}. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Scanner</em>' containment reference list isn't clear, + * If the meaning of the '<em>Damagers</em>' containment reference list isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Scanner</em>' containment reference list. - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getModel_Scanner() + * @return the value of the '<em>Damagers</em>' containment reference list. + * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getModel_Damagers() * @model containment="true" * @generated */ - EList<Scanner> getScanner(); + EList<Damager> getDamagers(); /** * Returns the value of the '<em><b>Partitioner</b></em>' containment reference. diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/PartitionMultiLineRule.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/PartitionMultiLineRule.java index 01fbcd302..cd899ff67 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/PartitionMultiLineRule.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/PartitionMultiLineRule.java @@ -11,7 +11,7 @@ package org.eclipse.fx.code.compensator.hsl.hSL; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getToken <em>Token</em>}</li> + * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getParition <em>Parition</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getStartSeq <em>Start Seq</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getEndSeq <em>End Seq</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getEscapeSeq <em>Escape Seq</em>}</li> @@ -25,30 +25,30 @@ package org.eclipse.fx.code.compensator.hsl.hSL; public interface PartitionMultiLineRule extends ParitionRule { /** - * Returns the value of the '<em><b>Token</b></em>' reference. + * Returns the value of the '<em><b>Parition</b></em>' reference. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Token</em>' reference isn't clear, + * If the meaning of the '<em>Parition</em>' reference isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Token</em>' reference. - * @see #setToken(Partition) - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getPartitionMultiLineRule_Token() + * @return the value of the '<em>Parition</em>' reference. + * @see #setParition(Partition) + * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getPartitionMultiLineRule_Parition() * @model * @generated */ - Partition getToken(); + Partition getParition(); /** - * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getToken <em>Token</em>}' reference. + * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule#getParition <em>Parition</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Token</em>' reference. - * @see #getToken() + * @param value the new value of the '<em>Parition</em>' reference. + * @see #getParition() * @generated */ - void setToken(Partition value); + void setParition(Partition value); /** * Returns the value of the '<em><b>Start Seq</b></em>' attribute. diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/Scanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/Scanner.java deleted file mode 100644 index 3fb005078..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/Scanner.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - */ -package org.eclipse.fx.code.compensator.hsl.hSL; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EObject; - -/** - * <!-- begin-user-doc --> - * A representation of the model object '<em><b>Scanner</b></em>'. - * <!-- end-user-doc --> - * - * <p> - * The following features are supported: - * <ul> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getPartition <em>Partition</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getTokens <em>Tokens</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getKeywordGroups <em>Keyword Groups</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getRules <em>Rules</em>}</li> - * </ul> - * </p> - * - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScanner() - * @model - * @generated - */ -public interface Scanner extends EObject -{ - /** - * Returns the value of the '<em><b>Partition</b></em>' reference. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Partition</em>' reference isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Partition</em>' reference. - * @see #setPartition(Partition) - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScanner_Partition() - * @model - * @generated - */ - Partition getPartition(); - - /** - * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner#getPartition <em>Partition</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param value the new value of the '<em>Partition</em>' reference. - * @see #getPartition() - * @generated - */ - void setPartition(Partition value); - - /** - * Returns the value of the '<em><b>Tokens</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Tokens</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Tokens</em>' containment reference list. - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScanner_Tokens() - * @model containment="true" - * @generated - */ - EList<ScannerToken> getTokens(); - - /** - * Returns the value of the '<em><b>Keyword Groups</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.fx.code.compensator.hsl.hSL.KeywordGroup}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Keyword Groups</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Keyword Groups</em>' containment reference list. - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScanner_KeywordGroups() - * @model containment="true" - * @generated - */ - EList<KeywordGroup> getKeywordGroups(); - - /** - * Returns the value of the '<em><b>Rules</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerRule}. - * <!-- begin-user-doc --> - * <p> - * If the meaning of the '<em>Rules</em>' containment reference list isn't clear, - * there really should be more of a description here... - * </p> - * <!-- end-user-doc --> - * @return the value of the '<em>Rules</em>' containment reference list. - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScanner_Rules() - * @model containment="true" - * @generated - */ - EList<ScannerRule> getRules(); - -} // Scanner diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerWhitespaceRule.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerWhitespaceRule.java index bb6650994..118842068 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerWhitespaceRule.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/ScannerWhitespaceRule.java @@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.EList; * The following features are supported: * <ul> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getCharacters <em>Characters</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsMethod <em>Js Method</em>}</li> + * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsDetector <em>Js Detector</em>}</li> * </ul> * </p> * @@ -40,29 +40,29 @@ public interface ScannerWhitespaceRule extends ScannerRule EList<String> getCharacters(); /** - * Returns the value of the '<em><b>Js Method</b></em>' attribute. + * Returns the value of the '<em><b>Js Detector</b></em>' attribute. * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Js Method</em>' attribute isn't clear, + * If the meaning of the '<em>Js Detector</em>' attribute isn't clear, * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * @return the value of the '<em>Js Method</em>' attribute. - * @see #setJsMethod(String) - * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScannerWhitespaceRule_JsMethod() + * @return the value of the '<em>Js Detector</em>' attribute. + * @see #setJsDetector(String) + * @see org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage#getScannerWhitespaceRule_JsDetector() * @model * @generated */ - String getJsMethod(); + String getJsDetector(); /** - * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsMethod <em>Js Method</em>}' attribute. + * Sets the value of the '{@link org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule#getJsDetector <em>Js Detector</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @param value the new value of the '<em>Js Method</em>' attribute. - * @see #getJsMethod() + * @param value the new value of the '<em>Js Detector</em>' attribute. + * @see #getJsDetector() * @generated */ - void setJsMethod(String value); + void setJsDetector(String value); } // ScannerWhitespaceRule diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLFactoryImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLFactoryImpl.java index 0dfaf1a99..896881acf 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLFactoryImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLFactoryImpl.java @@ -70,7 +70,9 @@ public class HSLFactoryImpl extends EFactoryImpl implements HSLFactory case HSLPackage.PARTITIONER: return createPartitioner(); case HSLPackage.RULE_PARTITIONER: return createRulePartitioner(); case HSLPackage.JS_PARITIONER: return createJSParitioner(); - case HSLPackage.SCANNER: return createScanner(); + case HSLPackage.DAMAGER: return createDamager(); + case HSLPackage.JS_DAMAGER: return createJSDamager(); + case HSLPackage.RULE_DAMAGER: return createRuleDamager(); case HSLPackage.SCANNER_TOKEN: return createScannerToken(); case HSLPackage.KEYWORD_GROUP: return createKeywordGroup(); case HSLPackage.KEYWORD: return createKeyword(); @@ -186,10 +188,32 @@ public class HSLFactoryImpl extends EFactoryImpl implements HSLFactory * <!-- end-user-doc --> * @generated */ - public Scanner createScanner() + public Damager createDamager() { - ScannerImpl scanner = new ScannerImpl(); - return scanner; + DamagerImpl damager = new DamagerImpl(); + return damager; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public JSDamager createJSDamager() + { + JSDamagerImpl jsDamager = new JSDamagerImpl(); + return jsDamager; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public RuleDamager createRuleDamager() + { + RuleDamagerImpl ruleDamager = new RuleDamagerImpl(); + return ruleDamager; } /** diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java index c92c3c2fe..da0b73fac 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/HSLPackageImpl.java @@ -11,10 +11,12 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.fx.code.compensator.hsl.hSL.Color; +import org.eclipse.fx.code.compensator.hsl.hSL.Damager; import org.eclipse.fx.code.compensator.hsl.hSL.Font; import org.eclipse.fx.code.compensator.hsl.hSL.FontType; import org.eclipse.fx.code.compensator.hsl.hSL.HSLFactory; import org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage; +import org.eclipse.fx.code.compensator.hsl.hSL.JSDamager; import org.eclipse.fx.code.compensator.hsl.hSL.JSParitioner; import org.eclipse.fx.code.compensator.hsl.hSL.Keyword; import org.eclipse.fx.code.compensator.hsl.hSL.KeywordGroup; @@ -26,8 +28,8 @@ import org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule; import org.eclipse.fx.code.compensator.hsl.hSL.PartitionSingleLineRule; import org.eclipse.fx.code.compensator.hsl.hSL.Partitioner; import org.eclipse.fx.code.compensator.hsl.hSL.RGBColor; +import org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager; import org.eclipse.fx.code.compensator.hsl.hSL.RulePartitioner; -import org.eclipse.fx.code.compensator.hsl.hSL.Scanner; import org.eclipse.fx.code.compensator.hsl.hSL.ScannerCharacterRule; import org.eclipse.fx.code.compensator.hsl.hSL.ScannerJSRule; import org.eclipse.fx.code.compensator.hsl.hSL.ScannerMultiLineRule; @@ -84,7 +86,21 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - private EClass scannerEClass = null; + private EClass damagerEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass jsDamagerEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass ruleDamagerEClass = null; /** * <!-- begin-user-doc --> @@ -303,7 +319,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EReference getModel_Scanner() + public EReference getModel_Damagers() { return (EReference)modelEClass.getEStructuralFeatures().get(2); } @@ -393,9 +409,19 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EClass getScanner() + public EClass getDamager() + { + return damagerEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getDamager_Partition() { - return scannerEClass; + return (EReference)damagerEClass.getEStructuralFeatures().get(0); } /** @@ -403,9 +429,9 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EReference getScanner_Partition() + public EClass getJSDamager() { - return (EReference)scannerEClass.getEStructuralFeatures().get(0); + return jsDamagerEClass; } /** @@ -413,9 +439,9 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EReference getScanner_Tokens() + public EAttribute getJSDamager_FileURI() { - return (EReference)scannerEClass.getEStructuralFeatures().get(1); + return (EAttribute)jsDamagerEClass.getEStructuralFeatures().get(0); } /** @@ -423,9 +449,9 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EReference getScanner_KeywordGroups() + public EClass getRuleDamager() { - return (EReference)scannerEClass.getEStructuralFeatures().get(2); + return ruleDamagerEClass; } /** @@ -433,9 +459,29 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EReference getScanner_Rules() + public EReference getRuleDamager_Tokens() { - return (EReference)scannerEClass.getEStructuralFeatures().get(3); + return (EReference)ruleDamagerEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getRuleDamager_KeywordGroups() + { + return (EReference)ruleDamagerEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getRuleDamager_Rules() + { + return (EReference)ruleDamagerEClass.getEStructuralFeatures().get(2); } /** @@ -733,7 +779,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EReference getPartitionMultiLineRule_Token() + public EReference getPartitionMultiLineRule_Parition() { return (EReference)partitionMultiLineRuleEClass.getEStructuralFeatures().get(0); } @@ -863,7 +909,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage * <!-- end-user-doc --> * @generated */ - public EAttribute getScannerWhitespaceRule_JsMethod() + public EAttribute getScannerWhitespaceRule_JsDetector() { return (EAttribute)scannerWhitespaceRuleEClass.getEStructuralFeatures().get(1); } @@ -1001,7 +1047,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage modelEClass = createEClass(MODEL); createEAttribute(modelEClass, MODEL__NAME); createEReference(modelEClass, MODEL__PARTITIONS); - createEReference(modelEClass, MODEL__SCANNER); + createEReference(modelEClass, MODEL__DAMAGERS); createEReference(modelEClass, MODEL__PARTITIONER); partitionEClass = createEClass(PARTITION); @@ -1015,11 +1061,16 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage jsParitionerEClass = createEClass(JS_PARITIONER); createEAttribute(jsParitionerEClass, JS_PARITIONER__FILE_URI); - scannerEClass = createEClass(SCANNER); - createEReference(scannerEClass, SCANNER__PARTITION); - createEReference(scannerEClass, SCANNER__TOKENS); - createEReference(scannerEClass, SCANNER__KEYWORD_GROUPS); - createEReference(scannerEClass, SCANNER__RULES); + damagerEClass = createEClass(DAMAGER); + createEReference(damagerEClass, DAMAGER__PARTITION); + + jsDamagerEClass = createEClass(JS_DAMAGER); + createEAttribute(jsDamagerEClass, JS_DAMAGER__FILE_URI); + + ruleDamagerEClass = createEClass(RULE_DAMAGER); + createEReference(ruleDamagerEClass, RULE_DAMAGER__TOKENS); + createEReference(ruleDamagerEClass, RULE_DAMAGER__KEYWORD_GROUPS); + createEReference(ruleDamagerEClass, RULE_DAMAGER__RULES); scannerTokenEClass = createEClass(SCANNER_TOKEN); createEAttribute(scannerTokenEClass, SCANNER_TOKEN__DEFAULT); @@ -1058,7 +1109,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage createEAttribute(scannerMultiLineRuleEClass, SCANNER_MULTI_LINE_RULE__ESCAPE_SEQ); partitionMultiLineRuleEClass = createEClass(PARTITION_MULTI_LINE_RULE); - createEReference(partitionMultiLineRuleEClass, PARTITION_MULTI_LINE_RULE__TOKEN); + createEReference(partitionMultiLineRuleEClass, PARTITION_MULTI_LINE_RULE__PARITION); createEAttribute(partitionMultiLineRuleEClass, PARTITION_MULTI_LINE_RULE__START_SEQ); createEAttribute(partitionMultiLineRuleEClass, PARTITION_MULTI_LINE_RULE__END_SEQ); createEAttribute(partitionMultiLineRuleEClass, PARTITION_MULTI_LINE_RULE__ESCAPE_SEQ); @@ -1075,7 +1126,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage scannerWhitespaceRuleEClass = createEClass(SCANNER_WHITESPACE_RULE); createEAttribute(scannerWhitespaceRuleEClass, SCANNER_WHITESPACE_RULE__CHARACTERS); - createEAttribute(scannerWhitespaceRuleEClass, SCANNER_WHITESPACE_RULE__JS_METHOD); + createEAttribute(scannerWhitespaceRuleEClass, SCANNER_WHITESPACE_RULE__JS_DETECTOR); colorEClass = createEClass(COLOR); @@ -1124,6 +1175,8 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage // Add supertypes to classes rulePartitionerEClass.getESuperTypes().add(this.getPartitioner()); jsParitionerEClass.getESuperTypes().add(this.getPartitioner()); + jsDamagerEClass.getESuperTypes().add(this.getDamager()); + ruleDamagerEClass.getESuperTypes().add(this.getDamager()); scannerSingleLineRuleEClass.getESuperTypes().add(this.getScannerRule()); partitionSingleLineRuleEClass.getESuperTypes().add(this.getParitionRule()); scannerMultiLineRuleEClass.getESuperTypes().add(this.getScannerRule()); @@ -1138,7 +1191,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage initEClass(modelEClass, Model.class, "Model", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getModel_Name(), ecorePackage.getEString(), "name", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getModel_Partitions(), this.getPartition(), null, "partitions", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getModel_Scanner(), this.getScanner(), null, "scanner", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getModel_Damagers(), this.getDamager(), null, "damagers", null, 0, -1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getModel_Partitioner(), this.getPartitioner(), null, "partitioner", null, 0, 1, Model.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(partitionEClass, Partition.class, "Partition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -1152,11 +1205,16 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage initEClass(jsParitionerEClass, JSParitioner.class, "JSParitioner", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getJSParitioner_FileURI(), ecorePackage.getEString(), "fileURI", null, 0, 1, JSParitioner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(scannerEClass, Scanner.class, "Scanner", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getScanner_Partition(), this.getPartition(), null, "partition", null, 0, 1, Scanner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getScanner_Tokens(), this.getScannerToken(), null, "tokens", null, 0, -1, Scanner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getScanner_KeywordGroups(), this.getKeywordGroup(), null, "keywordGroups", null, 0, -1, Scanner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getScanner_Rules(), this.getScannerRule(), null, "rules", null, 0, -1, Scanner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(damagerEClass, Damager.class, "Damager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getDamager_Partition(), this.getPartition(), null, "partition", null, 0, 1, Damager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(jsDamagerEClass, JSDamager.class, "JSDamager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getJSDamager_FileURI(), ecorePackage.getEString(), "fileURI", null, 0, 1, JSDamager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(ruleDamagerEClass, RuleDamager.class, "RuleDamager", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getRuleDamager_Tokens(), this.getScannerToken(), null, "tokens", null, 0, -1, RuleDamager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRuleDamager_KeywordGroups(), this.getKeywordGroup(), null, "keywordGroups", null, 0, -1, RuleDamager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRuleDamager_Rules(), this.getScannerRule(), null, "rules", null, 0, -1, RuleDamager.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(scannerTokenEClass, ScannerToken.class, "ScannerToken", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getScannerToken_Default(), ecorePackage.getEBoolean(), "default", null, 0, 1, ScannerToken.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1195,7 +1253,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage initEAttribute(getScannerMultiLineRule_EscapeSeq(), ecorePackage.getEString(), "escapeSeq", null, 0, 1, ScannerMultiLineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(partitionMultiLineRuleEClass, PartitionMultiLineRule.class, "PartitionMultiLineRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getPartitionMultiLineRule_Token(), this.getPartition(), null, "token", null, 0, 1, PartitionMultiLineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getPartitionMultiLineRule_Parition(), this.getPartition(), null, "parition", null, 0, 1, PartitionMultiLineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getPartitionMultiLineRule_StartSeq(), ecorePackage.getEString(), "startSeq", null, 0, 1, PartitionMultiLineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getPartitionMultiLineRule_EndSeq(), ecorePackage.getEString(), "endSeq", null, 0, 1, PartitionMultiLineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getPartitionMultiLineRule_EscapeSeq(), ecorePackage.getEString(), "escapeSeq", null, 0, 1, PartitionMultiLineRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -1212,7 +1270,7 @@ public class HSLPackageImpl extends EPackageImpl implements HSLPackage initEClass(scannerWhitespaceRuleEClass, ScannerWhitespaceRule.class, "ScannerWhitespaceRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getScannerWhitespaceRule_Characters(), ecorePackage.getEString(), "characters", null, 0, -1, ScannerWhitespaceRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getScannerWhitespaceRule_JsMethod(), ecorePackage.getEString(), "jsMethod", null, 0, 1, ScannerWhitespaceRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getScannerWhitespaceRule_JsDetector(), ecorePackage.getEString(), "jsDetector", null, 0, 1, ScannerWhitespaceRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(colorEClass, Color.class, "Color", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ModelImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ModelImpl.java index 2aef8b78d..d9545bf33 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ModelImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ModelImpl.java @@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.fx.code.compensator.hsl.hSL.Damager; import org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage; import org.eclipse.fx.code.compensator.hsl.hSL.Model; import org.eclipse.fx.code.compensator.hsl.hSL.Partition; import org.eclipse.fx.code.compensator.hsl.hSL.Partitioner; -import org.eclipse.fx.code.compensator.hsl.hSL.Scanner; /** * <!-- begin-user-doc --> @@ -33,7 +33,7 @@ import org.eclipse.fx.code.compensator.hsl.hSL.Scanner; * <ul> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ModelImpl#getName <em>Name</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ModelImpl#getPartitions <em>Partitions</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ModelImpl#getScanner <em>Scanner</em>}</li> + * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ModelImpl#getDamagers <em>Damagers</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ModelImpl#getPartitioner <em>Partitioner</em>}</li> * </ul> * </p> @@ -73,14 +73,14 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model protected EList<Partition> partitions; /** - * The cached value of the '{@link #getScanner() <em>Scanner</em>}' containment reference list. + * The cached value of the '{@link #getDamagers() <em>Damagers</em>}' containment reference list. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getScanner() + * @see #getDamagers() * @generated * @ordered */ - protected EList<Scanner> scanner; + protected EList<Damager> damagers; /** * The cached value of the '{@link #getPartitioner() <em>Partitioner</em>}' containment reference. @@ -155,13 +155,13 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model * <!-- end-user-doc --> * @generated */ - public EList<Scanner> getScanner() + public EList<Damager> getDamagers() { - if (scanner == null) + if (damagers == null) { - scanner = new EObjectContainmentEList<Scanner>(Scanner.class, this, HSLPackage.MODEL__SCANNER); + damagers = new EObjectContainmentEList<Damager>(Damager.class, this, HSLPackage.MODEL__DAMAGERS); } - return scanner; + return damagers; } /** @@ -224,8 +224,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model { case HSLPackage.MODEL__PARTITIONS: return ((InternalEList<?>)getPartitions()).basicRemove(otherEnd, msgs); - case HSLPackage.MODEL__SCANNER: - return ((InternalEList<?>)getScanner()).basicRemove(otherEnd, msgs); + case HSLPackage.MODEL__DAMAGERS: + return ((InternalEList<?>)getDamagers()).basicRemove(otherEnd, msgs); case HSLPackage.MODEL__PARTITIONER: return basicSetPartitioner(null, msgs); } @@ -246,8 +246,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model return getName(); case HSLPackage.MODEL__PARTITIONS: return getPartitions(); - case HSLPackage.MODEL__SCANNER: - return getScanner(); + case HSLPackage.MODEL__DAMAGERS: + return getDamagers(); case HSLPackage.MODEL__PARTITIONER: return getPartitioner(); } @@ -272,9 +272,9 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model getPartitions().clear(); getPartitions().addAll((Collection<? extends Partition>)newValue); return; - case HSLPackage.MODEL__SCANNER: - getScanner().clear(); - getScanner().addAll((Collection<? extends Scanner>)newValue); + case HSLPackage.MODEL__DAMAGERS: + getDamagers().clear(); + getDamagers().addAll((Collection<? extends Damager>)newValue); return; case HSLPackage.MODEL__PARTITIONER: setPartitioner((Partitioner)newValue); @@ -299,8 +299,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model case HSLPackage.MODEL__PARTITIONS: getPartitions().clear(); return; - case HSLPackage.MODEL__SCANNER: - getScanner().clear(); + case HSLPackage.MODEL__DAMAGERS: + getDamagers().clear(); return; case HSLPackage.MODEL__PARTITIONER: setPartitioner((Partitioner)null); @@ -323,8 +323,8 @@ public class ModelImpl extends MinimalEObjectImpl.Container implements Model return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case HSLPackage.MODEL__PARTITIONS: return partitions != null && !partitions.isEmpty(); - case HSLPackage.MODEL__SCANNER: - return scanner != null && !scanner.isEmpty(); + case HSLPackage.MODEL__DAMAGERS: + return damagers != null && !damagers.isEmpty(); case HSLPackage.MODEL__PARTITIONER: return partitioner != null; } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/PartitionMultiLineRuleImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/PartitionMultiLineRuleImpl.java index 897743c63..3008b745b 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/PartitionMultiLineRuleImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/PartitionMultiLineRuleImpl.java @@ -20,7 +20,7 @@ import org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule; * <p> * The following features are implemented: * <ul> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.PartitionMultiLineRuleImpl#getToken <em>Token</em>}</li> + * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.PartitionMultiLineRuleImpl#getParition <em>Parition</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.PartitionMultiLineRuleImpl#getStartSeq <em>Start Seq</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.PartitionMultiLineRuleImpl#getEndSeq <em>End Seq</em>}</li> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.PartitionMultiLineRuleImpl#getEscapeSeq <em>Escape Seq</em>}</li> @@ -32,14 +32,14 @@ import org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule; public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements PartitionMultiLineRule { /** - * The cached value of the '{@link #getToken() <em>Token</em>}' reference. + * The cached value of the '{@link #getParition() <em>Parition</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getToken() + * @see #getParition() * @generated * @ordered */ - protected Partition token; + protected Partition parition; /** * The default value of the '{@link #getStartSeq() <em>Start Seq</em>}' attribute. @@ -127,19 +127,19 @@ public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements Part * <!-- end-user-doc --> * @generated */ - public Partition getToken() + public Partition getParition() { - if (token != null && token.eIsProxy()) + if (parition != null && parition.eIsProxy()) { - InternalEObject oldToken = (InternalEObject)token; - token = (Partition)eResolveProxy(oldToken); - if (token != oldToken) + InternalEObject oldParition = (InternalEObject)parition; + parition = (Partition)eResolveProxy(oldParition); + if (parition != oldParition) { if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, HSLPackage.PARTITION_MULTI_LINE_RULE__TOKEN, oldToken, token)); + eNotify(new ENotificationImpl(this, Notification.RESOLVE, HSLPackage.PARTITION_MULTI_LINE_RULE__PARITION, oldParition, parition)); } } - return token; + return parition; } /** @@ -147,9 +147,9 @@ public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements Part * <!-- end-user-doc --> * @generated */ - public Partition basicGetToken() + public Partition basicGetParition() { - return token; + return parition; } /** @@ -157,12 +157,12 @@ public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements Part * <!-- end-user-doc --> * @generated */ - public void setToken(Partition newToken) + public void setParition(Partition newParition) { - Partition oldToken = token; - token = newToken; + Partition oldParition = parition; + parition = newParition; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.PARTITION_MULTI_LINE_RULE__TOKEN, oldToken, token)); + eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.PARTITION_MULTI_LINE_RULE__PARITION, oldParition, parition)); } /** @@ -244,9 +244,9 @@ public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements Part { switch (featureID) { - case HSLPackage.PARTITION_MULTI_LINE_RULE__TOKEN: - if (resolve) return getToken(); - return basicGetToken(); + case HSLPackage.PARTITION_MULTI_LINE_RULE__PARITION: + if (resolve) return getParition(); + return basicGetParition(); case HSLPackage.PARTITION_MULTI_LINE_RULE__START_SEQ: return getStartSeq(); case HSLPackage.PARTITION_MULTI_LINE_RULE__END_SEQ: @@ -267,8 +267,8 @@ public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements Part { switch (featureID) { - case HSLPackage.PARTITION_MULTI_LINE_RULE__TOKEN: - setToken((Partition)newValue); + case HSLPackage.PARTITION_MULTI_LINE_RULE__PARITION: + setParition((Partition)newValue); return; case HSLPackage.PARTITION_MULTI_LINE_RULE__START_SEQ: setStartSeq((String)newValue); @@ -293,8 +293,8 @@ public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements Part { switch (featureID) { - case HSLPackage.PARTITION_MULTI_LINE_RULE__TOKEN: - setToken((Partition)null); + case HSLPackage.PARTITION_MULTI_LINE_RULE__PARITION: + setParition((Partition)null); return; case HSLPackage.PARTITION_MULTI_LINE_RULE__START_SEQ: setStartSeq(START_SEQ_EDEFAULT); @@ -319,8 +319,8 @@ public class PartitionMultiLineRuleImpl extends ParitionRuleImpl implements Part { switch (featureID) { - case HSLPackage.PARTITION_MULTI_LINE_RULE__TOKEN: - return token != null; + case HSLPackage.PARTITION_MULTI_LINE_RULE__PARITION: + return parition != null; case HSLPackage.PARTITION_MULTI_LINE_RULE__START_SEQ: return START_SEQ_EDEFAULT == null ? startSeq != null : !START_SEQ_EDEFAULT.equals(startSeq); case HSLPackage.PARTITION_MULTI_LINE_RULE__END_SEQ: diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerImpl.java deleted file mode 100644 index 33c621993..000000000 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerImpl.java +++ /dev/null @@ -1,313 +0,0 @@ -/** - */ -package org.eclipse.fx.code.compensator.hsl.hSL.impl; - -import java.util.Collection; - -import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.InternalEObject; - -import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; - -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.emf.ecore.util.InternalEList; - -import org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage; -import org.eclipse.fx.code.compensator.hsl.hSL.KeywordGroup; -import org.eclipse.fx.code.compensator.hsl.hSL.Partition; -import org.eclipse.fx.code.compensator.hsl.hSL.Scanner; -import org.eclipse.fx.code.compensator.hsl.hSL.ScannerRule; -import org.eclipse.fx.code.compensator.hsl.hSL.ScannerToken; - -/** - * <!-- begin-user-doc --> - * An implementation of the model object '<em><b>Scanner</b></em>'. - * <!-- end-user-doc --> - * <p> - * The following features are implemented: - * <ul> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl#getPartition <em>Partition</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl#getTokens <em>Tokens</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl#getKeywordGroups <em>Keyword Groups</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerImpl#getRules <em>Rules</em>}</li> - * </ul> - * </p> - * - * @generated - */ -public class ScannerImpl extends MinimalEObjectImpl.Container implements Scanner -{ - /** - * The cached value of the '{@link #getPartition() <em>Partition</em>}' reference. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getPartition() - * @generated - * @ordered - */ - protected Partition partition; - - /** - * The cached value of the '{@link #getTokens() <em>Tokens</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getTokens() - * @generated - * @ordered - */ - protected EList<ScannerToken> tokens; - - /** - * The cached value of the '{@link #getKeywordGroups() <em>Keyword Groups</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getKeywordGroups() - * @generated - * @ordered - */ - protected EList<KeywordGroup> keywordGroups; - - /** - * The cached value of the '{@link #getRules() <em>Rules</em>}' containment reference list. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @see #getRules() - * @generated - * @ordered - */ - protected EList<ScannerRule> rules; - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected ScannerImpl() - { - super(); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - protected EClass eStaticClass() - { - return HSLPackage.Literals.SCANNER; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Partition getPartition() - { - if (partition != null && partition.eIsProxy()) - { - InternalEObject oldPartition = (InternalEObject)partition; - partition = (Partition)eResolveProxy(oldPartition); - if (partition != oldPartition) - { - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.RESOLVE, HSLPackage.SCANNER__PARTITION, oldPartition, partition)); - } - } - return partition; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public Partition basicGetPartition() - { - return partition; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public void setPartition(Partition newPartition) - { - Partition oldPartition = partition; - partition = newPartition; - if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER__PARTITION, oldPartition, partition)); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList<ScannerToken> getTokens() - { - if (tokens == null) - { - tokens = new EObjectContainmentEList<ScannerToken>(ScannerToken.class, this, HSLPackage.SCANNER__TOKENS); - } - return tokens; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList<KeywordGroup> getKeywordGroups() - { - if (keywordGroups == null) - { - keywordGroups = new EObjectContainmentEList<KeywordGroup>(KeywordGroup.class, this, HSLPackage.SCANNER__KEYWORD_GROUPS); - } - return keywordGroups; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public EList<ScannerRule> getRules() - { - if (rules == null) - { - rules = new EObjectContainmentEList<ScannerRule>(ScannerRule.class, this, HSLPackage.SCANNER__RULES); - } - return rules; - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) - { - switch (featureID) - { - case HSLPackage.SCANNER__TOKENS: - return ((InternalEList<?>)getTokens()).basicRemove(otherEnd, msgs); - case HSLPackage.SCANNER__KEYWORD_GROUPS: - return ((InternalEList<?>)getKeywordGroups()).basicRemove(otherEnd, msgs); - case HSLPackage.SCANNER__RULES: - return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs); - } - return super.eInverseRemove(otherEnd, featureID, msgs); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public Object eGet(int featureID, boolean resolve, boolean coreType) - { - switch (featureID) - { - case HSLPackage.SCANNER__PARTITION: - if (resolve) return getPartition(); - return basicGetPartition(); - case HSLPackage.SCANNER__TOKENS: - return getTokens(); - case HSLPackage.SCANNER__KEYWORD_GROUPS: - return getKeywordGroups(); - case HSLPackage.SCANNER__RULES: - return getRules(); - } - return super.eGet(featureID, resolve, coreType); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @SuppressWarnings("unchecked") - @Override - public void eSet(int featureID, Object newValue) - { - switch (featureID) - { - case HSLPackage.SCANNER__PARTITION: - setPartition((Partition)newValue); - return; - case HSLPackage.SCANNER__TOKENS: - getTokens().clear(); - getTokens().addAll((Collection<? extends ScannerToken>)newValue); - return; - case HSLPackage.SCANNER__KEYWORD_GROUPS: - getKeywordGroups().clear(); - getKeywordGroups().addAll((Collection<? extends KeywordGroup>)newValue); - return; - case HSLPackage.SCANNER__RULES: - getRules().clear(); - getRules().addAll((Collection<? extends ScannerRule>)newValue); - return; - } - super.eSet(featureID, newValue); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public void eUnset(int featureID) - { - switch (featureID) - { - case HSLPackage.SCANNER__PARTITION: - setPartition((Partition)null); - return; - case HSLPackage.SCANNER__TOKENS: - getTokens().clear(); - return; - case HSLPackage.SCANNER__KEYWORD_GROUPS: - getKeywordGroups().clear(); - return; - case HSLPackage.SCANNER__RULES: - getRules().clear(); - return; - } - super.eUnset(featureID); - } - - /** - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - @Override - public boolean eIsSet(int featureID) - { - switch (featureID) - { - case HSLPackage.SCANNER__PARTITION: - return partition != null; - case HSLPackage.SCANNER__TOKENS: - return tokens != null && !tokens.isEmpty(); - case HSLPackage.SCANNER__KEYWORD_GROUPS: - return keywordGroups != null && !keywordGroups.isEmpty(); - case HSLPackage.SCANNER__RULES: - return rules != null && !rules.isEmpty(); - } - return super.eIsSet(featureID); - } - -} //ScannerImpl diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerWhitespaceRuleImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerWhitespaceRuleImpl.java index 6d6f9d73f..a8d49be12 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerWhitespaceRuleImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/impl/ScannerWhitespaceRuleImpl.java @@ -25,7 +25,7 @@ import org.eclipse.fx.code.compensator.hsl.hSL.ScannerWhitespaceRule; * The following features are implemented: * <ul> * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerWhitespaceRuleImpl#getCharacters <em>Characters</em>}</li> - * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerWhitespaceRuleImpl#getJsMethod <em>Js Method</em>}</li> + * <li>{@link org.eclipse.fx.code.compensator.hsl.hSL.impl.ScannerWhitespaceRuleImpl#getJsDetector <em>Js Detector</em>}</li> * </ul> * </p> * @@ -44,24 +44,24 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne protected EList<String> characters; /** - * The default value of the '{@link #getJsMethod() <em>Js Method</em>}' attribute. + * The default value of the '{@link #getJsDetector() <em>Js Detector</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getJsMethod() + * @see #getJsDetector() * @generated * @ordered */ - protected static final String JS_METHOD_EDEFAULT = null; + protected static final String JS_DETECTOR_EDEFAULT = null; /** - * The cached value of the '{@link #getJsMethod() <em>Js Method</em>}' attribute. + * The cached value of the '{@link #getJsDetector() <em>Js Detector</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see #getJsMethod() + * @see #getJsDetector() * @generated * @ordered */ - protected String jsMethod = JS_METHOD_EDEFAULT; + protected String jsDetector = JS_DETECTOR_EDEFAULT; /** * <!-- begin-user-doc --> @@ -103,9 +103,9 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne * <!-- end-user-doc --> * @generated */ - public String getJsMethod() + public String getJsDetector() { - return jsMethod; + return jsDetector; } /** @@ -113,12 +113,12 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne * <!-- end-user-doc --> * @generated */ - public void setJsMethod(String newJsMethod) + public void setJsDetector(String newJsDetector) { - String oldJsMethod = jsMethod; - jsMethod = newJsMethod; + String oldJsDetector = jsDetector; + jsDetector = newJsDetector; if (eNotificationRequired()) - eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_WHITESPACE_RULE__JS_METHOD, oldJsMethod, jsMethod)); + eNotify(new ENotificationImpl(this, Notification.SET, HSLPackage.SCANNER_WHITESPACE_RULE__JS_DETECTOR, oldJsDetector, jsDetector)); } /** @@ -133,8 +133,8 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne { case HSLPackage.SCANNER_WHITESPACE_RULE__CHARACTERS: return getCharacters(); - case HSLPackage.SCANNER_WHITESPACE_RULE__JS_METHOD: - return getJsMethod(); + case HSLPackage.SCANNER_WHITESPACE_RULE__JS_DETECTOR: + return getJsDetector(); } return super.eGet(featureID, resolve, coreType); } @@ -154,8 +154,8 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne getCharacters().clear(); getCharacters().addAll((Collection<? extends String>)newValue); return; - case HSLPackage.SCANNER_WHITESPACE_RULE__JS_METHOD: - setJsMethod((String)newValue); + case HSLPackage.SCANNER_WHITESPACE_RULE__JS_DETECTOR: + setJsDetector((String)newValue); return; } super.eSet(featureID, newValue); @@ -174,8 +174,8 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne case HSLPackage.SCANNER_WHITESPACE_RULE__CHARACTERS: getCharacters().clear(); return; - case HSLPackage.SCANNER_WHITESPACE_RULE__JS_METHOD: - setJsMethod(JS_METHOD_EDEFAULT); + case HSLPackage.SCANNER_WHITESPACE_RULE__JS_DETECTOR: + setJsDetector(JS_DETECTOR_EDEFAULT); return; } super.eUnset(featureID); @@ -193,8 +193,8 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne { case HSLPackage.SCANNER_WHITESPACE_RULE__CHARACTERS: return characters != null && !characters.isEmpty(); - case HSLPackage.SCANNER_WHITESPACE_RULE__JS_METHOD: - return JS_METHOD_EDEFAULT == null ? jsMethod != null : !JS_METHOD_EDEFAULT.equals(jsMethod); + case HSLPackage.SCANNER_WHITESPACE_RULE__JS_DETECTOR: + return JS_DETECTOR_EDEFAULT == null ? jsDetector != null : !JS_DETECTOR_EDEFAULT.equals(jsDetector); } return super.eIsSet(featureID); } @@ -212,8 +212,8 @@ public class ScannerWhitespaceRuleImpl extends ScannerRuleImpl implements Scanne StringBuffer result = new StringBuffer(super.toString()); result.append(" (characters: "); result.append(characters); - result.append(", jsMethod: "); - result.append(jsMethod); + result.append(", jsDetector: "); + result.append(jsDetector); result.append(')'); return result.toString(); } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLAdapterFactory.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLAdapterFactory.java index 9332d72e0..18b8a1541 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLAdapterFactory.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLAdapterFactory.java @@ -100,9 +100,19 @@ public class HSLAdapterFactory extends AdapterFactoryImpl return createJSParitionerAdapter(); } @Override - public Adapter caseScanner(Scanner object) + public Adapter caseDamager(Damager object) { - return createScannerAdapter(); + return createDamagerAdapter(); + } + @Override + public Adapter caseJSDamager(JSDamager object) + { + return createJSDamagerAdapter(); + } + @Override + public Adapter caseRuleDamager(RuleDamager object) + { + return createRuleDamagerAdapter(); } @Override public Adapter caseScannerToken(ScannerToken object) @@ -282,16 +292,46 @@ public class HSLAdapterFactory extends AdapterFactoryImpl } /** - * Creates a new adapter for an object of class '{@link org.eclipse.fx.code.compensator.hsl.hSL.Scanner <em>Scanner</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.fx.code.compensator.hsl.hSL.Damager <em>Damager</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.fx.code.compensator.hsl.hSL.Damager + * @generated + */ + public Adapter createDamagerAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.fx.code.compensator.hsl.hSL.JSDamager <em>JS Damager</em>}'. + * <!-- begin-user-doc --> + * This default implementation returns null so that we can easily ignore cases; + * it's useful to ignore a case when inheritance will catch all the cases anyway. + * <!-- end-user-doc --> + * @return the new adapter. + * @see org.eclipse.fx.code.compensator.hsl.hSL.JSDamager + * @generated + */ + public Adapter createJSDamagerAdapter() + { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager <em>Rule Damager</em>}'. * <!-- begin-user-doc --> * This default implementation returns null so that we can easily ignore cases; * it's useful to ignore a case when inheritance will catch all the cases anyway. * <!-- end-user-doc --> * @return the new adapter. - * @see org.eclipse.fx.code.compensator.hsl.hSL.Scanner + * @see org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager * @generated */ - public Adapter createScannerAdapter() + public Adapter createRuleDamagerAdapter() { return null; } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLSwitch.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLSwitch.java index 1ae0ab840..1eab56159 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLSwitch.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/hSL/util/HSLSwitch.java @@ -109,10 +109,26 @@ public class HSLSwitch<T> extends Switch<T> if (result == null) result = defaultCase(theEObject); return result; } - case HSLPackage.SCANNER: + case HSLPackage.DAMAGER: { - Scanner scanner = (Scanner)theEObject; - T result = caseScanner(scanner); + Damager damager = (Damager)theEObject; + T result = caseDamager(damager); + if (result == null) result = defaultCase(theEObject); + return result; + } + case HSLPackage.JS_DAMAGER: + { + JSDamager jsDamager = (JSDamager)theEObject; + T result = caseJSDamager(jsDamager); + if (result == null) result = caseDamager(jsDamager); + if (result == null) result = defaultCase(theEObject); + return result; + } + case HSLPackage.RULE_DAMAGER: + { + RuleDamager ruleDamager = (RuleDamager)theEObject; + T result = caseRuleDamager(ruleDamager); + if (result == null) result = caseDamager(ruleDamager); if (result == null) result = defaultCase(theEObject); return result; } @@ -322,17 +338,49 @@ public class HSLSwitch<T> extends Switch<T> } /** - * Returns the result of interpreting the object as an instance of '<em>Scanner</em>'. + * Returns the result of interpreting the object as an instance of '<em>Damager</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>Damager</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseDamager(Damager object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>JS Damager</em>'. + * <!-- begin-user-doc --> + * This implementation returns null; + * returning a non-null result will terminate the switch. + * <!-- end-user-doc --> + * @param object the target of the switch. + * @return the result of interpreting the object as an instance of '<em>JS Damager</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseJSDamager(JSDamager object) + { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Rule Damager</em>'. * <!-- begin-user-doc --> * This implementation returns null; * returning a non-null result will terminate the switch. * <!-- end-user-doc --> * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Scanner</em>'. + * @return the result of interpreting the object as an instance of '<em>Rule Damager</em>'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) * @generated */ - public T caseScanner(Scanner object) + public T caseRuleDamager(RuleDamager object) { return null; } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g index cd8a638bd..f8a40c942 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g @@ -121,17 +121,17 @@ ruleModel returns [EObject current=null] )+( ( { - newCompositeNode(grammarAccess.getModelAccess().getScannerScannerParserRuleCall_3_0()); + newCompositeNode(grammarAccess.getModelAccess().getDamagersDamagerParserRuleCall_3_0()); } - lv_scanner_3_0=ruleScanner { + lv_damagers_3_0=ruleDamager { if ($current==null) { $current = createModelElementForParent(grammarAccess.getModelRule()); } add( $current, - "scanner", - lv_scanner_3_0, - "Scanner"); + "damagers", + lv_damagers_3_0, + "Damager"); afterParserOrEnumRuleCall(); } @@ -342,49 +342,145 @@ ruleJSParitioner returns [EObject current=null] -// Entry rule entryRuleScanner -entryRuleScanner returns [EObject current=null] +// Entry rule entryRuleDamager +entryRuleDamager returns [EObject current=null] : - { newCompositeNode(grammarAccess.getScannerRule()); } - iv_ruleScanner=ruleScanner - { $current=$iv_ruleScanner.current; } + { newCompositeNode(grammarAccess.getDamagerRule()); } + iv_ruleDamager=ruleDamager + { $current=$iv_ruleDamager.current; } EOF ; -// Rule Scanner -ruleScanner returns [EObject current=null] +// Rule Damager +ruleDamager returns [EObject current=null] @init { enterRule(); } @after { leaveRule(); }: -( otherlv_0='scanner' +( + { + newCompositeNode(grammarAccess.getDamagerAccess().getRuleDamagerParserRuleCall_0()); + } + this_RuleDamager_0=ruleRuleDamager + { + $current = $this_RuleDamager_0.current; + afterParserOrEnumRuleCall(); + } + + | + { + newCompositeNode(grammarAccess.getDamagerAccess().getJSDamagerParserRuleCall_1()); + } + this_JSDamager_1=ruleJSDamager + { + $current = $this_JSDamager_1.current; + afterParserOrEnumRuleCall(); + } +) +; + + + + + +// Entry rule entryRuleJSDamager +entryRuleJSDamager returns [EObject current=null] + : + { newCompositeNode(grammarAccess.getJSDamagerRule()); } + iv_ruleJSDamager=ruleJSDamager + { $current=$iv_ruleJSDamager.current; } + EOF +; + +// Rule JSDamager +ruleJSDamager returns [EObject current=null] + @init { enterRule(); + } + @after { leaveRule(); }: +( otherlv_0='js-damager' + { + newLeafNode(otherlv_0, grammarAccess.getJSDamagerAccess().getJsDamagerKeyword_0()); + } +( +( + { + if ($current==null) { + $current = createModelElement(grammarAccess.getJSDamagerRule()); + } + } + otherlv_1=RULE_ID + { + newLeafNode(otherlv_1, grammarAccess.getJSDamagerAccess().getPartitionPartitionCrossReference_1_0()); + } + +) +)( +( + lv_fileURI_2_0=RULE_STRING + { + newLeafNode(lv_fileURI_2_0, grammarAccess.getJSDamagerAccess().getFileURISTRINGTerminalRuleCall_2_0()); + } + { + if ($current==null) { + $current = createModelElement(grammarAccess.getJSDamagerRule()); + } + setWithLastConsumed( + $current, + "fileURI", + lv_fileURI_2_0, + "STRING"); + } + +) +)) +; + + + + + +// Entry rule entryRuleRuleDamager +entryRuleRuleDamager returns [EObject current=null] + : + { newCompositeNode(grammarAccess.getRuleDamagerRule()); } + iv_ruleRuleDamager=ruleRuleDamager + { $current=$iv_ruleRuleDamager.current; } + EOF +; + +// Rule RuleDamager +ruleRuleDamager returns [EObject current=null] + @init { enterRule(); + } + @after { leaveRule(); }: +( otherlv_0='rule-damager' { - newLeafNode(otherlv_0, grammarAccess.getScannerAccess().getScannerKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getRuleDamagerAccess().getRuleDamagerKeyword_0()); } ( ( { if ($current==null) { - $current = createModelElement(grammarAccess.getScannerRule()); + $current = createModelElement(grammarAccess.getRuleDamagerRule()); } } otherlv_1=RULE_ID { - newLeafNode(otherlv_1, grammarAccess.getScannerAccess().getPartitionPartitionCrossReference_1_0()); + newLeafNode(otherlv_1, grammarAccess.getRuleDamagerAccess().getPartitionPartitionCrossReference_1_0()); } ) ) otherlv_2='{' { - newLeafNode(otherlv_2, grammarAccess.getScannerAccess().getLeftCurlyBracketKeyword_2()); + newLeafNode(otherlv_2, grammarAccess.getRuleDamagerAccess().getLeftCurlyBracketKeyword_2()); } ( ( { - newCompositeNode(grammarAccess.getScannerAccess().getTokensScannerTokenParserRuleCall_3_0()); + newCompositeNode(grammarAccess.getRuleDamagerAccess().getTokensScannerTokenParserRuleCall_3_0()); } lv_tokens_3_0=ruleScannerToken { if ($current==null) { - $current = createModelElementForParent(grammarAccess.getScannerRule()); + $current = createModelElementForParent(grammarAccess.getRuleDamagerRule()); } add( $current, @@ -398,11 +494,11 @@ ruleScanner returns [EObject current=null] )*( ( { - newCompositeNode(grammarAccess.getScannerAccess().getKeywordGroupsKeywordGroupParserRuleCall_4_0()); + newCompositeNode(grammarAccess.getRuleDamagerAccess().getKeywordGroupsKeywordGroupParserRuleCall_4_0()); } lv_keywordGroups_4_0=ruleKeywordGroup { if ($current==null) { - $current = createModelElementForParent(grammarAccess.getScannerRule()); + $current = createModelElementForParent(grammarAccess.getRuleDamagerRule()); } add( $current, @@ -416,11 +512,11 @@ ruleScanner returns [EObject current=null] )*( ( { - newCompositeNode(grammarAccess.getScannerAccess().getRulesScannerRuleParserRuleCall_5_0()); + newCompositeNode(grammarAccess.getRuleDamagerAccess().getRulesScannerRuleParserRuleCall_5_0()); } lv_rules_5_0=ruleScannerRule { if ($current==null) { - $current = createModelElementForParent(grammarAccess.getScannerRule()); + $current = createModelElementForParent(grammarAccess.getRuleDamagerRule()); } add( $current, @@ -433,7 +529,7 @@ ruleScanner returns [EObject current=null] ) )+ otherlv_6='}' { - newLeafNode(otherlv_6, grammarAccess.getScannerAccess().getRightCurlyBracketKeyword_6()); + newLeafNode(otherlv_6, grammarAccess.getRuleDamagerAccess().getRightCurlyBracketKeyword_6()); } ) ; @@ -1192,7 +1288,7 @@ rulePartitionMultiLineRule returns [EObject current=null] } otherlv_1=RULE_ID { - newLeafNode(otherlv_1, grammarAccess.getPartitionMultiLineRuleAccess().getTokenPartitionCrossReference_1_0()); + newLeafNode(otherlv_1, grammarAccess.getPartitionMultiLineRuleAccess().getParitionPartitionCrossReference_1_0()); } ) @@ -1553,9 +1649,9 @@ ruleScannerWhitespaceRule returns [EObject current=null] } ( ( - lv_jsMethod_8_0=RULE_ANY_OTHER + lv_jsDetector_8_0=RULE_ANY_OTHER { - newLeafNode(lv_jsMethod_8_0, grammarAccess.getScannerWhitespaceRuleAccess().getJsMethodANY_OTHERTerminalRuleCall_1_1_0()); + newLeafNode(lv_jsDetector_8_0, grammarAccess.getScannerWhitespaceRuleAccess().getJsDetectorANY_OTHERTerminalRuleCall_1_1_0()); } { if ($current==null) { @@ -1563,8 +1659,8 @@ ruleScannerWhitespaceRule returns [EObject current=null] } setWithLastConsumed( $current, - "jsMethod", - lv_jsMethod_8_0, + "jsDetector", + lv_jsDetector_8_0, "ANY_OTHER"); } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens index 5b6d814c2..673cc2a51 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.tokens @@ -35,41 +35,43 @@ T__32=32 RULE_WS=10 RULE_ANY_OTHER=6 T__44=44 +T__45=45 T__40=40 T__41=41 T__42=42 T__43=43 -'escaped'=30 -'underline'=43 -')'=40 -'italic'=42 -'fgcolor'=19 -'}#'=37 -'=>'=29 -'bgcolor'=21 -']'=26 +'escaped'=31 +'underline'=44 +')'=41 +'rule-damager'=17 +'italic'=43 +'fgcolor'=20 +'}#'=38 +'=>'=30 +'bgcolor'=22 +']'=27 'js-partitioner'=15 -'['=24 -':'=20 -'multi-line'=32 -'bold'=41 -'javascript-rule'=34 -'since'=27 -','=25 -'keywords'=23 -'character-rule'=33 +'['=25 +':'=21 +'multi-line'=33 +'bold'=42 +'javascript-rule'=35 +'since'=28 +'js-damager'=16 +','=26 +'keywords'=24 +'character-rule'=34 'partition'=13 -'token'=18 -'('=39 -'font'=22 +'token'=19 +'('=40 +'font'=23 '}'=12 '{'=11 -'scanner'=16 -'strike-through'=44 +'strike-through'=45 'rule-partitioner'=14 -'whitespace-rule'=35 -'by'=31 -'#{'=36 -'rgb'=38 -'single-line'=28 -'default'=17 +'whitespace-rule'=36 +'by'=32 +'#{'=37 +'rgb'=39 +'single-line'=29 +'default'=18 diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java index ecd317882..9cafb282e 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLLexer.java @@ -50,6 +50,7 @@ public class InternalHSLLexer extends Lexer { public static final int RULE_WS=10; public static final int RULE_ANY_OTHER=6; public static final int T__44=44; + public static final int T__45=45; public static final int T__40=40; public static final int T__41=41; public static final int T__42=42; @@ -176,10 +177,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__16; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:16:7: ( 'scanner' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:16:9: 'scanner' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:16:7: ( 'js-damager' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:16:9: 'js-damager' { - match("scanner"); + match("js-damager"); } @@ -197,10 +198,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__17; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:17:7: ( 'default' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:17:9: 'default' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:17:7: ( 'rule-damager' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:17:9: 'rule-damager' { - match("default"); + match("rule-damager"); } @@ -218,10 +219,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__18; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:18:7: ( 'token' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:18:9: 'token' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:18:7: ( 'default' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:18:9: 'default' { - match("token"); + match("default"); } @@ -239,10 +240,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__19; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:19:7: ( 'fgcolor' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:19:9: 'fgcolor' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:19:7: ( 'token' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:19:9: 'token' { - match("fgcolor"); + match("token"); } @@ -260,10 +261,11 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__20; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:20:7: ( ':' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:20:9: ':' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:20:7: ( 'fgcolor' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:20:9: 'fgcolor' { - match(':'); + match("fgcolor"); + } @@ -280,11 +282,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__21; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:21:7: ( 'bgcolor' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:21:9: 'bgcolor' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:21:7: ( ':' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:21:9: ':' { - match("bgcolor"); - + match(':'); } @@ -301,10 +302,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__22; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:22:7: ( 'font' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:22:9: 'font' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:22:7: ( 'bgcolor' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:22:9: 'bgcolor' { - match("font"); + match("bgcolor"); } @@ -322,10 +323,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__23; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:23:7: ( 'keywords' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:23:9: 'keywords' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:23:7: ( 'font' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:23:9: 'font' { - match("keywords"); + match("font"); } @@ -343,10 +344,11 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__24; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:24:7: ( '[' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:24:9: '[' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:24:7: ( 'keywords' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:24:9: 'keywords' { - match('['); + match("keywords"); + } @@ -363,10 +365,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__25; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:25:7: ( ',' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:25:9: ',' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:25:7: ( '[' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:25:9: '[' { - match(','); + match('['); } @@ -383,10 +385,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__26; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:26:7: ( ']' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:26:9: ']' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:26:7: ( ',' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:26:9: ',' { - match(']'); + match(','); } @@ -403,11 +405,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__27; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:7: ( 'since' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:9: 'since' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:7: ( ']' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:27:9: ']' { - match("since"); - + match(']'); } @@ -424,10 +425,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__28; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:7: ( 'single-line' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:9: 'single-line' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:7: ( 'since' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:28:9: 'since' { - match("single-line"); + match("since"); } @@ -445,10 +446,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__29; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:7: ( '=>' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:9: '=>' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:7: ( 'single-line' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:29:9: 'single-line' { - match("=>"); + match("single-line"); } @@ -466,10 +467,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__30; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:7: ( 'escaped' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:9: 'escaped' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:7: ( '=>' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:30:9: '=>' { - match("escaped"); + match("=>"); } @@ -487,10 +488,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__31; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:7: ( 'by' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:9: 'by' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:7: ( 'escaped' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:31:9: 'escaped' { - match("by"); + match("escaped"); } @@ -508,10 +509,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__32; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:7: ( 'multi-line' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:9: 'multi-line' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:7: ( 'by' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:32:9: 'by' { - match("multi-line"); + match("by"); } @@ -529,10 +530,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__33; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:7: ( 'character-rule' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:9: 'character-rule' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:7: ( 'multi-line' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:33:9: 'multi-line' { - match("character-rule"); + match("multi-line"); } @@ -550,10 +551,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__34; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:7: ( 'javascript-rule' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:9: 'javascript-rule' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:7: ( 'character-rule' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:34:9: 'character-rule' { - match("javascript-rule"); + match("character-rule"); } @@ -571,10 +572,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__35; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:7: ( 'whitespace-rule' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:9: 'whitespace-rule' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:7: ( 'javascript-rule' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:35:9: 'javascript-rule' { - match("whitespace-rule"); + match("javascript-rule"); } @@ -592,10 +593,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__36; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:7: ( '#{' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:9: '#{' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:7: ( 'whitespace-rule' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:36:9: 'whitespace-rule' { - match("#{"); + match("whitespace-rule"); } @@ -613,10 +614,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__37; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:7: ( '}#' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:9: '}#' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:7: ( '#{' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:37:9: '#{' { - match("}#"); + match("#{"); } @@ -634,10 +635,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__38; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:7: ( 'rgb' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:9: 'rgb' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:7: ( '}#' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:38:9: '}#' { - match("rgb"); + match("}#"); } @@ -655,10 +656,11 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__39; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:7: ( '(' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:9: '(' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:7: ( 'rgb' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:39:9: 'rgb' { - match('('); + match("rgb"); + } @@ -675,10 +677,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__40; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:7: ( ')' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:9: ')' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:7: ( '(' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:40:9: '(' { - match(')'); + match('('); } @@ -695,11 +697,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__41; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:7: ( 'bold' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:9: 'bold' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:7: ( ')' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:41:9: ')' { - match("bold"); - + match(')'); } @@ -716,10 +717,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__42; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:7: ( 'italic' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:9: 'italic' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:7: ( 'bold' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:42:9: 'bold' { - match("italic"); + match("bold"); } @@ -737,10 +738,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__43; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:7: ( 'underline' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:9: 'underline' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:7: ( 'italic' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:43:9: 'italic' { - match("underline"); + match("italic"); } @@ -758,10 +759,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = T__44; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:7: ( 'strike-through' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:9: 'strike-through' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:7: ( 'underline' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:44:9: 'underline' { - match("strike-through"); + match("underline"); } @@ -774,15 +775,36 @@ public class InternalHSLLexer extends Lexer { } // $ANTLR end "T__44" + // $ANTLR start "T__45" + public final void mT__45() throws RecognitionException { + try { + int _type = T__45; + int _channel = DEFAULT_TOKEN_CHANNEL; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:45:7: ( 'strike-through' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:45:9: 'strike-through' + { + match("strike-through"); + + + } + + state.type = _type; + state.channel = _channel; + } + finally { + } + } + // $ANTLR end "T__45" + // $ANTLR start "RULE_ID" public final void mRULE_ID() throws RecognitionException { try { int _type = RULE_ID; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1814:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1814:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1910:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1910:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1814:11: ( '^' )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1910:11: ( '^' )? int alt1=2; int LA1_0 = input.LA(1); @@ -791,7 +813,7 @@ public class InternalHSLLexer extends Lexer { } switch (alt1) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1814:11: '^' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1910:11: '^' { match('^'); @@ -809,7 +831,7 @@ public class InternalHSLLexer extends Lexer { recover(mse); throw mse;} - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1814:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1910:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* loop2: do { int alt2=2; @@ -858,10 +880,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = RULE_INT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1816:10: ( ( '0' .. '9' )+ ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1816:12: ( '0' .. '9' )+ + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1912:10: ( ( '0' .. '9' )+ ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1912:12: ( '0' .. '9' )+ { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1816:12: ( '0' .. '9' )+ + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1912:12: ( '0' .. '9' )+ int cnt3=0; loop3: do { @@ -875,7 +897,7 @@ public class InternalHSLLexer extends Lexer { switch (alt3) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1816:13: '0' .. '9' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1912:13: '0' .. '9' { matchRange('0','9'); @@ -907,10 +929,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = RULE_STRING; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:13: ( ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:15: ( '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) int alt6=2; int LA6_0 = input.LA(1); @@ -928,10 +950,10 @@ public class InternalHSLLexer extends Lexer { } switch (alt6) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:16: '\"' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* '\"' { match('\"'); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:20: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\"' ) ) )* loop4: do { int alt4=3; @@ -947,7 +969,7 @@ public class InternalHSLLexer extends Lexer { switch (alt4) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:21: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { match('\\'); if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) { @@ -963,7 +985,7 @@ public class InternalHSLLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:66: ~ ( ( '\\\\' | '\"' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:66: ~ ( ( '\\\\' | '\"' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -988,10 +1010,10 @@ public class InternalHSLLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:86: '\\'' ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' { match('\''); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:91: ( '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) | ~ ( ( '\\\\' | '\\'' ) ) )* loop5: do { int alt5=3; @@ -1007,7 +1029,7 @@ public class InternalHSLLexer extends Lexer { switch (alt5) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:92: '\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\"' | '\\'' | '\\\\' ) { match('\\'); if ( input.LA(1)=='\"'||input.LA(1)=='\''||input.LA(1)=='\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) { @@ -1023,7 +1045,7 @@ public class InternalHSLLexer extends Lexer { } break; case 2 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:137: ~ ( ( '\\\\' | '\\'' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1914:137: ~ ( ( '\\\\' | '\\'' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1066,12 +1088,12 @@ public class InternalHSLLexer extends Lexer { try { int _type = RULE_ML_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1820:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1820:19: '/*' ( options {greedy=false; } : . )* '*/' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1916:17: ( '/*' ( options {greedy=false; } : . )* '*/' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1916:19: '/*' ( options {greedy=false; } : . )* '*/' { match("/*"); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1820:24: ( options {greedy=false; } : . )* + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1916:24: ( options {greedy=false; } : . )* loop7: do { int alt7=2; @@ -1096,7 +1118,7 @@ public class InternalHSLLexer extends Lexer { switch (alt7) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1820:52: . + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1916:52: . { matchAny(); @@ -1126,12 +1148,12 @@ public class InternalHSLLexer extends Lexer { try { int _type = RULE_SL_COMMENT; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? { match("//"); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:24: (~ ( ( '\\n' | '\\r' ) ) )* + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:24: (~ ( ( '\\n' | '\\r' ) ) )* loop8: do { int alt8=2; @@ -1144,7 +1166,7 @@ public class InternalHSLLexer extends Lexer { switch (alt8) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:24: ~ ( ( '\\n' | '\\r' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:24: ~ ( ( '\\n' | '\\r' ) ) { if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) { input.consume(); @@ -1164,7 +1186,7 @@ public class InternalHSLLexer extends Lexer { } } while (true); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:40: ( ( '\\r' )? '\\n' )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:40: ( ( '\\r' )? '\\n' )? int alt10=2; int LA10_0 = input.LA(1); @@ -1173,9 +1195,9 @@ public class InternalHSLLexer extends Lexer { } switch (alt10) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:41: ( '\\r' )? '\\n' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:41: ( '\\r' )? '\\n' { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:41: ( '\\r' )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:41: ( '\\r' )? int alt9=2; int LA9_0 = input.LA(1); @@ -1184,7 +1206,7 @@ public class InternalHSLLexer extends Lexer { } switch (alt9) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1822:41: '\\r' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1918:41: '\\r' { match('\r'); @@ -1216,10 +1238,10 @@ public class InternalHSLLexer extends Lexer { try { int _type = RULE_WS; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1824:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1824:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1920:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1920:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1824:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1920:11: ( ' ' | '\\t' | '\\r' | '\\n' )+ int cnt11=0; loop11: do { @@ -1273,8 +1295,8 @@ public class InternalHSLLexer extends Lexer { try { int _type = RULE_ANY_OTHER; int _channel = DEFAULT_TOKEN_CHANNEL; - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1826:16: ( . ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1826:18: . + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1922:16: ( . ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1922:18: . { matchAny(); @@ -1289,8 +1311,8 @@ public class InternalHSLLexer extends Lexer { // $ANTLR end "RULE_ANY_OTHER" public void mTokens() throws RecognitionException { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) - int alt12=41; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:8: ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER ) + int alt12=42; alt12 = dfa12.predict(input); switch (alt12) { case 1 : @@ -1532,49 +1554,56 @@ public class InternalHSLLexer extends Lexer { } break; case 35 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:214: RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:214: T__45 { - mRULE_ID(); + mT__45(); } break; case 36 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:222: RULE_INT + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:220: RULE_ID { - mRULE_INT(); + mRULE_ID(); } break; case 37 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:231: RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:228: RULE_INT { - mRULE_STRING(); + mRULE_INT(); } break; case 38 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:243: RULE_ML_COMMENT + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:237: RULE_STRING { - mRULE_ML_COMMENT(); + mRULE_STRING(); } break; case 39 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:259: RULE_SL_COMMENT + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:249: RULE_ML_COMMENT { - mRULE_SL_COMMENT(); + mRULE_ML_COMMENT(); } break; case 40 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:275: RULE_WS + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:265: RULE_SL_COMMENT { - mRULE_WS(); + mRULE_SL_COMMENT(); } break; case 41 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:283: RULE_ANY_OTHER + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:281: RULE_WS + { + mRULE_WS(); + + } + break; + case 42 : + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1:289: RULE_ANY_OTHER { mRULE_ANY_OTHER(); @@ -1588,106 +1617,106 @@ public class InternalHSLLexer extends Lexer { protected DFA12 dfa12 = new DFA12(this); static final String DFA12_eotS = - "\2\uffff\1\44\7\46\1\uffff\2\46\3\uffff\1\41\4\46\1\41\2\uffff\2"+ - "\46\1\41\2\uffff\3\41\5\uffff\1\46\1\uffff\13\46\1\uffff\1\46\1"+ - "\126\2\46\4\uffff\4\46\3\uffff\2\46\5\uffff\2\46\1\141\1\uffff\11"+ - "\46\1\uffff\12\46\1\uffff\10\46\1\176\1\46\1\u0080\10\46\1\uffff"+ - "\2\46\1\u008b\3\46\1\u008f\1\46\1\uffff\1\46\1\uffff\12\46\1\uffff"+ - "\3\46\1\uffff\4\46\1\uffff\2\46\1\u00a5\3\46\1\u00a9\2\uffff\1\u00aa"+ - "\1\u00ab\1\u00ac\1\46\1\u00ae\2\46\1\uffff\3\46\4\uffff\1\u00b4"+ - "\1\uffff\3\46\1\u00b8\1\46\1\uffff\2\46\1\u00bc\1\uffff\1\46\1\uffff"+ - "\1\46\3\uffff"; + "\2\uffff\1\44\6\46\1\uffff\2\46\3\uffff\1\46\1\41\4\46\1\41\2\uffff"+ + "\2\46\1\41\2\uffff\3\41\5\uffff\1\46\1\uffff\10\46\1\uffff\1\46"+ + "\1\122\2\46\3\uffff\2\46\1\uffff\4\46\3\uffff\2\46\5\uffff\2\46"+ + "\1\137\1\uffff\6\46\1\uffff\14\46\3\uffff\4\46\1\171\1\46\1\173"+ + "\13\46\1\uffff\2\46\1\u008b\1\46\1\uffff\1\46\1\uffff\1\46\1\u008f"+ + "\11\46\2\uffff\2\46\1\uffff\3\46\1\uffff\3\46\1\uffff\2\46\1\u00a3"+ + "\3\46\1\u00a7\1\u00a8\1\u00a9\1\46\2\uffff\1\u00ab\2\46\1\uffff"+ + "\3\46\3\uffff\1\u00b1\1\uffff\3\46\1\u00b5\1\46\1\uffff\2\46\1\u00b9"+ + "\1\uffff\1\46\1\uffff\1\46\3\uffff"; static final String DFA12_eofS = - "\u00bf\uffff"; + "\u00bc\uffff"; static final String DFA12_minS = - "\1\0\1\uffff\1\43\1\141\1\147\1\141\1\143\1\145\1\157\1\147\1\uffff"+ - "\1\147\1\145\3\uffff\1\76\1\163\1\165\2\150\1\173\2\uffff\1\164"+ - "\1\156\1\101\2\uffff\2\0\1\52\5\uffff\1\162\1\uffff\1\154\1\142"+ - "\1\55\1\166\1\141\1\156\1\162\1\146\1\153\1\143\1\156\1\uffff\1"+ - "\143\1\60\1\154\1\171\4\uffff\1\143\1\154\1\141\1\151\3\uffff\1"+ - "\141\1\144\5\uffff\1\164\1\145\1\60\1\uffff\1\141\1\156\1\143\1"+ - "\151\1\141\1\145\1\157\1\164\1\157\1\uffff\1\144\1\167\1\141\1\164"+ - "\1\162\1\164\1\154\1\145\1\151\1\55\1\uffff\1\163\1\156\1\145\1"+ - "\154\1\153\1\165\1\156\1\154\1\60\1\154\1\60\1\157\1\160\1\151\1"+ - "\141\1\145\1\151\1\162\1\164\1\uffff\1\143\1\145\1\60\2\145\1\154"+ - "\1\60\1\157\1\uffff\1\157\1\uffff\1\162\1\145\1\55\1\143\1\163\1"+ - "\143\1\154\1\151\2\162\1\uffff\2\55\1\164\1\uffff\2\162\2\144\1"+ - "\uffff\1\164\1\160\1\60\1\151\1\157\1\151\1\60\2\uffff\3\60\1\163"+ - "\1\60\1\145\1\141\1\uffff\2\156\1\160\4\uffff\1\60\1\uffff\1\162"+ - "\1\143\1\145\1\60\1\164\1\uffff\1\55\1\145\1\60\1\uffff\1\55\1\uffff"+ - "\1\55\3\uffff"; + "\1\0\1\uffff\1\43\1\141\1\147\1\141\1\145\1\157\1\147\1\uffff\1"+ + "\147\1\145\3\uffff\1\151\1\76\1\163\1\165\2\150\1\173\2\uffff\1"+ + "\164\1\156\1\101\2\uffff\2\0\1\52\5\uffff\1\162\1\uffff\1\154\1"+ + "\142\1\55\1\166\1\146\1\153\1\143\1\156\1\uffff\1\143\1\60\1\154"+ + "\1\171\3\uffff\1\156\1\162\1\uffff\1\143\1\154\1\141\1\151\3\uffff"+ + "\1\141\1\144\5\uffff\1\164\1\145\1\60\1\144\2\141\1\145\1\157\1"+ + "\164\1\157\1\uffff\1\144\1\167\1\143\1\151\1\141\1\164\1\162\1\164"+ + "\1\154\1\145\1\151\1\55\3\uffff\1\163\1\165\1\156\1\154\1\60\1\154"+ + "\1\60\1\157\1\145\1\154\1\153\1\160\1\151\1\141\1\145\1\151\1\162"+ + "\1\164\1\144\1\143\1\154\1\60\1\157\1\uffff\1\157\1\uffff\1\162"+ + "\1\60\3\145\1\55\1\143\1\163\1\143\1\154\1\151\2\uffff\1\162\1\164"+ + "\1\uffff\2\162\1\144\1\uffff\2\55\1\144\1\uffff\1\164\1\160\1\60"+ + "\1\151\1\157\1\151\3\60\1\163\2\uffff\1\60\1\145\1\141\1\uffff\2"+ + "\156\1\160\3\uffff\1\60\1\uffff\1\162\1\143\1\145\1\60\1\164\1\uffff"+ + "\1\55\1\145\1\60\1\uffff\1\55\1\uffff\1\55\3\uffff"; static final String DFA12_maxS = - "\1\uffff\1\uffff\1\43\1\141\1\165\1\163\1\164\1\145\2\157\1\uffff"+ - "\1\171\1\145\3\uffff\1\76\1\163\1\165\2\150\1\173\2\uffff\1\164"+ + "\1\uffff\1\uffff\1\43\1\141\1\165\1\163\1\145\2\157\1\uffff\1\171"+ + "\1\145\3\uffff\1\164\1\76\1\163\1\165\2\150\1\173\2\uffff\1\164"+ "\1\156\1\172\2\uffff\2\uffff\1\57\5\uffff\1\162\1\uffff\1\154\1"+ - "\142\1\55\1\166\1\141\1\156\1\162\1\146\1\153\1\143\1\156\1\uffff"+ - "\1\143\1\172\1\154\1\171\4\uffff\1\143\1\154\1\141\1\151\3\uffff"+ - "\1\141\1\144\5\uffff\1\164\1\145\1\172\1\uffff\1\141\1\156\1\147"+ - "\1\151\1\141\1\145\1\157\1\164\1\157\1\uffff\1\144\1\167\1\141\1"+ - "\164\1\162\1\164\1\154\1\145\1\151\1\55\1\uffff\1\163\1\156\1\145"+ - "\1\154\1\153\1\165\1\156\1\154\1\172\1\154\1\172\1\157\1\160\1\151"+ - "\1\141\1\145\1\151\1\162\1\164\1\uffff\1\143\1\145\1\172\2\145\1"+ - "\154\1\172\1\157\1\uffff\1\157\1\uffff\1\162\1\145\1\55\1\143\1"+ - "\163\1\143\1\154\1\151\2\162\1\uffff\2\55\1\164\1\uffff\2\162\2"+ - "\144\1\uffff\1\164\1\160\1\172\1\151\1\157\1\151\1\172\2\uffff\3"+ - "\172\1\163\1\172\1\145\1\141\1\uffff\2\156\1\160\4\uffff\1\172\1"+ - "\uffff\1\162\1\143\1\145\1\172\1\164\1\uffff\1\55\1\145\1\172\1"+ - "\uffff\1\55\1\uffff\1\55\3\uffff"; + "\142\1\55\1\166\1\146\1\153\1\143\1\156\1\uffff\1\143\1\172\1\154"+ + "\1\171\3\uffff\1\156\1\162\1\uffff\1\143\1\154\1\141\1\151\3\uffff"+ + "\1\141\1\144\5\uffff\1\164\1\145\1\172\1\160\2\141\1\145\1\157\1"+ + "\164\1\157\1\uffff\1\144\1\167\1\147\1\151\1\141\1\164\1\162\1\164"+ + "\1\154\1\145\1\151\1\55\3\uffff\1\163\1\165\1\156\1\154\1\172\1"+ + "\154\1\172\1\157\1\145\1\154\1\153\1\160\1\151\1\141\1\145\1\151"+ + "\1\162\1\164\1\160\1\143\1\154\1\172\1\157\1\uffff\1\157\1\uffff"+ + "\1\162\1\172\3\145\1\55\1\143\1\163\1\143\1\154\1\151\2\uffff\1"+ + "\162\1\164\1\uffff\2\162\1\144\1\uffff\2\55\1\144\1\uffff\1\164"+ + "\1\160\1\172\1\151\1\157\1\151\3\172\1\163\2\uffff\1\172\1\145\1"+ + "\141\1\uffff\2\156\1\160\3\uffff\1\172\1\uffff\1\162\1\143\1\145"+ + "\1\172\1\164\1\uffff\1\55\1\145\1\172\1\uffff\1\55\1\uffff\1\55"+ + "\3\uffff"; static final String DFA12_acceptS = - "\1\uffff\1\1\10\uffff\1\12\2\uffff\1\16\1\17\1\20\6\uffff\1\35\1"+ - "\36\3\uffff\1\43\1\44\3\uffff\1\50\1\51\1\1\1\33\1\2\1\uffff\1\43"+ - "\13\uffff\1\12\4\uffff\1\16\1\17\1\20\1\23\4\uffff\1\32\1\35\1\36"+ - "\2\uffff\1\44\1\45\1\46\1\47\1\50\3\uffff\1\5\11\uffff\1\25\12\uffff"+ - "\1\34\23\uffff\1\4\10\uffff\1\14\1\uffff\1\37\12\uffff\1\21\3\uffff"+ - "\1\10\4\uffff\1\26\7\uffff\1\22\1\42\7\uffff\1\40\3\uffff\1\6\1"+ - "\7\1\11\1\13\1\uffff\1\24\5\uffff\1\15\3\uffff\1\3\1\uffff\1\27"+ - "\1\uffff\1\41\1\30\1\31"; + "\1\uffff\1\1\7\uffff\1\13\2\uffff\1\17\1\20\1\21\7\uffff\1\36\1"+ + "\37\3\uffff\1\44\1\45\3\uffff\1\51\1\52\1\1\1\34\1\2\1\uffff\1\44"+ + "\10\uffff\1\13\4\uffff\1\17\1\20\1\21\2\uffff\1\24\4\uffff\1\33"+ + "\1\36\1\37\2\uffff\1\45\1\46\1\47\1\50\1\51\12\uffff\1\26\14\uffff"+ + "\1\35\1\5\1\6\27\uffff\1\15\1\uffff\1\40\13\uffff\1\4\1\7\2\uffff"+ + "\1\11\3\uffff\1\22\3\uffff\1\27\12\uffff\1\23\1\43\3\uffff\1\41"+ + "\3\uffff\1\10\1\12\1\14\1\uffff\1\25\5\uffff\1\16\3\uffff\1\3\1"+ + "\uffff\1\30\1\uffff\1\42\1\31\1\32"; static final String DFA12_specialS = - "\1\1\34\uffff\1\0\1\2\u00a0\uffff}>"; + "\1\2\34\uffff\1\0\1\1\u009d\uffff}>"; static final String[] DFA12_transitionS = { "\11\41\2\40\2\41\1\40\22\41\1\40\1\41\1\35\1\25\3\41\1\36\1"+ - "\26\1\27\2\41\1\16\2\41\1\37\12\34\1\12\2\41\1\20\3\41\32\33"+ - "\1\15\1\41\1\17\1\32\1\33\1\41\1\33\1\13\1\23\1\7\1\21\1\11"+ - "\2\33\1\30\1\5\1\14\1\33\1\22\2\33\1\3\1\33\1\4\1\6\1\10\1\31"+ + "\26\1\27\2\41\1\15\2\41\1\37\12\34\1\11\2\41\1\20\3\41\32\33"+ + "\1\14\1\41\1\16\1\32\1\33\1\41\1\33\1\12\1\23\1\6\1\21\1\10"+ + "\2\33\1\30\1\5\1\13\1\33\1\22\2\33\1\3\1\33\1\4\1\17\1\7\1\31"+ "\1\33\1\24\3\33\1\1\1\41\1\2\uff82\41", "", "\1\43", "\1\45", "\1\50\15\uffff\1\47", "\1\52\21\uffff\1\51", - "\1\53\5\uffff\1\54\12\uffff\1\55", - "\1\56", - "\1\57", - "\1\60\7\uffff\1\61", + "\1\53", + "\1\54", + "\1\55\7\uffff\1\56", "", - "\1\63\7\uffff\1\65\11\uffff\1\64", - "\1\66", + "\1\60\7\uffff\1\62\11\uffff\1\61", + "\1\63", "", "", "", + "\1\67\12\uffff\1\70", + "\1\71", "\1\72", "\1\73", "\1\74", "\1\75", "\1\76", - "\1\77", "", "", + "\1\101", "\1\102", - "\1\103", "\32\46\4\uffff\1\46\1\uffff\32\46", "", "", - "\0\105", - "\0\105", - "\1\106\4\uffff\1\107", + "\0\104", + "\0\104", + "\1\105\4\uffff\1\106", "", "", "", "", "", - "\1\111", + "\1\110", "", + "\1\111", "\1\112", "\1\113", "\1\114", @@ -1695,47 +1724,45 @@ public class InternalHSLLexer extends Lexer { "\1\116", "\1\117", "\1\120", + "", "\1\121", - "\1\122", + "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\123", "\1\124", "", - "\1\125", - "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", - "\1\127", - "\1\130", - "", "", "", + "\1\125", + "\1\126", "", + "\1\127", + "\1\130", "\1\131", "\1\132", - "\1\133", - "\1\134", "", "", "", - "\1\135", - "\1\136", + "\1\133", + "\1\134", "", "", "", "", "", - "\1\137", - "\1\140", + "\1\135", + "\1\136", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", - "", + "\1\141\13\uffff\1\140", "\1\142", "\1\143", - "\1\144\3\uffff\1\145", + "\1\144", + "\1\145", "\1\146", "\1\147", + "", "\1\150", "\1\151", - "\1\152", - "\1\153", - "", + "\1\152\3\uffff\1\153", "\1\154", "\1\155", "\1\156", @@ -1745,39 +1772,39 @@ public class InternalHSLLexer extends Lexer { "\1\162", "\1\163", "\1\164", - "\1\165", "", + "", + "", + "\1\165", "\1\166", "\1\167", "\1\170", - "\1\171", + "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\172", - "\1\173", + "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\174", "\1\175", - "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", + "\1\176", "\1\177", - "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", + "\1\u0080", "\1\u0081", "\1\u0082", "\1\u0083", "\1\u0084", "\1\u0085", "\1\u0086", - "\1\u0087", - "\1\u0088", - "", + "\1\u0088\13\uffff\1\u0087", "\1\u0089", "\1\u008a", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\u008c", + "", "\1\u008d", + "", "\1\u008e", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\u0090", - "", "\1\u0091", - "", "\1\u0092", "\1\u0093", "\1\u0094", @@ -1785,58 +1812,56 @@ public class InternalHSLLexer extends Lexer { "\1\u0096", "\1\u0097", "\1\u0098", + "", + "", "\1\u0099", "\1\u009a", - "\1\u009b", "", + "\1\u009b", "\1\u009c", "\1\u009d", - "\1\u009e", "", + "\1\u009e", "\1\u009f", "\1\u00a0", + "", "\1\u00a1", "\1\u00a2", - "", - "\1\u00a3", - "\1\u00a4", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", + "\1\u00a4", + "\1\u00a5", "\1\u00a6", - "\1\u00a7", - "\1\u00a8", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", - "", - "", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", + "\1\u00aa", + "", + "", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", + "\1\u00ac", "\1\u00ad", - "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", + "", + "\1\u00ae", "\1\u00af", "\1\u00b0", "", - "\1\u00b1", - "\1\u00b2", - "\1\u00b3", - "", - "", "", "", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "", - "\1\u00b5", + "\1\u00b2", + "\1\u00b3", + "\1\u00b4", + "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", "\1\u00b6", + "", "\1\u00b7", + "\1\u00b8", "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", - "\1\u00b9", "", "\1\u00ba", - "\1\u00bb", - "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46", - "", - "\1\u00bd", "", - "\1\u00be", + "\1\u00bb", "", "", "" @@ -1872,7 +1897,7 @@ public class InternalHSLLexer extends Lexer { this.transition = DFA12_transition; } public String getDescription() { - return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; + return "1:1: Tokens : ( T__11 | T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | T__44 | T__45 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );"; } public int specialStateTransition(int s, IntStream _input) throws NoViableAltException { IntStream input = _input; @@ -1882,13 +1907,23 @@ public class InternalHSLLexer extends Lexer { int LA12_29 = input.LA(1); s = -1; - if ( ((LA12_29>='\u0000' && LA12_29<='\uFFFF')) ) {s = 69;} + if ( ((LA12_29>='\u0000' && LA12_29<='\uFFFF')) ) {s = 68;} else s = 33; if ( s>=0 ) return s; break; case 1 : + int LA12_30 = input.LA(1); + + s = -1; + if ( ((LA12_30>='\u0000' && LA12_30<='\uFFFF')) ) {s = 68;} + + else s = 33; + + if ( s>=0 ) return s; + break; + case 2 : int LA12_0 = input.LA(1); s = -1; @@ -1902,25 +1937,25 @@ public class InternalHSLLexer extends Lexer { else if ( (LA12_0=='j') ) {s = 5;} - else if ( (LA12_0=='s') ) {s = 6;} + else if ( (LA12_0=='d') ) {s = 6;} - else if ( (LA12_0=='d') ) {s = 7;} + else if ( (LA12_0=='t') ) {s = 7;} - else if ( (LA12_0=='t') ) {s = 8;} + else if ( (LA12_0=='f') ) {s = 8;} - else if ( (LA12_0=='f') ) {s = 9;} + else if ( (LA12_0==':') ) {s = 9;} - else if ( (LA12_0==':') ) {s = 10;} + else if ( (LA12_0=='b') ) {s = 10;} - else if ( (LA12_0=='b') ) {s = 11;} + else if ( (LA12_0=='k') ) {s = 11;} - else if ( (LA12_0=='k') ) {s = 12;} + else if ( (LA12_0=='[') ) {s = 12;} - else if ( (LA12_0=='[') ) {s = 13;} + else if ( (LA12_0==',') ) {s = 13;} - else if ( (LA12_0==',') ) {s = 14;} + else if ( (LA12_0==']') ) {s = 14;} - else if ( (LA12_0==']') ) {s = 15;} + else if ( (LA12_0=='s') ) {s = 15;} else if ( (LA12_0=='=') ) {s = 16;} @@ -1960,16 +1995,6 @@ public class InternalHSLLexer extends Lexer { if ( s>=0 ) return s; break; - case 2 : - int LA12_30 = input.LA(1); - - s = -1; - if ( ((LA12_30>='\u0000' && LA12_30<='\uFFFF')) ) {s = 69;} - - else s = 33; - - if ( s>=0 ) return s; - break; } NoViableAltException nvae = new NoViableAltException(getDescription(), 12, _s, input); diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java index 195f0345f..5ab60f9c4 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSLParser.java @@ -22,7 +22,7 @@ import java.util.ArrayList; @SuppressWarnings("all") public class InternalHSLParser extends AbstractInternalAntlrParser { public static final String[] tokenNames = new String[] { - "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_ANY_OTHER", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "'{'", "'}'", "'partition'", "'rule-partitioner'", "'js-partitioner'", "'scanner'", "'default'", "'token'", "'fgcolor'", "':'", "'bgcolor'", "'font'", "'keywords'", "'['", "','", "']'", "'since'", "'single-line'", "'=>'", "'escaped'", "'by'", "'multi-line'", "'character-rule'", "'javascript-rule'", "'whitespace-rule'", "'#{'", "'}#'", "'rgb'", "'('", "')'", "'bold'", "'italic'", "'underline'", "'strike-through'" + "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_STRING", "RULE_ANY_OTHER", "RULE_INT", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "'{'", "'}'", "'partition'", "'rule-partitioner'", "'js-partitioner'", "'js-damager'", "'rule-damager'", "'default'", "'token'", "'fgcolor'", "':'", "'bgcolor'", "'font'", "'keywords'", "'['", "','", "']'", "'since'", "'single-line'", "'=>'", "'escaped'", "'by'", "'multi-line'", "'character-rule'", "'javascript-rule'", "'whitespace-rule'", "'#{'", "'}#'", "'rgb'", "'('", "')'", "'bold'", "'italic'", "'underline'", "'strike-through'" }; public static final int T__19=19; public static final int T__15=15; @@ -62,6 +62,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { public static final int RULE_WS=10; public static final int RULE_ANY_OTHER=6; public static final int T__44=44; + public static final int T__45=45; public static final int T__40=40; public static final int T__41=41; public static final int T__42=42; @@ -142,7 +143,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleModel" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:77:1: ruleModel returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_scanner_3_0= ruleScanner ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:77:1: ruleModel returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_damagers_3_0= ruleDamager ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) ; public final EObject ruleModel() throws RecognitionException { EObject current = null; @@ -151,7 +152,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { Token otherlv_5=null; EObject lv_partitions_2_0 = null; - EObject lv_scanner_3_0 = null; + EObject lv_damagers_3_0 = null; EObject lv_partitioner_4_0 = null; @@ -159,11 +160,11 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:80:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_scanner_3_0= ruleScanner ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_scanner_3_0= ruleScanner ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:80:28: ( ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_damagers_3_0= ruleDamager ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_damagers_3_0= ruleDamager ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_scanner_3_0= ruleScanner ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:81:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_scanner_3_0= ruleScanner ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:81:1: ( ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_damagers_3_0= ruleDamager ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:81:2: ( (lv_name_0_0= RULE_ID ) ) otherlv_1= '{' ( (lv_partitions_2_0= rulePartition ) )+ ( (lv_damagers_3_0= ruleDamager ) )+ ( (lv_partitioner_4_0= rulePartitioner ) ) otherlv_5= '}' { // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:81:2: ( (lv_name_0_0= RULE_ID ) ) // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:82:1: (lv_name_0_0= RULE_ID ) @@ -249,30 +250,30 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { cnt1++; } while (true); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:121:3: ( (lv_scanner_3_0= ruleScanner ) )+ + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:121:3: ( (lv_damagers_3_0= ruleDamager ) )+ int cnt2=0; loop2: do { int alt2=2; int LA2_0 = input.LA(1); - if ( (LA2_0==16) ) { + if ( ((LA2_0>=16 && LA2_0<=17)) ) { alt2=1; } switch (alt2) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:122:1: (lv_scanner_3_0= ruleScanner ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:122:1: (lv_damagers_3_0= ruleDamager ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:122:1: (lv_scanner_3_0= ruleScanner ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:123:3: lv_scanner_3_0= ruleScanner + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:122:1: (lv_damagers_3_0= ruleDamager ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:123:3: lv_damagers_3_0= ruleDamager { - newCompositeNode(grammarAccess.getModelAccess().getScannerScannerParserRuleCall_3_0()); + newCompositeNode(grammarAccess.getModelAccess().getDamagersDamagerParserRuleCall_3_0()); - pushFollow(FOLLOW_ruleScanner_in_ruleModel187); - lv_scanner_3_0=ruleScanner(); + pushFollow(FOLLOW_ruleDamager_in_ruleModel187); + lv_damagers_3_0=ruleDamager(); state._fsp--; @@ -282,9 +283,9 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } add( current, - "scanner", - lv_scanner_3_0, - "Scanner"); + "damagers", + lv_damagers_3_0, + "Damager"); afterParserOrEnumRuleCall(); @@ -657,7 +658,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { int alt4=2; int LA4_0 = input.LA(1); - if ( (LA4_0==28||LA4_0==32||LA4_0==34) ) { + if ( (LA4_0==29||LA4_0==33||LA4_0==35) ) { alt4=1; } @@ -831,26 +832,26 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR end "ruleJSParitioner" - // $ANTLR start "entryRuleScanner" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:346:1: entryRuleScanner returns [EObject current=null] : iv_ruleScanner= ruleScanner EOF ; - public final EObject entryRuleScanner() throws RecognitionException { + // $ANTLR start "entryRuleDamager" + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:346:1: entryRuleDamager returns [EObject current=null] : iv_ruleDamager= ruleDamager EOF ; + public final EObject entryRuleDamager() throws RecognitionException { EObject current = null; - EObject iv_ruleScanner = null; + EObject iv_ruleDamager = null; try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:347:2: (iv_ruleScanner= ruleScanner EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:348:2: iv_ruleScanner= ruleScanner EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:347:2: (iv_ruleDamager= ruleDamager EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:348:2: iv_ruleDamager= ruleDamager EOF { - newCompositeNode(grammarAccess.getScannerRule()); - pushFollow(FOLLOW_ruleScanner_in_entryRuleScanner715); - iv_ruleScanner=ruleScanner(); + newCompositeNode(grammarAccess.getDamagerRule()); + pushFollow(FOLLOW_ruleDamager_in_entryRuleDamager715); + iv_ruleDamager=ruleDamager(); state._fsp--; - current =iv_ruleScanner; - match(input,EOF,FOLLOW_EOF_in_entryRuleScanner725); + current =iv_ruleDamager; + match(input,EOF,FOLLOW_EOF_in_entryRuleDamager725); } @@ -864,12 +865,262 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "entryRuleScanner" + // $ANTLR end "entryRuleDamager" - // $ANTLR start "ruleScanner" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:355:1: ruleScanner returns [EObject current=null] : (otherlv_0= 'scanner' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) ; - public final EObject ruleScanner() throws RecognitionException { + // $ANTLR start "ruleDamager" + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:355:1: ruleDamager returns [EObject current=null] : (this_RuleDamager_0= ruleRuleDamager | this_JSDamager_1= ruleJSDamager ) ; + public final EObject ruleDamager() throws RecognitionException { + EObject current = null; + + EObject this_RuleDamager_0 = null; + + EObject this_JSDamager_1 = null; + + + enterRule(); + + try { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:358:28: ( (this_RuleDamager_0= ruleRuleDamager | this_JSDamager_1= ruleJSDamager ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:359:1: (this_RuleDamager_0= ruleRuleDamager | this_JSDamager_1= ruleJSDamager ) + { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:359:1: (this_RuleDamager_0= ruleRuleDamager | this_JSDamager_1= ruleJSDamager ) + int alt5=2; + int LA5_0 = input.LA(1); + + if ( (LA5_0==17) ) { + alt5=1; + } + else if ( (LA5_0==16) ) { + alt5=2; + } + else { + NoViableAltException nvae = + new NoViableAltException("", 5, 0, input); + + throw nvae; + } + switch (alt5) { + case 1 : + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:360:5: this_RuleDamager_0= ruleRuleDamager + { + + newCompositeNode(grammarAccess.getDamagerAccess().getRuleDamagerParserRuleCall_0()); + + pushFollow(FOLLOW_ruleRuleDamager_in_ruleDamager772); + this_RuleDamager_0=ruleRuleDamager(); + + state._fsp--; + + + current = this_RuleDamager_0; + afterParserOrEnumRuleCall(); + + + } + break; + case 2 : + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:370:5: this_JSDamager_1= ruleJSDamager + { + + newCompositeNode(grammarAccess.getDamagerAccess().getJSDamagerParserRuleCall_1()); + + pushFollow(FOLLOW_ruleJSDamager_in_ruleDamager799); + this_JSDamager_1=ruleJSDamager(); + + state._fsp--; + + + current = this_JSDamager_1; + afterParserOrEnumRuleCall(); + + + } + break; + + } + + + } + + leaveRule(); + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "ruleDamager" + + + // $ANTLR start "entryRuleJSDamager" + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:386:1: entryRuleJSDamager returns [EObject current=null] : iv_ruleJSDamager= ruleJSDamager EOF ; + public final EObject entryRuleJSDamager() throws RecognitionException { + EObject current = null; + + EObject iv_ruleJSDamager = null; + + + try { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:387:2: (iv_ruleJSDamager= ruleJSDamager EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:388:2: iv_ruleJSDamager= ruleJSDamager EOF + { + newCompositeNode(grammarAccess.getJSDamagerRule()); + pushFollow(FOLLOW_ruleJSDamager_in_entryRuleJSDamager834); + iv_ruleJSDamager=ruleJSDamager(); + + state._fsp--; + + current =iv_ruleJSDamager; + match(input,EOF,FOLLOW_EOF_in_entryRuleJSDamager844); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "entryRuleJSDamager" + + + // $ANTLR start "ruleJSDamager" + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:395:1: ruleJSDamager returns [EObject current=null] : (otherlv_0= 'js-damager' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ; + public final EObject ruleJSDamager() throws RecognitionException { + EObject current = null; + + Token otherlv_0=null; + Token otherlv_1=null; + Token lv_fileURI_2_0=null; + + enterRule(); + + try { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:398:28: ( (otherlv_0= 'js-damager' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:399:1: (otherlv_0= 'js-damager' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) + { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:399:1: (otherlv_0= 'js-damager' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:399:3: otherlv_0= 'js-damager' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) + { + otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleJSDamager881); + + newLeafNode(otherlv_0, grammarAccess.getJSDamagerAccess().getJsDamagerKeyword_0()); + + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:403:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:404:1: (otherlv_1= RULE_ID ) + { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:404:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:405:3: otherlv_1= RULE_ID + { + + if (current==null) { + current = createModelElement(grammarAccess.getJSDamagerRule()); + } + + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleJSDamager901); + + newLeafNode(otherlv_1, grammarAccess.getJSDamagerAccess().getPartitionPartitionCrossReference_1_0()); + + + } + + + } + + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:416:2: ( (lv_fileURI_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:417:1: (lv_fileURI_2_0= RULE_STRING ) + { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:417:1: (lv_fileURI_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:418:3: lv_fileURI_2_0= RULE_STRING + { + lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleJSDamager918); + + newLeafNode(lv_fileURI_2_0, grammarAccess.getJSDamagerAccess().getFileURISTRINGTerminalRuleCall_2_0()); + + + if (current==null) { + current = createModelElement(grammarAccess.getJSDamagerRule()); + } + setWithLastConsumed( + current, + "fileURI", + lv_fileURI_2_0, + "STRING"); + + + } + + + } + + + } + + + } + + leaveRule(); + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "ruleJSDamager" + + + // $ANTLR start "entryRuleRuleDamager" + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:442:1: entryRuleRuleDamager returns [EObject current=null] : iv_ruleRuleDamager= ruleRuleDamager EOF ; + public final EObject entryRuleRuleDamager() throws RecognitionException { + EObject current = null; + + EObject iv_ruleRuleDamager = null; + + + try { + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:443:2: (iv_ruleRuleDamager= ruleRuleDamager EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:444:2: iv_ruleRuleDamager= ruleRuleDamager EOF + { + newCompositeNode(grammarAccess.getRuleDamagerRule()); + pushFollow(FOLLOW_ruleRuleDamager_in_entryRuleRuleDamager959); + iv_ruleRuleDamager=ruleRuleDamager(); + + state._fsp--; + + current =iv_ruleRuleDamager; + match(input,EOF,FOLLOW_EOF_in_entryRuleRuleDamager969); + + } + + } + + catch (RecognitionException re) { + recover(input,re); + appendSkippedTokens(); + } + finally { + } + return current; + } + // $ANTLR end "entryRuleRuleDamager" + + + // $ANTLR start "ruleRuleDamager" + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:451:1: ruleRuleDamager returns [EObject current=null] : (otherlv_0= 'rule-damager' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) ; + public final EObject ruleRuleDamager() throws RecognitionException { EObject current = null; Token otherlv_0=null; @@ -886,30 +1137,30 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:358:28: ( (otherlv_0= 'scanner' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:359:1: (otherlv_0= 'scanner' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:454:28: ( (otherlv_0= 'rule-damager' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:455:1: (otherlv_0= 'rule-damager' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:359:1: (otherlv_0= 'scanner' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:359:3: otherlv_0= 'scanner' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:455:1: (otherlv_0= 'rule-damager' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:455:3: otherlv_0= 'rule-damager' ( (otherlv_1= RULE_ID ) ) otherlv_2= '{' ( (lv_tokens_3_0= ruleScannerToken ) )* ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* ( (lv_rules_5_0= ruleScannerRule ) )+ otherlv_6= '}' { - otherlv_0=(Token)match(input,16,FOLLOW_16_in_ruleScanner762); + otherlv_0=(Token)match(input,17,FOLLOW_17_in_ruleRuleDamager1006); - newLeafNode(otherlv_0, grammarAccess.getScannerAccess().getScannerKeyword_0()); + newLeafNode(otherlv_0, grammarAccess.getRuleDamagerAccess().getRuleDamagerKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:363:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:364:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:459:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:460:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:364:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:365:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:460:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:461:3: otherlv_1= RULE_ID { if (current==null) { - current = createModelElement(grammarAccess.getScannerRule()); + current = createModelElement(grammarAccess.getRuleDamagerRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScanner782); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleRuleDamager1026); - newLeafNode(otherlv_1, grammarAccess.getScannerAccess().getPartitionPartitionCrossReference_1_0()); + newLeafNode(otherlv_1, grammarAccess.getRuleDamagerAccess().getPartitionPartitionCrossReference_1_0()); } @@ -917,39 +1168,39 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,11,FOLLOW_11_in_ruleScanner794); + otherlv_2=(Token)match(input,11,FOLLOW_11_in_ruleRuleDamager1038); - newLeafNode(otherlv_2, grammarAccess.getScannerAccess().getLeftCurlyBracketKeyword_2()); + newLeafNode(otherlv_2, grammarAccess.getRuleDamagerAccess().getLeftCurlyBracketKeyword_2()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:380:1: ( (lv_tokens_3_0= ruleScannerToken ) )* - loop5: + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:476:1: ( (lv_tokens_3_0= ruleScannerToken ) )* + loop6: do { - int alt5=2; - int LA5_0 = input.LA(1); + int alt6=2; + int LA6_0 = input.LA(1); - if ( ((LA5_0>=17 && LA5_0<=18)) ) { - alt5=1; + if ( ((LA6_0>=18 && LA6_0<=19)) ) { + alt6=1; } - switch (alt5) { + switch (alt6) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:381:1: (lv_tokens_3_0= ruleScannerToken ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:477:1: (lv_tokens_3_0= ruleScannerToken ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:381:1: (lv_tokens_3_0= ruleScannerToken ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:382:3: lv_tokens_3_0= ruleScannerToken + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:477:1: (lv_tokens_3_0= ruleScannerToken ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:478:3: lv_tokens_3_0= ruleScannerToken { - newCompositeNode(grammarAccess.getScannerAccess().getTokensScannerTokenParserRuleCall_3_0()); + newCompositeNode(grammarAccess.getRuleDamagerAccess().getTokensScannerTokenParserRuleCall_3_0()); - pushFollow(FOLLOW_ruleScannerToken_in_ruleScanner815); + pushFollow(FOLLOW_ruleScannerToken_in_ruleRuleDamager1059); lv_tokens_3_0=ruleScannerToken(); state._fsp--; if (current==null) { - current = createModelElementForParent(grammarAccess.getScannerRule()); + current = createModelElementForParent(grammarAccess.getRuleDamagerRule()); } add( current, @@ -966,39 +1217,39 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { break; default : - break loop5; + break loop6; } } while (true); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:398:3: ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* - loop6: + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:494:3: ( (lv_keywordGroups_4_0= ruleKeywordGroup ) )* + loop7: do { - int alt6=2; - int LA6_0 = input.LA(1); + int alt7=2; + int LA7_0 = input.LA(1); - if ( (LA6_0==23) ) { - alt6=1; + if ( (LA7_0==24) ) { + alt7=1; } - switch (alt6) { + switch (alt7) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:399:1: (lv_keywordGroups_4_0= ruleKeywordGroup ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:495:1: (lv_keywordGroups_4_0= ruleKeywordGroup ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:399:1: (lv_keywordGroups_4_0= ruleKeywordGroup ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:400:3: lv_keywordGroups_4_0= ruleKeywordGroup + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:495:1: (lv_keywordGroups_4_0= ruleKeywordGroup ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:496:3: lv_keywordGroups_4_0= ruleKeywordGroup { - newCompositeNode(grammarAccess.getScannerAccess().getKeywordGroupsKeywordGroupParserRuleCall_4_0()); + newCompositeNode(grammarAccess.getRuleDamagerAccess().getKeywordGroupsKeywordGroupParserRuleCall_4_0()); - pushFollow(FOLLOW_ruleKeywordGroup_in_ruleScanner837); + pushFollow(FOLLOW_ruleKeywordGroup_in_ruleRuleDamager1081); lv_keywordGroups_4_0=ruleKeywordGroup(); state._fsp--; if (current==null) { - current = createModelElementForParent(grammarAccess.getScannerRule()); + current = createModelElementForParent(grammarAccess.getRuleDamagerRule()); } add( current, @@ -1015,40 +1266,40 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { break; default : - break loop6; + break loop7; } } while (true); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:416:3: ( (lv_rules_5_0= ruleScannerRule ) )+ - int cnt7=0; - loop7: + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:512:3: ( (lv_rules_5_0= ruleScannerRule ) )+ + int cnt8=0; + loop8: do { - int alt7=2; - int LA7_0 = input.LA(1); + int alt8=2; + int LA8_0 = input.LA(1); - if ( (LA7_0==28||(LA7_0>=32 && LA7_0<=36)) ) { - alt7=1; + if ( (LA8_0==29||(LA8_0>=33 && LA8_0<=37)) ) { + alt8=1; } - switch (alt7) { + switch (alt8) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:417:1: (lv_rules_5_0= ruleScannerRule ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:513:1: (lv_rules_5_0= ruleScannerRule ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:417:1: (lv_rules_5_0= ruleScannerRule ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:418:3: lv_rules_5_0= ruleScannerRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:513:1: (lv_rules_5_0= ruleScannerRule ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:514:3: lv_rules_5_0= ruleScannerRule { - newCompositeNode(grammarAccess.getScannerAccess().getRulesScannerRuleParserRuleCall_5_0()); + newCompositeNode(grammarAccess.getRuleDamagerAccess().getRulesScannerRuleParserRuleCall_5_0()); - pushFollow(FOLLOW_ruleScannerRule_in_ruleScanner859); + pushFollow(FOLLOW_ruleScannerRule_in_ruleRuleDamager1103); lv_rules_5_0=ruleScannerRule(); state._fsp--; if (current==null) { - current = createModelElementForParent(grammarAccess.getScannerRule()); + current = createModelElementForParent(grammarAccess.getRuleDamagerRule()); } add( current, @@ -1065,17 +1316,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { break; default : - if ( cnt7 >= 1 ) break loop7; + if ( cnt8 >= 1 ) break loop8; EarlyExitException eee = - new EarlyExitException(7, input); + new EarlyExitException(8, input); throw eee; } - cnt7++; + cnt8++; } while (true); - otherlv_6=(Token)match(input,12,FOLLOW_12_in_ruleScanner872); + otherlv_6=(Token)match(input,12,FOLLOW_12_in_ruleRuleDamager1116); - newLeafNode(otherlv_6, grammarAccess.getScannerAccess().getRightCurlyBracketKeyword_6()); + newLeafNode(otherlv_6, grammarAccess.getRuleDamagerAccess().getRightCurlyBracketKeyword_6()); } @@ -1094,11 +1345,11 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } return current; } - // $ANTLR end "ruleScanner" + // $ANTLR end "ruleRuleDamager" // $ANTLR start "entryRuleScannerToken" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:446:1: entryRuleScannerToken returns [EObject current=null] : iv_ruleScannerToken= ruleScannerToken EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:542:1: entryRuleScannerToken returns [EObject current=null] : iv_ruleScannerToken= ruleScannerToken EOF ; public final EObject entryRuleScannerToken() throws RecognitionException { EObject current = null; @@ -1106,17 +1357,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:447:2: (iv_ruleScannerToken= ruleScannerToken EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:448:2: iv_ruleScannerToken= ruleScannerToken EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:543:2: (iv_ruleScannerToken= ruleScannerToken EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:544:2: iv_ruleScannerToken= ruleScannerToken EOF { newCompositeNode(grammarAccess.getScannerTokenRule()); - pushFollow(FOLLOW_ruleScannerToken_in_entryRuleScannerToken908); + pushFollow(FOLLOW_ruleScannerToken_in_entryRuleScannerToken1152); iv_ruleScannerToken=ruleScannerToken(); state._fsp--; current =iv_ruleScannerToken; - match(input,EOF,FOLLOW_EOF_in_entryRuleScannerToken918); + match(input,EOF,FOLLOW_EOF_in_entryRuleScannerToken1162); } @@ -1134,7 +1385,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleScannerToken" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:455:1: ruleScannerToken returns [EObject current=null] : ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:551:1: ruleScannerToken returns [EObject current=null] : ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) ; public final EObject ruleScannerToken() throws RecognitionException { EObject current = null; @@ -1159,27 +1410,27 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:458:28: ( ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:459:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:554:28: ( ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:555:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:459:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:459:2: ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:555:1: ( ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:555:2: ( (lv_default_0_0= 'default' ) )? otherlv_1= 'token' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:459:2: ( (lv_default_0_0= 'default' ) )? - int alt8=2; - int LA8_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:555:2: ( (lv_default_0_0= 'default' ) )? + int alt9=2; + int LA9_0 = input.LA(1); - if ( (LA8_0==17) ) { - alt8=1; + if ( (LA9_0==18) ) { + alt9=1; } - switch (alt8) { + switch (alt9) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:460:1: (lv_default_0_0= 'default' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:556:1: (lv_default_0_0= 'default' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:460:1: (lv_default_0_0= 'default' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:461:3: lv_default_0_0= 'default' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:556:1: (lv_default_0_0= 'default' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:557:3: lv_default_0_0= 'default' { - lv_default_0_0=(Token)match(input,17,FOLLOW_17_in_ruleScannerToken961); + lv_default_0_0=(Token)match(input,18,FOLLOW_18_in_ruleScannerToken1205); newLeafNode(lv_default_0_0, grammarAccess.getScannerTokenAccess().getDefaultDefaultKeyword_0_0()); @@ -1198,17 +1449,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_1=(Token)match(input,18,FOLLOW_18_in_ruleScannerToken987); + otherlv_1=(Token)match(input,19,FOLLOW_19_in_ruleScannerToken1231); newLeafNode(otherlv_1, grammarAccess.getScannerTokenAccess().getTokenKeyword_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:478:1: ( (lv_name_2_0= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:479:1: (lv_name_2_0= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:574:1: ( (lv_name_2_0= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:575:1: (lv_name_2_0= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:479:1: (lv_name_2_0= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:480:3: lv_name_2_0= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:575:1: (lv_name_2_0= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:576:3: lv_name_2_0= RULE_ID { - lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerToken1004); + lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerToken1248); newLeafNode(lv_name_2_0, grammarAccess.getScannerTokenAccess().getNameIDTerminalRuleCall_2_0()); @@ -1228,50 +1479,50 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:496:2: (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? - int alt12=2; - int LA12_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:592:2: (otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' )? + int alt13=2; + int LA13_0 = input.LA(1); - if ( (LA12_0==11) ) { - alt12=1; + if ( (LA13_0==11) ) { + alt13=1; } - switch (alt12) { + switch (alt13) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:496:4: otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:592:4: otherlv_3= '{' (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? otherlv_13= '}' { - otherlv_3=(Token)match(input,11,FOLLOW_11_in_ruleScannerToken1022); + otherlv_3=(Token)match(input,11,FOLLOW_11_in_ruleScannerToken1266); newLeafNode(otherlv_3, grammarAccess.getScannerTokenAccess().getLeftCurlyBracketKeyword_3_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:500:1: (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? - int alt9=2; - int LA9_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:596:1: (otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) )? + int alt10=2; + int LA10_0 = input.LA(1); - if ( (LA9_0==19) ) { - alt9=1; + if ( (LA10_0==20) ) { + alt10=1; } - switch (alt9) { + switch (alt10) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:500:3: otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:596:3: otherlv_4= 'fgcolor' otherlv_5= ':' ( (lv_fgColor_6_0= ruleColor ) ) { - otherlv_4=(Token)match(input,19,FOLLOW_19_in_ruleScannerToken1035); + otherlv_4=(Token)match(input,20,FOLLOW_20_in_ruleScannerToken1279); newLeafNode(otherlv_4, grammarAccess.getScannerTokenAccess().getFgcolorKeyword_3_1_0()); - otherlv_5=(Token)match(input,20,FOLLOW_20_in_ruleScannerToken1047); + otherlv_5=(Token)match(input,21,FOLLOW_21_in_ruleScannerToken1291); newLeafNode(otherlv_5, grammarAccess.getScannerTokenAccess().getColonKeyword_3_1_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:508:1: ( (lv_fgColor_6_0= ruleColor ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:509:1: (lv_fgColor_6_0= ruleColor ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:604:1: ( (lv_fgColor_6_0= ruleColor ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:605:1: (lv_fgColor_6_0= ruleColor ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:509:1: (lv_fgColor_6_0= ruleColor ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:510:3: lv_fgColor_6_0= ruleColor + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:605:1: (lv_fgColor_6_0= ruleColor ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:606:3: lv_fgColor_6_0= ruleColor { newCompositeNode(grammarAccess.getScannerTokenAccess().getFgColorColorParserRuleCall_3_1_2_0()); - pushFollow(FOLLOW_ruleColor_in_ruleScannerToken1068); + pushFollow(FOLLOW_ruleColor_in_ruleScannerToken1312); lv_fgColor_6_0=ruleColor(); state._fsp--; @@ -1299,35 +1550,35 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:526:4: (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? - int alt10=2; - int LA10_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:622:4: (otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) )? + int alt11=2; + int LA11_0 = input.LA(1); - if ( (LA10_0==21) ) { - alt10=1; + if ( (LA11_0==22) ) { + alt11=1; } - switch (alt10) { + switch (alt11) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:526:6: otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:622:6: otherlv_7= 'bgcolor' otherlv_8= ':' ( (lv_bgColor_9_0= ruleColor ) ) { - otherlv_7=(Token)match(input,21,FOLLOW_21_in_ruleScannerToken1083); + otherlv_7=(Token)match(input,22,FOLLOW_22_in_ruleScannerToken1327); newLeafNode(otherlv_7, grammarAccess.getScannerTokenAccess().getBgcolorKeyword_3_2_0()); - otherlv_8=(Token)match(input,20,FOLLOW_20_in_ruleScannerToken1095); + otherlv_8=(Token)match(input,21,FOLLOW_21_in_ruleScannerToken1339); newLeafNode(otherlv_8, grammarAccess.getScannerTokenAccess().getColonKeyword_3_2_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:534:1: ( (lv_bgColor_9_0= ruleColor ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:535:1: (lv_bgColor_9_0= ruleColor ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:630:1: ( (lv_bgColor_9_0= ruleColor ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:631:1: (lv_bgColor_9_0= ruleColor ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:535:1: (lv_bgColor_9_0= ruleColor ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:536:3: lv_bgColor_9_0= ruleColor + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:631:1: (lv_bgColor_9_0= ruleColor ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:632:3: lv_bgColor_9_0= ruleColor { newCompositeNode(grammarAccess.getScannerTokenAccess().getBgColorColorParserRuleCall_3_2_2_0()); - pushFollow(FOLLOW_ruleColor_in_ruleScannerToken1116); + pushFollow(FOLLOW_ruleColor_in_ruleScannerToken1360); lv_bgColor_9_0=ruleColor(); state._fsp--; @@ -1355,35 +1606,35 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:552:4: (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? - int alt11=2; - int LA11_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:648:4: (otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) )? + int alt12=2; + int LA12_0 = input.LA(1); - if ( (LA11_0==22) ) { - alt11=1; + if ( (LA12_0==23) ) { + alt12=1; } - switch (alt11) { + switch (alt12) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:552:6: otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:648:6: otherlv_10= 'font' otherlv_11= ':' ( (lv_font_12_0= ruleFont ) ) { - otherlv_10=(Token)match(input,22,FOLLOW_22_in_ruleScannerToken1131); + otherlv_10=(Token)match(input,23,FOLLOW_23_in_ruleScannerToken1375); newLeafNode(otherlv_10, grammarAccess.getScannerTokenAccess().getFontKeyword_3_3_0()); - otherlv_11=(Token)match(input,20,FOLLOW_20_in_ruleScannerToken1143); + otherlv_11=(Token)match(input,21,FOLLOW_21_in_ruleScannerToken1387); newLeafNode(otherlv_11, grammarAccess.getScannerTokenAccess().getColonKeyword_3_3_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:560:1: ( (lv_font_12_0= ruleFont ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:561:1: (lv_font_12_0= ruleFont ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:656:1: ( (lv_font_12_0= ruleFont ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:657:1: (lv_font_12_0= ruleFont ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:561:1: (lv_font_12_0= ruleFont ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:562:3: lv_font_12_0= ruleFont + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:657:1: (lv_font_12_0= ruleFont ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:658:3: lv_font_12_0= ruleFont { newCompositeNode(grammarAccess.getScannerTokenAccess().getFontFontParserRuleCall_3_3_2_0()); - pushFollow(FOLLOW_ruleFont_in_ruleScannerToken1164); + pushFollow(FOLLOW_ruleFont_in_ruleScannerToken1408); lv_font_12_0=ruleFont(); state._fsp--; @@ -1411,7 +1662,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_13=(Token)match(input,12,FOLLOW_12_in_ruleScannerToken1178); + otherlv_13=(Token)match(input,12,FOLLOW_12_in_ruleScannerToken1422); newLeafNode(otherlv_13, grammarAccess.getScannerTokenAccess().getRightCurlyBracketKeyword_3_4()); @@ -1442,7 +1693,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleKeywordGroup" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:590:1: entryRuleKeywordGroup returns [EObject current=null] : iv_ruleKeywordGroup= ruleKeywordGroup EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:686:1: entryRuleKeywordGroup returns [EObject current=null] : iv_ruleKeywordGroup= ruleKeywordGroup EOF ; public final EObject entryRuleKeywordGroup() throws RecognitionException { EObject current = null; @@ -1450,17 +1701,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:591:2: (iv_ruleKeywordGroup= ruleKeywordGroup EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:592:2: iv_ruleKeywordGroup= ruleKeywordGroup EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:687:2: (iv_ruleKeywordGroup= ruleKeywordGroup EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:688:2: iv_ruleKeywordGroup= ruleKeywordGroup EOF { newCompositeNode(grammarAccess.getKeywordGroupRule()); - pushFollow(FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1216); + pushFollow(FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1460); iv_ruleKeywordGroup=ruleKeywordGroup(); state._fsp--; current =iv_ruleKeywordGroup; - match(input,EOF,FOLLOW_EOF_in_entryRuleKeywordGroup1226); + match(input,EOF,FOLLOW_EOF_in_entryRuleKeywordGroup1470); } @@ -1478,7 +1729,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleKeywordGroup" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:599:1: ruleKeywordGroup returns [EObject current=null] : (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:695:1: ruleKeywordGroup returns [EObject current=null] : (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) ; public final EObject ruleKeywordGroup() throws RecognitionException { EObject current = null; @@ -1495,28 +1746,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:602:28: ( (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:603:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:698:28: ( (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:699:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:603:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:603:3: otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:699:1: (otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:699:3: otherlv_0= 'keywords' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_keywords_3_0= ruleKeyword ) ) (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* otherlv_6= ']' { - otherlv_0=(Token)match(input,23,FOLLOW_23_in_ruleKeywordGroup1263); + otherlv_0=(Token)match(input,24,FOLLOW_24_in_ruleKeywordGroup1507); newLeafNode(otherlv_0, grammarAccess.getKeywordGroupAccess().getKeywordsKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:607:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:608:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:703:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:704:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:608:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:609:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:704:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:705:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getKeywordGroupRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeywordGroup1283); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKeywordGroup1527); newLeafNode(otherlv_1, grammarAccess.getKeywordGroupAccess().getTokenScannerTokenCrossReference_1_0()); @@ -1526,20 +1777,20 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleKeywordGroup1295); + otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleKeywordGroup1539); newLeafNode(otherlv_2, grammarAccess.getKeywordGroupAccess().getLeftSquareBracketKeyword_2()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:624:1: ( (lv_keywords_3_0= ruleKeyword ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:625:1: (lv_keywords_3_0= ruleKeyword ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:720:1: ( (lv_keywords_3_0= ruleKeyword ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:721:1: (lv_keywords_3_0= ruleKeyword ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:625:1: (lv_keywords_3_0= ruleKeyword ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:626:3: lv_keywords_3_0= ruleKeyword + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:721:1: (lv_keywords_3_0= ruleKeyword ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:722:3: lv_keywords_3_0= ruleKeyword { newCompositeNode(grammarAccess.getKeywordGroupAccess().getKeywordsKeywordParserRuleCall_3_0()); - pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1316); + pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1560); lv_keywords_3_0=ruleKeyword(); state._fsp--; @@ -1561,35 +1812,35 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:642:2: (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* - loop13: + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:738:2: (otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) )* + loop14: do { - int alt13=2; - int LA13_0 = input.LA(1); + int alt14=2; + int LA14_0 = input.LA(1); - if ( (LA13_0==25) ) { - alt13=1; + if ( (LA14_0==26) ) { + alt14=1; } - switch (alt13) { + switch (alt14) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:642:4: otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:738:4: otherlv_4= ',' ( (lv_keywords_5_0= ruleKeyword ) ) { - otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleKeywordGroup1329); + otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleKeywordGroup1573); newLeafNode(otherlv_4, grammarAccess.getKeywordGroupAccess().getCommaKeyword_4_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:646:1: ( (lv_keywords_5_0= ruleKeyword ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:647:1: (lv_keywords_5_0= ruleKeyword ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:742:1: ( (lv_keywords_5_0= ruleKeyword ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:743:1: (lv_keywords_5_0= ruleKeyword ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:647:1: (lv_keywords_5_0= ruleKeyword ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:648:3: lv_keywords_5_0= ruleKeyword + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:743:1: (lv_keywords_5_0= ruleKeyword ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:744:3: lv_keywords_5_0= ruleKeyword { newCompositeNode(grammarAccess.getKeywordGroupAccess().getKeywordsKeywordParserRuleCall_4_1_0()); - pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1350); + pushFollow(FOLLOW_ruleKeyword_in_ruleKeywordGroup1594); lv_keywords_5_0=ruleKeyword(); state._fsp--; @@ -1616,11 +1867,11 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { break; default : - break loop13; + break loop14; } } while (true); - otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleKeywordGroup1364); + otherlv_6=(Token)match(input,27,FOLLOW_27_in_ruleKeywordGroup1608); newLeafNode(otherlv_6, grammarAccess.getKeywordGroupAccess().getRightSquareBracketKeyword_5()); @@ -1645,7 +1896,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleKeyword" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:676:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:772:1: entryRuleKeyword returns [EObject current=null] : iv_ruleKeyword= ruleKeyword EOF ; public final EObject entryRuleKeyword() throws RecognitionException { EObject current = null; @@ -1653,17 +1904,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:677:2: (iv_ruleKeyword= ruleKeyword EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:678:2: iv_ruleKeyword= ruleKeyword EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:773:2: (iv_ruleKeyword= ruleKeyword EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:774:2: iv_ruleKeyword= ruleKeyword EOF { newCompositeNode(grammarAccess.getKeywordRule()); - pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword1400); + pushFollow(FOLLOW_ruleKeyword_in_entryRuleKeyword1644); iv_ruleKeyword=ruleKeyword(); state._fsp--; current =iv_ruleKeyword; - match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword1410); + match(input,EOF,FOLLOW_EOF_in_entryRuleKeyword1654); } @@ -1681,7 +1932,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleKeyword" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:685:1: ruleKeyword returns [EObject current=null] : ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:781:1: ruleKeyword returns [EObject current=null] : ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) ; public final EObject ruleKeyword() throws RecognitionException { EObject current = null; @@ -1692,19 +1943,19 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:688:28: ( ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:689:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:784:28: ( ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:785:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:689:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:689:2: ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:785:1: ( ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:785:2: ( (lv_name_0_0= RULE_STRING ) ) (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:689:2: ( (lv_name_0_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:690:1: (lv_name_0_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:785:2: ( (lv_name_0_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:786:1: (lv_name_0_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:690:1: (lv_name_0_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:691:3: lv_name_0_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:786:1: (lv_name_0_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:787:3: lv_name_0_0= RULE_STRING { - lv_name_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword1452); + lv_name_0_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword1696); newLeafNode(lv_name_0_0, grammarAccess.getKeywordAccess().getNameSTRINGTerminalRuleCall_0_0()); @@ -1724,28 +1975,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:707:2: (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? - int alt14=2; - int LA14_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:803:2: (otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) )? + int alt15=2; + int LA15_0 = input.LA(1); - if ( (LA14_0==27) ) { - alt14=1; + if ( (LA15_0==28) ) { + alt15=1; } - switch (alt14) { + switch (alt15) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:707:4: otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:803:4: otherlv_1= 'since' ( (lv_version_2_0= RULE_STRING ) ) { - otherlv_1=(Token)match(input,27,FOLLOW_27_in_ruleKeyword1470); + otherlv_1=(Token)match(input,28,FOLLOW_28_in_ruleKeyword1714); newLeafNode(otherlv_1, grammarAccess.getKeywordAccess().getSinceKeyword_1_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:711:1: ( (lv_version_2_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:712:1: (lv_version_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:807:1: ( (lv_version_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:808:1: (lv_version_2_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:712:1: (lv_version_2_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:713:3: lv_version_2_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:808:1: (lv_version_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:809:3: lv_version_2_0= RULE_STRING { - lv_version_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword1487); + lv_version_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleKeyword1731); newLeafNode(lv_version_2_0, grammarAccess.getKeywordAccess().getVersionSTRINGTerminalRuleCall_1_1_0()); @@ -1792,7 +2043,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleScannerRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:737:1: entryRuleScannerRule returns [EObject current=null] : iv_ruleScannerRule= ruleScannerRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:833:1: entryRuleScannerRule returns [EObject current=null] : iv_ruleScannerRule= ruleScannerRule EOF ; public final EObject entryRuleScannerRule() throws RecognitionException { EObject current = null; @@ -1800,17 +2051,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:738:2: (iv_ruleScannerRule= ruleScannerRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:739:2: iv_ruleScannerRule= ruleScannerRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:834:2: (iv_ruleScannerRule= ruleScannerRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:835:2: iv_ruleScannerRule= ruleScannerRule EOF { newCompositeNode(grammarAccess.getScannerRuleRule()); - pushFollow(FOLLOW_ruleScannerRule_in_entryRuleScannerRule1530); + pushFollow(FOLLOW_ruleScannerRule_in_entryRuleScannerRule1774); iv_ruleScannerRule=ruleScannerRule(); state._fsp--; current =iv_ruleScannerRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleScannerRule1540); + match(input,EOF,FOLLOW_EOF_in_entryRuleScannerRule1784); } @@ -1828,7 +2079,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleScannerRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:746:1: ruleScannerRule returns [EObject current=null] : (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:842:1: ruleScannerRule returns [EObject current=null] : (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) ; public final EObject ruleScannerRule() throws RecognitionException { EObject current = null; @@ -1846,53 +2097,53 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:749:28: ( (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:750:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:845:28: ( (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:846:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:750:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) - int alt15=5; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:846:1: (this_ScannerSingleLineRule_0= ruleScannerSingleLineRule | this_ScannerMultiLineRule_1= ruleScannerMultiLineRule | this_ScannerCharacterRule_2= ruleScannerCharacterRule | this_ScannerJSRule_3= ruleScannerJSRule | this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule ) + int alt16=5; switch ( input.LA(1) ) { - case 28: - { - alt15=1; - } - break; - case 32: + case 29: { - alt15=2; + alt16=1; } break; case 33: { - alt15=3; + alt16=2; } break; case 34: { - alt15=4; + alt16=3; } break; case 35: + { + alt16=4; + } + break; case 36: + case 37: { - alt15=5; + alt16=5; } break; default: NoViableAltException nvae = - new NoViableAltException("", 15, 0, input); + new NoViableAltException("", 16, 0, input); throw nvae; } - switch (alt15) { + switch (alt16) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:751:5: this_ScannerSingleLineRule_0= ruleScannerSingleLineRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:847:5: this_ScannerSingleLineRule_0= ruleScannerSingleLineRule { newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerSingleLineRuleParserRuleCall_0()); - pushFollow(FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule1587); + pushFollow(FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule1831); this_ScannerSingleLineRule_0=ruleScannerSingleLineRule(); state._fsp--; @@ -1905,12 +2156,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:761:5: this_ScannerMultiLineRule_1= ruleScannerMultiLineRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:857:5: this_ScannerMultiLineRule_1= ruleScannerMultiLineRule { newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerMultiLineRuleParserRuleCall_1()); - pushFollow(FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule1614); + pushFollow(FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule1858); this_ScannerMultiLineRule_1=ruleScannerMultiLineRule(); state._fsp--; @@ -1923,12 +2174,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:771:5: this_ScannerCharacterRule_2= ruleScannerCharacterRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:867:5: this_ScannerCharacterRule_2= ruleScannerCharacterRule { newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerCharacterRuleParserRuleCall_2()); - pushFollow(FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule1641); + pushFollow(FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule1885); this_ScannerCharacterRule_2=ruleScannerCharacterRule(); state._fsp--; @@ -1941,12 +2192,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 4 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:781:5: this_ScannerJSRule_3= ruleScannerJSRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:877:5: this_ScannerJSRule_3= ruleScannerJSRule { newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerJSRuleParserRuleCall_3()); - pushFollow(FOLLOW_ruleScannerJSRule_in_ruleScannerRule1668); + pushFollow(FOLLOW_ruleScannerJSRule_in_ruleScannerRule1912); this_ScannerJSRule_3=ruleScannerJSRule(); state._fsp--; @@ -1959,12 +2210,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 5 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:791:5: this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:887:5: this_ScannerWhitespaceRule_4= ruleScannerWhitespaceRule { newCompositeNode(grammarAccess.getScannerRuleAccess().getScannerWhitespaceRuleParserRuleCall_4()); - pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule1695); + pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule1939); this_ScannerWhitespaceRule_4=ruleScannerWhitespaceRule(); state._fsp--; @@ -1997,7 +2248,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleParitionRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:807:1: entryRuleParitionRule returns [EObject current=null] : iv_ruleParitionRule= ruleParitionRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:903:1: entryRuleParitionRule returns [EObject current=null] : iv_ruleParitionRule= ruleParitionRule EOF ; public final EObject entryRuleParitionRule() throws RecognitionException { EObject current = null; @@ -2005,17 +2256,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:808:2: (iv_ruleParitionRule= ruleParitionRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:809:2: iv_ruleParitionRule= ruleParitionRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:904:2: (iv_ruleParitionRule= ruleParitionRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:905:2: iv_ruleParitionRule= ruleParitionRule EOF { newCompositeNode(grammarAccess.getParitionRuleRule()); - pushFollow(FOLLOW_ruleParitionRule_in_entryRuleParitionRule1730); + pushFollow(FOLLOW_ruleParitionRule_in_entryRuleParitionRule1974); iv_ruleParitionRule=ruleParitionRule(); state._fsp--; current =iv_ruleParitionRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleParitionRule1740); + match(input,EOF,FOLLOW_EOF_in_entryRuleParitionRule1984); } @@ -2033,7 +2284,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleParitionRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:816:1: ruleParitionRule returns [EObject current=null] : (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:912:1: ruleParitionRule returns [EObject current=null] : (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) ; public final EObject ruleParitionRule() throws RecognitionException { EObject current = null; @@ -2047,42 +2298,42 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:819:28: ( (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:820:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:915:28: ( (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:916:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:820:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) - int alt16=3; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:916:1: (this_PartitionSingleLineRule_0= rulePartitionSingleLineRule | this_PartitionMultiLineRule_1= rulePartitionMultiLineRule | this_PartitionJSRule_2= rulePartitionJSRule ) + int alt17=3; switch ( input.LA(1) ) { - case 28: + case 29: { - alt16=1; + alt17=1; } break; - case 32: + case 33: { - alt16=2; + alt17=2; } break; - case 34: + case 35: { - alt16=3; + alt17=3; } break; default: NoViableAltException nvae = - new NoViableAltException("", 16, 0, input); + new NoViableAltException("", 17, 0, input); throw nvae; } - switch (alt16) { + switch (alt17) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:821:5: this_PartitionSingleLineRule_0= rulePartitionSingleLineRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:917:5: this_PartitionSingleLineRule_0= rulePartitionSingleLineRule { newCompositeNode(grammarAccess.getParitionRuleAccess().getPartitionSingleLineRuleParserRuleCall_0()); - pushFollow(FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule1787); + pushFollow(FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule2031); this_PartitionSingleLineRule_0=rulePartitionSingleLineRule(); state._fsp--; @@ -2095,12 +2346,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:831:5: this_PartitionMultiLineRule_1= rulePartitionMultiLineRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:927:5: this_PartitionMultiLineRule_1= rulePartitionMultiLineRule { newCompositeNode(grammarAccess.getParitionRuleAccess().getPartitionMultiLineRuleParserRuleCall_1()); - pushFollow(FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule1814); + pushFollow(FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule2058); this_PartitionMultiLineRule_1=rulePartitionMultiLineRule(); state._fsp--; @@ -2113,12 +2364,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:841:5: this_PartitionJSRule_2= rulePartitionJSRule + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:937:5: this_PartitionJSRule_2= rulePartitionJSRule { newCompositeNode(grammarAccess.getParitionRuleAccess().getPartitionJSRuleParserRuleCall_2()); - pushFollow(FOLLOW_rulePartitionJSRule_in_ruleParitionRule1841); + pushFollow(FOLLOW_rulePartitionJSRule_in_ruleParitionRule2085); this_PartitionJSRule_2=rulePartitionJSRule(); state._fsp--; @@ -2151,7 +2402,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleScannerSingleLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:857:1: entryRuleScannerSingleLineRule returns [EObject current=null] : iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:953:1: entryRuleScannerSingleLineRule returns [EObject current=null] : iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF ; public final EObject entryRuleScannerSingleLineRule() throws RecognitionException { EObject current = null; @@ -2159,17 +2410,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:858:2: (iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:859:2: iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:954:2: (iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:955:2: iv_ruleScannerSingleLineRule= ruleScannerSingleLineRule EOF { newCompositeNode(grammarAccess.getScannerSingleLineRuleRule()); - pushFollow(FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule1876); + pushFollow(FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule2120); iv_ruleScannerSingleLineRule=ruleScannerSingleLineRule(); state._fsp--; current =iv_ruleScannerSingleLineRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleScannerSingleLineRule1886); + match(input,EOF,FOLLOW_EOF_in_entryRuleScannerSingleLineRule2130); } @@ -2187,7 +2438,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleScannerSingleLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:866:1: ruleScannerSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:962:1: ruleScannerSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; public final EObject ruleScannerSingleLineRule() throws RecognitionException { EObject current = null; @@ -2203,28 +2454,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:869:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:870:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:965:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:966:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:870:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:870:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:966:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:966:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? { - otherlv_0=(Token)match(input,28,FOLLOW_28_in_ruleScannerSingleLineRule1923); + otherlv_0=(Token)match(input,29,FOLLOW_29_in_ruleScannerSingleLineRule2167); newLeafNode(otherlv_0, grammarAccess.getScannerSingleLineRuleAccess().getSingleLineKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:874:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:875:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:970:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:971:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:875:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:876:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:971:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:972:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getScannerSingleLineRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerSingleLineRule1943); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerSingleLineRule2187); newLeafNode(otherlv_1, grammarAccess.getScannerSingleLineRuleAccess().getTokenScannerTokenCrossReference_1_0()); @@ -2234,13 +2485,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:887:2: ( (lv_startSeq_2_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:888:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:983:2: ( (lv_startSeq_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:984:1: (lv_startSeq_2_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:888:1: (lv_startSeq_2_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:889:3: lv_startSeq_2_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:984:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:985:3: lv_startSeq_2_0= RULE_STRING { - lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule1960); + lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2204); newLeafNode(lv_startSeq_2_0, grammarAccess.getScannerSingleLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); @@ -2260,17 +2511,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,29,FOLLOW_29_in_ruleScannerSingleLineRule1977); + otherlv_3=(Token)match(input,30,FOLLOW_30_in_ruleScannerSingleLineRule2221); newLeafNode(otherlv_3, grammarAccess.getScannerSingleLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:909:1: ( (lv_endSeq_4_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:910:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1005:1: ( (lv_endSeq_4_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1006:1: (lv_endSeq_4_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:910:1: (lv_endSeq_4_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:911:3: lv_endSeq_4_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1006:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1007:3: lv_endSeq_4_0= RULE_STRING { - lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule1994); + lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2238); newLeafNode(lv_endSeq_4_0, grammarAccess.getScannerSingleLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); @@ -2290,32 +2541,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:927:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? - int alt17=2; - int LA17_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1023:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + int alt18=2; + int LA18_0 = input.LA(1); - if ( (LA17_0==30) ) { - alt17=1; + if ( (LA18_0==31) ) { + alt18=1; } - switch (alt17) { + switch (alt18) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:927:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1023:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) { - otherlv_5=(Token)match(input,30,FOLLOW_30_in_ruleScannerSingleLineRule2012); + otherlv_5=(Token)match(input,31,FOLLOW_31_in_ruleScannerSingleLineRule2256); newLeafNode(otherlv_5, grammarAccess.getScannerSingleLineRuleAccess().getEscapedKeyword_5_0()); - otherlv_6=(Token)match(input,31,FOLLOW_31_in_ruleScannerSingleLineRule2024); + otherlv_6=(Token)match(input,32,FOLLOW_32_in_ruleScannerSingleLineRule2268); newLeafNode(otherlv_6, grammarAccess.getScannerSingleLineRuleAccess().getByKeyword_5_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:935:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:936:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1031:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1032:1: (lv_escapeSeq_7_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:936:1: (lv_escapeSeq_7_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:937:3: lv_escapeSeq_7_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1032:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1033:3: lv_escapeSeq_7_0= RULE_STRING { - lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2041); + lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2285); newLeafNode(lv_escapeSeq_7_0, grammarAccess.getScannerSingleLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); @@ -2362,7 +2613,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRulePartitionSingleLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:961:1: entryRulePartitionSingleLineRule returns [EObject current=null] : iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1057:1: entryRulePartitionSingleLineRule returns [EObject current=null] : iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF ; public final EObject entryRulePartitionSingleLineRule() throws RecognitionException { EObject current = null; @@ -2370,17 +2621,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:962:2: (iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:963:2: iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1058:2: (iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1059:2: iv_rulePartitionSingleLineRule= rulePartitionSingleLineRule EOF { newCompositeNode(grammarAccess.getPartitionSingleLineRuleRule()); - pushFollow(FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2084); + pushFollow(FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2328); iv_rulePartitionSingleLineRule=rulePartitionSingleLineRule(); state._fsp--; current =iv_rulePartitionSingleLineRule; - match(input,EOF,FOLLOW_EOF_in_entryRulePartitionSingleLineRule2094); + match(input,EOF,FOLLOW_EOF_in_entryRulePartitionSingleLineRule2338); } @@ -2398,7 +2649,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePartitionSingleLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:970:1: rulePartitionSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1066:1: rulePartitionSingleLineRule returns [EObject current=null] : (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; public final EObject rulePartitionSingleLineRule() throws RecognitionException { EObject current = null; @@ -2414,28 +2665,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:973:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:974:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1069:28: ( (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1070:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:974:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:974:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1070:1: (otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1070:3: otherlv_0= 'single-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? { - otherlv_0=(Token)match(input,28,FOLLOW_28_in_rulePartitionSingleLineRule2131); + otherlv_0=(Token)match(input,29,FOLLOW_29_in_rulePartitionSingleLineRule2375); newLeafNode(otherlv_0, grammarAccess.getPartitionSingleLineRuleAccess().getSingleLineKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:978:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:979:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1074:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1075:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:979:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:980:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1075:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1076:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getPartitionSingleLineRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2151); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2395); newLeafNode(otherlv_1, grammarAccess.getPartitionSingleLineRuleAccess().getParitionPartitionCrossReference_1_0()); @@ -2445,13 +2696,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:991:2: ( (lv_startSeq_2_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:992:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1087:2: ( (lv_startSeq_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1088:1: (lv_startSeq_2_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:992:1: (lv_startSeq_2_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:993:3: lv_startSeq_2_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1088:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1089:3: lv_startSeq_2_0= RULE_STRING { - lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2168); + lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2412); newLeafNode(lv_startSeq_2_0, grammarAccess.getPartitionSingleLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); @@ -2471,17 +2722,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,29,FOLLOW_29_in_rulePartitionSingleLineRule2185); + otherlv_3=(Token)match(input,30,FOLLOW_30_in_rulePartitionSingleLineRule2429); newLeafNode(otherlv_3, grammarAccess.getPartitionSingleLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1013:1: ( (lv_endSeq_4_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1014:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1109:1: ( (lv_endSeq_4_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1110:1: (lv_endSeq_4_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1014:1: (lv_endSeq_4_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1015:3: lv_endSeq_4_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1110:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1111:3: lv_endSeq_4_0= RULE_STRING { - lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2202); + lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2446); newLeafNode(lv_endSeq_4_0, grammarAccess.getPartitionSingleLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); @@ -2501,32 +2752,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1031:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? - int alt18=2; - int LA18_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1127:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + int alt19=2; + int LA19_0 = input.LA(1); - if ( (LA18_0==30) ) { - alt18=1; + if ( (LA19_0==31) ) { + alt19=1; } - switch (alt18) { + switch (alt19) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1031:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1127:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) { - otherlv_5=(Token)match(input,30,FOLLOW_30_in_rulePartitionSingleLineRule2220); + otherlv_5=(Token)match(input,31,FOLLOW_31_in_rulePartitionSingleLineRule2464); newLeafNode(otherlv_5, grammarAccess.getPartitionSingleLineRuleAccess().getEscapedKeyword_5_0()); - otherlv_6=(Token)match(input,31,FOLLOW_31_in_rulePartitionSingleLineRule2232); + otherlv_6=(Token)match(input,32,FOLLOW_32_in_rulePartitionSingleLineRule2476); newLeafNode(otherlv_6, grammarAccess.getPartitionSingleLineRuleAccess().getByKeyword_5_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1039:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1040:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1135:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1136:1: (lv_escapeSeq_7_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1040:1: (lv_escapeSeq_7_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1041:3: lv_escapeSeq_7_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1136:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1137:3: lv_escapeSeq_7_0= RULE_STRING { - lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2249); + lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2493); newLeafNode(lv_escapeSeq_7_0, grammarAccess.getPartitionSingleLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); @@ -2573,7 +2824,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleScannerMultiLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1065:1: entryRuleScannerMultiLineRule returns [EObject current=null] : iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1161:1: entryRuleScannerMultiLineRule returns [EObject current=null] : iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF ; public final EObject entryRuleScannerMultiLineRule() throws RecognitionException { EObject current = null; @@ -2581,17 +2832,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1066:2: (iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1067:2: iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1162:2: (iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1163:2: iv_ruleScannerMultiLineRule= ruleScannerMultiLineRule EOF { newCompositeNode(grammarAccess.getScannerMultiLineRuleRule()); - pushFollow(FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2292); + pushFollow(FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2536); iv_ruleScannerMultiLineRule=ruleScannerMultiLineRule(); state._fsp--; current =iv_ruleScannerMultiLineRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleScannerMultiLineRule2302); + match(input,EOF,FOLLOW_EOF_in_entryRuleScannerMultiLineRule2546); } @@ -2609,7 +2860,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleScannerMultiLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1074:1: ruleScannerMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1170:1: ruleScannerMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; public final EObject ruleScannerMultiLineRule() throws RecognitionException { EObject current = null; @@ -2625,28 +2876,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1077:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1078:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1173:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1174:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1078:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1078:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1174:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1174:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? { - otherlv_0=(Token)match(input,32,FOLLOW_32_in_ruleScannerMultiLineRule2339); + otherlv_0=(Token)match(input,33,FOLLOW_33_in_ruleScannerMultiLineRule2583); newLeafNode(otherlv_0, grammarAccess.getScannerMultiLineRuleAccess().getMultiLineKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1082:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1083:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1178:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1179:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1083:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1084:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1179:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1180:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getScannerMultiLineRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2359); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2603); newLeafNode(otherlv_1, grammarAccess.getScannerMultiLineRuleAccess().getTokenScannerTokenCrossReference_1_0()); @@ -2656,13 +2907,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1095:2: ( (lv_startSeq_2_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1096:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1191:2: ( (lv_startSeq_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1192:1: (lv_startSeq_2_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1096:1: (lv_startSeq_2_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1097:3: lv_startSeq_2_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1192:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1193:3: lv_startSeq_2_0= RULE_STRING { - lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2376); + lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2620); newLeafNode(lv_startSeq_2_0, grammarAccess.getScannerMultiLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); @@ -2682,17 +2933,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,29,FOLLOW_29_in_ruleScannerMultiLineRule2393); + otherlv_3=(Token)match(input,30,FOLLOW_30_in_ruleScannerMultiLineRule2637); newLeafNode(otherlv_3, grammarAccess.getScannerMultiLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1117:1: ( (lv_endSeq_4_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1118:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1213:1: ( (lv_endSeq_4_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1214:1: (lv_endSeq_4_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1118:1: (lv_endSeq_4_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1119:3: lv_endSeq_4_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1214:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1215:3: lv_endSeq_4_0= RULE_STRING { - lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2410); + lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2654); newLeafNode(lv_endSeq_4_0, grammarAccess.getScannerMultiLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); @@ -2712,32 +2963,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1135:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? - int alt19=2; - int LA19_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1231:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + int alt20=2; + int LA20_0 = input.LA(1); - if ( (LA19_0==30) ) { - alt19=1; + if ( (LA20_0==31) ) { + alt20=1; } - switch (alt19) { + switch (alt20) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1135:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1231:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) { - otherlv_5=(Token)match(input,30,FOLLOW_30_in_ruleScannerMultiLineRule2428); + otherlv_5=(Token)match(input,31,FOLLOW_31_in_ruleScannerMultiLineRule2672); newLeafNode(otherlv_5, grammarAccess.getScannerMultiLineRuleAccess().getEscapedKeyword_5_0()); - otherlv_6=(Token)match(input,31,FOLLOW_31_in_ruleScannerMultiLineRule2440); + otherlv_6=(Token)match(input,32,FOLLOW_32_in_ruleScannerMultiLineRule2684); newLeafNode(otherlv_6, grammarAccess.getScannerMultiLineRuleAccess().getByKeyword_5_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1143:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1144:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1239:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1240:1: (lv_escapeSeq_7_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1144:1: (lv_escapeSeq_7_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1145:3: lv_escapeSeq_7_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1240:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1241:3: lv_escapeSeq_7_0= RULE_STRING { - lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2457); + lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2701); newLeafNode(lv_escapeSeq_7_0, grammarAccess.getScannerMultiLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); @@ -2784,7 +3035,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRulePartitionMultiLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1169:1: entryRulePartitionMultiLineRule returns [EObject current=null] : iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1265:1: entryRulePartitionMultiLineRule returns [EObject current=null] : iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF ; public final EObject entryRulePartitionMultiLineRule() throws RecognitionException { EObject current = null; @@ -2792,17 +3043,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1170:2: (iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1171:2: iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1266:2: (iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1267:2: iv_rulePartitionMultiLineRule= rulePartitionMultiLineRule EOF { newCompositeNode(grammarAccess.getPartitionMultiLineRuleRule()); - pushFollow(FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule2500); + pushFollow(FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule2744); iv_rulePartitionMultiLineRule=rulePartitionMultiLineRule(); state._fsp--; current =iv_rulePartitionMultiLineRule; - match(input,EOF,FOLLOW_EOF_in_entryRulePartitionMultiLineRule2510); + match(input,EOF,FOLLOW_EOF_in_entryRulePartitionMultiLineRule2754); } @@ -2820,7 +3071,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePartitionMultiLineRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1178:1: rulePartitionMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1274:1: rulePartitionMultiLineRule returns [EObject current=null] : (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ; public final EObject rulePartitionMultiLineRule() throws RecognitionException { EObject current = null; @@ -2836,30 +3087,30 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1181:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1182:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1277:28: ( (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1278:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1182:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1182:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1278:1: (otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1278:3: otherlv_0= 'multi-line' ( (otherlv_1= RULE_ID ) ) ( (lv_startSeq_2_0= RULE_STRING ) ) otherlv_3= '=>' ( (lv_endSeq_4_0= RULE_STRING ) ) (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? { - otherlv_0=(Token)match(input,32,FOLLOW_32_in_rulePartitionMultiLineRule2547); + otherlv_0=(Token)match(input,33,FOLLOW_33_in_rulePartitionMultiLineRule2791); newLeafNode(otherlv_0, grammarAccess.getPartitionMultiLineRuleAccess().getMultiLineKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1186:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1187:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1282:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1283:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1187:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1188:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1283:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1284:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getPartitionMultiLineRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionMultiLineRule2567); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionMultiLineRule2811); - newLeafNode(otherlv_1, grammarAccess.getPartitionMultiLineRuleAccess().getTokenPartitionCrossReference_1_0()); + newLeafNode(otherlv_1, grammarAccess.getPartitionMultiLineRuleAccess().getParitionPartitionCrossReference_1_0()); } @@ -2867,13 +3118,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1199:2: ( (lv_startSeq_2_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1200:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1295:2: ( (lv_startSeq_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1296:1: (lv_startSeq_2_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1200:1: (lv_startSeq_2_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1201:3: lv_startSeq_2_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1296:1: (lv_startSeq_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1297:3: lv_startSeq_2_0= RULE_STRING { - lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2584); + lv_startSeq_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2828); newLeafNode(lv_startSeq_2_0, grammarAccess.getPartitionMultiLineRuleAccess().getStartSeqSTRINGTerminalRuleCall_2_0()); @@ -2893,17 +3144,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,29,FOLLOW_29_in_rulePartitionMultiLineRule2601); + otherlv_3=(Token)match(input,30,FOLLOW_30_in_rulePartitionMultiLineRule2845); newLeafNode(otherlv_3, grammarAccess.getPartitionMultiLineRuleAccess().getEqualsSignGreaterThanSignKeyword_3()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1221:1: ( (lv_endSeq_4_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1222:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1317:1: ( (lv_endSeq_4_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1318:1: (lv_endSeq_4_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1222:1: (lv_endSeq_4_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1223:3: lv_endSeq_4_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1318:1: (lv_endSeq_4_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1319:3: lv_endSeq_4_0= RULE_STRING { - lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2618); + lv_endSeq_4_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2862); newLeafNode(lv_endSeq_4_0, grammarAccess.getPartitionMultiLineRuleAccess().getEndSeqSTRINGTerminalRuleCall_4_0()); @@ -2923,32 +3174,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1239:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? - int alt20=2; - int LA20_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1335:2: (otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) )? + int alt21=2; + int LA21_0 = input.LA(1); - if ( (LA20_0==30) ) { - alt20=1; + if ( (LA21_0==31) ) { + alt21=1; } - switch (alt20) { + switch (alt21) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1239:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1335:4: otherlv_5= 'escaped' otherlv_6= 'by' ( (lv_escapeSeq_7_0= RULE_STRING ) ) { - otherlv_5=(Token)match(input,30,FOLLOW_30_in_rulePartitionMultiLineRule2636); + otherlv_5=(Token)match(input,31,FOLLOW_31_in_rulePartitionMultiLineRule2880); newLeafNode(otherlv_5, grammarAccess.getPartitionMultiLineRuleAccess().getEscapedKeyword_5_0()); - otherlv_6=(Token)match(input,31,FOLLOW_31_in_rulePartitionMultiLineRule2648); + otherlv_6=(Token)match(input,32,FOLLOW_32_in_rulePartitionMultiLineRule2892); newLeafNode(otherlv_6, grammarAccess.getPartitionMultiLineRuleAccess().getByKeyword_5_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1247:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1248:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1343:1: ( (lv_escapeSeq_7_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1344:1: (lv_escapeSeq_7_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1248:1: (lv_escapeSeq_7_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1249:3: lv_escapeSeq_7_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1344:1: (lv_escapeSeq_7_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1345:3: lv_escapeSeq_7_0= RULE_STRING { - lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2665); + lv_escapeSeq_7_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2909); newLeafNode(lv_escapeSeq_7_0, grammarAccess.getPartitionMultiLineRuleAccess().getEscapeSeqSTRINGTerminalRuleCall_5_2_0()); @@ -2995,7 +3246,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleScannerCharacterRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1273:1: entryRuleScannerCharacterRule returns [EObject current=null] : iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1369:1: entryRuleScannerCharacterRule returns [EObject current=null] : iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF ; public final EObject entryRuleScannerCharacterRule() throws RecognitionException { EObject current = null; @@ -3003,17 +3254,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1274:2: (iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1275:2: iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1370:2: (iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1371:2: iv_ruleScannerCharacterRule= ruleScannerCharacterRule EOF { newCompositeNode(grammarAccess.getScannerCharacterRuleRule()); - pushFollow(FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule2708); + pushFollow(FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule2952); iv_ruleScannerCharacterRule=ruleScannerCharacterRule(); state._fsp--; current =iv_ruleScannerCharacterRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleScannerCharacterRule2718); + match(input,EOF,FOLLOW_EOF_in_entryRuleScannerCharacterRule2962); } @@ -3031,7 +3282,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleScannerCharacterRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1282:1: ruleScannerCharacterRule returns [EObject current=null] : (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1378:1: ruleScannerCharacterRule returns [EObject current=null] : (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) ; public final EObject ruleScannerCharacterRule() throws RecognitionException { EObject current = null; @@ -3046,28 +3297,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1285:28: ( (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1286:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1381:28: ( (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1382:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1286:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1286:3: otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1382:1: (otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1382:3: otherlv_0= 'character-rule' ( (otherlv_1= RULE_ID ) ) otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) otherlv_6= ']' { - otherlv_0=(Token)match(input,33,FOLLOW_33_in_ruleScannerCharacterRule2755); + otherlv_0=(Token)match(input,34,FOLLOW_34_in_ruleScannerCharacterRule2999); newLeafNode(otherlv_0, grammarAccess.getScannerCharacterRuleAccess().getCharacterRuleKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1290:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1291:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1386:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1387:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1291:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1292:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1387:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1388:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getScannerCharacterRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerCharacterRule2775); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerCharacterRule3019); newLeafNode(otherlv_1, grammarAccess.getScannerCharacterRuleAccess().getTokenScannerTokenCrossReference_1_0()); @@ -3077,17 +3328,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleScannerCharacterRule2787); + otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleScannerCharacterRule3031); newLeafNode(otherlv_2, grammarAccess.getScannerCharacterRuleAccess().getLeftSquareBracketKeyword_2()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1307:1: ( (lv_characters_3_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1308:1: (lv_characters_3_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1403:1: ( (lv_characters_3_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1404:1: (lv_characters_3_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1308:1: (lv_characters_3_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1309:3: lv_characters_3_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1404:1: (lv_characters_3_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1405:3: lv_characters_3_0= RULE_STRING { - lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule2804); + lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3048); newLeafNode(lv_characters_3_0, grammarAccess.getScannerCharacterRuleAccess().getCharactersSTRINGTerminalRuleCall_3_0()); @@ -3107,17 +3358,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleScannerCharacterRule2821); + otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleScannerCharacterRule3065); newLeafNode(otherlv_4, grammarAccess.getScannerCharacterRuleAccess().getCommaKeyword_4()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1329:1: ( (lv_characters_5_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1330:1: (lv_characters_5_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1425:1: ( (lv_characters_5_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1426:1: (lv_characters_5_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1330:1: (lv_characters_5_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1331:3: lv_characters_5_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1426:1: (lv_characters_5_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1427:3: lv_characters_5_0= RULE_STRING { - lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule2838); + lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3082); newLeafNode(lv_characters_5_0, grammarAccess.getScannerCharacterRuleAccess().getCharactersSTRINGTerminalRuleCall_5_0()); @@ -3137,7 +3388,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleScannerCharacterRule2855); + otherlv_6=(Token)match(input,27,FOLLOW_27_in_ruleScannerCharacterRule3099); newLeafNode(otherlv_6, grammarAccess.getScannerCharacterRuleAccess().getRightSquareBracketKeyword_6()); @@ -3162,7 +3413,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleScannerJSRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1359:1: entryRuleScannerJSRule returns [EObject current=null] : iv_ruleScannerJSRule= ruleScannerJSRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1455:1: entryRuleScannerJSRule returns [EObject current=null] : iv_ruleScannerJSRule= ruleScannerJSRule EOF ; public final EObject entryRuleScannerJSRule() throws RecognitionException { EObject current = null; @@ -3170,17 +3421,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1360:2: (iv_ruleScannerJSRule= ruleScannerJSRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1361:2: iv_ruleScannerJSRule= ruleScannerJSRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1456:2: (iv_ruleScannerJSRule= ruleScannerJSRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1457:2: iv_ruleScannerJSRule= ruleScannerJSRule EOF { newCompositeNode(grammarAccess.getScannerJSRuleRule()); - pushFollow(FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule2891); + pushFollow(FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule3135); iv_ruleScannerJSRule=ruleScannerJSRule(); state._fsp--; current =iv_ruleScannerJSRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleScannerJSRule2901); + match(input,EOF,FOLLOW_EOF_in_entryRuleScannerJSRule3145); } @@ -3198,7 +3449,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleScannerJSRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1368:1: ruleScannerJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1464:1: ruleScannerJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ; public final EObject ruleScannerJSRule() throws RecognitionException { EObject current = null; @@ -3209,28 +3460,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1371:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1372:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1467:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1468:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1372:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1372:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1468:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1468:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) { - otherlv_0=(Token)match(input,34,FOLLOW_34_in_ruleScannerJSRule2938); + otherlv_0=(Token)match(input,35,FOLLOW_35_in_ruleScannerJSRule3182); newLeafNode(otherlv_0, grammarAccess.getScannerJSRuleAccess().getJavascriptRuleKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1376:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1377:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1472:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1473:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1377:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1378:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1473:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1474:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getScannerJSRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerJSRule2958); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerJSRule3202); newLeafNode(otherlv_1, grammarAccess.getScannerJSRuleAccess().getTokenScannerTokenCrossReference_1_0()); @@ -3240,13 +3491,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1389:2: ( (lv_fileURI_2_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1390:1: (lv_fileURI_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1485:2: ( (lv_fileURI_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1486:1: (lv_fileURI_2_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1390:1: (lv_fileURI_2_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1391:3: lv_fileURI_2_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1486:1: (lv_fileURI_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1487:3: lv_fileURI_2_0= RULE_STRING { - lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerJSRule2975); + lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerJSRule3219); newLeafNode(lv_fileURI_2_0, grammarAccess.getScannerJSRuleAccess().getFileURISTRINGTerminalRuleCall_2_0()); @@ -3287,7 +3538,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRulePartitionJSRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1415:1: entryRulePartitionJSRule returns [EObject current=null] : iv_rulePartitionJSRule= rulePartitionJSRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1511:1: entryRulePartitionJSRule returns [EObject current=null] : iv_rulePartitionJSRule= rulePartitionJSRule EOF ; public final EObject entryRulePartitionJSRule() throws RecognitionException { EObject current = null; @@ -3295,17 +3546,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1416:2: (iv_rulePartitionJSRule= rulePartitionJSRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1417:2: iv_rulePartitionJSRule= rulePartitionJSRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1512:2: (iv_rulePartitionJSRule= rulePartitionJSRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1513:2: iv_rulePartitionJSRule= rulePartitionJSRule EOF { newCompositeNode(grammarAccess.getPartitionJSRuleRule()); - pushFollow(FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3016); + pushFollow(FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3260); iv_rulePartitionJSRule=rulePartitionJSRule(); state._fsp--; current =iv_rulePartitionJSRule; - match(input,EOF,FOLLOW_EOF_in_entryRulePartitionJSRule3026); + match(input,EOF,FOLLOW_EOF_in_entryRulePartitionJSRule3270); } @@ -3323,7 +3574,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "rulePartitionJSRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1424:1: rulePartitionJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1520:1: rulePartitionJSRule returns [EObject current=null] : (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ; public final EObject rulePartitionJSRule() throws RecognitionException { EObject current = null; @@ -3334,28 +3585,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1427:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1428:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1523:28: ( (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1524:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1428:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1428:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1524:1: (otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1524:3: otherlv_0= 'javascript-rule' ( (otherlv_1= RULE_ID ) ) ( (lv_fileURI_2_0= RULE_STRING ) ) { - otherlv_0=(Token)match(input,34,FOLLOW_34_in_rulePartitionJSRule3063); + otherlv_0=(Token)match(input,35,FOLLOW_35_in_rulePartitionJSRule3307); newLeafNode(otherlv_0, grammarAccess.getPartitionJSRuleAccess().getJavascriptRuleKeyword_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1432:1: ( (otherlv_1= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1433:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1528:1: ( (otherlv_1= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1529:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1433:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1434:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1529:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1530:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getPartitionJSRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionJSRule3083); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_rulePartitionJSRule3327); newLeafNode(otherlv_1, grammarAccess.getPartitionJSRuleAccess().getTokenPartitionCrossReference_1_0()); @@ -3365,13 +3616,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1445:2: ( (lv_fileURI_2_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1446:1: (lv_fileURI_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1541:2: ( (lv_fileURI_2_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1542:1: (lv_fileURI_2_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1446:1: (lv_fileURI_2_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1447:3: lv_fileURI_2_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1542:1: (lv_fileURI_2_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1543:3: lv_fileURI_2_0= RULE_STRING { - lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionJSRule3100); + lv_fileURI_2_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_rulePartitionJSRule3344); newLeafNode(lv_fileURI_2_0, grammarAccess.getPartitionJSRuleAccess().getFileURISTRINGTerminalRuleCall_2_0()); @@ -3412,7 +3663,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleScannerWhitespaceRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1471:1: entryRuleScannerWhitespaceRule returns [EObject current=null] : iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1567:1: entryRuleScannerWhitespaceRule returns [EObject current=null] : iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF ; public final EObject entryRuleScannerWhitespaceRule() throws RecognitionException { EObject current = null; @@ -3420,17 +3671,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1472:2: (iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1473:2: iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1568:2: (iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1569:2: iv_ruleScannerWhitespaceRule= ruleScannerWhitespaceRule EOF { newCompositeNode(grammarAccess.getScannerWhitespaceRuleRule()); - pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3141); + pushFollow(FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3385); iv_ruleScannerWhitespaceRule=ruleScannerWhitespaceRule(); state._fsp--; current =iv_ruleScannerWhitespaceRule; - match(input,EOF,FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3151); + match(input,EOF,FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3395); } @@ -3448,7 +3699,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleScannerWhitespaceRule" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1480:1: ruleScannerWhitespaceRule returns [EObject current=null] : ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1576:1: ruleScannerWhitespaceRule returns [EObject current=null] : ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) ; public final EObject ruleScannerWhitespaceRule() throws RecognitionException { EObject current = null; @@ -3460,62 +3711,62 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { Token lv_characters_5_0=null; Token otherlv_6=null; Token otherlv_7=null; - Token lv_jsMethod_8_0=null; + Token lv_jsDetector_8_0=null; Token otherlv_9=null; enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1483:28: ( ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1484:1: ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1579:28: ( ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1580:1: ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1484:1: ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) - int alt23=2; - int LA23_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1580:1: ( (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) | (otherlv_7= '#{' ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) ) + int alt24=2; + int LA24_0 = input.LA(1); - if ( (LA23_0==35) ) { - alt23=1; + if ( (LA24_0==36) ) { + alt24=1; } - else if ( (LA23_0==36) ) { - alt23=2; + else if ( (LA24_0==37) ) { + alt24=2; } else { NoViableAltException nvae = - new NoViableAltException("", 23, 0, input); + new NoViableAltException("", 24, 0, input); throw nvae; } - switch (alt23) { + switch (alt24) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1484:2: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1580:2: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1484:2: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1484:4: otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1580:2: (otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1580:4: otherlv_0= 'whitespace-rule' ( (otherlv_1= RULE_ID ) )? (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) { - otherlv_0=(Token)match(input,35,FOLLOW_35_in_ruleScannerWhitespaceRule3189); + otherlv_0=(Token)match(input,36,FOLLOW_36_in_ruleScannerWhitespaceRule3433); newLeafNode(otherlv_0, grammarAccess.getScannerWhitespaceRuleAccess().getWhitespaceRuleKeyword_0_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1488:1: ( (otherlv_1= RULE_ID ) )? - int alt21=2; - int LA21_0 = input.LA(1); + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1584:1: ( (otherlv_1= RULE_ID ) )? + int alt22=2; + int LA22_0 = input.LA(1); - if ( (LA21_0==RULE_ID) ) { - alt21=1; + if ( (LA22_0==RULE_ID) ) { + alt22=1; } - switch (alt21) { + switch (alt22) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1489:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1585:1: (otherlv_1= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1489:1: (otherlv_1= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1490:3: otherlv_1= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1585:1: (otherlv_1= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1586:3: otherlv_1= RULE_ID { if (current==null) { current = createModelElement(grammarAccess.getScannerWhitespaceRuleRule()); } - otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3209); + otherlv_1=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3453); newLeafNode(otherlv_1, grammarAccess.getScannerWhitespaceRuleAccess().getTokenScannerTokenCrossReference_0_1_0()); @@ -3528,20 +3779,20 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1501:3: (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1501:5: otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1597:3: (otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1597:5: otherlv_2= '[' ( (lv_characters_3_0= RULE_STRING ) ) (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* otherlv_6= ']' { - otherlv_2=(Token)match(input,24,FOLLOW_24_in_ruleScannerWhitespaceRule3223); + otherlv_2=(Token)match(input,25,FOLLOW_25_in_ruleScannerWhitespaceRule3467); newLeafNode(otherlv_2, grammarAccess.getScannerWhitespaceRuleAccess().getLeftSquareBracketKeyword_0_2_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1505:1: ( (lv_characters_3_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1506:1: (lv_characters_3_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1601:1: ( (lv_characters_3_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1602:1: (lv_characters_3_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1506:1: (lv_characters_3_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1507:3: lv_characters_3_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1602:1: (lv_characters_3_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1603:3: lv_characters_3_0= RULE_STRING { - lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3240); + lv_characters_3_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3484); newLeafNode(lv_characters_3_0, grammarAccess.getScannerWhitespaceRuleAccess().getCharactersSTRINGTerminalRuleCall_0_2_1_0()); @@ -3561,32 +3812,32 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1523:2: (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* - loop22: + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1619:2: (otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) )* + loop23: do { - int alt22=2; - int LA22_0 = input.LA(1); + int alt23=2; + int LA23_0 = input.LA(1); - if ( (LA22_0==25) ) { - alt22=1; + if ( (LA23_0==26) ) { + alt23=1; } - switch (alt22) { + switch (alt23) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1523:4: otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1619:4: otherlv_4= ',' ( (lv_characters_5_0= RULE_STRING ) ) { - otherlv_4=(Token)match(input,25,FOLLOW_25_in_ruleScannerWhitespaceRule3258); + otherlv_4=(Token)match(input,26,FOLLOW_26_in_ruleScannerWhitespaceRule3502); newLeafNode(otherlv_4, grammarAccess.getScannerWhitespaceRuleAccess().getCommaKeyword_0_2_2_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1527:1: ( (lv_characters_5_0= RULE_STRING ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1528:1: (lv_characters_5_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1623:1: ( (lv_characters_5_0= RULE_STRING ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1624:1: (lv_characters_5_0= RULE_STRING ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1528:1: (lv_characters_5_0= RULE_STRING ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1529:3: lv_characters_5_0= RULE_STRING + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1624:1: (lv_characters_5_0= RULE_STRING ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1625:3: lv_characters_5_0= RULE_STRING { - lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3275); + lv_characters_5_0=(Token)match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3519); newLeafNode(lv_characters_5_0, grammarAccess.getScannerWhitespaceRuleAccess().getCharactersSTRINGTerminalRuleCall_0_2_2_1_0()); @@ -3611,11 +3862,11 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { break; default : - break loop22; + break loop23; } } while (true); - otherlv_6=(Token)match(input,26,FOLLOW_26_in_ruleScannerWhitespaceRule3294); + otherlv_6=(Token)match(input,27,FOLLOW_27_in_ruleScannerWhitespaceRule3538); newLeafNode(otherlv_6, grammarAccess.getScannerWhitespaceRuleAccess().getRightSquareBracketKeyword_0_2_3()); @@ -3629,24 +3880,24 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1550:6: (otherlv_7= '#{' ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1646:6: (otherlv_7= '#{' ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1550:6: (otherlv_7= '#{' ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1550:8: otherlv_7= '#{' ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1646:6: (otherlv_7= '#{' ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1646:8: otherlv_7= '#{' ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) otherlv_9= '}#' { - otherlv_7=(Token)match(input,36,FOLLOW_36_in_ruleScannerWhitespaceRule3315); + otherlv_7=(Token)match(input,37,FOLLOW_37_in_ruleScannerWhitespaceRule3559); newLeafNode(otherlv_7, grammarAccess.getScannerWhitespaceRuleAccess().getNumberSignLeftCurlyBracketKeyword_1_0()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1554:1: ( (lv_jsMethod_8_0= RULE_ANY_OTHER ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1555:1: (lv_jsMethod_8_0= RULE_ANY_OTHER ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1650:1: ( (lv_jsDetector_8_0= RULE_ANY_OTHER ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1651:1: (lv_jsDetector_8_0= RULE_ANY_OTHER ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1555:1: (lv_jsMethod_8_0= RULE_ANY_OTHER ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1556:3: lv_jsMethod_8_0= RULE_ANY_OTHER + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1651:1: (lv_jsDetector_8_0= RULE_ANY_OTHER ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1652:3: lv_jsDetector_8_0= RULE_ANY_OTHER { - lv_jsMethod_8_0=(Token)match(input,RULE_ANY_OTHER,FOLLOW_RULE_ANY_OTHER_in_ruleScannerWhitespaceRule3332); + lv_jsDetector_8_0=(Token)match(input,RULE_ANY_OTHER,FOLLOW_RULE_ANY_OTHER_in_ruleScannerWhitespaceRule3576); - newLeafNode(lv_jsMethod_8_0, grammarAccess.getScannerWhitespaceRuleAccess().getJsMethodANY_OTHERTerminalRuleCall_1_1_0()); + newLeafNode(lv_jsDetector_8_0, grammarAccess.getScannerWhitespaceRuleAccess().getJsDetectorANY_OTHERTerminalRuleCall_1_1_0()); if (current==null) { @@ -3654,8 +3905,8 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } setWithLastConsumed( current, - "jsMethod", - lv_jsMethod_8_0, + "jsDetector", + lv_jsDetector_8_0, "ANY_OTHER"); @@ -3664,7 +3915,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_9=(Token)match(input,37,FOLLOW_37_in_ruleScannerWhitespaceRule3349); + otherlv_9=(Token)match(input,38,FOLLOW_38_in_ruleScannerWhitespaceRule3593); newLeafNode(otherlv_9, grammarAccess.getScannerWhitespaceRuleAccess().getRightCurlyBracketNumberSignKeyword_1_2()); @@ -3695,7 +3946,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleColor" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1584:1: entryRuleColor returns [EObject current=null] : iv_ruleColor= ruleColor EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1680:1: entryRuleColor returns [EObject current=null] : iv_ruleColor= ruleColor EOF ; public final EObject entryRuleColor() throws RecognitionException { EObject current = null; @@ -3703,17 +3954,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1585:2: (iv_ruleColor= ruleColor EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1586:2: iv_ruleColor= ruleColor EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1681:2: (iv_ruleColor= ruleColor EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1682:2: iv_ruleColor= ruleColor EOF { newCompositeNode(grammarAccess.getColorRule()); - pushFollow(FOLLOW_ruleColor_in_entryRuleColor3386); + pushFollow(FOLLOW_ruleColor_in_entryRuleColor3630); iv_ruleColor=ruleColor(); state._fsp--; current =iv_ruleColor; - match(input,EOF,FOLLOW_EOF_in_entryRuleColor3396); + match(input,EOF,FOLLOW_EOF_in_entryRuleColor3640); } @@ -3731,7 +3982,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleColor" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1593:1: ruleColor returns [EObject current=null] : this_RGBColor_0= ruleRGBColor ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1689:1: ruleColor returns [EObject current=null] : this_RGBColor_0= ruleRGBColor ; public final EObject ruleColor() throws RecognitionException { EObject current = null; @@ -3741,13 +3992,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1596:28: (this_RGBColor_0= ruleRGBColor ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1598:5: this_RGBColor_0= ruleRGBColor + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1692:28: (this_RGBColor_0= ruleRGBColor ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1694:5: this_RGBColor_0= ruleRGBColor { newCompositeNode(grammarAccess.getColorAccess().getRGBColorParserRuleCall()); - pushFollow(FOLLOW_ruleRGBColor_in_ruleColor3442); + pushFollow(FOLLOW_ruleRGBColor_in_ruleColor3686); this_RGBColor_0=ruleRGBColor(); state._fsp--; @@ -3774,7 +4025,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleRGBColor" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1614:1: entryRuleRGBColor returns [EObject current=null] : iv_ruleRGBColor= ruleRGBColor EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1710:1: entryRuleRGBColor returns [EObject current=null] : iv_ruleRGBColor= ruleRGBColor EOF ; public final EObject entryRuleRGBColor() throws RecognitionException { EObject current = null; @@ -3782,17 +4033,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1615:2: (iv_ruleRGBColor= ruleRGBColor EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1616:2: iv_ruleRGBColor= ruleRGBColor EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1711:2: (iv_ruleRGBColor= ruleRGBColor EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1712:2: iv_ruleRGBColor= ruleRGBColor EOF { newCompositeNode(grammarAccess.getRGBColorRule()); - pushFollow(FOLLOW_ruleRGBColor_in_entryRuleRGBColor3476); + pushFollow(FOLLOW_ruleRGBColor_in_entryRuleRGBColor3720); iv_ruleRGBColor=ruleRGBColor(); state._fsp--; current =iv_ruleRGBColor; - match(input,EOF,FOLLOW_EOF_in_entryRuleRGBColor3486); + match(input,EOF,FOLLOW_EOF_in_entryRuleRGBColor3730); } @@ -3810,7 +4061,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleRGBColor" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1623:1: ruleRGBColor returns [EObject current=null] : (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1719:1: ruleRGBColor returns [EObject current=null] : (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) ; public final EObject ruleRGBColor() throws RecognitionException { EObject current = null; @@ -3826,27 +4077,27 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1626:28: ( (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1627:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1722:28: ( (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1723:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1627:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1627:3: otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1723:1: (otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1723:3: otherlv_0= 'rgb' otherlv_1= '(' ( (lv_r_2_0= RULE_INT ) ) otherlv_3= ',' ( (lv_g_4_0= RULE_INT ) ) otherlv_5= ',' ( (lv_b_6_0= RULE_INT ) ) otherlv_7= ')' { - otherlv_0=(Token)match(input,38,FOLLOW_38_in_ruleRGBColor3523); + otherlv_0=(Token)match(input,39,FOLLOW_39_in_ruleRGBColor3767); newLeafNode(otherlv_0, grammarAccess.getRGBColorAccess().getRgbKeyword_0()); - otherlv_1=(Token)match(input,39,FOLLOW_39_in_ruleRGBColor3535); + otherlv_1=(Token)match(input,40,FOLLOW_40_in_ruleRGBColor3779); newLeafNode(otherlv_1, grammarAccess.getRGBColorAccess().getLeftParenthesisKeyword_1()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1635:1: ( (lv_r_2_0= RULE_INT ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1636:1: (lv_r_2_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1731:1: ( (lv_r_2_0= RULE_INT ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1732:1: (lv_r_2_0= RULE_INT ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1636:1: (lv_r_2_0= RULE_INT ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1637:3: lv_r_2_0= RULE_INT + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1732:1: (lv_r_2_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1733:3: lv_r_2_0= RULE_INT { - lv_r_2_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3552); + lv_r_2_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3796); newLeafNode(lv_r_2_0, grammarAccess.getRGBColorAccess().getRINTTerminalRuleCall_2_0()); @@ -3866,17 +4117,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_3=(Token)match(input,25,FOLLOW_25_in_ruleRGBColor3569); + otherlv_3=(Token)match(input,26,FOLLOW_26_in_ruleRGBColor3813); newLeafNode(otherlv_3, grammarAccess.getRGBColorAccess().getCommaKeyword_3()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1657:1: ( (lv_g_4_0= RULE_INT ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1658:1: (lv_g_4_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1753:1: ( (lv_g_4_0= RULE_INT ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1754:1: (lv_g_4_0= RULE_INT ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1658:1: (lv_g_4_0= RULE_INT ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1659:3: lv_g_4_0= RULE_INT + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1754:1: (lv_g_4_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1755:3: lv_g_4_0= RULE_INT { - lv_g_4_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3586); + lv_g_4_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3830); newLeafNode(lv_g_4_0, grammarAccess.getRGBColorAccess().getGINTTerminalRuleCall_4_0()); @@ -3896,17 +4147,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_5=(Token)match(input,25,FOLLOW_25_in_ruleRGBColor3603); + otherlv_5=(Token)match(input,26,FOLLOW_26_in_ruleRGBColor3847); newLeafNode(otherlv_5, grammarAccess.getRGBColorAccess().getCommaKeyword_5()); - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1679:1: ( (lv_b_6_0= RULE_INT ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1680:1: (lv_b_6_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1775:1: ( (lv_b_6_0= RULE_INT ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1776:1: (lv_b_6_0= RULE_INT ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1680:1: (lv_b_6_0= RULE_INT ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1681:3: lv_b_6_0= RULE_INT + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1776:1: (lv_b_6_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1777:3: lv_b_6_0= RULE_INT { - lv_b_6_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3620); + lv_b_6_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleRGBColor3864); newLeafNode(lv_b_6_0, grammarAccess.getRGBColorAccess().getBINTTerminalRuleCall_6_0()); @@ -3926,7 +4177,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - otherlv_7=(Token)match(input,40,FOLLOW_40_in_ruleRGBColor3637); + otherlv_7=(Token)match(input,41,FOLLOW_41_in_ruleRGBColor3881); newLeafNode(otherlv_7, grammarAccess.getRGBColorAccess().getRightParenthesisKeyword_7()); @@ -3951,7 +4202,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "entryRuleFont" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1709:1: entryRuleFont returns [EObject current=null] : iv_ruleFont= ruleFont EOF ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1805:1: entryRuleFont returns [EObject current=null] : iv_ruleFont= ruleFont EOF ; public final EObject entryRuleFont() throws RecognitionException { EObject current = null; @@ -3959,17 +4210,17 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1710:2: (iv_ruleFont= ruleFont EOF ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1711:2: iv_ruleFont= ruleFont EOF + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1806:2: (iv_ruleFont= ruleFont EOF ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1807:2: iv_ruleFont= ruleFont EOF { newCompositeNode(grammarAccess.getFontRule()); - pushFollow(FOLLOW_ruleFont_in_entryRuleFont3673); + pushFollow(FOLLOW_ruleFont_in_entryRuleFont3917); iv_ruleFont=ruleFont(); state._fsp--; current =iv_ruleFont; - match(input,EOF,FOLLOW_EOF_in_entryRuleFont3683); + match(input,EOF,FOLLOW_EOF_in_entryRuleFont3927); } @@ -3987,7 +4238,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleFont" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1718:1: ruleFont returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1814:1: ruleFont returns [EObject current=null] : ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) ; public final EObject ruleFont() throws RecognitionException { EObject current = null; @@ -3999,19 +4250,19 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1721:28: ( ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1722:1: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1817:28: ( ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:1: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1722:1: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1722:2: ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:1: ( ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:2: ( (lv_name_0_0= RULE_ID ) ) ( (lv_size_1_0= RULE_INT ) ) ( (lv_attributes_2_0= ruleFontType ) )* { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1722:2: ( (lv_name_0_0= RULE_ID ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1723:1: (lv_name_0_0= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1818:2: ( (lv_name_0_0= RULE_ID ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1819:1: (lv_name_0_0= RULE_ID ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1723:1: (lv_name_0_0= RULE_ID ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1724:3: lv_name_0_0= RULE_ID + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1819:1: (lv_name_0_0= RULE_ID ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1820:3: lv_name_0_0= RULE_ID { - lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFont3725); + lv_name_0_0=(Token)match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFont3969); newLeafNode(lv_name_0_0, grammarAccess.getFontAccess().getNameIDTerminalRuleCall_0_0()); @@ -4031,13 +4282,13 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1740:2: ( (lv_size_1_0= RULE_INT ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1741:1: (lv_size_1_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1836:2: ( (lv_size_1_0= RULE_INT ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1837:1: (lv_size_1_0= RULE_INT ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1741:1: (lv_size_1_0= RULE_INT ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1742:3: lv_size_1_0= RULE_INT + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1837:1: (lv_size_1_0= RULE_INT ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1838:3: lv_size_1_0= RULE_INT { - lv_size_1_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleFont3747); + lv_size_1_0=(Token)match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleFont3991); newLeafNode(lv_size_1_0, grammarAccess.getFontAccess().getSizeINTTerminalRuleCall_1_0()); @@ -4057,28 +4308,28 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1758:2: ( (lv_attributes_2_0= ruleFontType ) )* - loop24: + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1854:2: ( (lv_attributes_2_0= ruleFontType ) )* + loop25: do { - int alt24=2; - int LA24_0 = input.LA(1); + int alt25=2; + int LA25_0 = input.LA(1); - if ( ((LA24_0>=41 && LA24_0<=44)) ) { - alt24=1; + if ( ((LA25_0>=42 && LA25_0<=45)) ) { + alt25=1; } - switch (alt24) { + switch (alt25) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1759:1: (lv_attributes_2_0= ruleFontType ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1855:1: (lv_attributes_2_0= ruleFontType ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1759:1: (lv_attributes_2_0= ruleFontType ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1760:3: lv_attributes_2_0= ruleFontType + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1855:1: (lv_attributes_2_0= ruleFontType ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1856:3: lv_attributes_2_0= ruleFontType { newCompositeNode(grammarAccess.getFontAccess().getAttributesFontTypeEnumRuleCall_2_0()); - pushFollow(FOLLOW_ruleFontType_in_ruleFont3773); + pushFollow(FOLLOW_ruleFontType_in_ruleFont4017); lv_attributes_2_0=ruleFontType(); state._fsp--; @@ -4102,7 +4353,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { break; default : - break loop24; + break loop25; } } while (true); @@ -4127,7 +4378,7 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { // $ANTLR start "ruleFontType" - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1784:1: ruleFontType returns [Enumerator current=null] : ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) ; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1880:1: ruleFontType returns [Enumerator current=null] : ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) ; public final Enumerator ruleFontType() throws RecognitionException { Enumerator current = null; @@ -4138,47 +4389,47 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { enterRule(); try { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1786:28: ( ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1787:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1882:28: ( ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1787:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) - int alt25=4; + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:1: ( (enumLiteral_0= 'bold' ) | (enumLiteral_1= 'italic' ) | (enumLiteral_2= 'underline' ) | (enumLiteral_3= 'strike-through' ) ) + int alt26=4; switch ( input.LA(1) ) { - case 41: - { - alt25=1; - } - break; case 42: { - alt25=2; + alt26=1; } break; case 43: { - alt25=3; + alt26=2; } break; case 44: { - alt25=4; + alt26=3; + } + break; + case 45: + { + alt26=4; } break; default: NoViableAltException nvae = - new NoViableAltException("", 25, 0, input); + new NoViableAltException("", 26, 0, input); throw nvae; } - switch (alt25) { + switch (alt26) { case 1 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1787:2: (enumLiteral_0= 'bold' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:2: (enumLiteral_0= 'bold' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1787:2: (enumLiteral_0= 'bold' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1787:4: enumLiteral_0= 'bold' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:2: (enumLiteral_0= 'bold' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1883:4: enumLiteral_0= 'bold' { - enumLiteral_0=(Token)match(input,41,FOLLOW_41_in_ruleFontType3824); + enumLiteral_0=(Token)match(input,42,FOLLOW_42_in_ruleFontType4068); current = grammarAccess.getFontTypeAccess().getBoldEnumLiteralDeclaration_0().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_0, grammarAccess.getFontTypeAccess().getBoldEnumLiteralDeclaration_0()); @@ -4190,12 +4441,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 2 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1793:6: (enumLiteral_1= 'italic' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:6: (enumLiteral_1= 'italic' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1793:6: (enumLiteral_1= 'italic' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1793:8: enumLiteral_1= 'italic' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:6: (enumLiteral_1= 'italic' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1889:8: enumLiteral_1= 'italic' { - enumLiteral_1=(Token)match(input,42,FOLLOW_42_in_ruleFontType3841); + enumLiteral_1=(Token)match(input,43,FOLLOW_43_in_ruleFontType4085); current = grammarAccess.getFontTypeAccess().getItalicEnumLiteralDeclaration_1().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_1, grammarAccess.getFontTypeAccess().getItalicEnumLiteralDeclaration_1()); @@ -4207,12 +4458,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 3 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1799:6: (enumLiteral_2= 'underline' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1895:6: (enumLiteral_2= 'underline' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1799:6: (enumLiteral_2= 'underline' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1799:8: enumLiteral_2= 'underline' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1895:6: (enumLiteral_2= 'underline' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1895:8: enumLiteral_2= 'underline' { - enumLiteral_2=(Token)match(input,43,FOLLOW_43_in_ruleFontType3858); + enumLiteral_2=(Token)match(input,44,FOLLOW_44_in_ruleFontType4102); current = grammarAccess.getFontTypeAccess().getUnderlineEnumLiteralDeclaration_2().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_2, grammarAccess.getFontTypeAccess().getUnderlineEnumLiteralDeclaration_2()); @@ -4224,12 +4475,12 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { } break; case 4 : - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1805:6: (enumLiteral_3= 'strike-through' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1901:6: (enumLiteral_3= 'strike-through' ) { - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1805:6: (enumLiteral_3= 'strike-through' ) - // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1805:8: enumLiteral_3= 'strike-through' + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1901:6: (enumLiteral_3= 'strike-through' ) + // ../org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/parser/antlr/internal/InternalHSL.g:1901:8: enumLiteral_3= 'strike-through' { - enumLiteral_3=(Token)match(input,44,FOLLOW_44_in_ruleFontType3875); + enumLiteral_3=(Token)match(input,45,FOLLOW_45_in_ruleFontType4119); current = grammarAccess.getFontTypeAccess().getStrike_throughEnumLiteralDeclaration_3().getEnumLiteral().getInstance(); newLeafNode(enumLiteral_3, grammarAccess.getFontTypeAccess().getStrike_throughEnumLiteralDeclaration_3()); @@ -4268,8 +4519,8 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_EOF_in_entryRuleModel85 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_RULE_ID_in_ruleModel127 = new BitSet(new long[]{0x0000000000000800L}); public static final BitSet FOLLOW_11_in_ruleModel144 = new BitSet(new long[]{0x0000000000002000L}); - public static final BitSet FOLLOW_rulePartition_in_ruleModel165 = new BitSet(new long[]{0x0000000000012000L}); - public static final BitSet FOLLOW_ruleScanner_in_ruleModel187 = new BitSet(new long[]{0x000000000001C000L}); + public static final BitSet FOLLOW_rulePartition_in_ruleModel165 = new BitSet(new long[]{0x0000000000032000L}); + public static final BitSet FOLLOW_ruleDamager_in_ruleModel187 = new BitSet(new long[]{0x000000000003C000L}); public static final BitSet FOLLOW_rulePartitioner_in_ruleModel209 = new BitSet(new long[]{0x0000000000001000L}); public static final BitSet FOLLOW_12_in_ruleModel221 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_rulePartition_in_entryRulePartition257 = new BitSet(new long[]{0x0000000000000000L}); @@ -4283,156 +4534,165 @@ public class InternalHSLParser extends AbstractInternalAntlrParser { public static final BitSet FOLLOW_ruleRulePartitioner_in_entryRuleRulePartitioner481 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleRulePartitioner491 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_14_in_ruleRulePartitioner528 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_11_in_ruleRulePartitioner540 = new BitSet(new long[]{0x0000000510000000L}); - public static final BitSet FOLLOW_ruleParitionRule_in_ruleRulePartitioner561 = new BitSet(new long[]{0x0000000510001000L}); + public static final BitSet FOLLOW_11_in_ruleRulePartitioner540 = new BitSet(new long[]{0x0000000A20000000L}); + public static final BitSet FOLLOW_ruleParitionRule_in_ruleRulePartitioner561 = new BitSet(new long[]{0x0000000A20001000L}); public static final BitSet FOLLOW_12_in_ruleRulePartitioner574 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_ruleJSParitioner_in_entryRuleJSParitioner610 = new BitSet(new long[]{0x0000000000000000L}); public static final BitSet FOLLOW_EOF_in_entryRuleJSParitioner620 = new BitSet(new long[]{0x0000000000000002L}); public static final BitSet FOLLOW_15_in_ruleJSParitioner657 = new BitSet(new long[]{0x0000000000000020L}); public static final BitSet FOLLOW_RULE_STRING_in_ruleJSParitioner674 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScanner_in_entryRuleScanner715 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScanner725 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_16_in_ruleScanner762 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleScanner782 = new BitSet(new long[]{0x0000000000000800L}); - public static final BitSet FOLLOW_11_in_ruleScanner794 = new BitSet(new long[]{0x0000001F10860000L}); - public static final BitSet FOLLOW_ruleScannerToken_in_ruleScanner815 = new BitSet(new long[]{0x0000001F10860000L}); - public static final BitSet FOLLOW_ruleKeywordGroup_in_ruleScanner837 = new BitSet(new long[]{0x0000001F10860000L}); - public static final BitSet FOLLOW_ruleScannerRule_in_ruleScanner859 = new BitSet(new long[]{0x0000001F10861000L}); - public static final BitSet FOLLOW_12_in_ruleScanner872 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerToken_in_entryRuleScannerToken908 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScannerToken918 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_17_in_ruleScannerToken961 = new BitSet(new long[]{0x0000000000040000L}); - public static final BitSet FOLLOW_18_in_ruleScannerToken987 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleScannerToken1004 = new BitSet(new long[]{0x0000000000000802L}); - public static final BitSet FOLLOW_11_in_ruleScannerToken1022 = new BitSet(new long[]{0x0000000000681000L}); - public static final BitSet FOLLOW_19_in_ruleScannerToken1035 = new BitSet(new long[]{0x0000000000100000L}); - public static final BitSet FOLLOW_20_in_ruleScannerToken1047 = new BitSet(new long[]{0x0000004000000000L}); - public static final BitSet FOLLOW_ruleColor_in_ruleScannerToken1068 = new BitSet(new long[]{0x0000000000601000L}); - public static final BitSet FOLLOW_21_in_ruleScannerToken1083 = new BitSet(new long[]{0x0000000000100000L}); - public static final BitSet FOLLOW_20_in_ruleScannerToken1095 = new BitSet(new long[]{0x0000004000000000L}); - public static final BitSet FOLLOW_ruleColor_in_ruleScannerToken1116 = new BitSet(new long[]{0x0000000000401000L}); - public static final BitSet FOLLOW_22_in_ruleScannerToken1131 = new BitSet(new long[]{0x0000000000100000L}); - public static final BitSet FOLLOW_20_in_ruleScannerToken1143 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_ruleFont_in_ruleScannerToken1164 = new BitSet(new long[]{0x0000000000001000L}); - public static final BitSet FOLLOW_12_in_ruleScannerToken1178 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1216 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleKeywordGroup1226 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_23_in_ruleKeywordGroup1263 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleKeywordGroup1283 = new BitSet(new long[]{0x0000000001000000L}); - public static final BitSet FOLLOW_24_in_ruleKeywordGroup1295 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1316 = new BitSet(new long[]{0x0000000006000000L}); - public static final BitSet FOLLOW_25_in_ruleKeywordGroup1329 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1350 = new BitSet(new long[]{0x0000000006000000L}); - public static final BitSet FOLLOW_26_in_ruleKeywordGroup1364 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword1400 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleKeyword1410 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword1452 = new BitSet(new long[]{0x0000000008000002L}); - public static final BitSet FOLLOW_27_in_ruleKeyword1470 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword1487 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerRule_in_entryRuleScannerRule1530 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScannerRule1540 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule1587 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule1614 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule1641 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerJSRule_in_ruleScannerRule1668 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule1695 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleParitionRule_in_entryRuleParitionRule1730 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleParitionRule1740 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule1787 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule1814 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePartitionJSRule_in_ruleParitionRule1841 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule1876 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScannerSingleLineRule1886 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_28_in_ruleScannerSingleLineRule1923 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleScannerSingleLineRule1943 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule1960 = new BitSet(new long[]{0x0000000020000000L}); - public static final BitSet FOLLOW_29_in_ruleScannerSingleLineRule1977 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule1994 = new BitSet(new long[]{0x0000000040000002L}); - public static final BitSet FOLLOW_30_in_ruleScannerSingleLineRule2012 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_ruleScannerSingleLineRule2024 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2041 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2084 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRulePartitionSingleLineRule2094 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_28_in_rulePartitionSingleLineRule2131 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2151 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2168 = new BitSet(new long[]{0x0000000020000000L}); - public static final BitSet FOLLOW_29_in_rulePartitionSingleLineRule2185 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2202 = new BitSet(new long[]{0x0000000040000002L}); - public static final BitSet FOLLOW_30_in_rulePartitionSingleLineRule2220 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_rulePartitionSingleLineRule2232 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2249 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2292 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScannerMultiLineRule2302 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_ruleScannerMultiLineRule2339 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2359 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2376 = new BitSet(new long[]{0x0000000020000000L}); - public static final BitSet FOLLOW_29_in_ruleScannerMultiLineRule2393 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2410 = new BitSet(new long[]{0x0000000040000002L}); - public static final BitSet FOLLOW_30_in_ruleScannerMultiLineRule2428 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_ruleScannerMultiLineRule2440 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2457 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule2500 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRulePartitionMultiLineRule2510 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_32_in_rulePartitionMultiLineRule2547 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_rulePartitionMultiLineRule2567 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2584 = new BitSet(new long[]{0x0000000020000000L}); - public static final BitSet FOLLOW_29_in_rulePartitionMultiLineRule2601 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2618 = new BitSet(new long[]{0x0000000040000002L}); - public static final BitSet FOLLOW_30_in_rulePartitionMultiLineRule2636 = new BitSet(new long[]{0x0000000080000000L}); - public static final BitSet FOLLOW_31_in_rulePartitionMultiLineRule2648 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2665 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule2708 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScannerCharacterRule2718 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_33_in_ruleScannerCharacterRule2755 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleScannerCharacterRule2775 = new BitSet(new long[]{0x0000000001000000L}); - public static final BitSet FOLLOW_24_in_ruleScannerCharacterRule2787 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule2804 = new BitSet(new long[]{0x0000000002000000L}); - public static final BitSet FOLLOW_25_in_ruleScannerCharacterRule2821 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule2838 = new BitSet(new long[]{0x0000000004000000L}); - public static final BitSet FOLLOW_26_in_ruleScannerCharacterRule2855 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule2891 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScannerJSRule2901 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_34_in_ruleScannerJSRule2938 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleScannerJSRule2958 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerJSRule2975 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3016 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRulePartitionJSRule3026 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_34_in_rulePartitionJSRule3063 = new BitSet(new long[]{0x0000000000000010L}); - public static final BitSet FOLLOW_RULE_ID_in_rulePartitionJSRule3083 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionJSRule3100 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3141 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3151 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_35_in_ruleScannerWhitespaceRule3189 = new BitSet(new long[]{0x0000000001000010L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3209 = new BitSet(new long[]{0x0000000001000000L}); - public static final BitSet FOLLOW_24_in_ruleScannerWhitespaceRule3223 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3240 = new BitSet(new long[]{0x0000000006000000L}); - public static final BitSet FOLLOW_25_in_ruleScannerWhitespaceRule3258 = new BitSet(new long[]{0x0000000000000020L}); - public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3275 = new BitSet(new long[]{0x0000000006000000L}); - public static final BitSet FOLLOW_26_in_ruleScannerWhitespaceRule3294 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_36_in_ruleScannerWhitespaceRule3315 = new BitSet(new long[]{0x0000000000000040L}); - public static final BitSet FOLLOW_RULE_ANY_OTHER_in_ruleScannerWhitespaceRule3332 = new BitSet(new long[]{0x0000002000000000L}); - public static final BitSet FOLLOW_37_in_ruleScannerWhitespaceRule3349 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleColor_in_entryRuleColor3386 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleColor3396 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleRGBColor_in_ruleColor3442 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleRGBColor_in_entryRuleRGBColor3476 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleRGBColor3486 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_38_in_ruleRGBColor3523 = new BitSet(new long[]{0x0000008000000000L}); - public static final BitSet FOLLOW_39_in_ruleRGBColor3535 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3552 = new BitSet(new long[]{0x0000000002000000L}); - public static final BitSet FOLLOW_25_in_ruleRGBColor3569 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3586 = new BitSet(new long[]{0x0000000002000000L}); - public static final BitSet FOLLOW_25_in_ruleRGBColor3603 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3620 = new BitSet(new long[]{0x0000010000000000L}); - public static final BitSet FOLLOW_40_in_ruleRGBColor3637 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_ruleFont_in_entryRuleFont3673 = new BitSet(new long[]{0x0000000000000000L}); - public static final BitSet FOLLOW_EOF_in_entryRuleFont3683 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_RULE_ID_in_ruleFont3725 = new BitSet(new long[]{0x0000000000000080L}); - public static final BitSet FOLLOW_RULE_INT_in_ruleFont3747 = new BitSet(new long[]{0x00001E0000000002L}); - public static final BitSet FOLLOW_ruleFontType_in_ruleFont3773 = new BitSet(new long[]{0x00001E0000000002L}); - public static final BitSet FOLLOW_41_in_ruleFontType3824 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_42_in_ruleFontType3841 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_43_in_ruleFontType3858 = new BitSet(new long[]{0x0000000000000002L}); - public static final BitSet FOLLOW_44_in_ruleFontType3875 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleDamager_in_entryRuleDamager715 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleDamager725 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleRuleDamager_in_ruleDamager772 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleJSDamager_in_ruleDamager799 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleJSDamager_in_entryRuleJSDamager834 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleJSDamager844 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_16_in_ruleJSDamager881 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleJSDamager901 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleJSDamager918 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleRuleDamager_in_entryRuleRuleDamager959 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleRuleDamager969 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_17_in_ruleRuleDamager1006 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleRuleDamager1026 = new BitSet(new long[]{0x0000000000000800L}); + public static final BitSet FOLLOW_11_in_ruleRuleDamager1038 = new BitSet(new long[]{0x0000003E210C0000L}); + public static final BitSet FOLLOW_ruleScannerToken_in_ruleRuleDamager1059 = new BitSet(new long[]{0x0000003E210C0000L}); + public static final BitSet FOLLOW_ruleKeywordGroup_in_ruleRuleDamager1081 = new BitSet(new long[]{0x0000003E210C0000L}); + public static final BitSet FOLLOW_ruleScannerRule_in_ruleRuleDamager1103 = new BitSet(new long[]{0x0000003E210C1000L}); + public static final BitSet FOLLOW_12_in_ruleRuleDamager1116 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerToken_in_entryRuleScannerToken1152 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleScannerToken1162 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_18_in_ruleScannerToken1205 = new BitSet(new long[]{0x0000000000080000L}); + public static final BitSet FOLLOW_19_in_ruleScannerToken1231 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleScannerToken1248 = new BitSet(new long[]{0x0000000000000802L}); + public static final BitSet FOLLOW_11_in_ruleScannerToken1266 = new BitSet(new long[]{0x0000000000D01000L}); + public static final BitSet FOLLOW_20_in_ruleScannerToken1279 = new BitSet(new long[]{0x0000000000200000L}); + public static final BitSet FOLLOW_21_in_ruleScannerToken1291 = new BitSet(new long[]{0x0000008000000000L}); + public static final BitSet FOLLOW_ruleColor_in_ruleScannerToken1312 = new BitSet(new long[]{0x0000000000C01000L}); + public static final BitSet FOLLOW_22_in_ruleScannerToken1327 = new BitSet(new long[]{0x0000000000200000L}); + public static final BitSet FOLLOW_21_in_ruleScannerToken1339 = new BitSet(new long[]{0x0000008000000000L}); + public static final BitSet FOLLOW_ruleColor_in_ruleScannerToken1360 = new BitSet(new long[]{0x0000000000801000L}); + public static final BitSet FOLLOW_23_in_ruleScannerToken1375 = new BitSet(new long[]{0x0000000000200000L}); + public static final BitSet FOLLOW_21_in_ruleScannerToken1387 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_ruleFont_in_ruleScannerToken1408 = new BitSet(new long[]{0x0000000000001000L}); + public static final BitSet FOLLOW_12_in_ruleScannerToken1422 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleKeywordGroup_in_entryRuleKeywordGroup1460 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleKeywordGroup1470 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_24_in_ruleKeywordGroup1507 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleKeywordGroup1527 = new BitSet(new long[]{0x0000000002000000L}); + public static final BitSet FOLLOW_25_in_ruleKeywordGroup1539 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1560 = new BitSet(new long[]{0x000000000C000000L}); + public static final BitSet FOLLOW_26_in_ruleKeywordGroup1573 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_ruleKeyword_in_ruleKeywordGroup1594 = new BitSet(new long[]{0x000000000C000000L}); + public static final BitSet FOLLOW_27_in_ruleKeywordGroup1608 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleKeyword_in_entryRuleKeyword1644 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleKeyword1654 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword1696 = new BitSet(new long[]{0x0000000010000002L}); + public static final BitSet FOLLOW_28_in_ruleKeyword1714 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleKeyword1731 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerRule_in_entryRuleScannerRule1774 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleScannerRule1784 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_ruleScannerRule1831 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_ruleScannerRule1858 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerCharacterRule_in_ruleScannerRule1885 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerJSRule_in_ruleScannerRule1912 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_ruleScannerRule1939 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleParitionRule_in_entryRuleParitionRule1974 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleParitionRule1984 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_ruleParitionRule2031 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_ruleParitionRule2058 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePartitionJSRule_in_ruleParitionRule2085 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerSingleLineRule_in_entryRuleScannerSingleLineRule2120 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleScannerSingleLineRule2130 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_29_in_ruleScannerSingleLineRule2167 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleScannerSingleLineRule2187 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2204 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_30_in_ruleScannerSingleLineRule2221 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2238 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_31_in_ruleScannerSingleLineRule2256 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_ruleScannerSingleLineRule2268 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerSingleLineRule2285 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePartitionSingleLineRule_in_entryRulePartitionSingleLineRule2328 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRulePartitionSingleLineRule2338 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_29_in_rulePartitionSingleLineRule2375 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_rulePartitionSingleLineRule2395 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2412 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_30_in_rulePartitionSingleLineRule2429 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2446 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_31_in_rulePartitionSingleLineRule2464 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_rulePartitionSingleLineRule2476 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionSingleLineRule2493 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerMultiLineRule_in_entryRuleScannerMultiLineRule2536 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleScannerMultiLineRule2546 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_33_in_ruleScannerMultiLineRule2583 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleScannerMultiLineRule2603 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2620 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_30_in_ruleScannerMultiLineRule2637 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2654 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_31_in_ruleScannerMultiLineRule2672 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_ruleScannerMultiLineRule2684 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerMultiLineRule2701 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePartitionMultiLineRule_in_entryRulePartitionMultiLineRule2744 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRulePartitionMultiLineRule2754 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_33_in_rulePartitionMultiLineRule2791 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_rulePartitionMultiLineRule2811 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2828 = new BitSet(new long[]{0x0000000040000000L}); + public static final BitSet FOLLOW_30_in_rulePartitionMultiLineRule2845 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2862 = new BitSet(new long[]{0x0000000080000002L}); + public static final BitSet FOLLOW_31_in_rulePartitionMultiLineRule2880 = new BitSet(new long[]{0x0000000100000000L}); + public static final BitSet FOLLOW_32_in_rulePartitionMultiLineRule2892 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionMultiLineRule2909 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerCharacterRule_in_entryRuleScannerCharacterRule2952 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleScannerCharacterRule2962 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_34_in_ruleScannerCharacterRule2999 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleScannerCharacterRule3019 = new BitSet(new long[]{0x0000000002000000L}); + public static final BitSet FOLLOW_25_in_ruleScannerCharacterRule3031 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3048 = new BitSet(new long[]{0x0000000004000000L}); + public static final BitSet FOLLOW_26_in_ruleScannerCharacterRule3065 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerCharacterRule3082 = new BitSet(new long[]{0x0000000008000000L}); + public static final BitSet FOLLOW_27_in_ruleScannerCharacterRule3099 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerJSRule_in_entryRuleScannerJSRule3135 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleScannerJSRule3145 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_35_in_ruleScannerJSRule3182 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleScannerJSRule3202 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerJSRule3219 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_rulePartitionJSRule_in_entryRulePartitionJSRule3260 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRulePartitionJSRule3270 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_35_in_rulePartitionJSRule3307 = new BitSet(new long[]{0x0000000000000010L}); + public static final BitSet FOLLOW_RULE_ID_in_rulePartitionJSRule3327 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_rulePartitionJSRule3344 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleScannerWhitespaceRule_in_entryRuleScannerWhitespaceRule3385 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleScannerWhitespaceRule3395 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_36_in_ruleScannerWhitespaceRule3433 = new BitSet(new long[]{0x0000000002000010L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleScannerWhitespaceRule3453 = new BitSet(new long[]{0x0000000002000000L}); + public static final BitSet FOLLOW_25_in_ruleScannerWhitespaceRule3467 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3484 = new BitSet(new long[]{0x000000000C000000L}); + public static final BitSet FOLLOW_26_in_ruleScannerWhitespaceRule3502 = new BitSet(new long[]{0x0000000000000020L}); + public static final BitSet FOLLOW_RULE_STRING_in_ruleScannerWhitespaceRule3519 = new BitSet(new long[]{0x000000000C000000L}); + public static final BitSet FOLLOW_27_in_ruleScannerWhitespaceRule3538 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_37_in_ruleScannerWhitespaceRule3559 = new BitSet(new long[]{0x0000000000000040L}); + public static final BitSet FOLLOW_RULE_ANY_OTHER_in_ruleScannerWhitespaceRule3576 = new BitSet(new long[]{0x0000004000000000L}); + public static final BitSet FOLLOW_38_in_ruleScannerWhitespaceRule3593 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleColor_in_entryRuleColor3630 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleColor3640 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleRGBColor_in_ruleColor3686 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleRGBColor_in_entryRuleRGBColor3720 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleRGBColor3730 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_39_in_ruleRGBColor3767 = new BitSet(new long[]{0x0000010000000000L}); + public static final BitSet FOLLOW_40_in_ruleRGBColor3779 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3796 = new BitSet(new long[]{0x0000000004000000L}); + public static final BitSet FOLLOW_26_in_ruleRGBColor3813 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3830 = new BitSet(new long[]{0x0000000004000000L}); + public static final BitSet FOLLOW_26_in_ruleRGBColor3847 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleRGBColor3864 = new BitSet(new long[]{0x0000020000000000L}); + public static final BitSet FOLLOW_41_in_ruleRGBColor3881 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_ruleFont_in_entryRuleFont3917 = new BitSet(new long[]{0x0000000000000000L}); + public static final BitSet FOLLOW_EOF_in_entryRuleFont3927 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_RULE_ID_in_ruleFont3969 = new BitSet(new long[]{0x0000000000000080L}); + public static final BitSet FOLLOW_RULE_INT_in_ruleFont3991 = new BitSet(new long[]{0x00003C0000000002L}); + public static final BitSet FOLLOW_ruleFontType_in_ruleFont4017 = new BitSet(new long[]{0x00003C0000000002L}); + public static final BitSet FOLLOW_42_in_ruleFontType4068 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_43_in_ruleFontType4085 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_44_in_ruleFontType4102 = new BitSet(new long[]{0x0000000000000002L}); + public static final BitSet FOLLOW_45_in_ruleFontType4119 = new BitSet(new long[]{0x0000000000000002L}); }
\ No newline at end of file diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java index 6f70eea66..362b0af08 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/serializer/HSLSemanticSequencer.java @@ -5,6 +5,7 @@ import com.google.inject.Provider; import org.eclipse.emf.ecore.EObject; import org.eclipse.fx.code.compensator.hsl.hSL.Font; import org.eclipse.fx.code.compensator.hsl.hSL.HSLPackage; +import org.eclipse.fx.code.compensator.hsl.hSL.JSDamager; import org.eclipse.fx.code.compensator.hsl.hSL.JSParitioner; import org.eclipse.fx.code.compensator.hsl.hSL.Keyword; import org.eclipse.fx.code.compensator.hsl.hSL.KeywordGroup; @@ -14,8 +15,8 @@ import org.eclipse.fx.code.compensator.hsl.hSL.PartitionJSRule; import org.eclipse.fx.code.compensator.hsl.hSL.PartitionMultiLineRule; import org.eclipse.fx.code.compensator.hsl.hSL.PartitionSingleLineRule; import org.eclipse.fx.code.compensator.hsl.hSL.RGBColor; +import org.eclipse.fx.code.compensator.hsl.hSL.RuleDamager; import org.eclipse.fx.code.compensator.hsl.hSL.RulePartitioner; -import org.eclipse.fx.code.compensator.hsl.hSL.Scanner; import org.eclipse.fx.code.compensator.hsl.hSL.ScannerCharacterRule; import org.eclipse.fx.code.compensator.hsl.hSL.ScannerJSRule; import org.eclipse.fx.code.compensator.hsl.hSL.ScannerMultiLineRule; @@ -48,6 +49,13 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { return; } else break; + case HSLPackage.JS_DAMAGER: + if(context == grammarAccess.getDamagerRule() || + context == grammarAccess.getJSDamagerRule()) { + sequence_JSDamager(context, (JSDamager) semanticObject); + return; + } + else break; case HSLPackage.JS_PARITIONER: if(context == grammarAccess.getJSParitionerRule() || context == grammarAccess.getPartitionerRule()) { @@ -107,6 +115,13 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { return; } else break; + case HSLPackage.RULE_DAMAGER: + if(context == grammarAccess.getDamagerRule() || + context == grammarAccess.getRuleDamagerRule()) { + sequence_RuleDamager(context, (RuleDamager) semanticObject); + return; + } + else break; case HSLPackage.RULE_PARTITIONER: if(context == grammarAccess.getPartitionerRule() || context == grammarAccess.getRulePartitionerRule()) { @@ -114,12 +129,6 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { return; } else break; - case HSLPackage.SCANNER: - if(context == grammarAccess.getScannerRule()) { - sequence_Scanner(context, (Scanner) semanticObject); - return; - } - else break; case HSLPackage.SCANNER_CHARACTER_RULE: if(context == grammarAccess.getScannerCharacterRuleRule() || context == grammarAccess.getScannerRuleRule()) { @@ -176,6 +185,25 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { /** * Constraint: + * (partition=[Partition|ID] fileURI=STRING) + */ + protected void sequence_JSDamager(EObject context, JSDamager semanticObject) { + if(errorAcceptor != null) { + if(transientValues.isValueTransient(semanticObject, HSLPackage.Literals.DAMAGER__PARTITION) == ValueTransient.YES) + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, HSLPackage.Literals.DAMAGER__PARTITION)); + if(transientValues.isValueTransient(semanticObject, HSLPackage.Literals.JS_DAMAGER__FILE_URI) == ValueTransient.YES) + errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, HSLPackage.Literals.JS_DAMAGER__FILE_URI)); + } + INodesForEObjectProvider nodes = createNodeProvider(semanticObject); + SequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes); + feeder.accept(grammarAccess.getJSDamagerAccess().getPartitionPartitionIDTerminalRuleCall_1_0_1(), semanticObject.getPartition()); + feeder.accept(grammarAccess.getJSDamagerAccess().getFileURISTRINGTerminalRuleCall_2_0(), semanticObject.getFileURI()); + feeder.finish(); + } + + + /** + * Constraint: * fileURI=STRING */ protected void sequence_JSParitioner(EObject context, JSParitioner semanticObject) { @@ -210,7 +238,7 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { /** * Constraint: - * (name=ID partitions+=Partition+ scanner+=Scanner+ partitioner=Partitioner) + * (name=ID partitions+=Partition+ damagers+=Damager+ partitioner=Partitioner) */ protected void sequence_Model(EObject context, Model semanticObject) { genericSequencer.createSequence(context, semanticObject); @@ -238,7 +266,7 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { /** * Constraint: - * (token=[Partition|ID] startSeq=STRING endSeq=STRING escapeSeq=STRING?) + * (parition=[Partition|ID] startSeq=STRING endSeq=STRING escapeSeq=STRING?) */ protected void sequence_PartitionMultiLineRule(EObject context, PartitionMultiLineRule semanticObject) { genericSequencer.createSequence(context, semanticObject); @@ -294,6 +322,15 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { /** * Constraint: + * (partition=[Partition|ID] tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+) + */ + protected void sequence_RuleDamager(EObject context, RuleDamager semanticObject) { + genericSequencer.createSequence(context, semanticObject); + } + + + /** + * Constraint: * rules+=ParitionRule+ */ protected void sequence_RulePartitioner(EObject context, RulePartitioner semanticObject) { @@ -358,18 +395,9 @@ public class HSLSemanticSequencer extends AbstractDelegatingSemanticSequencer { /** * Constraint: - * ((token=[ScannerToken|ID]? characters+=STRING characters+=STRING*) | jsMethod=ANY_OTHER) + * ((token=[ScannerToken|ID]? characters+=STRING characters+=STRING*) | jsDetector=ANY_OTHER) */ protected void sequence_ScannerWhitespaceRule(EObject context, ScannerWhitespaceRule semanticObject) { genericSequencer.createSequence(context, semanticObject); } - - - /** - * Constraint: - * (partition=[Partition|ID] tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+) - */ - protected void sequence_Scanner(EObject context, Scanner semanticObject) { - genericSequencer.createSequence(context, semanticObject); - } } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java index 06aaea56e..3301c2802 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src-gen/org/eclipse/fx/code/compensator/hsl/services/HSLGrammarAccess.java @@ -26,17 +26,17 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cLeftCurlyBracketKeyword_1 = (Keyword)cGroup.eContents().get(1); private final Assignment cPartitionsAssignment_2 = (Assignment)cGroup.eContents().get(2); private final RuleCall cPartitionsPartitionParserRuleCall_2_0 = (RuleCall)cPartitionsAssignment_2.eContents().get(0); - private final Assignment cScannerAssignment_3 = (Assignment)cGroup.eContents().get(3); - private final RuleCall cScannerScannerParserRuleCall_3_0 = (RuleCall)cScannerAssignment_3.eContents().get(0); + private final Assignment cDamagersAssignment_3 = (Assignment)cGroup.eContents().get(3); + private final RuleCall cDamagersDamagerParserRuleCall_3_0 = (RuleCall)cDamagersAssignment_3.eContents().get(0); private final Assignment cPartitionerAssignment_4 = (Assignment)cGroup.eContents().get(4); private final RuleCall cPartitionerPartitionerParserRuleCall_4_0 = (RuleCall)cPartitionerAssignment_4.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5); //Model: - // name=ID "{" partitions+=Partition+ scanner+=Scanner+ partitioner=Partitioner "}"; + // name=ID "{" partitions+=Partition+ damagers+=Damager+ partitioner=Partitioner "}"; public ParserRule getRule() { return rule; } - //name=ID "{" partitions+=Partition+ scanner+=Scanner+ partitioner=Partitioner "}" + //name=ID "{" partitions+=Partition+ damagers+=Damager+ partitioner=Partitioner "}" public Group getGroup() { return cGroup; } //name=ID @@ -54,11 +54,11 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { //Partition public RuleCall getPartitionsPartitionParserRuleCall_2_0() { return cPartitionsPartitionParserRuleCall_2_0; } - //scanner+=Scanner+ - public Assignment getScannerAssignment_3() { return cScannerAssignment_3; } + //damagers+=Damager+ + public Assignment getDamagersAssignment_3() { return cDamagersAssignment_3; } - //Scanner - public RuleCall getScannerScannerParserRuleCall_3_0() { return cScannerScannerParserRuleCall_3_0; } + //Damager + public RuleCall getDamagersDamagerParserRuleCall_3_0() { return cDamagersDamagerParserRuleCall_3_0; } //partitioner=Partitioner public Assignment getPartitionerAssignment_4() { return cPartitionerAssignment_4; } @@ -170,10 +170,66 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { public RuleCall getFileURISTRINGTerminalRuleCall_1_0() { return cFileURISTRINGTerminalRuleCall_1_0; } } - public class ScannerElements extends AbstractParserRuleElementFinder { - private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Scanner"); + public class DamagerElements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Damager"); + private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1); + private final RuleCall cRuleDamagerParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0); + private final RuleCall cJSDamagerParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1); + + //Damager: + // RuleDamager | JSDamager; + public ParserRule getRule() { return rule; } + + //RuleDamager | JSDamager + public Alternatives getAlternatives() { return cAlternatives; } + + //RuleDamager + public RuleCall getRuleDamagerParserRuleCall_0() { return cRuleDamagerParserRuleCall_0; } + + //JSDamager + public RuleCall getJSDamagerParserRuleCall_1() { return cJSDamagerParserRuleCall_1; } + } + + public class JSDamagerElements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "JSDamager"); + private final Group cGroup = (Group)rule.eContents().get(1); + private final Keyword cJsDamagerKeyword_0 = (Keyword)cGroup.eContents().get(0); + private final Assignment cPartitionAssignment_1 = (Assignment)cGroup.eContents().get(1); + private final CrossReference cPartitionPartitionCrossReference_1_0 = (CrossReference)cPartitionAssignment_1.eContents().get(0); + private final RuleCall cPartitionPartitionIDTerminalRuleCall_1_0_1 = (RuleCall)cPartitionPartitionCrossReference_1_0.eContents().get(1); + private final Assignment cFileURIAssignment_2 = (Assignment)cGroup.eContents().get(2); + private final RuleCall cFileURISTRINGTerminalRuleCall_2_0 = (RuleCall)cFileURIAssignment_2.eContents().get(0); + + //JSDamager: + // "js-damager" partition=[Partition] fileURI=STRING; + public ParserRule getRule() { return rule; } + + //"js-damager" partition=[Partition] fileURI=STRING + public Group getGroup() { return cGroup; } + + //"js-damager" + public Keyword getJsDamagerKeyword_0() { return cJsDamagerKeyword_0; } + + //partition=[Partition] + public Assignment getPartitionAssignment_1() { return cPartitionAssignment_1; } + + //[Partition] + public CrossReference getPartitionPartitionCrossReference_1_0() { return cPartitionPartitionCrossReference_1_0; } + + //ID + public RuleCall getPartitionPartitionIDTerminalRuleCall_1_0_1() { return cPartitionPartitionIDTerminalRuleCall_1_0_1; } + + //fileURI=STRING + public Assignment getFileURIAssignment_2() { return cFileURIAssignment_2; } + + //STRING + public RuleCall getFileURISTRINGTerminalRuleCall_2_0() { return cFileURISTRINGTerminalRuleCall_2_0; } + } + + public class RuleDamagerElements extends AbstractParserRuleElementFinder { + private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "RuleDamager"); private final Group cGroup = (Group)rule.eContents().get(1); - private final Keyword cScannerKeyword_0 = (Keyword)cGroup.eContents().get(0); + private final Keyword cRuleDamagerKeyword_0 = (Keyword)cGroup.eContents().get(0); private final Assignment cPartitionAssignment_1 = (Assignment)cGroup.eContents().get(1); private final CrossReference cPartitionPartitionCrossReference_1_0 = (CrossReference)cPartitionAssignment_1.eContents().get(0); private final RuleCall cPartitionPartitionIDTerminalRuleCall_1_0_1 = (RuleCall)cPartitionPartitionCrossReference_1_0.eContents().get(1); @@ -186,15 +242,15 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cRulesScannerRuleParserRuleCall_5_0 = (RuleCall)cRulesAssignment_5.eContents().get(0); private final Keyword cRightCurlyBracketKeyword_6 = (Keyword)cGroup.eContents().get(6); - //Scanner: - // "scanner" partition=[Partition] "{" tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+ "}"; + //RuleDamager: + // "rule-damager" partition=[Partition] "{" tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+ "}"; public ParserRule getRule() { return rule; } - //"scanner" partition=[Partition] "{" tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+ "}" + //"rule-damager" partition=[Partition] "{" tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+ "}" public Group getGroup() { return cGroup; } - //"scanner" - public Keyword getScannerKeyword_0() { return cScannerKeyword_0; } + //"rule-damager" + public Keyword getRuleDamagerKeyword_0() { return cRuleDamagerKeyword_0; } //partition=[Partition] public Assignment getPartitionAssignment_1() { return cPartitionAssignment_1; } @@ -696,9 +752,9 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "PartitionMultiLineRule"); private final Group cGroup = (Group)rule.eContents().get(1); private final Keyword cMultiLineKeyword_0 = (Keyword)cGroup.eContents().get(0); - private final Assignment cTokenAssignment_1 = (Assignment)cGroup.eContents().get(1); - private final CrossReference cTokenPartitionCrossReference_1_0 = (CrossReference)cTokenAssignment_1.eContents().get(0); - private final RuleCall cTokenPartitionIDTerminalRuleCall_1_0_1 = (RuleCall)cTokenPartitionCrossReference_1_0.eContents().get(1); + private final Assignment cParitionAssignment_1 = (Assignment)cGroup.eContents().get(1); + private final CrossReference cParitionPartitionCrossReference_1_0 = (CrossReference)cParitionAssignment_1.eContents().get(0); + private final RuleCall cParitionPartitionIDTerminalRuleCall_1_0_1 = (RuleCall)cParitionPartitionCrossReference_1_0.eContents().get(1); private final Assignment cStartSeqAssignment_2 = (Assignment)cGroup.eContents().get(2); private final RuleCall cStartSeqSTRINGTerminalRuleCall_2_0 = (RuleCall)cStartSeqAssignment_2.eContents().get(0); private final Keyword cEqualsSignGreaterThanSignKeyword_3 = (Keyword)cGroup.eContents().get(3); @@ -711,23 +767,23 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { private final RuleCall cEscapeSeqSTRINGTerminalRuleCall_5_2_0 = (RuleCall)cEscapeSeqAssignment_5_2.eContents().get(0); //PartitionMultiLineRule: - // "multi-line" token=[Partition] startSeq=STRING "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)?; + // "multi-line" parition=[Partition] startSeq=STRING "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)?; public ParserRule getRule() { return rule; } - //"multi-line" token=[Partition] startSeq=STRING "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)? + //"multi-line" parition=[Partition] startSeq=STRING "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)? public Group getGroup() { return cGroup; } //"multi-line" public Keyword getMultiLineKeyword_0() { return cMultiLineKeyword_0; } - //token=[Partition] - public Assignment getTokenAssignment_1() { return cTokenAssignment_1; } + //parition=[Partition] + public Assignment getParitionAssignment_1() { return cParitionAssignment_1; } //[Partition] - public CrossReference getTokenPartitionCrossReference_1_0() { return cTokenPartitionCrossReference_1_0; } + public CrossReference getParitionPartitionCrossReference_1_0() { return cParitionPartitionCrossReference_1_0; } //ID - public RuleCall getTokenPartitionIDTerminalRuleCall_1_0_1() { return cTokenPartitionIDTerminalRuleCall_1_0_1; } + public RuleCall getParitionPartitionIDTerminalRuleCall_1_0_1() { return cParitionPartitionIDTerminalRuleCall_1_0_1; } //startSeq=STRING public Assignment getStartSeqAssignment_2() { return cStartSeqAssignment_2; } @@ -907,17 +963,17 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { private final Keyword cRightSquareBracketKeyword_0_2_3 = (Keyword)cGroup_0_2.eContents().get(3); private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1); private final Keyword cNumberSignLeftCurlyBracketKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0); - private final Assignment cJsMethodAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); - private final RuleCall cJsMethodANY_OTHERTerminalRuleCall_1_1_0 = (RuleCall)cJsMethodAssignment_1_1.eContents().get(0); + private final Assignment cJsDetectorAssignment_1_1 = (Assignment)cGroup_1.eContents().get(1); + private final RuleCall cJsDetectorANY_OTHERTerminalRuleCall_1_1_0 = (RuleCall)cJsDetectorAssignment_1_1.eContents().get(0); private final Keyword cRightCurlyBracketNumberSignKeyword_1_2 = (Keyword)cGroup_1.eContents().get(2); //ScannerWhitespaceRule: // "whitespace-rule" token=[ScannerToken]? ("[" characters+=STRING ("," characters+=STRING)* "]") | "#{" - // jsMethod=ANY_OTHER "}#"; + // jsDetector=ANY_OTHER "}#"; public ParserRule getRule() { return rule; } - //"whitespace-rule" token=[ScannerToken]? ("[" characters+=STRING ("," characters+=STRING)* "]") | "#{" jsMethod=ANY_OTHER - //"}#" + //"whitespace-rule" token=[ScannerToken]? ("[" characters+=STRING ("," characters+=STRING)* "]") | "#{" + //jsDetector=ANY_OTHER "}#" public Alternatives getAlternatives() { return cAlternatives; } //"whitespace-rule" token=[ScannerToken]? ("[" characters+=STRING ("," characters+=STRING)* "]") @@ -962,17 +1018,17 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { //"]" public Keyword getRightSquareBracketKeyword_0_2_3() { return cRightSquareBracketKeyword_0_2_3; } - //"#{" jsMethod=ANY_OTHER "}#" + //"#{" jsDetector=ANY_OTHER "}#" public Group getGroup_1() { return cGroup_1; } //"#{" public Keyword getNumberSignLeftCurlyBracketKeyword_1_0() { return cNumberSignLeftCurlyBracketKeyword_1_0; } - //jsMethod=ANY_OTHER - public Assignment getJsMethodAssignment_1_1() { return cJsMethodAssignment_1_1; } + //jsDetector=ANY_OTHER + public Assignment getJsDetectorAssignment_1_1() { return cJsDetectorAssignment_1_1; } //ANY_OTHER - public RuleCall getJsMethodANY_OTHERTerminalRuleCall_1_1_0() { return cJsMethodANY_OTHERTerminalRuleCall_1_1_0; } + public RuleCall getJsDetectorANY_OTHERTerminalRuleCall_1_1_0() { return cJsDetectorANY_OTHERTerminalRuleCall_1_1_0; } //"}#" public Keyword getRightCurlyBracketNumberSignKeyword_1_2() { return cRightCurlyBracketNumberSignKeyword_1_2; } @@ -1132,7 +1188,9 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { private PartitionerElements pPartitioner; private RulePartitionerElements pRulePartitioner; private JSParitionerElements pJSParitioner; - private ScannerElements pScanner; + private DamagerElements pDamager; + private JSDamagerElements pJSDamager; + private RuleDamagerElements pRuleDamager; private ScannerTokenElements pScannerToken; private KeywordGroupElements pKeywordGroup; private KeywordElements pKeyword; @@ -1190,7 +1248,7 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { //Model: - // name=ID "{" partitions+=Partition+ scanner+=Scanner+ partitioner=Partitioner "}"; + // name=ID "{" partitions+=Partition+ damagers+=Damager+ partitioner=Partitioner "}"; public ModelElements getModelAccess() { return (pModel != null) ? pModel : (pModel = new ModelElements()); } @@ -1239,14 +1297,34 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { return getJSParitionerAccess().getRule(); } - //Scanner: - // "scanner" partition=[Partition] "{" tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+ "}"; - public ScannerElements getScannerAccess() { - return (pScanner != null) ? pScanner : (pScanner = new ScannerElements()); + //Damager: + // RuleDamager | JSDamager; + public DamagerElements getDamagerAccess() { + return (pDamager != null) ? pDamager : (pDamager = new DamagerElements()); + } + + public ParserRule getDamagerRule() { + return getDamagerAccess().getRule(); + } + + //JSDamager: + // "js-damager" partition=[Partition] fileURI=STRING; + public JSDamagerElements getJSDamagerAccess() { + return (pJSDamager != null) ? pJSDamager : (pJSDamager = new JSDamagerElements()); + } + + public ParserRule getJSDamagerRule() { + return getJSDamagerAccess().getRule(); + } + + //RuleDamager: + // "rule-damager" partition=[Partition] "{" tokens+=ScannerToken* keywordGroups+=KeywordGroup* rules+=ScannerRule+ "}"; + public RuleDamagerElements getRuleDamagerAccess() { + return (pRuleDamager != null) ? pRuleDamager : (pRuleDamager = new RuleDamagerElements()); } - public ParserRule getScannerRule() { - return getScannerAccess().getRule(); + public ParserRule getRuleDamagerRule() { + return getRuleDamagerAccess().getRule(); } //ScannerToken: @@ -1331,7 +1409,7 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { } //PartitionMultiLineRule: - // "multi-line" token=[Partition] startSeq=STRING "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)?; + // "multi-line" parition=[Partition] startSeq=STRING "=>" endSeq=STRING ("escaped" "by" escapeSeq=STRING)?; public PartitionMultiLineRuleElements getPartitionMultiLineRuleAccess() { return (pPartitionMultiLineRule != null) ? pPartitionMultiLineRule : (pPartitionMultiLineRule = new PartitionMultiLineRuleElements()); } @@ -1372,7 +1450,7 @@ public class HSLGrammarAccess extends AbstractGrammarElementFinder { //ScannerWhitespaceRule: // "whitespace-rule" token=[ScannerToken]? ("[" characters+=STRING ("," characters+=STRING)* "]") | "#{" - // jsMethod=ANY_OTHER "}#"; + // jsDetector=ANY_OTHER "}#"; public ScannerWhitespaceRuleElements getScannerWhitespaceRuleAccess() { return (pScannerWhitespaceRule != null) ? pScannerWhitespaceRule : (pScannerWhitespaceRule = new ScannerWhitespaceRuleElements()); } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext index e434332a6..fea96254c 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext +++ b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/src/org/eclipse/fx/code/compensator/hsl/HSL.xtext @@ -5,7 +5,7 @@ generate hSL "http://www.eclipse.org/fx/code/compensator/hsl/HSL" Model: name=ID '{' partitions+=Partition+ - scanner+=Scanner+ + damagers+=Damager+ partitioner=Partitioner '}' ; @@ -28,8 +28,16 @@ JSParitioner: 'js-partitioner' fileURI=STRING ; -Scanner: - 'scanner' partition=[Partition|ID] '{' +Damager: + RuleDamager | JSDamager +; + +JSDamager: + 'js-damager' partition=[Partition|ID] fileURI=STRING +; + +RuleDamager: + 'rule-damager' partition=[Partition|ID] '{' tokens+=ScannerToken* keywordGroups +=KeywordGroup* rules += ScannerRule+ @@ -73,7 +81,7 @@ ScannerMultiLineRule: ; PartitionMultiLineRule: - 'multi-line' token=[Partition|ID] startSeq=STRING '=>' endSeq=STRING ('escaped' 'by' escapeSeq=STRING)? + 'multi-line' parition=[Partition|ID] startSeq=STRING '=>' endSeq=STRING ('escaped' 'by' escapeSeq=STRING)? ; ScannerCharacterRule: @@ -89,7 +97,7 @@ PartitionJSRule: ; ScannerWhitespaceRule: - 'whitespace-rule' (token=[ScannerToken|ID])? ('[' characters+=STRING (',' characters+=STRING )* ']') | ('#{' jsMethod=ANY_OTHER '}#') + 'whitespace-rule' (token=[ScannerToken|ID])? ('[' characters+=STRING (',' characters+=STRING )* ']') | ('#{' jsDetector=ANY_OTHER '}#') ; Color: |