This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-161
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-161 by this push:
new fc62ccf WIP.
fc62ccf is described below
commit fc62ccf552c921e21e67164d3281db638cb7f57f
Author: Aaron Radzinski <[email protected]>
AuthorDate: Sat Oct 24 23:18:21 2020 -0700
WIP.
---
.../mgrs/model/NCModelSynonymDslCompiler.scala | 4 +-
.../model/antlr4/NCSynonymDslBaseListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslBaseVisitor.java | 98 ----------------------
.../probe/mgrs/model/antlr4/NCSynonymDslLexer.java | 5 +-
.../mgrs/model/antlr4/NCSynonymDslListener.java | 2 +-
.../mgrs/model/antlr4/NCSynonymDslParser.java | 65 +-------------
.../mgrs/model/antlr4/NCSynonymDslVisitor.java | 85 -------------------
7 files changed, 12 insertions(+), 249 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
index 18328d7..532ad76 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/NCModelSynonymDslCompiler.scala
@@ -20,11 +20,11 @@ package org.apache.nlpcraft.probe.mgrs.model
import com.typesafe.scalalogging.LazyLogging
import org.antlr.v4.runtime._
import org.antlr.v4.runtime.tree._
-
import org.apache.nlpcraft.common._
import org.apache.nlpcraft.model.NCToken
import org.apache.nlpcraft.model.intent.utils.NCDslTokenPredicate
-import org.apache.nlpcraft.probe.mgrs.model.antlr4._
+import org.apache.nlpcraft.probe.mgrs.model.antlr4.{NCSynonymDslBaseListener,
NCSynonymDslLexer, NCSynonymDslParser}
+//import org.apache.nlpcraft.probe.mgrs.model.antlr4._
import scala.collection.JavaConverters._
import scala.collection.mutable
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseListener.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseListener.java
index d655d5c..5e399d9 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseListener.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseListener.java
@@ -1,4 +1,4 @@
-// Generated from
/Users/xxx/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.g4
by ANTLR 4.8
+// Generated from C:/Users/Nikita
Ivanov/Documents/GitHub/incubator-nlpcraft/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4\NCSynonymDsl.g4
by ANTLR 4.8
package org.apache.nlpcraft.probe.mgrs.model.antlr4;
import org.antlr.v4.runtime.ParserRuleContext;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseVisitor.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseVisitor.java
deleted file mode 100644
index ed8033c..0000000
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslBaseVisitor.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// Generated from
/Users/xxx/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.g4
by ANTLR 4.8
-package org.apache.nlpcraft.probe.mgrs.model.antlr4;
-import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
-
-/**
- * This class provides an empty implementation of {@link NCSynonymDslVisitor},
- * which can be extended to create a visitor which only needs to handle a
subset
- * of the available methods.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-public class NCSynonymDslBaseVisitor<T> extends AbstractParseTreeVisitor<T>
implements NCSynonymDslVisitor<T> {
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitSynonym(NCSynonymDslParser.SynonymContext ctx)
{ return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitAlias(NCSynonymDslParser.AliasContext ctx) {
return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitItem(NCSynonymDslParser.ItemContext ctx) {
return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitPredicate(NCSynonymDslParser.PredicateContext
ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitLval(NCSynonymDslParser.LvalContext ctx) {
return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitLvalQual(NCSynonymDslParser.LvalQualContext
ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitLvalPart(NCSynonymDslParser.LvalPartContext
ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitRvalSingle(NCSynonymDslParser.RvalSingleContext
ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitRval(NCSynonymDslParser.RvalContext ctx) {
return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitRvalList(NCSynonymDslParser.RvalListContext
ctx) { return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitMeta(NCSynonymDslParser.MetaContext ctx) {
return visitChildren(ctx); }
- /**
- * {@inheritDoc}
- *
- * <p>The default implementation returns the result of calling
- * {@link #visitChildren} on {@code ctx}.</p>
- */
- @Override public T visitQstring(NCSynonymDslParser.QstringContext ctx)
{ return visitChildren(ctx); }
-}
\ No newline at end of file
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslLexer.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslLexer.java
index 106a6b6..97468fc 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslLexer.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslLexer.java
@@ -1,10 +1,13 @@
-// Generated from
/Users/xxx/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.g4
by ANTLR 4.8
+// Generated from C:/Users/Nikita
Ivanov/Documents/GitHub/incubator-nlpcraft/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4\NCSynonymDsl.g4
by ANTLR 4.8
package org.apache.nlpcraft.probe.mgrs.model.antlr4;
import org.antlr.v4.runtime.Lexer;
import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
import org.antlr.v4.runtime.*;
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
+import org.antlr.v4.runtime.misc.*;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class NCSynonymDslLexer extends Lexer {
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslListener.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslListener.java
index cff963c..e33a5cb 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslListener.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslListener.java
@@ -1,4 +1,4 @@
-// Generated from
/Users/xxx/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.g4
by ANTLR 4.8
+// Generated from C:/Users/Nikita
Ivanov/Documents/GitHub/incubator-nlpcraft/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4\NCSynonymDsl.g4
by ANTLR 4.8
package org.apache.nlpcraft.probe.mgrs.model.antlr4;
import org.antlr.v4.runtime.tree.ParseTreeListener;
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslParser.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslParser.java
index 2767757..09bf741 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslParser.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslParser.java
@@ -1,10 +1,13 @@
-// Generated from
/Users/xxx/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.g4
by ANTLR 4.8
+// Generated from C:/Users/Nikita
Ivanov/Documents/GitHub/incubator-nlpcraft/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4\NCSynonymDsl.g4
by ANTLR 4.8
package org.apache.nlpcraft.probe.mgrs.model.antlr4;
import org.antlr.v4.runtime.atn.*;
import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.*;
+import org.antlr.v4.runtime.misc.*;
import org.antlr.v4.runtime.tree.*;
import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class NCSynonymDslParser extends Parser {
@@ -119,11 +122,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitSynonym(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitSynonym(this);
- else return visitor.visitChildren(this);
- }
}
public final SynonymContext synonym() throws RecognitionException {
@@ -199,11 +197,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitAlias(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitAlias(this);
- else return visitor.visitChildren(this);
- }
}
public final AliasContext alias() throws RecognitionException {
@@ -258,11 +251,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitItem(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitItem(this);
- else return visitor.visitChildren(this);
- }
}
public final ItemContext item() throws RecognitionException {
@@ -389,11 +377,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitPredicate(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitPredicate(this);
- else return visitor.visitChildren(this);
- }
}
public final PredicateContext predicate() throws RecognitionException {
@@ -463,11 +446,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitLval(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitLval(this);
- else return visitor.visitChildren(this);
- }
}
public final LvalContext lval() throws RecognitionException {
@@ -579,11 +557,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitLvalQual(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitLvalQual(this);
- else return visitor.visitChildren(this);
- }
}
public final LvalQualContext lvalQual() throws RecognitionException {
@@ -656,11 +629,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitLvalPart(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitLvalPart(this);
- else return visitor.visitChildren(this);
- }
}
public final LvalPartContext lvalPart() throws RecognitionException {
@@ -706,11 +674,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitRvalSingle(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitRvalSingle(this);
- else return visitor.visitChildren(this);
- }
}
public final RvalSingleContext rvalSingle() throws RecognitionException
{
@@ -812,11 +775,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitRval(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitRval(this);
- else return visitor.visitChildren(this);
- }
}
public final RvalContext rval() throws RecognitionException {
@@ -883,11 +841,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitRvalList(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitRvalList(this);
- else return visitor.visitChildren(this);
- }
}
public final RvalListContext rvalList() throws RecognitionException {
@@ -968,11 +921,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitMeta(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitMeta(this);
- else return visitor.visitChildren(this);
- }
}
public final MetaContext meta() throws RecognitionException {
@@ -1051,11 +999,6 @@ public class NCSynonymDslParser extends Parser {
public void exitRule(ParseTreeListener listener) {
if ( listener instanceof NCSynonymDslListener )
((NCSynonymDslListener)listener).exitQstring(this);
}
- @Override
- public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
- if ( visitor instanceof NCSynonymDslVisitor ) return
((NCSynonymDslVisitor<? extends T>)visitor).visitQstring(this);
- else return visitor.visitChildren(this);
- }
}
public final QstringContext qstring() throws RecognitionException {
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslVisitor.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslVisitor.java
deleted file mode 100644
index 72bedbf..0000000
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDslVisitor.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Generated from
/Users/xxx/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/model/antlr4/NCSynonymDsl.g4
by ANTLR 4.8
-package org.apache.nlpcraft.probe.mgrs.model.antlr4;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-
-/**
- * This interface defines a complete generic visitor for a parse tree produced
- * by {@link NCSynonymDslParser}.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-public interface NCSynonymDslVisitor<T> extends ParseTreeVisitor<T> {
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#synonym}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitSynonym(NCSynonymDslParser.SynonymContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#alias}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitAlias(NCSynonymDslParser.AliasContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#item}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitItem(NCSynonymDslParser.ItemContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#predicate}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitPredicate(NCSynonymDslParser.PredicateContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#lval}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitLval(NCSynonymDslParser.LvalContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#lvalQual}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitLvalQual(NCSynonymDslParser.LvalQualContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#lvalPart}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitLvalPart(NCSynonymDslParser.LvalPartContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#rvalSingle}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitRvalSingle(NCSynonymDslParser.RvalSingleContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#rval}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitRval(NCSynonymDslParser.RvalContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#rvalList}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitRvalList(NCSynonymDslParser.RvalListContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#meta}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitMeta(NCSynonymDslParser.MetaContext ctx);
- /**
- * Visit a parse tree produced by {@link NCSynonymDslParser#qstring}.
- * @param ctx the parse tree
- * @return the visitor result
- */
- T visitQstring(NCSynonymDslParser.QstringContext ctx);
-}
\ No newline at end of file
