This is an automated email from the ASF dual-hosted git repository. sergeykamov pushed a commit to branch NLPCRAFT-91-REVIEW in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 14bce06079c9fd1fd45dbc308a14dd9ee86c5d91 Merge: 1eae3ee 466433b Author: Sergey Kamov <[email protected]> AuthorDate: Mon Mar 29 10:58:00 2021 +0300 Merge branch 'master' into NLPCRAFT-91-REVIEW .../nlpcraft/common/config/NCConfigurableJava.java | 4 +- .../common/extcfg/NCExternalConfigManager.scala | 4 +- .../nlpcraft/common/makro/NCMacroCompiler.scala | 4 +- .../nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 2 +- .../common/makro/antlr4/NCMacroDslLexer.interp | 2 +- .../common/makro/antlr4/NCMacroDslLexer.java | 2 +- .../org/apache/nlpcraft/common/util/NCUtils.scala | 81 +- .../org/apache/nlpcraft/examples/alarm/intents.idl | 4 +- .../apache/nlpcraft/examples/time/TimeModel.java | 5 +- .../nlpcraft/model/NCTokenPredicateContext.java | 3 +- .../nlpcraft/model/NCTokenPredicateResult.java | 10 +- .../model/intent/compiler/NCIdlCompiler.scala | 52 +- .../model/intent/compiler/NCIdlCompilerBase.scala | 12 +- .../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 15 +- .../model/intent/compiler/antlr4/NCIdl.interp | 3 +- .../intent/compiler/antlr4/NCIdlBaseListener.java | 12 + .../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +- .../model/intent/compiler/antlr4/NCIdlLexer.java | 930 ++++++++++----------- .../intent/compiler/antlr4/NCIdlListener.java | 10 + .../model/intent/compiler/antlr4/NCIdlParser.java | 834 ++++++++++-------- .../model/intent/solver/NCIntentSolverEngine.scala | 38 +- .../probe/mgrs/conn/NCConnectionManager.scala | 16 +- .../probe/mgrs/deploy/NCDeployManager.scala | 17 +- .../server/geo/tools/NCGeoNamesGenerator.scala | 2 +- .../geo/tools/NCGeoStateNamesGenerator.scala | 2 +- .../geo/tools/metro/NCGeoMetroGenerator.scala | 2 +- .../geo/tools/unstats/NCUnsdStatsService.scala | 2 +- .../org/apache/nlpcraft/server/json/NCJson.scala | 4 +- .../org/apache/nlpcraft/model/NCIdlSpec.scala | 2 +- .../nlpcraft/model/dialog/NCDialogSpec.scala | 71 +- .../nlpcraft/model/dialog/NCDialogSpec2.scala | 147 ++++ .../idl/compiler/functions/NCIdlFunctions.scala | 84 +- .../functions/NCIdlFunctionsCollections.scala | 5 +- .../compiler/functions/NCIdlFunctionsCompany.scala | 1 - .../compiler/functions/NCIdlFunctionsCustom.scala | 86 ++ .../compiler/functions/NCIdlFunctionsMath.scala | 18 +- .../compiler/functions/NCIdlFunctionsMeta.scala | 7 +- .../compiler/functions/NCIdlFunctionsOther.scala | 31 +- .../compiler/functions/NCIdlFunctionsRequest.scala | 2 +- .../compiler/functions/NCIdlFunctionsStat.scala | 15 +- .../compiler/functions/NCIdlFunctionsStrings.scala | 21 +- .../compiler/functions/NCIdlFunctionsToken.scala | 4 +- ...nsStat.scala => NCIdlFunctionsTokensUsed.scala} | 48 +- .../nlpcraft/model/intent/idl/compiler/test_ok.idl | 4 +- .../nlpcraft/model/intent/idl/idl_test_model.yaml | 2 +- .../apache/nlpcraft/model/meta/NCMetaSpec.scala | 4 +- ...onymsSpecTmp.scala => NCSuspSynonymsSpec.scala} | 25 +- 47 files changed, 1617 insertions(+), 1034 deletions(-)
