This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-273 in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit a45778b5bbf46743198018fe5d5da455c27c7d63 Merge: 32c4d28 b10ffcb Author: Sergey Kamov <[email protected]> AuthorDate: Sat Mar 20 10:12:43 2021 +0300 Merge branch 'master' into NLPCRAFT-273 .../apache/nlpcraft/examples/sql/SqlModel.scala | 2 +- .../apache/nlpcraft/examples/sql/sql_model.yaml | 6 +- .../model/intent/compiler/NCIdlCompilerBase.scala | 59 +- .../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 8 - .../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +- .../model/intent/compiler/antlr4/NCIdlLexer.java | 747 ++++++++++----------- .../{NCIntentDslSpec.scala => NCIdlSpec.scala} | 6 +- .../{NCIntentDslSpec2.scala => NCIdlSpec2.scala} | 6 +- .../NCIdlTestModel.scala} | 4 +- .../NCIdlTestSpec.scala} | 12 +- .../{dsl => idl}/compiler/NCIdlCompilerSpec.scala | 11 +- .../model/intent/{dsl => idl}/compiler/test_ok.idl | 1 + .../idl_test_model.yaml} | 0 .../model/NCEnricherNestedModelSpec5.scala | 2 +- 14 files changed, 435 insertions(+), 431 deletions(-)
