This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-235
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-235 by this push:
new df74ce0 WIP.
df74ce0 is described below
commit df74ce0b954094e62a7539f0c3e764a755325fad
Author: Aaron Radzinski <[email protected]>
AuthorDate: Sat Mar 27 09:49:54 2021 -0700
WIP.
---
.../org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.g4 | 2 +-
.../apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.interp | 2 +-
.../apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.java | 2 +-
.../apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala | 10 +++++-----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.g4
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.g4
index 4f21797..962f23a 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.g4
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDsl.g4
@@ -42,7 +42,7 @@ UNDERSCORE: '_';
fragment ESC_CHAR: [{}\\_[\]|,];
fragment ESC: '\\' ESC_CHAR;
fragment TXT_CHAR
- : [~!@#$%^&*()+._]
+ : [~!@#$%^&*?()+._]
| [-=<>/\\;:`'",]
| 'A'..'Z'
| 'a'..'z'
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.interp
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.interp
index c9ab8a3..97a62a2 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.interp
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.interp
@@ -50,4 +50,4 @@ mode names:
DEFAULT_MODE
atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 13, 96, 8, 1,
4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8,
9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4,
14, 9, 14, 4, 15, 9, 15, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6,
3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 5, 9, 48, 10, 9, 3, 10, 3, 10, 6, 10,
52, 10, 10, 13, 10, 14, 10, 53, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 7,
11, 62, 10, 11, 12, 11, [...]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 13, 96, 8, 1,
4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8,
9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4,
14, 9, 14, 4, 15, 9, 15, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6,
3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 8, 3, 9, 5, 9, 48, 10, 9, 3, 10, 3, 10, 6, 10,
52, 10, 10, 13, 10, 14, 10, 53, 3, 10, 3, 10, 3, 11, 3, 11, 3, 11, 3, 11, 7,
11, 62, 10, 11, 12, 11, [...]
\ No newline at end of file
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.java
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.java
index e2d9665..a28fe8a 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.java
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/makro/antlr4/NCMacroDslLexer.java
@@ -114,7 +114,7 @@ public class NCMacroDslLexer extends Lexer {
"\13\3\13\3\f\3\f\3\f\3\f\7\fJ\n\f\f\f\16\fM\13\f\3\f\3\f\3\f\3\r\3\r\6"+
"\rT\n\r\r\r\16\rU\3\16\6\16Y\n\16\r\16\16\16Z\3\16\3\16\3\17\3\17\4?K"+
"\2\20\3\3\5\4\7\5\t\6\13\7\r\2\17\2\21\2\23\b\25\t\27\n\31\13\33\f\35"+
-
"\r\3\2\6\6\2..]_aa}\177\24\2#@B\\^^`|\u0080\u0080\u00a2\u0251\u025b\u0294"+
+
"\r\3\2\6\6\2..]_aa}\177\23\2#\\^^`|\u0080\u0080\u00a2\u0251\u025b\u0294"+
"\u02b2\u0371\u0402\u0501\u1e04\u1ef5\u1f03\u2001\u200e\u200f\u2041\u2042"+
"\u2072\u2191\u2c02\u2ff1\u3003\ud801\uf902\ufdd1\ufdf2\uffff\5\2\"\"."+
".\62;\5\2\13\f\16\17\"\"\2b\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3"+
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
index caef44f..3b68aef 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/deploy/NCDeployManager.scala
@@ -83,7 +83,7 @@ object NCDeployManager extends NCService with DecorateAsScala
{
private final val SEPARATORS = Seq('?', ',', '.', '-', '!')
- private final val SUSP_SYNS = Seq("?", "*", "+")
+ private final val SUSP_SYNS_CHARS = Seq("?", "*", "+")
@volatile private var data: ArrayBuffer[NCProbeModel] = _
@volatile private var mdlFactory: NCModelFactory = _
@@ -217,14 +217,14 @@ object NCDeployManager extends NCService with
DecorateAsScala {
val elmId = elm.getId
// Checks before macros processing.
- val susp = elm.getSynonyms.asScala.filter(syn ⇒
SUSP_SYNS.exists(susp ⇒ syn.contains(susp)))
+ val susp = elm.getSynonyms.asScala.filter(syn ⇒
SUSP_SYNS_CHARS.exists(susp ⇒ syn.contains(susp)))
if (susp.nonEmpty)
logger.warn(
s"Suspicious synonyms definition [" +
- s"mdlId=$mdlId, " +
- s"elementId=$elmId, " +
- s"synonyms=[${susp.mkString(", ")}]" +
+ s"mdlId=$mdlId, " +
+ s"elementId=$elmId, " +
+ s"synonyms=[${susp.mkString(", ")}]" +
s"]"
)
