[incubator-nlpcraft] branch NLPCRAFT-206 updated: WIP.

[aradzinski]

This is an automated email from the ASF dual-hosted git repository.

aradzinski pushed a commit to branch NLPCRAFT-206
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git


The following commit(s) were added to refs/heads/NLPCRAFT-206 by this push:
     new 3a7dede  WIP.
3a7dede is described below

commit 3a7dedec8c5c60c0c4e1036c04ea2a8a5fa57a2b
Author: Aaron Radzinski <aradizn...@apache.org>
AuthorDate: Tue Mar 16 12:11:22 2021 -0700

    WIP.
---
 .../org/apache/nlpcraft/model/intent/compiler/NCDslCompiler.scala      | 3 +++
 .../src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala | 2 +-
 .../scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpecTmp.scala   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCDslCompiler.scala
 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCDslCompiler.scala
index 2de7559..43de203 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCDslCompiler.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCDslCompiler.scala
@@ -165,6 +165,9 @@ object NCDslCompiler extends LazyLogging {
             implicit val evidence: PRC = ctx
 
             synonym = NCDslSynonym(origin, Option(alias), 
instrToPredicate("Synonym"))
+
+            alias = null
+            instrs.clear()
         }
 
         override def exitFragId(ctx: IDP.FragIdContext): Unit = {
diff --git 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
index cd05a1a..3a89f18 100644
--- 
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
+++ 
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/NCProbeSynonym.scala
@@ -117,7 +117,7 @@ class NCProbeSynonym(
                             r.matcher(get0(_.origText, _.origText)).matches() 
|| r.matcher(get0(_.normText, _.normText)).matches()
 
                         case DSL ⇒
-                            get0(t ⇒ chunk.dslPred.apply(t, NCDslContext(req = 
req))._2, _ ⇒ false)
+                            get0(t ⇒ chunk.dslPred.apply(t, NCDslContext(req = 
req))._1, _ ⇒ false)
 
                         case _ ⇒ throw new AssertionError()
                     }
diff --git 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpecTmp.scala
 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpecTmp.scala
index ff0e055..dd2f67b 100644
--- 
a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpecTmp.scala
+++ 
b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpecTmp.scala
@@ -30,7 +30,7 @@ class NCSynonymsSpecModelTmp extends 
NCModelAdapter("nlpcraft.syns.test.mdl", "S
 
     override def getElements: util.Set[NCElement] =
         Set(
-            NCTestElement("wrapper", "{^^{id() == 'unknown'}^^}")
+            NCTestElement("wrapper", "^^{id() == 'unknown'}^^")
         )
 
     @NCIntent("intent=onWrapper term(t)={id() == 'wrapper'}")