You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2021/04/14 17:59:35 UTC
[incubator-nlpcraft] 06/06: Merge branch 'master' into NLPCRAFT-287
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-287
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 9beb6310bf833564b1585120a3a74b748a9c1f4b
Merge: facba33 a3f9f2b
Author: Sergey Kamov <sk...@gmail.com>
AuthorDate: Wed Apr 14 20:58:56 2021 +0300
Merge branch 'master' into NLPCRAFT-287
# Conflicts:
# nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlBaseListener.java
# nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.java
# nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlListener.java
# nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlParser.java
.../model/intent/compiler/NCIdlCompilerBase.scala | 8 +-
.../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 4 +-
.../intent/compiler/antlr4/NCIdlBaseListener.java | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.java | 685 +++++++++++----------
.../intent/compiler/antlr4/NCIdlListener.java | 2 +-
.../model/intent/compiler/antlr4/NCIdlParser.java | 2 +-
.../compiler/functions/NCIdlFunctionsStrings.scala | 8 +-
8 files changed, 357 insertions(+), 356 deletions(-)