diff --git a/plugin/Raven.SQDev.Editors/META-INF/MANIFEST.MF b/plugin/Raven.SQDev.Editors/META-INF/MANIFEST.MF
index 503d5512..1b0ac4b5 100644
--- a/plugin/Raven.SQDev.Editors/META-INF/MANIFEST.MF
+++ b/plugin/Raven.SQDev.Editors/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Editors
Bundle-SymbolicName: raven.sqdev.editors;singleton:=true
-Bundle-Version: 0.7.0
+Bundle-Version: 0.7.1.dev2
Bundle-Activator: raven.sqdev.editors.activator.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.swt,
org.eclipse.core.resources,
org.eclipse.ui.ide,
- org.eclipse.core.filesystem;bundle-version="1.4.100"
+ org.eclipse.core.filesystem;bundle-version="1.4.100",
+ raven.sqdev.misc;bundle-version="0.6.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: raven.sqdev.editors;
@@ -33,16 +34,10 @@ Export-Package: raven.sqdev.editors;
raven.sqdev.interfaces,
org.eclipse.jface.text.rules"
Bundle-Vendor: Raven
-Import-Package: org.antlr.v4.runtime,
- org.antlr.v4.runtime.atn,
- org.antlr.v4.runtime.dfa,
- org.antlr.v4.runtime.misc,
- org.antlr.v4.runtime.tree,
- raven.sqdev.constants,
+Import-Package: raven.sqdev.constants,
raven.sqdev.exceptions,
raven.sqdev.infoCollection.base,
raven.sqdev.interfaces,
- raven.sqdev.misc,
raven.sqdev.miscellaneous,
raven.sqdev.parser.misc,
raven.sqdev.parser.preprocessor,
diff --git a/plugin/Raven.SQDev.Misc/.classpath b/plugin/Raven.SQDev.Misc/.classpath
index 23636a05..cea67ffa 100644
--- a/plugin/Raven.SQDev.Misc/.classpath
+++ b/plugin/Raven.SQDev.Misc/.classpath
@@ -3,6 +3,6 @@
-
+
diff --git a/plugin/Raven.SQDev.Misc/ANTLR/antlr-runtime-4.5.3.jar b/plugin/Raven.SQDev.Misc/ANTLR/antlr-runtime-4.5.3.jar
deleted file mode 100644
index 44353757..00000000
Binary files a/plugin/Raven.SQDev.Misc/ANTLR/antlr-runtime-4.5.3.jar and /dev/null differ
diff --git a/plugin/Raven.SQDev.Misc/ANTLR/antlr-runtime-4.7.jar b/plugin/Raven.SQDev.Misc/ANTLR/antlr-runtime-4.7.jar
new file mode 100644
index 00000000..5c3bf7d3
Binary files /dev/null and b/plugin/Raven.SQDev.Misc/ANTLR/antlr-runtime-4.7.jar differ
diff --git a/plugin/Raven.SQDev.Misc/META-INF/MANIFEST.MF b/plugin/Raven.SQDev.Misc/META-INF/MANIFEST.MF
index 8e8bec9e..956dc426 100644
--- a/plugin/Raven.SQDev.Misc/META-INF/MANIFEST.MF
+++ b/plugin/Raven.SQDev.Misc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Misc
Bundle-SymbolicName: raven.sqdev.misc;singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 0.6.1.dev
Bundle-Activator: raven.sqdev.activator.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.swt,
@@ -18,6 +18,8 @@ Export-Package: org.antlr.v4.runtime,
org.antlr.v4.runtime.dfa,
org.antlr.v4.runtime.misc,
org.antlr.v4.runtime.tree,
+ org.antlr.v4.runtime.tree.pattern,
+ org.antlr.v4.runtime.tree.xpath,
raven.sqdev.constants,
raven.sqdev.exceptions,
raven.sqdev.fileSystemListener,
@@ -34,5 +36,5 @@ Export-Package: org.antlr.v4.runtime,
raven.sqdev.syntax
Import-Package: raven.sqdev.misc
Bundle-Vendor: Raven
-Bundle-ClassPath: ANTLR/antlr-runtime-4.5.3.jar,
+Bundle-ClassPath: ANTLR/antlr-runtime-4.7.jar,
.
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorLexer.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorLexer.class
index 77bee9cf..43b422d3 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorLexer.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorLexer.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorParser.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorParser.class
index 6c229d33..ec1fc4ab 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorParser.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/preprocessor/PreprocessorParser.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFLexer.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFLexer.class
index f8c6b725..1539b412 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFLexer.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFLexer.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ArrayContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ArrayContext.class
index 0ba86b69..0fe851bf 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ArrayContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ArrayContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$AssignmentContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$AssignmentContext.class
index 0b0e5290..2bcd2073 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$AssignmentContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$AssignmentContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$BinaryExpressionContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$BinaryExpressionContext.class
index d0d823ec..c0e78dd8 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$BinaryExpressionContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$BinaryExpressionContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CodeContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CodeContext.class
index e2bc0413..b3f839dd 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CodeContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CodeContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CommonErrorContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CommonErrorContext.class
index 979e97ee..f846fa0c 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CommonErrorContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$CommonErrorContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ErrorContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ErrorContext.class
index 5d40d73b..a3e83537 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ErrorContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ErrorContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$InlineCodeContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$InlineCodeContext.class
index 85d2c4ac..e6d024be 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$InlineCodeContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$InlineCodeContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroArgumentContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroArgumentContext.class
index 7d08d3f4..5503ec39 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroArgumentContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroArgumentContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroContext.class
index 99506b64..21d424dd 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$MacroContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularExpressionContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularExpressionContext.class
index fd2ae983..34cd63b5 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularExpressionContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularExpressionContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularOperatorContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularOperatorContext.class
index e9f8d155..dfb66415 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularOperatorContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NularOperatorContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NumberContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NumberContext.class
index f2cbadef..6c563ff6 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NumberContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$NumberContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$OperatorContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$OperatorContext.class
index dc8813f5..7902a86f 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$OperatorContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$OperatorContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ParenthesisContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ParenthesisContext.class
index d8290d30..9cbc0565 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ParenthesisContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$ParenthesisContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PrimaryExpressionContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PrimaryExpressionContext.class
index 6a419d99..6204b112 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PrimaryExpressionContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PrimaryExpressionContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PunctuationContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PunctuationContext.class
index b66b8a0f..422a1fc9 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PunctuationContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$PunctuationContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StartContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StartContext.class
index 93b5bba5..ea937833 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StartContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StartContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StatementContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StatementContext.class
index c419c765..687d3634 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StatementContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StatementContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StringContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StringContext.class
index 1a30a517..b3301f10 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StringContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$StringContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$UnaryExpressionContext.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$UnaryExpressionContext.class
index ca690cf2..605a4e5c 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$UnaryExpressionContext.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser$UnaryExpressionContext.class differ
diff --git a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser.class b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser.class
index 7330b40e..deb841cb 100644
Binary files a/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser.class and b/plugin/Raven.SQDev.Misc/bin/raven/sqdev/parser/sqf/SQFParser.class differ
diff --git a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFBaseListener.java b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFBaseListener.java
index e5514df2..0d7554e8 100644
--- a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFBaseListener.java
+++ b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from SQF.g4 by ANTLR 4.5.3
+// Generated from SQF.g4 by ANTLR 4.7
package raven.sqdev.parser.sqf;
diff --git a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFLexer.java b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFLexer.java
index 56015b83..f63279d5 100644
--- a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFLexer.java
+++ b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFLexer.java
@@ -1,8 +1,8 @@
-// Generated from SQF.g4 by ANTLR 4.5.3
+// Generated from SQF.g4 by ANTLR 4.7
-package raven.sqdev.parser.sqf;
-
-import java.util.List;
+ package raven.sqdev.parser.sqf;
+
+ import java.util.List;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
@@ -13,45 +13,50 @@
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.misc.*;
-@SuppressWarnings({ "all", "warnings", "unchecked", "unused", "cast" })
+@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class SQFLexer extends Lexer {
- static {
- RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION);
- }
-
+ static { RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION); }
+
protected static final DFA[] _decisionToDFA;
- protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache();
- public static final int OPERATOR_PRECEDENCE_MULTIPLY = 1,
- OPERATOR_PRECEDENCE_ADD = 2, PUCTUATION_OTHER = 3, OR = 4, AND = 5,
- COMPARE_PRECEDENCE_OPERATOR = 6, ELSE = 7, POWER = 8, SEMICOLON = 9,
- COMMA = 10, EQUALS = 11, PRIVATE = 12, MACRO_DECLARATION = 13,
- WHITESPACE = 14, COMMENT = 15, NUMBER = 16, ID = 17,
- BINARY_OPERATOR = 18, STRING = 19, C_B_O = 20, C_B_C = 21,
- S_B_O = 22, S_B_C = 23, R_B_O = 24, R_B_C = 25, OTHER = 26;
- public static String[] modeNames = { "DEFAULT_MODE" };
-
- public static final String[] ruleNames = { "OPERATOR_PRECEDENCE_MULTIPLY",
- "OPERATOR_PRECEDENCE_ADD", "PUCTUATION_OTHER", "OR", "AND",
- "COMPARE_PRECEDENCE_OPERATOR", "ELSE", "POWER", "SEMICOLON",
- "COMMA", "EQUALS", "PRIVATE", "MACRO_DECLARATION", "WHITESPACE",
- "COMMENT", "NUMBER", "ID", "BINARY_OPERATOR", "STRING", "C_B_O",
- "C_B_C", "S_B_O", "S_B_C", "R_B_O", "R_B_C", "OTHER", "LETTER",
- "INT", "A", "E", "P", "L", "R", "S", "T", "I", "V" };
-
- private static final String[] _LITERAL_NAMES = { null, null, null, "'!'",
- "'||'", "'&&'", null, null, "'^'", "';'", "','", "'='", null, null,
- null, null, null, null, "':'", null, "'{'", "'}'", "'['", "']'",
- "'('", "')'" };
- private static final String[] _SYMBOLIC_NAMES = { null,
- "OPERATOR_PRECEDENCE_MULTIPLY", "OPERATOR_PRECEDENCE_ADD",
- "PUCTUATION_OTHER", "OR", "AND", "COMPARE_PRECEDENCE_OPERATOR",
- "ELSE", "POWER", "SEMICOLON", "COMMA", "EQUALS", "PRIVATE",
- "MACRO_DECLARATION", "WHITESPACE", "COMMENT", "NUMBER", "ID",
- "BINARY_OPERATOR", "STRING", "C_B_O", "C_B_C", "S_B_O", "S_B_C",
- "R_B_O", "R_B_C", "OTHER" };
- public static final Vocabulary VOCABULARY = new VocabularyImpl(
- _LITERAL_NAMES, _SYMBOLIC_NAMES);
-
+ protected static final PredictionContextCache _sharedContextCache =
+ new PredictionContextCache();
+ public static final int
+ OPERATOR_PRECEDENCE_MULTIPLY=1, OPERATOR_PRECEDENCE_ADD=2, PUCTUATION_OTHER=3,
+ OR=4, AND=5, COMPARE_PRECEDENCE_OPERATOR=6, ELSE=7, POWER=8, SEMICOLON=9,
+ COMMA=10, EQUALS=11, PRIVATE=12, MACRO_DECLARATION=13, WHITESPACE=14,
+ COMMENT=15, NUMBER=16, ID=17, BINARY_OPERATOR=18, STRING=19, C_B_O=20,
+ C_B_C=21, S_B_O=22, S_B_C=23, R_B_O=24, R_B_C=25, OTHER=26;
+ public static String[] channelNames = {
+ "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
+ };
+
+ public static String[] modeNames = {
+ "DEFAULT_MODE"
+ };
+
+ public static final String[] ruleNames = {
+ "OPERATOR_PRECEDENCE_MULTIPLY", "OPERATOR_PRECEDENCE_ADD", "PUCTUATION_OTHER",
+ "OR", "AND", "COMPARE_PRECEDENCE_OPERATOR", "ELSE", "POWER", "SEMICOLON",
+ "COMMA", "EQUALS", "PRIVATE", "MACRO_DECLARATION", "WHITESPACE", "COMMENT",
+ "NUMBER", "ID", "BINARY_OPERATOR", "STRING", "C_B_O", "C_B_C", "S_B_O",
+ "S_B_C", "R_B_O", "R_B_C", "OTHER", "LETTER", "INT", "A", "E", "P", "L",
+ "R", "S", "T", "I", "V"
+ };
+
+ private static final String[] _LITERAL_NAMES = {
+ null, null, null, "'!'", "'||'", "'&&'", null, null, "'^'", "';'", "','",
+ "'='", null, null, null, null, null, null, "':'", null, "'{'", "'}'",
+ "'['", "']'", "'('", "')'"
+ };
+ private static final String[] _SYMBOLIC_NAMES = {
+ null, "OPERATOR_PRECEDENCE_MULTIPLY", "OPERATOR_PRECEDENCE_ADD", "PUCTUATION_OTHER",
+ "OR", "AND", "COMPARE_PRECEDENCE_OPERATOR", "ELSE", "POWER", "SEMICOLON",
+ "COMMA", "EQUALS", "PRIVATE", "MACRO_DECLARATION", "WHITESPACE", "COMMENT",
+ "NUMBER", "ID", "BINARY_OPERATOR", "STRING", "C_B_O", "C_B_C", "S_B_O",
+ "S_B_C", "R_B_O", "R_B_C", "OTHER"
+ };
+ public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
+
/**
* @deprecated Use {@link #VOCABULARY} instead.
*/
@@ -64,93 +69,84 @@ public class SQFLexer extends Lexer {
if (tokenNames[i] == null) {
tokenNames[i] = VOCABULARY.getSymbolicName(i);
}
-
+
if (tokenNames[i] == null) {
tokenNames[i] = "";
}
}
}
-
+
@Override
@Deprecated
public String[] getTokenNames() {
return tokenNames;
}
-
+
@Override
-
+
public Vocabulary getVocabulary() {
return VOCABULARY;
}
-
-
- protected List binaryOperators;
- protected List unaryOperators;
- protected List macroNames;
-
-
- public SQFLexer(CharStream input, List binaryOperators,
- List unaryOperators, List macroNames) {
- this(input);
+
+
- // make operators lowercase
- for (int i = 0; i < binaryOperators.size(); i++) {
- binaryOperators.set(i, binaryOperators.get(i).toLowerCase());
- }
- for (int i = 0; i < unaryOperators.size(); i++) {
- unaryOperators.set(i, unaryOperators.get(i).toLowerCase());
- }
+ protected List binaryOperators;
+ protected List unaryOperators;
+ protected List macroNames;
- this.binaryOperators = binaryOperators;
- this.unaryOperators = unaryOperators;
- this.macroNames = macroNames;
- }
-
-
+
+ public SQFLexer(CharStream input, List binaryOperators, List unaryOperators, List macroNames) {
+ this(input);
+
+ // make operators lowercase
+ for(int i=0; i>@@\3\2\f\f\5\2\13\f\17\17\"\"\3\3\f\f\3\2$$\3"
- + "\2))\4\2C\\c|\3\2\62;\4\2CCcc\4\2GGgg\4\2RRrr\4\2NNnn\4\2TTtt\4\2UUuu"
- + "\4\2VVvv\4\2KKkk\4\2XXxx\u018a\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t"
- + "\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2"
- + "\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2"
- + "\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2"
- + "+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2"
- + "\3Q\3\2\2\2\5Z\3\2\2\2\7\\\3\2\2\2\t^\3\2\2\2\13a\3\2\2\2\ro\3\2\2\2\17"
- + "q\3\2\2\2\21v\3\2\2\2\23x\3\2\2\2\25z\3\2\2\2\27|\3\2\2\2\31~\3\2\2\2"
- + "\33\u00ac\3\2\2\2\35\u00b1\3\2\2\2\37\u00ce\3\2\2\2!\u00f3\3\2\2\2#\u0121"
- + "\3\2\2\2%\u0127\3\2\2\2\'\u013d\3\2\2\2)\u013f\3\2\2\2+\u0141\3\2\2\2"
- + "-\u0143\3\2\2\2/\u0145\3\2\2\2\61\u0147\3\2\2\2\63\u0149\3\2\2\2\65\u014c"
- + "\3\2\2\2\67\u0150\3\2\2\29\u0152\3\2\2\2;\u0154\3\2\2\2=\u0156\3\2\2\2"
- + "?\u0158\3\2\2\2A\u015a\3\2\2\2C\u015c\3\2\2\2E\u015e\3\2\2\2G\u0160\3"
- + "\2\2\2I\u0162\3\2\2\2K\u0164\3\2\2\2MR\t\2\2\2NO\7o\2\2OP\7q\2\2PR\7f"
- + "\2\2QM\3\2\2\2QN\3\2\2\2R\4\3\2\2\2S[\t\3\2\2TU\7o\2\2UV\7k\2\2V[\7p\2"
- + "\2WX\7o\2\2XY\7c\2\2Y[\7z\2\2ZS\3\2\2\2ZT\3\2\2\2ZW\3\2\2\2[\6\3\2\2\2"
- + "\\]\7#\2\2]\b\3\2\2\2^_\7~\2\2_`\7~\2\2`\n\3\2\2\2ab\7(\2\2bc\7(\2\2c"
- + "\f\3\2\2\2de\7?\2\2ep\7?\2\2fg\7#\2\2gp\7?\2\2hp\t\4\2\2ij\7>\2\2jp\7"
- + "?\2\2kl\7@\2\2lp\7?\2\2mn\7@\2\2np\7@\2\2od\3\2\2\2of\3\2\2\2oh\3\2\2"
- + "\2oi\3\2\2\2ok\3\2\2\2om\3\2\2\2p\16\3\2\2\2qr\5=\37\2rs\5A!\2st\5E#\2"
- + "tu\5=\37\2u\20\3\2\2\2vw\7`\2\2w\22\3\2\2\2xy\7=\2\2y\24\3\2\2\2z{\7."
- + "\2\2{\26\3\2\2\2|}\7?\2\2}\30\3\2\2\2~\177\5? \2\177\u0080\5C\"\2\u0080"
- + "\u0081\5I%\2\u0081\u0082\5K&\2\u0082\u0083\5;\36\2\u0083\u0084\5G$\2\u0084"
- + "\u0085\5=\37\2\u0085\32\3\2\2\2\u0086\u0087\7%\2\2\u0087\u0088\7k\2\2"
- + "\u0088\u0089\7h\2\2\u0089\u008a\7f\2\2\u008a\u008b\7g\2\2\u008b\u0094"
- + "\7h\2\2\u008c\u008d\7%\2\2\u008d\u008e\7k\2\2\u008e\u008f\7h\2\2\u008f"
- + "\u0090\7p\2\2\u0090\u0091\7f\2\2\u0091\u0092\7g\2\2\u0092\u0094\7h\2\2"
- + "\u0093\u0086\3\2\2\2\u0093\u008c\3\2\2\2\u0094\u0098\3\2\2\2\u0095\u0097"
- + "\13\2\2\2\u0096\u0095\3\2\2\2\u0097\u009a\3\2\2\2\u0098\u0099\3\2\2\2"
- + "\u0098\u0096\3\2\2\2\u0099\u009b\3\2\2\2\u009a\u0098\3\2\2\2\u009b\u009c"
- + "\7%\2\2\u009c\u009d\7g\2\2\u009d\u009e\7p\2\2\u009e\u009f\7f\2\2\u009f"
- + "\u00a0\7k\2\2\u00a0\u00ad\7h\2\2\u00a1\u00a8\7%\2\2\u00a2\u00a7\n\5\2"
- + "\2\u00a3\u00a4\7\"\2\2\u00a4\u00a5\7^\2\2\u00a5\u00a7\7\f\2\2\u00a6\u00a2"
- + "\3\2\2\2\u00a6\u00a3\3\2\2\2\u00a7\u00aa\3\2\2\2\u00a8\u00a6\3\2\2\2\u00a8"
- + "\u00a9\3\2\2\2\u00a9\u00ab\3\2\2\2\u00aa\u00a8\3\2\2\2\u00ab\u00ad\7\f"
- + "\2\2\u00ac\u0093\3\2\2\2\u00ac\u00a1\3\2\2\2\u00ad\u00ae\3\2\2\2\u00ae"
- + "\u00af\b\16\2\2\u00af\34\3\2\2\2\u00b0\u00b2\t\6\2\2\u00b1\u00b0\3\2\2"
- + "\2\u00b2\u00b3\3\2\2\2\u00b3\u00b1\3\2\2\2\u00b3\u00b4\3\2\2\2\u00b4\u00b5"
- + "\3\2\2\2\u00b5\u00b6\b\17\2\2\u00b6\36\3\2\2\2\u00b7\u00b8\7\61\2\2\u00b8"
- + "\u00b9\7\61\2\2\u00b9\u00bd\3\2\2\2\u00ba\u00bc\13\2\2\2\u00bb\u00ba\3"
- + "\2\2\2\u00bc\u00bf\3\2\2\2\u00bd\u00be\3\2\2\2\u00bd\u00bb\3\2\2\2\u00be"
- + "\u00c1\3\2\2\2\u00bf\u00bd\3\2\2\2\u00c0\u00c2\t\7\2\2\u00c1\u00c0\3\2"
- + "\2\2\u00c2\u00cf\3\2\2\2\u00c3\u00c4\7\61\2\2\u00c4\u00c5\7,\2\2\u00c5"
- + "\u00c9\3\2\2\2\u00c6\u00c8\13\2\2\2\u00c7\u00c6\3\2\2\2\u00c8\u00cb\3"
- + "\2\2\2\u00c9\u00ca\3\2\2\2\u00c9\u00c7\3\2\2\2\u00ca\u00cc\3\2\2\2\u00cb"
- + "\u00c9\3\2\2\2\u00cc\u00cd\7,\2\2\u00cd\u00cf\7\61\2\2\u00ce\u00b7\3\2"
- + "\2\2\u00ce\u00c3\3\2\2\2\u00cf\u00d0\3\2\2\2\u00d0\u00d1\b\20\2\2\u00d1"
- + " \3\2\2\2\u00d2\u00d4\59\35\2\u00d3\u00d2\3\2\2\2\u00d4\u00d5\3\2\2\2"
- + "\u00d5\u00d3\3\2\2\2\u00d5\u00d6\3\2\2\2\u00d6\u00f4\3\2\2\2\u00d7\u00d9"
- + "\59\35\2\u00d8\u00d7\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00d8\3\2\2\2\u00da"
- + "\u00db\3\2\2\2\u00db\u00dc\3\2\2\2\u00dc\u00de\7\60\2\2\u00dd\u00df\5"
- + "9\35\2\u00de\u00dd\3\2\2\2\u00df\u00e0\3\2\2\2\u00e0\u00de\3\2\2\2\u00e0"
- + "\u00e1\3\2\2\2\u00e1\u00f4\3\2\2\2\u00e2\u00e4\7\60\2\2\u00e3\u00e5\5"
- + "9\35\2\u00e4\u00e3\3\2\2\2\u00e5\u00e6\3\2\2\2\u00e6\u00e4\3\2\2\2\u00e6"
- + "\u00e7\3\2\2\2\u00e7\u00f4\3\2\2\2\u00e8\u00e9\7\62\2\2\u00e9\u00ec\7"
- + "z\2\2\u00ea\u00ec\7&\2\2\u00eb\u00e8\3\2\2\2\u00eb\u00ea\3\2\2\2\u00ec"
- + "\u00ef\3\2\2\2\u00ed\u00f0\59\35\2\u00ee\u00f0\5\67\34\2\u00ef\u00ed\3"
- + "\2\2\2\u00ef\u00ee\3\2\2\2\u00f0\u00f1\3\2\2\2\u00f1\u00ef\3\2\2\2\u00f1"
- + "\u00f2\3\2\2\2\u00f2\u00f4\3\2\2\2\u00f3\u00d3\3\2\2\2\u00f3\u00d8\3\2"
- + "\2\2\u00f3\u00e2\3\2\2\2\u00f3\u00eb\3\2\2\2\u00f4\u011c\3\2\2\2\u00f5"
- + "\u00f7\7g\2\2\u00f6\u00f8\7/\2\2\u00f7\u00f6\3\2\2\2\u00f7\u00f8\3\2\2"
- + "\2\u00f8\u011a\3\2\2\2\u00f9\u00fb\59\35\2\u00fa\u00f9\3\2\2\2\u00fb\u00fc"
- + "\3\2\2\2\u00fc\u00fa\3\2\2\2\u00fc\u00fd\3\2\2\2\u00fd\u011b\3\2\2\2\u00fe"
- + "\u0100\59\35\2\u00ff\u00fe\3\2\2\2\u0100\u0101\3\2\2\2\u0101\u00ff\3\2"
- + "\2\2\u0101\u0102\3\2\2\2\u0102\u0103\3\2\2\2\u0103\u0105\7\60\2\2\u0104"
- + "\u0106\59\35\2\u0105\u0104\3\2\2\2\u0106\u0107\3\2\2\2\u0107\u0105\3\2"
- + "\2\2\u0107\u0108\3\2\2\2\u0108\u011b\3\2\2\2\u0109\u010b\7\60\2\2\u010a"
- + "\u010c\59\35\2\u010b\u010a\3\2\2\2\u010c\u010d\3\2\2\2\u010d\u010b\3\2"
- + "\2\2\u010d\u010e\3\2\2\2\u010e\u011b\3\2\2\2\u010f\u0110\7\62\2\2\u0110"
- + "\u0113\7z\2\2\u0111\u0113\7&\2\2\u0112\u010f\3\2\2\2\u0112\u0111\3\2\2"
- + "\2\u0113\u0116\3\2\2\2\u0114\u0117\59\35\2\u0115\u0117\5\67\34\2\u0116"
- + "\u0114\3\2\2\2\u0116\u0115\3\2\2\2\u0117\u0118\3\2\2\2\u0118\u0116\3\2"
- + "\2\2\u0118\u0119\3\2\2\2\u0119\u011b\3\2\2\2\u011a\u00fa\3\2\2\2\u011a"
- + "\u00ff\3\2\2\2\u011a\u0109\3\2\2\2\u011a\u0112\3\2\2\2\u011b\u011d\3\2"
- + "\2\2\u011c\u00f5\3\2\2\2\u011c\u011d\3\2\2\2\u011d\"\3\2\2\2\u011e\u0122"
- + "\5\67\34\2\u011f\u0122\59\35\2\u0120\u0122\7a\2\2\u0121\u011e\3\2\2\2"
- + "\u0121\u011f\3\2\2\2\u0121\u0120\3\2\2\2\u0122\u0123\3\2\2\2\u0123\u0121"
- + "\3\2\2\2\u0123\u0124\3\2\2\2\u0124\u0125\3\2\2\2\u0125\u0126\b\22\3\2"
- + "\u0126$\3\2\2\2\u0127\u0128\7<\2\2\u0128&\3\2\2\2\u0129\u012f\7$\2\2\u012a"
- + "\u012e\n\b\2\2\u012b\u012c\7$\2\2\u012c\u012e\7$\2\2\u012d\u012a\3\2\2"
- + "\2\u012d\u012b\3\2\2\2\u012e\u0131\3\2\2\2\u012f\u012d\3\2\2\2\u012f\u0130"
- + "\3\2\2\2\u0130\u0132\3\2\2\2\u0131\u012f\3\2\2\2\u0132\u013e\7$\2\2\u0133"
- + "\u0139\7)\2\2\u0134\u0138\n\t\2\2\u0135\u0136\7)\2\2\u0136\u0138\7)\2"
- + "\2\u0137\u0134\3\2\2\2\u0137\u0135\3\2\2\2\u0138\u013b\3\2\2\2\u0139\u0137"
- + "\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u013c\3\2\2\2\u013b\u0139\3\2\2\2\u013c"
- + "\u013e\7)\2\2\u013d\u0129\3\2\2\2\u013d\u0133\3\2\2\2\u013e(\3\2\2\2\u013f"
- + "\u0140\7}\2\2\u0140*\3\2\2\2\u0141\u0142\7\177\2\2\u0142,\3\2\2\2\u0143"
- + "\u0144\7]\2\2\u0144.\3\2\2\2\u0145\u0146\7_\2\2\u0146\60\3\2\2\2\u0147"
- + "\u0148\7*\2\2\u0148\62\3\2\2\2\u0149\u014a\7+\2\2\u014a\64\3\2\2\2\u014b"
- + "\u014d\13\2\2\2\u014c\u014b\3\2\2\2\u014d\u014e\3\2\2\2\u014e\u014f\3"
- + "\2\2\2\u014e\u014c\3\2\2\2\u014f\66\3\2\2\2\u0150\u0151\t\n\2\2\u0151"
- + "8\3\2\2\2\u0152\u0153\t\13\2\2\u0153:\3\2\2\2\u0154\u0155\t\f\2\2\u0155"
- + "<\3\2\2\2\u0156\u0157\t\r\2\2\u0157>\3\2\2\2\u0158\u0159\t\16\2\2\u0159"
- + "@\3\2\2\2\u015a\u015b\t\17\2\2\u015bB\3\2\2\2\u015c\u015d\t\20\2\2\u015d"
- + "D\3\2\2\2\u015e\u015f\t\21\2\2\u015fF\3\2\2\2\u0160\u0161\t\22\2\2\u0161"
- + "H\3\2\2\2\u0162\u0163\t\23\2\2\u0163J\3\2\2\2\u0164\u0165\t\24\2\2\u0165"
- + "L\3\2\2\2*\2QZo\u0093\u0098\u00a6\u00a8\u00ac\u00b3\u00bd\u00c1\u00c9"
- + "\u00ce\u00d5\u00da\u00e0\u00e6\u00eb\u00ef\u00f1\u00f3\u00f7\u00fc\u0101"
- + "\u0107\u010d\u0112\u0116\u0118\u011a\u011c\u0121\u0123\u012d\u012f\u0137"
- + "\u0139\u013d\u014e\4\b\2\2\3\22\2";
- public static final ATN _ATN = new ATNDeserializer()
- .deserialize(_serializedATN.toCharArray());
+
+ public static final String _serializedATN =
+ "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\34\u0166\b\1\4\2"+
+ "\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4"+
+ "\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22"+
+ "\t\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31"+
+ "\t\31\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 \t"+
+ " \4!\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\4&\t&\3\2\3\2\3\2\3\2\5\2R\n\2\3\3\3"+
+ "\3\3\3\3\3\3\3\3\3\3\3\5\3[\n\3\3\4\3\4\3\5\3\5\3\5\3\6\3\6\3\6\3\7\3"+
+ "\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\5\7p\n\7\3\b\3\b\3\b\3\b\3\b\3"+
+ "\t\3\t\3\n\3\n\3\13\3\13\3\f\3\f\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\r\3\16"+
+ "\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\3\16\5\16\u0094"+
+ "\n\16\3\16\7\16\u0097\n\16\f\16\16\16\u009a\13\16\3\16\3\16\3\16\3\16"+
+ "\3\16\3\16\3\16\3\16\3\16\3\16\3\16\7\16\u00a7\n\16\f\16\16\16\u00aa\13"+
+ "\16\3\16\5\16\u00ad\n\16\3\16\3\16\3\17\6\17\u00b2\n\17\r\17\16\17\u00b3"+
+ "\3\17\3\17\3\20\3\20\3\20\3\20\7\20\u00bc\n\20\f\20\16\20\u00bf\13\20"+
+ "\3\20\5\20\u00c2\n\20\3\20\3\20\3\20\3\20\7\20\u00c8\n\20\f\20\16\20\u00cb"+
+ "\13\20\3\20\3\20\5\20\u00cf\n\20\3\20\3\20\3\21\6\21\u00d4\n\21\r\21\16"+
+ "\21\u00d5\3\21\6\21\u00d9\n\21\r\21\16\21\u00da\3\21\3\21\6\21\u00df\n"+
+ "\21\r\21\16\21\u00e0\3\21\3\21\6\21\u00e5\n\21\r\21\16\21\u00e6\3\21\3"+
+ "\21\3\21\5\21\u00ec\n\21\3\21\3\21\6\21\u00f0\n\21\r\21\16\21\u00f1\5"+
+ "\21\u00f4\n\21\3\21\3\21\5\21\u00f8\n\21\3\21\6\21\u00fb\n\21\r\21\16"+
+ "\21\u00fc\3\21\6\21\u0100\n\21\r\21\16\21\u0101\3\21\3\21\6\21\u0106\n"+
+ "\21\r\21\16\21\u0107\3\21\3\21\6\21\u010c\n\21\r\21\16\21\u010d\3\21\3"+
+ "\21\3\21\5\21\u0113\n\21\3\21\3\21\6\21\u0117\n\21\r\21\16\21\u0118\5"+
+ "\21\u011b\n\21\5\21\u011d\n\21\3\22\3\22\3\22\6\22\u0122\n\22\r\22\16"+
+ "\22\u0123\3\22\3\22\3\23\3\23\3\24\3\24\3\24\3\24\7\24\u012e\n\24\f\24"+
+ "\16\24\u0131\13\24\3\24\3\24\3\24\3\24\3\24\7\24\u0138\n\24\f\24\16\24"+
+ "\u013b\13\24\3\24\5\24\u013e\n\24\3\25\3\25\3\26\3\26\3\27\3\27\3\30\3"+
+ "\30\3\31\3\31\3\32\3\32\3\33\6\33\u014d\n\33\r\33\16\33\u014e\3\34\3\34"+
+ "\3\35\3\35\3\36\3\36\3\37\3\37\3 \3 \3!\3!\3\"\3\"\3#\3#\3$\3$\3%\3%\3"+
+ "&\3&\6\u0098\u00bd\u00c9\u014e\2\'\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n"+
+ "\23\13\25\f\27\r\31\16\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30"+
+ "/\31\61\32\63\33\65\34\67\29\2;\2=\2?\2A\2C\2E\2G\2I\2K\2\3\2\25\5\2\'"+
+ "\',,\61\61\4\2--//\4\2>>@@\3\2\f\f\5\2\13\f\17\17\"\"\3\3\f\f\3\2$$\3"+
+ "\2))\4\2C\\c|\3\2\62;\4\2CCcc\4\2GGgg\4\2RRrr\4\2NNnn\4\2TTtt\4\2UUuu"+
+ "\4\2VVvv\4\2KKkk\4\2XXxx\2\u018a\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2"+
+ "\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2"+
+ "\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2"+
+ "\2\37\3\2\2\2\2!\3\2\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2"+
+ "\2+\3\2\2\2\2-\3\2\2\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2"+
+ "\2\3Q\3\2\2\2\5Z\3\2\2\2\7\\\3\2\2\2\t^\3\2\2\2\13a\3\2\2\2\ro\3\2\2\2"+
+ "\17q\3\2\2\2\21v\3\2\2\2\23x\3\2\2\2\25z\3\2\2\2\27|\3\2\2\2\31~\3\2\2"+
+ "\2\33\u00ac\3\2\2\2\35\u00b1\3\2\2\2\37\u00ce\3\2\2\2!\u00f3\3\2\2\2#"+
+ "\u0121\3\2\2\2%\u0127\3\2\2\2\'\u013d\3\2\2\2)\u013f\3\2\2\2+\u0141\3"+
+ "\2\2\2-\u0143\3\2\2\2/\u0145\3\2\2\2\61\u0147\3\2\2\2\63\u0149\3\2\2\2"+
+ "\65\u014c\3\2\2\2\67\u0150\3\2\2\29\u0152\3\2\2\2;\u0154\3\2\2\2=\u0156"+
+ "\3\2\2\2?\u0158\3\2\2\2A\u015a\3\2\2\2C\u015c\3\2\2\2E\u015e\3\2\2\2G"+
+ "\u0160\3\2\2\2I\u0162\3\2\2\2K\u0164\3\2\2\2MR\t\2\2\2NO\7o\2\2OP\7q\2"+
+ "\2PR\7f\2\2QM\3\2\2\2QN\3\2\2\2R\4\3\2\2\2S[\t\3\2\2TU\7o\2\2UV\7k\2\2"+
+ "V[\7p\2\2WX\7o\2\2XY\7c\2\2Y[\7z\2\2ZS\3\2\2\2ZT\3\2\2\2ZW\3\2\2\2[\6"+
+ "\3\2\2\2\\]\7#\2\2]\b\3\2\2\2^_\7~\2\2_`\7~\2\2`\n\3\2\2\2ab\7(\2\2bc"+
+ "\7(\2\2c\f\3\2\2\2de\7?\2\2ep\7?\2\2fg\7#\2\2gp\7?\2\2hp\t\4\2\2ij\7>"+
+ "\2\2jp\7?\2\2kl\7@\2\2lp\7?\2\2mn\7@\2\2np\7@\2\2od\3\2\2\2of\3\2\2\2"+
+ "oh\3\2\2\2oi\3\2\2\2ok\3\2\2\2om\3\2\2\2p\16\3\2\2\2qr\5=\37\2rs\5A!\2"+
+ "st\5E#\2tu\5=\37\2u\20\3\2\2\2vw\7`\2\2w\22\3\2\2\2xy\7=\2\2y\24\3\2\2"+
+ "\2z{\7.\2\2{\26\3\2\2\2|}\7?\2\2}\30\3\2\2\2~\177\5? \2\177\u0080\5C\""+
+ "\2\u0080\u0081\5I%\2\u0081\u0082\5K&\2\u0082\u0083\5;\36\2\u0083\u0084"+
+ "\5G$\2\u0084\u0085\5=\37\2\u0085\32\3\2\2\2\u0086\u0087\7%\2\2\u0087\u0088"+
+ "\7k\2\2\u0088\u0089\7h\2\2\u0089\u008a\7f\2\2\u008a\u008b\7g\2\2\u008b"+
+ "\u0094\7h\2\2\u008c\u008d\7%\2\2\u008d\u008e\7k\2\2\u008e\u008f\7h\2\2"+
+ "\u008f\u0090\7p\2\2\u0090\u0091\7f\2\2\u0091\u0092\7g\2\2\u0092\u0094"+
+ "\7h\2\2\u0093\u0086\3\2\2\2\u0093\u008c\3\2\2\2\u0094\u0098\3\2\2\2\u0095"+
+ "\u0097\13\2\2\2\u0096\u0095\3\2\2\2\u0097\u009a\3\2\2\2\u0098\u0099\3"+
+ "\2\2\2\u0098\u0096\3\2\2\2\u0099\u009b\3\2\2\2\u009a\u0098\3\2\2\2\u009b"+
+ "\u009c\7%\2\2\u009c\u009d\7g\2\2\u009d\u009e\7p\2\2\u009e\u009f\7f\2\2"+
+ "\u009f\u00a0\7k\2\2\u00a0\u00ad\7h\2\2\u00a1\u00a8\7%\2\2\u00a2\u00a7"+
+ "\n\5\2\2\u00a3\u00a4\7\"\2\2\u00a4\u00a5\7^\2\2\u00a5\u00a7\7\f\2\2\u00a6"+
+ "\u00a2\3\2\2\2\u00a6\u00a3\3\2\2\2\u00a7\u00aa\3\2\2\2\u00a8\u00a6\3\2"+
+ "\2\2\u00a8\u00a9\3\2\2\2\u00a9\u00ab\3\2\2\2\u00aa\u00a8\3\2\2\2\u00ab"+
+ "\u00ad\7\f\2\2\u00ac\u0093\3\2\2\2\u00ac\u00a1\3\2\2\2\u00ad\u00ae\3\2"+
+ "\2\2\u00ae\u00af\b\16\2\2\u00af\34\3\2\2\2\u00b0\u00b2\t\6\2\2\u00b1\u00b0"+
+ "\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\u00b1\3\2\2\2\u00b3\u00b4\3\2\2\2\u00b4"+
+ "\u00b5\3\2\2\2\u00b5\u00b6\b\17\2\2\u00b6\36\3\2\2\2\u00b7\u00b8\7\61"+
+ "\2\2\u00b8\u00b9\7\61\2\2\u00b9\u00bd\3\2\2\2\u00ba\u00bc\13\2\2\2\u00bb"+
+ "\u00ba\3\2\2\2\u00bc\u00bf\3\2\2\2\u00bd\u00be\3\2\2\2\u00bd\u00bb\3\2"+
+ "\2\2\u00be\u00c1\3\2\2\2\u00bf\u00bd\3\2\2\2\u00c0\u00c2\t\7\2\2\u00c1"+
+ "\u00c0\3\2\2\2\u00c2\u00cf\3\2\2\2\u00c3\u00c4\7\61\2\2\u00c4\u00c5\7"+
+ ",\2\2\u00c5\u00c9\3\2\2\2\u00c6\u00c8\13\2\2\2\u00c7\u00c6\3\2\2\2\u00c8"+
+ "\u00cb\3\2\2\2\u00c9\u00ca\3\2\2\2\u00c9\u00c7\3\2\2\2\u00ca\u00cc\3\2"+
+ "\2\2\u00cb\u00c9\3\2\2\2\u00cc\u00cd\7,\2\2\u00cd\u00cf\7\61\2\2\u00ce"+
+ "\u00b7\3\2\2\2\u00ce\u00c3\3\2\2\2\u00cf\u00d0\3\2\2\2\u00d0\u00d1\b\20"+
+ "\2\2\u00d1 \3\2\2\2\u00d2\u00d4\59\35\2\u00d3\u00d2\3\2\2\2\u00d4\u00d5"+
+ "\3\2\2\2\u00d5\u00d3\3\2\2\2\u00d5\u00d6\3\2\2\2\u00d6\u00f4\3\2\2\2\u00d7"+
+ "\u00d9\59\35\2\u00d8\u00d7\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\u00d8\3\2"+
+ "\2\2\u00da\u00db\3\2\2\2\u00db\u00dc\3\2\2\2\u00dc\u00de\7\60\2\2\u00dd"+
+ "\u00df\59\35\2\u00de\u00dd\3\2\2\2\u00df\u00e0\3\2\2\2\u00e0\u00de\3\2"+
+ "\2\2\u00e0\u00e1\3\2\2\2\u00e1\u00f4\3\2\2\2\u00e2\u00e4\7\60\2\2\u00e3"+
+ "\u00e5\59\35\2\u00e4\u00e3\3\2\2\2\u00e5\u00e6\3\2\2\2\u00e6\u00e4\3\2"+
+ "\2\2\u00e6\u00e7\3\2\2\2\u00e7\u00f4\3\2\2\2\u00e8\u00e9\7\62\2\2\u00e9"+
+ "\u00ec\7z\2\2\u00ea\u00ec\7&\2\2\u00eb\u00e8\3\2\2\2\u00eb\u00ea\3\2\2"+
+ "\2\u00ec\u00ef\3\2\2\2\u00ed\u00f0\59\35\2\u00ee\u00f0\5\67\34\2\u00ef"+
+ "\u00ed\3\2\2\2\u00ef\u00ee\3\2\2\2\u00f0\u00f1\3\2\2\2\u00f1\u00ef\3\2"+
+ "\2\2\u00f1\u00f2\3\2\2\2\u00f2\u00f4\3\2\2\2\u00f3\u00d3\3\2\2\2\u00f3"+
+ "\u00d8\3\2\2\2\u00f3\u00e2\3\2\2\2\u00f3\u00eb\3\2\2\2\u00f4\u011c\3\2"+
+ "\2\2\u00f5\u00f7\7g\2\2\u00f6\u00f8\7/\2\2\u00f7\u00f6\3\2\2\2\u00f7\u00f8"+
+ "\3\2\2\2\u00f8\u011a\3\2\2\2\u00f9\u00fb\59\35\2\u00fa\u00f9\3\2\2\2\u00fb"+
+ "\u00fc\3\2\2\2\u00fc\u00fa\3\2\2\2\u00fc\u00fd\3\2\2\2\u00fd\u011b\3\2"+
+ "\2\2\u00fe\u0100\59\35\2\u00ff\u00fe\3\2\2\2\u0100\u0101\3\2\2\2\u0101"+
+ "\u00ff\3\2\2\2\u0101\u0102\3\2\2\2\u0102\u0103\3\2\2\2\u0103\u0105\7\60"+
+ "\2\2\u0104\u0106\59\35\2\u0105\u0104\3\2\2\2\u0106\u0107\3\2\2\2\u0107"+
+ "\u0105\3\2\2\2\u0107\u0108\3\2\2\2\u0108\u011b\3\2\2\2\u0109\u010b\7\60"+
+ "\2\2\u010a\u010c\59\35\2\u010b\u010a\3\2\2\2\u010c\u010d\3\2\2\2\u010d"+
+ "\u010b\3\2\2\2\u010d\u010e\3\2\2\2\u010e\u011b\3\2\2\2\u010f\u0110\7\62"+
+ "\2\2\u0110\u0113\7z\2\2\u0111\u0113\7&\2\2\u0112\u010f\3\2\2\2\u0112\u0111"+
+ "\3\2\2\2\u0113\u0116\3\2\2\2\u0114\u0117\59\35\2\u0115\u0117\5\67\34\2"+
+ "\u0116\u0114\3\2\2\2\u0116\u0115\3\2\2\2\u0117\u0118\3\2\2\2\u0118\u0116"+
+ "\3\2\2\2\u0118\u0119\3\2\2\2\u0119\u011b\3\2\2\2\u011a\u00fa\3\2\2\2\u011a"+
+ "\u00ff\3\2\2\2\u011a\u0109\3\2\2\2\u011a\u0112\3\2\2\2\u011b\u011d\3\2"+
+ "\2\2\u011c\u00f5\3\2\2\2\u011c\u011d\3\2\2\2\u011d\"\3\2\2\2\u011e\u0122"+
+ "\5\67\34\2\u011f\u0122\59\35\2\u0120\u0122\7a\2\2\u0121\u011e\3\2\2\2"+
+ "\u0121\u011f\3\2\2\2\u0121\u0120\3\2\2\2\u0122\u0123\3\2\2\2\u0123\u0121"+
+ "\3\2\2\2\u0123\u0124\3\2\2\2\u0124\u0125\3\2\2\2\u0125\u0126\b\22\3\2"+
+ "\u0126$\3\2\2\2\u0127\u0128\7<\2\2\u0128&\3\2\2\2\u0129\u012f\7$\2\2\u012a"+
+ "\u012e\n\b\2\2\u012b\u012c\7$\2\2\u012c\u012e\7$\2\2\u012d\u012a\3\2\2"+
+ "\2\u012d\u012b\3\2\2\2\u012e\u0131\3\2\2\2\u012f\u012d\3\2\2\2\u012f\u0130"+
+ "\3\2\2\2\u0130\u0132\3\2\2\2\u0131\u012f\3\2\2\2\u0132\u013e\7$\2\2\u0133"+
+ "\u0139\7)\2\2\u0134\u0138\n\t\2\2\u0135\u0136\7)\2\2\u0136\u0138\7)\2"+
+ "\2\u0137\u0134\3\2\2\2\u0137\u0135\3\2\2\2\u0138\u013b\3\2\2\2\u0139\u0137"+
+ "\3\2\2\2\u0139\u013a\3\2\2\2\u013a\u013c\3\2\2\2\u013b\u0139\3\2\2\2\u013c"+
+ "\u013e\7)\2\2\u013d\u0129\3\2\2\2\u013d\u0133\3\2\2\2\u013e(\3\2\2\2\u013f"+
+ "\u0140\7}\2\2\u0140*\3\2\2\2\u0141\u0142\7\177\2\2\u0142,\3\2\2\2\u0143"+
+ "\u0144\7]\2\2\u0144.\3\2\2\2\u0145\u0146\7_\2\2\u0146\60\3\2\2\2\u0147"+
+ "\u0148\7*\2\2\u0148\62\3\2\2\2\u0149\u014a\7+\2\2\u014a\64\3\2\2\2\u014b"+
+ "\u014d\13\2\2\2\u014c\u014b\3\2\2\2\u014d\u014e\3\2\2\2\u014e\u014f\3"+
+ "\2\2\2\u014e\u014c\3\2\2\2\u014f\66\3\2\2\2\u0150\u0151\t\n\2\2\u0151"+
+ "8\3\2\2\2\u0152\u0153\t\13\2\2\u0153:\3\2\2\2\u0154\u0155\t\f\2\2\u0155"+
+ "<\3\2\2\2\u0156\u0157\t\r\2\2\u0157>\3\2\2\2\u0158\u0159\t\16\2\2\u0159"+
+ "@\3\2\2\2\u015a\u015b\t\17\2\2\u015bB\3\2\2\2\u015c\u015d\t\20\2\2\u015d"+
+ "D\3\2\2\2\u015e\u015f\t\21\2\2\u015fF\3\2\2\2\u0160\u0161\t\22\2\2\u0161"+
+ "H\3\2\2\2\u0162\u0163\t\23\2\2\u0163J\3\2\2\2\u0164\u0165\t\24\2\2\u0165"+
+ "L\3\2\2\2*\2QZo\u0093\u0098\u00a6\u00a8\u00ac\u00b3\u00bd\u00c1\u00c9"+
+ "\u00ce\u00d5\u00da\u00e0\u00e6\u00eb\u00ef\u00f1\u00f3\u00f7\u00fc\u0101"+
+ "\u0107\u010d\u0112\u0116\u0118\u011a\u011c\u0121\u0123\u012d\u012f\u0137"+
+ "\u0139\u013d\u014e\4\b\2\2\3\22\2";
+ public static final ATN _ATN =
+ new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {
_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
diff --git a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFListener.java b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFListener.java
index b86611f5..39a1c385 100644
--- a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFListener.java
+++ b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFListener.java
@@ -1,4 +1,4 @@
-// Generated from SQF.g4 by ANTLR 4.5.3
+// Generated from SQF.g4 by ANTLR 4.7
package raven.sqdev.parser.sqf;
diff --git a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFParser.java b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFParser.java
index ffa8ed38..d2354881 100644
--- a/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFParser.java
+++ b/plugin/Raven.SQDev.Misc/src/raven/sqdev/parser/sqf/SQFParser.java
@@ -1,4 +1,4 @@
-// Generated from SQF.g4 by ANTLR 4.5.3
+// Generated from SQF.g4 by ANTLR 4.7
package raven.sqdev.parser.sqf;
@@ -13,7 +13,7 @@
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class SQFParser extends Parser {
- static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }
+ static { RuntimeMetaData.checkVersion("4.7", RuntimeMetaData.VERSION); }
protected static final DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache =
@@ -114,11 +114,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitStart(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitStart(this);
- else return visitor.visitChildren(this);
- }
}
public final StartContext start() throws RecognitionException {
@@ -168,11 +163,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitCode(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitCode(this);
- else return visitor.visitChildren(this);
- }
}
public final CodeContext code() throws RecognitionException {
@@ -257,11 +247,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitMacro(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitMacro(this);
- else return visitor.visitChildren(this);
- }
}
public final MacroContext macro() throws RecognitionException {
@@ -347,11 +332,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitMacroArgument(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitMacroArgument(this);
- else return visitor.visitChildren(this);
- }
}
public final MacroArgumentContext macroArgument() throws RecognitionException {
@@ -403,7 +383,10 @@ public final MacroArgumentContext macroArgument() throws RecognitionException {
_la = _input.LA(1);
if ( _la <= 0 || (_la==COMMA || _la==R_B_C) ) {
_errHandler.recoverInline(this);
- } else {
+ }
+ else {
+ if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+ _errHandler.reportMatch(this);
consume();
}
}
@@ -448,11 +431,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitStatement(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitStatement(this);
- else return visitor.visitChildren(this);
- }
}
public final StatementContext statement() throws RecognitionException {
@@ -521,11 +499,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitAssignment(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitAssignment(this);
- else return visitor.visitChildren(this);
- }
}
public final AssignmentContext assignment() throws RecognitionException {
@@ -536,6 +509,7 @@ public final AssignmentContext assignment() throws RecognitionException {
enterOuterAlt(_localctx, 1);
{
setState(78);
+ _errHandler.sync(this);
_la = _input.LA(1);
if (_la==PRIVATE) {
{
@@ -545,6 +519,7 @@ public final AssignmentContext assignment() throws RecognitionException {
}
setState(82);
+ _errHandler.sync(this);
switch (_input.LA(1)) {
case ID:
{
@@ -622,11 +597,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitBinaryExpression(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitBinaryExpression(this);
- else return visitor.visitChildren(this);
- }
}
public final BinaryExpressionContext binaryExpression() throws RecognitionException {
@@ -829,11 +799,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitPrimaryExpression(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitPrimaryExpression(this);
- else return visitor.visitChildren(this);
- }
}
public final PrimaryExpressionContext primaryExpression(boolean allowBinaryAlts) throws RecognitionException {
@@ -910,11 +875,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitArray(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitArray(this);
- else return visitor.visitChildren(this);
- }
}
public static class ParenthesisContext extends NularExpressionContext {
public TerminalNode R_B_O() { return getToken(SQFParser.R_B_O, 0); }
@@ -931,11 +891,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitParenthesis(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitParenthesis(this);
- else return visitor.visitChildren(this);
- }
}
public static class NularOperatorContext extends NularExpressionContext {
public OperatorContext operator() {
@@ -950,11 +905,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitNularOperator(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitNularOperator(this);
- else return visitor.visitChildren(this);
- }
}
public static class NumberContext extends NularExpressionContext {
public TerminalNode NUMBER() { return getToken(SQFParser.NUMBER, 0); }
@@ -967,11 +917,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitNumber(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitNumber(this);
- else return visitor.visitChildren(this);
- }
}
public static class ErrorContext extends NularExpressionContext {
public CommonErrorContext commonError() {
@@ -986,11 +931,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitError(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitError(this);
- else return visitor.visitChildren(this);
- }
}
public static class StringContext extends NularExpressionContext {
public TerminalNode STRING() { return getToken(SQFParser.STRING, 0); }
@@ -1003,11 +943,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitString(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitString(this);
- else return visitor.visitChildren(this);
- }
}
public static class InlineCodeContext extends NularExpressionContext {
public TerminalNode C_B_O() { return getToken(SQFParser.C_B_O, 0); }
@@ -1024,11 +959,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitInlineCode(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitInlineCode(this);
- else return visitor.visitChildren(this);
- }
}
public final NularExpressionContext nularExpression() throws RecognitionException {
@@ -1186,11 +1116,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitCommonError(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitCommonError(this);
- else return visitor.visitChildren(this);
- }
}
public final CommonErrorContext commonError() throws RecognitionException {
@@ -1340,11 +1265,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitUnaryExpression(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitUnaryExpression(this);
- else return visitor.visitChildren(this);
- }
}
public final UnaryExpressionContext unaryExpression(boolean allowBinaryAlts) throws RecognitionException {
@@ -1362,7 +1282,10 @@ public final UnaryExpressionContext unaryExpression(boolean allowBinaryAlts) thr
_la = _input.LA(1);
if ( !(_la==PUCTUATION_OTHER || _la==UNARY_OPERATOR) ) {
_errHandler.recoverInline(this);
- } else {
+ }
+ else {
+ if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
+ _errHandler.reportMatch(this);
consume();
}
setState(196);
@@ -1419,11 +1342,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitOperator(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitOperator(this);
- else return visitor.visitChildren(this);
- }
}
public final OperatorContext operator() throws RecognitionException {
@@ -1431,6 +1349,7 @@ public final OperatorContext operator() throws RecognitionException {
enterRule(_localctx, 22, RULE_operator);
try {
setState(206);
+ _errHandler.sync(this);
switch (_input.LA(1)) {
case ID:
enterOuterAlt(_localctx, 1);
@@ -1475,11 +1394,6 @@ public void enterRule(ParseTreeListener listener) {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof SQFListener ) ((SQFListener)listener).exitPunctuation(this);
}
- @Override
- public T accept(ParseTreeVisitor visitor) {
- if ( visitor instanceof SQFVisitor ) return ((SQFVisitor)visitor).visitPunctuation(this);
- else return visitor.visitChildren(this);
- }
}
public final PunctuationContext punctuation() throws RecognitionException {
@@ -1542,7 +1456,7 @@ private boolean unaryExpression_sempred(UnaryExpressionContext _localctx, int pr
}
public static final String _serializedATN =
- "\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\36\u00d5\4\2\t\2"+
+ "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\36\u00d5\4\2\t\2"+
"\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\3\2\3\2\3\2\3\3\3\3\5\3\"\n\3\7\3$\n\3"+
"\f\3\16\3\'\13\3\3\3\5\3*\n\3\3\4\3\4\3\4\3\4\3\4\7\4\61\n\4\f\4\16\4"+
@@ -1558,8 +1472,8 @@ private boolean unaryExpression_sempred(UnaryExpressionContext _localctx, int pr
"\13\3\13\5\13\u00ba\n\13\3\13\3\13\3\13\5\13\u00bf\n\13\3\13\3\13\3\13"+
"\5\13\u00c4\n\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\5\f\u00cd\n\f\3\r\3\r\5\r"+
"\u00d1\n\r\3\16\3\16\3\16\3G\3\16\17\2\4\6\b\n\f\16\20\22\24\26\30\32"+
- "\2\4\4\2\f\f\33\33\4\2\5\5\36\36\u00f6\2\34\3\2\2\2\4%\3\2\2\2\6+\3\2"+
- "\2\2\bG\3\2\2\2\nM\3\2\2\2\fP\3\2\2\2\16b\3\2\2\2\20\u0084\3\2\2\2\22"+
+ "\2\4\4\2\f\f\33\33\4\2\5\5\36\36\2\u00f6\2\34\3\2\2\2\4%\3\2\2\2\6+\3"+
+ "\2\2\2\bG\3\2\2\2\nM\3\2\2\2\fP\3\2\2\2\16b\3\2\2\2\20\u0084\3\2\2\2\22"+
"\u009f\3\2\2\2\24\u00c3\3\2\2\2\26\u00cc\3\2\2\2\30\u00d0\3\2\2\2\32\u00d2"+
"\3\2\2\2\34\35\5\4\3\2\35\36\7\2\2\3\36\3\3\2\2\2\37!\5\n\6\2 \"\7\13"+
"\2\2! \3\2\2\2!\"\3\2\2\2\"$\3\2\2\2#\37\3\2\2\2$\'\3\2\2\2%#\3\2\2\2"+
diff --git a/plugin/Raven.SQDev.SQFEditor/META-INF/MANIFEST.MF b/plugin/Raven.SQDev.SQFEditor/META-INF/MANIFEST.MF
index c523d26a..b89d0ff5 100644
--- a/plugin/Raven.SQDev.SQFEditor/META-INF/MANIFEST.MF
+++ b/plugin/Raven.SQDev.SQFEditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: SQFEditor
Bundle-SymbolicName: raven.sqdev.editors.sqfeditor;singleton:=true
-Bundle-Version: 0.7.2
+Bundle-Version: 0.7.4.dev
Bundle-Activator: raven.sqdev.activator.Activator
Bundle-Vendor: Raven
Require-Bundle: org.eclipse.ui,
@@ -10,12 +10,12 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.editors,
org.eclipse.jface.text;bundle-version="3.9.2",
org.eclipse.osgi,
- raven.sqdev.util;bundle-version="0.1.0",
- raven.sqdev.editors;bundle-version="0.1.1",
- raven.sqdev.preferences,
+ raven.sqdev.util;bundle-version="0.7.1",
+ raven.sqdev.editors;bundle-version="0.7.1",
+ raven.sqdev.preferences;bundle-version="0.5.5",
org.eclipse.core.resources,
org.eclipse.ui.ide,
- raven.sqdev.misc;bundle-version="0.1.0",
+ raven.sqdev.misc;bundle-version="0.6.0",
org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
diff --git a/plugin/Raven.SQDev.UI/META-INF/MANIFEST.MF b/plugin/Raven.SQDev.UI/META-INF/MANIFEST.MF
index 870cc285..5963c355 100644
--- a/plugin/Raven.SQDev.UI/META-INF/MANIFEST.MF
+++ b/plugin/Raven.SQDev.UI/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: UI
Bundle-SymbolicName: raven.sqdev.ui;singleton:=true
-Bundle-Version: 0.3.0
+Bundle-Version: 0.3.1.dev
Bundle-Activator: raven.sqdev.ui.Activator
Bundle-Vendor: Raven
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- raven.sqdev.editors,
- raven.sqdev.util,
+ raven.sqdev.editors;bundle-version="0.7.1",
+ raven.sqdev.util;bundle-version="0.7.1",
org.eclipse.ui.navigator,
org.eclipse.ui.ide,
org.eclipse.ui.editors;bundle-version="3.8.200",
org.eclipse.core.resources,
org.eclipse.ui.navigator.resources,
- raven.sqdev.misc
+ raven.sqdev.misc;bundle-version="0.6.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
diff --git a/plugin/Raven.SQDev.Util/META-INF/MANIFEST.MF b/plugin/Raven.SQDev.Util/META-INF/MANIFEST.MF
index 25eb4615..0ebe899e 100644
--- a/plugin/Raven.SQDev.Util/META-INF/MANIFEST.MF
+++ b/plugin/Raven.SQDev.Util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Util
Bundle-SymbolicName: raven.sqdev.util;singleton:=true
-Bundle-Version: 0.7.0
+Bundle-Version: 0.7.2.dev
Bundle-Activator: raven.sqdev.activator.Activator
Bundle-Vendor: Raven
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil$1.class b/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil$1.class
index 7c2f9f19..d2e61257 100644
Binary files a/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil$1.class and b/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil$1.class differ
diff --git a/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil.class b/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil.class
index ac5ecb96..5ce11c07 100644
Binary files a/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil.class and b/plugin/Raven.SQDev.Util/bin/raven/sqdev/util/ProjectUtil.class differ
diff --git a/plugin/Raven.SQDev.Util/src/raven/sqdev/util/ProjectUtil.java b/plugin/Raven.SQDev.Util/src/raven/sqdev/util/ProjectUtil.java
index dffe0e86..946f930d 100644
--- a/plugin/Raven.SQDev.Util/src/raven/sqdev/util/ProjectUtil.java
+++ b/plugin/Raven.SQDev.Util/src/raven/sqdev/util/ProjectUtil.java
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
@@ -372,7 +373,8 @@ protected IStatus run(IProgressMonitor monitor) {
"Failed at building project " + projectName, e);
info.open(false);
}
- return null;
+
+ return Status.OK_STATUS;
}
};
buildJob.schedule();
diff --git a/plugin/Raven.SQDev/feature.xml b/plugin/Raven.SQDev/feature.xml
index 65831c78..35dd7ed6 100644
--- a/plugin/Raven.SQDev/feature.xml
+++ b/plugin/Raven.SQDev/feature.xml
@@ -2,7 +2,7 @@
@@ -88,14 +88,14 @@ POSSIBILITY OF SUCH DAMAGE.
id="raven.sqdev.editors.sqfeditor"
download-size="0"
install-size="0"
- version="0.7.2"
+ version="0.7.4.dev"
unpack="false"/>
diff --git a/plugin/RavenSQDev.Preferences/META-INF/MANIFEST.MF b/plugin/RavenSQDev.Preferences/META-INF/MANIFEST.MF
index b9125047..f3502095 100644
--- a/plugin/RavenSQDev.Preferences/META-INF/MANIFEST.MF
+++ b/plugin/RavenSQDev.Preferences/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Preferences
Bundle-SymbolicName: raven.sqdev.preferences;singleton:=true
-Bundle-Version: 0.5.4
+Bundle-Version: 0.5.5
Bundle-Activator: raven.sqdev.preferences.activator.Activator
Bundle-Vendor: Raven
Require-Bundle: org.eclipse.ui,
diff --git a/plugin/SQDev/site.xml b/plugin/SQDev/site.xml
index b98a4949..3446125f 100644
--- a/plugin/SQDev/site.xml
+++ b/plugin/SQDev/site.xml
@@ -1,6 +1,6 @@
-
+