You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2021/03/24 02:14:54 UTC
[incubator-nlpcraft] branch NLPCRAFT-278 updated (14c8ef1 ->
4265ffc)
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a change to branch NLPCRAFT-278
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git.
from 14c8ef1 Update NCToken.java
new 68efdd0 WIP.
new 4265ffc WIP.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 2 +-
.../org/apache/nlpcraft/examples/alarm/intents.idl | 4 +-
.../examples/lightswitch/lightswitch_model.yaml | 2 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 4 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 30 +-
.../apache/nlpcraft/examples/sql/sql_model.yaml | 18 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 4 +-
.../nlpcraft/examples/weather/WeatherModel.java | 8 +-
.../org/apache/nlpcraft/model/NCIntentSample.java | 2 +-
.../model/intent/compiler/NCIdlCompilerBase.scala | 37 +-
.../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 37 +-
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.java | 827 +++++++++++----------
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 10 +-
.../org/apache/nlpcraft/model/NCIdlSpec.scala | 6 +-
.../org/apache/nlpcraft/model/NCIdlSpec2.scala | 10 +-
.../nlpcraft/model/NCIntentPrioritiesSpec.scala | 4 +-
.../abstract/NCAbstractTokensIntentsSpec.scala | 8 +-
.../model/abstract/NCAbstractTokensModel.scala | 8 +-
.../model/conversation/NCConversationSpec.scala | 2 +-
.../conversation/NCConversationTimeoutSpec.scala | 2 +-
.../nlpcraft/model/dialog/NCDialogSpec.scala | 8 +-
.../intent/idl/compiler/NCIdlCompilerSpec.scala | 6 +-
.../compiler/functions/NCIdlFunctionsToken.scala | 4 +-
.../nlpcraft/model/intent/idl/compiler/test_ok.idl | 4 +-
.../nlpcraft/model/intent/idl/idl_test_model.yaml | 6 +-
.../apache/nlpcraft/model/meta/NCMetaSpec.scala | 2 +-
.../model/properties/NCTokensPropertiesSpec.scala | 4 +-
.../properties/NCTokensRestrictionsSpec.scala | 8 +-
.../nlpcraft/model/synonyms/NCSynonymsSpec.scala | 10 +-
.../model/synonyms/NCSynonymsSpecTmp.scala | 4 +-
.../nlpcraft/models/stm/NCStmTestModel.scala | 8 +-
.../model/NCEnricherNestedModelSpec.scala | 10 +-
.../model/NCEnricherNestedModelSpec2.scala | 6 +-
.../model/NCEnricherNestedModelSpec3.scala | 4 +-
.../model/NCEnricherNestedModelSpec4.scala | 4 +-
.../model/NCEnricherNestedModelSpec5.scala | 4 +-
37 files changed, 614 insertions(+), 505 deletions(-)
[incubator-nlpcraft] 02/02: WIP.
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-278
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 4265ffc70d259943a9f42788081da21ab91b485d
Author: Aaron Radzinski <ar...@apache.org>
AuthorDate: Tue Mar 23 19:14:44 2021 -0700
WIP.
---
README.md | 2 +-
.../src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala | 2 +-
.../src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml | 4 ++--
.../src/main/scala/org/apache/nlpcraft/model/NCIntentSample.java | 2 +-
.../nlpcraft/model/intent/idl/compiler/NCIdlCompilerSpec.scala | 6 +++---
.../scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 5658c7f..e7a522e 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ elements:
- "{<ACTION>|shut|kill|stop|eliminate} {off|out} <LIGHT>"
- "no <LIGHT>"
intents:
- - "intent=ls term(act)~{has(groups(), 'act')} term(loc)~{id() == 'ls:loc'}*"
+ - "intent=ls term(act)~{has(tok_groups(), 'act')} term(loc)~{tok_id() == 'ls:loc'}*"
```
### Model Implementation
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
index d1ec30b..820c4ad 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -278,7 +278,7 @@ class SqlModel extends NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
*/
@NCIntent(
"intent=commonReport " +
- "term(tbls)~{has(groups(), 'table')}[0,7] " +
+ "term(tbls)~{has(tok_groups(), 'table')}[0,7] " +
"term(cols)~{has(list('col:date', 'col:num', 'col:varchar'), tok_id())}[0,7] " +
"term(condNums)~{tok_id() == 'condition:num'}[0,7] " +
"term(condVals)~{tok_id() == 'condition:value'}[0,7] " +
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml
index 88df041..856e1ae 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml
@@ -1445,12 +1445,12 @@ elements:
groups:
- "element"
synonyms:
- - "^^[colName]{has(groups(), 'column') && value() == null}^^"
+ - "^^[colName]{has(tok_groups(), 'column') && tok_value() == null}^^"
- id: "col:val"
groups:
- "element"
synonyms:
- - "^^[colVal]{has(groups(), 'column') && value() != null}^^"
+ - "^^[colVal]{has(tok_groups(), 'column') && tok_value() != null}^^"
- id: "col:num"
groups:
- "element"
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentSample.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentSample.java
index 7a97a01..75cd1e0 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentSample.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/NCIntentSample.java
@@ -35,7 +35,7 @@ import static java.lang.annotation.RetentionPolicy.*;
* <p>
* Here's an example of using this annotation (from <a target=_new href="https://nlpcraft.apache.org/examples/light_switch.html">LightSwitch</a> example):
* <pre class="brush: java, highlight: [2]">
- * {@literal @}NCIntent("intent=act term(act)={has(groups(), 'act')} term(loc)={trim(id()) == 'ls:loc'}*")
+ * {@literal @}NCIntent("intent=act term(act)={has(tok_groups(), 'act')} term(loc)={trim(tok_id()) == 'ls:loc'}*")
* {@literal @}NCIntentSample(Array(
* "Turn the lights off in the entire house.",
* "Switch on the illumination in the master bedroom closet.",
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/NCIdlCompilerSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/NCIdlCompilerSpec.scala
index fd6e8e5..0f09a66 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/NCIdlCompilerSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/NCIdlCompilerSpec.scala
@@ -79,7 +79,7 @@ class NCIdlCompilerSpec {
|intent=i1
| flow="a[^0-9]b"
| meta={'a': true, 'b': {'Москва': [1, 2, 3]}}
- | term(t1)={2 == 2 && size(id()) != -25}
+ | term(t1)={2 == 2 && size(tok_id()) != -25}
|""".stripMargin
)
checkCompileOk(
@@ -140,7 +140,7 @@ class NCIdlCompilerSpec {
| */
| flow="a[^0-9]b"
| meta={{'a': true, 'b': {'arr': [1, 2, 3]}}
- | term(t1)={2 == 2 && size(id()) != -25}
+ | term(t1)={2 == 2 && size(tok_id()) != -25}
|""".stripMargin
)
checkCompileError(
@@ -148,7 +148,7 @@ class NCIdlCompilerSpec {
|intent=i1
| meta={'a': true, 'b': {'arr': [1, 2, 3]}}
| term(t1)={
- | @x == 2 && size(id()) != -25
+ | @x == 2 && size(tok_id()) != -25
| }
|""".stripMargin
)
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl
index 4ca2b8c..b9ae2df 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl
@@ -21,7 +21,7 @@
// Re-usable predicate #1.
fragment=p1
- term={id(tok_find_part(token(), "alias")) == 2}
+ term={tok_id(tok_find_part(tok_this(), "alias")) == 2}
term={meta_frag('a') && has_any(get(meta_frag('b'), 'Москва'), list(1, 2))}
term(userDefined)=/org.apache.MyShit#myMethod/
@@ -37,7 +37,7 @@ intent=i1
intent=i2
flow="a[^0-9]b"
meta={'a': 42, 'b': {'Москва': [1, 2, 3]}}
- term(t1)={2 == 2 && !(id()) != -25 && meta_model('a') == 42}
+ term(t1)={2 == 2 && !(tok_id()) != -25 && meta_model('a') == 42}
term(t2)={
@a = meta_model('a')
@list = list(1, 2, 3, 4)
[incubator-nlpcraft] 01/02: WIP.
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-278
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit 68efdd021bbe608f4a07eb28d586a3a7ec1273db
Author: Aaron Radzinski <ar...@apache.org>
AuthorDate: Tue Mar 23 19:05:32 2021 -0700
WIP.
---
.../org/apache/nlpcraft/examples/alarm/intents.idl | 4 +-
.../examples/lightswitch/lightswitch_model.yaml | 2 +-
.../apache/nlpcraft/examples/phone/PhoneModel.java | 4 +-
.../apache/nlpcraft/examples/sql/SqlModel.scala | 28 +-
.../apache/nlpcraft/examples/sql/sql_model.yaml | 14 +-
.../apache/nlpcraft/examples/time/TimeModel.java | 4 +-
.../nlpcraft/examples/weather/WeatherModel.java | 8 +-
.../model/intent/compiler/NCIdlCompilerBase.scala | 37 +-
.../nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 | 37 +-
.../model/intent/compiler/antlr4/NCIdlLexer.interp | 2 +-
.../model/intent/compiler/antlr4/NCIdlLexer.java | 827 +++++++++++----------
.../nlpcraft/common/makro/NCMacroParserSpec.scala | 10 +-
.../org/apache/nlpcraft/model/NCIdlSpec.scala | 6 +-
.../org/apache/nlpcraft/model/NCIdlSpec2.scala | 10 +-
.../nlpcraft/model/NCIntentPrioritiesSpec.scala | 4 +-
.../abstract/NCAbstractTokensIntentsSpec.scala | 8 +-
.../model/abstract/NCAbstractTokensModel.scala | 8 +-
.../model/conversation/NCConversationSpec.scala | 2 +-
.../conversation/NCConversationTimeoutSpec.scala | 2 +-
.../nlpcraft/model/dialog/NCDialogSpec.scala | 8 +-
.../compiler/functions/NCIdlFunctionsToken.scala | 4 +-
.../nlpcraft/model/intent/idl/compiler/test_ok.idl | 2 +-
.../nlpcraft/model/intent/idl/idl_test_model.yaml | 6 +-
.../apache/nlpcraft/model/meta/NCMetaSpec.scala | 2 +-
.../model/properties/NCTokensPropertiesSpec.scala | 4 +-
.../properties/NCTokensRestrictionsSpec.scala | 8 +-
.../nlpcraft/model/synonyms/NCSynonymsSpec.scala | 10 +-
.../model/synonyms/NCSynonymsSpecTmp.scala | 4 +-
.../nlpcraft/models/stm/NCStmTestModel.scala | 8 +-
.../model/NCEnricherNestedModelSpec.scala | 10 +-
.../model/NCEnricherNestedModelSpec2.scala | 6 +-
.../model/NCEnricherNestedModelSpec3.scala | 4 +-
.../model/NCEnricherNestedModelSpec4.scala | 4 +-
.../model/NCEnricherNestedModelSpec5.scala | 4 +-
34 files changed, 605 insertions(+), 496 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.idl b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.idl
index 391b9de..a3e6d7c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.idl
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/alarm/intents.idl
@@ -16,14 +16,14 @@
*/
// Fragments (mostly for demo purposes here).
-fragment=buzz term~{id() == 'x:alarm'}
+fragment=buzz term~{tok_id() == 'x:alarm'}
fragment=when
term(nums)~{
// Demonstrating term variable.
@type = meta_token('nlpcraft:num:unittype')
@iseq = meta_token('nlpcraft:num:isequalcondition')
- id() == 'nlpcraft:num' && @type == 'datetime' && @iseq == true
+ tok_id() == 'nlpcraft:num' && @type == 'datetime' && @iseq == true
}[0,7]
// Intents
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml
index 0b15316..c7f4fa6 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml
@@ -60,4 +60,4 @@ elements:
- "<LIGHT> <KILL>"
- "no <LIGHT>"
intents:
- - "intent=ls term(act)={has(groups(), 'act')} term(loc)={id() == 'ls:loc'}*"
\ No newline at end of file
+ - "intent=ls term(act)={has(tok_groups(), 'act')} term(loc)={tok_id() == 'ls:loc'}*"
\ No newline at end of file
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/phone/PhoneModel.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/phone/PhoneModel.java
index bafd428..c083e3c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/phone/PhoneModel.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/phone/PhoneModel.java
@@ -50,9 +50,9 @@ public class PhoneModel extends NCModelFileAdapter {
*/
@NCIntent("" +
"intent=action " +
- "term={id() == 'phone:act'} " +
+ "term={tok_id() == 'phone:act'} " +
// Either organization, person or a phone number (or a combination of).
- "term(rcpt)={id() == 'google:organization' || id() == 'google:person' || id() == 'google:phone_number'}[1,3]"
+ "term(rcpt)={has(list('google:organization', 'google:person', 'google:phone_number'), tok_id())}[1,3]"
)
@NCIntentSample({
"Call to Apple office",
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
index 7cefe2e..d1ec30b 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/SqlModel.scala
@@ -279,13 +279,13 @@ class SqlModel extends NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
@NCIntent(
"intent=commonReport " +
"term(tbls)~{has(groups(), 'table')}[0,7] " +
- "term(cols)~{id() == 'col:date' || id() == 'col:num' || id() == 'col:varchar'}[0,7] " +
- "term(condNums)~{id() == 'condition:num'}[0,7] " +
- "term(condVals)~{id() == 'condition:value'}[0,7] " +
- "term(condDates)~{id() == 'condition:date'}[0,7] " +
- "term(condFreeDate)~{id() == 'nlpcraft:date'}? " +
- "term(sort)~{id() == 'nlpcraft:sort'}? " +
- "term(limit)~{id() == 'nlpcraft:limit'}?"
+ "term(cols)~{has(list('col:date', 'col:num', 'col:varchar'), tok_id())}[0,7] " +
+ "term(condNums)~{tok_id() == 'condition:num'}[0,7] " +
+ "term(condVals)~{tok_id() == 'condition:value'}[0,7] " +
+ "term(condDates)~{tok_id() == 'condition:date'}[0,7] " +
+ "term(condFreeDate)~{tok_id() == 'nlpcraft:date'}? " +
+ "term(sort)~{tok_id() == 'nlpcraft:sort'}? " +
+ "term(limit)~{tok_id() == 'nlpcraft:limit'}?"
)
@NCIntentSample(Array(
"order date, please!",
@@ -340,14 +340,14 @@ class SqlModel extends NCModelFileAdapter("org/apache/nlpcraft/examples/sql/sql_
*/
@NCIntent(
"intent=customSortReport " +
- "term(sort)~{id() == 'sort:best' || id() == 'sort:worst'} " +
- "term(tbls)~{has(groups(), 'table')}[0,7] " +
+ "term(sort)~{tok_id() == 'sort:best' || tok_id() == 'sort:worst'} " +
+ "term(tbls)~{has(tok_groups(), 'table')}[0,7] " +
"term(cols)~{has(list('col:date', 'col:num', 'col:varchar'), id())}[0,7] " +
- "term(condNums)~{id() == 'condition:num'}[0,7] " +
- "term(condVals)~{id() == 'condition:value'}[0,7] " +
- "term(condDates)~{id() == 'condition:date'}[0,7] " +
- "term(condFreeDate)~{id() == 'nlpcraft:date'}? " +
- "term(limit)~{id() == 'nlpcraft:limit'}?"
+ "term(condNums)~{tok_id() == 'condition:num'}[0,7] " +
+ "term(condVals)~{tok_id() == 'condition:value'}[0,7] " +
+ "term(condDates)~{tok_id() == 'condition:date'}[0,7] " +
+ "term(condFreeDate)~{tok_id() == 'nlpcraft:date'}? " +
+ "term(limit)~{tok_id() == 'nlpcraft:limit'}?"
)
@NCIntentSample(Array(
"What are the least performing categories for the last quarter?"
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml
index fb4d403..88df041 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/sql/sql_model.yaml
@@ -1455,33 +1455,33 @@ elements:
groups:
- "element"
synonyms:
- - "^^{id() == 'col' && has(list(4, 8), meta_part('colName', 'sql:datatype'))}^^"
+ - "^^{tok_id() == 'col' && has(list(4, 8), meta_part('colName', 'sql:datatype'))}^^"
- id: "col:date"
groups:
- "element"
synonyms:
- - "^^{id() == 'col' && meta_part('colName', 'sql:datatype') == 91}^^"
+ - "^^{tok_id() == 'col' && meta_part('colName', 'sql:datatype') == 91}^^"
- id: "col:varchar"
groups:
- "element"
synonyms:
- - "^^{id() == 'col' && meta_part('colName', 'sql:datatype') == 12}^^"
+ - "^^{tok_id() == 'col' && meta_part('colName', 'sql:datatype') == 12}^^"
- id: "condition:num"
groups:
- "condition"
synonyms:
- - "^^{id() == 'col:num'}^^ ^^{id() == 'nlpcraft:num'}^^ "
+ - "^^{tok_id() == 'col:num'}^^ ^^{tok_id() == 'nlpcraft:num'}^^ "
- id: "condition:value"
groups:
- "condition"
synonyms:
- - "^^{id() == 'col:varchar'}^^ {is|equal|_} ^^{id() == 'col:val'}^^"
- - "^^{id() == 'col:val'}^^"
+ - "^^{tok_id() == 'col:varchar'}^^ {is|equal|_} ^^{tok_id() == 'col:val'}^^"
+ - "^^{tok_id() == 'col:val'}^^"
- id: "condition:date"
groups:
- "condition"
synonyms:
- - "^^{id() == 'col:date'}^^ ^^{id() == 'nlpcraft:date'}^^"
+ - "^^{tok_id() == 'col:date'}^^ ^^{tok_id() == 'nlpcraft:date'}^^"
- id: "sort:best"
groups:
- "Sort criteria"
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModel.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModel.java
index b8e87c2..de83473 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModel.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/time/TimeModel.java
@@ -41,8 +41,8 @@ import static java.time.format.FormatStyle.*;
* See 'README.md' file in the same folder for running and testing instructions.
*/
// Declaring intents on the class level for demo purposes.
-@NCIntent("intent=intent2 term~{id() == 'x:time'} term(city)~{id() == 'nlpcraft:city'}")
-@NCIntent("intent=intent1 term={id() == 'x:time'}")
+@NCIntent("intent=intent2 term~{tok_id() == 'x:time'} term(city)~{tok_id() == 'nlpcraft:city'}")
+@NCIntent("intent=intent1 term={tok_id() == 'x:time'}")
public class TimeModel extends NCModelFileAdapter {
// Medium data formatter.
static private final DateTimeFormatter FMT = DateTimeFormatter.ofLocalizedDateTime(MEDIUM);
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
index c3e22f1..bbdd5c9 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/examples/weather/WeatherModel.java
@@ -121,13 +121,13 @@ public class WeatherModel extends NCModelFileAdapter {
*/
@NCIntent(
"intent=req " +
- "term~{id() == 'wt:phen'}* " + // Zero or more weather phenomenon.
+ "term~{tok_id() == 'wt:phen'}* " + // Zero or more weather phenomenon.
"term(ind)~{" +
- "@isIndicator = has(groups(), 'indicator') " + // Just to demo term variable usage.
+ "@isIndicator = has(tok_groups(), 'indicator') " + // Just to demo term variable usage.
"@isIndicator" +
"}* " + // Optional indicator words (zero or more).
- "term(city)~{id() == 'nlpcraft:city'}? " + // Optional city.
- "term(date)~{id() == 'nlpcraft:date'}?" // Optional date (overrides indicator words).
+ "term(city)~{tok_id() == 'nlpcraft:city'}? " + // Optional city.
+ "term(date)~{tok_id() == 'nlpcraft:date'}?" // Optional date (overrides indicator words).
)
// NOTE: each samples group will reset conversation STM during auto-testing.
@NCIntentSample({
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
index b195eea..b24cecd 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/NCIdlCompilerBase.scala
@@ -856,17 +856,32 @@ trait NCIdlCompilerBase {
case "if" ⇒ doIf()
// Token functions.
- case "id" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getId, 1) }) }
- case "ancestors" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getAncestors, 1) }) }
- case "parent" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getParentId, 1) }) }
- case "groups" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getGroups, 1) }) }
- case "value" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getValue, 1) }) }
- case "aliases" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getAliases, 1) }) }
- case "start_idx" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getStartCharIndex, 1) }) }
- case "end_idx" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getEndCharIndex, 1) }) }
- case "token" ⇒ z0(() ⇒ Z(tok, 1))
- case "find_part" ⇒ doFindPart()
- case "find_parts" ⇒ doFindParts()
+ case "tok_id" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getId, 1) }) }
+ case "tok_lemma" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getLemma, 1) }) }
+ case "tok_stem" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getStem, 1) }) }
+ case "tok_pos" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getPos, 1) }) }
+ case "tok_sparsity" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getSparsity, 1) }) }
+ case "tok_unid" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getUnid, 1) }) }
+ case "tok_is_abstract" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isAbstract, 1) }) }
+ case "tok_is_bracketed" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isBracketed, 1) }) }
+ case "tok_is_direct" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isDirect, 1) }) }
+ case "tok_is_english" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isEnglish, 1) }) }
+ case "tok_is_freeWord" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isFreeWord, 1) }) }
+ case "tok_is_quoted" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isQuoted, 1) }) }
+ case "tok_is_stopword" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isStopWord, 1) }) }
+ case "tok_is_swear" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isSwear, 1) }) }
+ case "tok_is_user" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isUserDefined, 1) }) }
+ case "tok_is_wordnet" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).isWordnet, 1) }) }
+ case "tok_ancestors" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getAncestors, 1) }) }
+ case "tok_parent" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getParentId, 1) }) }
+ case "tok_groups" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getGroups, 1) }) }
+ case "tok_value" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getValue, 1) }) }
+ case "tok_aliases" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getAliases, 1) }) }
+ case "tok_start_idx" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getStartCharIndex, 1) }) }
+ case "tok_end_idx" ⇒ arg1Tok() match { case x ⇒ stack.push(() ⇒ { Z(toToken(x().value).getEndCharIndex, 1) }) }
+ case "tok_this" ⇒ z0(() ⇒ Z(tok, 1))
+ case "tok_find_part" ⇒ doFindPart()
+ case "tok_find_parts" ⇒ doFindParts()
// Request data.
case "req_id" ⇒ z0(() ⇒ Z(termCtx.req.getServerRequestId, 0))
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdl.g4 b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdl.g4
index 1aaead1..64efd4d 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdl.g4
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdl.g4
@@ -137,17 +137,32 @@ FUN_NAME
| 'meta_frag'
| 'json'
| 'if'
- | 'id'
- | 'token'
- | 'find_part'
- | 'find_parts'
- | 'ancestors'
- | 'parent'
- | 'groups'
- | 'value'
- | 'aliases'
- | 'start_idx'
- | 'end_idx'
+ | 'tok_id'
+ | 'tok_lemma'
+ | 'tok_stem'
+ | 'tok_pos'
+ | 'tok_sparsity'
+ | 'tok_unid'
+ | 'tok_is_abstract'
+ | 'tok_is_bracketed'
+ | 'tok_is_direct'
+ | 'tok_is_english'
+ | 'tok_is_freeWord'
+ | 'tok_is_quoted'
+ | 'tok_is_stopword'
+ | 'tok_is_swear'
+ | 'tok_is_user'
+ | 'tok_is_wordnet'
+ | 'tok_ancestors'
+ | 'tok_parent'
+ | 'tok_groups'
+ | 'tok_value'
+ | 'tok_aliases'
+ | 'tok_start_idx'
+ | 'tok_end_idx'
+ | 'tok_this'
+ | 'tok_find_part'
+ | 'tok_find_parts'
| 'req_id'
| 'req_normtext'
| 'req_tstamp'
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.interp b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.interp
index 49215a4..4d40473 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.interp
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.interp
@@ -172,4 +172,4 @@ mode names:
DEFAULT_MODE
atn:
-[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 54, 1178, 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, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, [...]
\ No newline at end of file
+[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 54, 1403, 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, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, [...]
\ No newline at end of file
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.java b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.java
index 42d39de..802871a 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.java
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/intent/compiler/antlr4/NCIdlLexer.java
@@ -124,7 +124,7 @@ public class NCIdlLexer extends Lexer {
public ATN getATN() { return _ATN; }
public static final String _serializedATN =
- "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\66\u049a\b\1\4\2"+
+ "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\66\u057b\b\1\4\2"+
"\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4"+
"\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22"+
"\t\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31"+
@@ -180,379 +180,458 @@ public class NCIdlLexer extends Lexer {
"\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
"\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
"\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
- "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\5\b\u03cd\n\b\3\t\3"+
- "\t\3\t\3\t\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\7\n\u03dc\n\n\f\n\16\n"+
- "\u03df\13\n\3\n\3\n\3\13\3\13\3\13\3\13\7\13\u03e7\n\13\f\13\16\13\u03ea"+
- "\13\13\3\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\5\f\u03f7\n\f\3\r"+
- "\3\r\3\r\3\r\3\r\3\16\3\16\3\16\3\17\3\17\3\17\3\20\3\20\3\20\3\21\3\21"+
- "\3\21\3\22\3\22\3\23\3\23\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\27"+
- "\3\27\3\30\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\34\3\34\3\35\3\35\3\36"+
- "\3\36\3\37\3\37\3 \3 \3!\3!\3\"\3\"\3#\3#\3$\3$\3%\3%\3&\3&\3\'\3\'\3"+
- "(\3(\3)\3)\3*\3*\3+\3+\3,\3,\3-\3-\3.\3.\3/\3/\3/\7/\u0449\n/\f/\16/\u044c"+
- "\13/\5/\u044e\n/\3\60\3\60\6\60\u0452\n\60\r\60\16\60\u0453\3\61\3\61"+
- "\5\61\u0458\n\61\3\61\3\61\3\62\3\62\3\63\3\63\3\64\3\64\3\64\3\64\6\64"+
- "\u0464\n\64\r\64\16\64\u0465\3\64\3\64\3\64\3\64\3\64\3\64\3\64\7\64\u046f"+
- "\n\64\f\64\16\64\u0472\13\64\3\65\3\65\3\65\3\65\7\65\u0478\n\65\f\65"+
- "\16\65\u047b\13\65\3\65\5\65\u047e\n\65\3\65\5\65\u0481\n\65\3\65\3\65"+
- "\3\65\3\65\7\65\u0487\n\65\f\65\16\65\u048a\13\65\3\65\3\65\5\65\u048e"+
- "\n\65\3\65\3\65\3\66\6\66\u0493\n\66\r\66\16\66\u0494\3\66\3\66\3\67\3"+
- "\67\3\u0488\28\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16"+
- "\33\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34"+
- "\67\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\2e\2g\63"+
- "i\64k\65m\66\3\2\16\3\2))\3\2$$\3\2\63;\4\2\62;aa\3\2\62;\4\2GGgg\4\2"+
- "--//\17\2\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\4\2C\\c|\4\2\f\f\17\17\3\3\f\f\5\2\13\f\16\17"+
- "\"\"\2\u0525\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2"+
- "\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2"+
- "\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2"+
- "\2\2\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2"+
- "\2\2/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3"+
- "\2\2\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2"+
- "\2\2G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2"+
- "S\3\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3"+
- "\2\2\2\2a\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\3o\3\2\2"+
- "\2\5v\3\2\2\2\7}\3\2\2\2\t\u0085\3\2\2\2\13\u008a\3\2\2\2\r\u008f\3\2"+
- "\2\2\17\u03cc\3\2\2\2\21\u03ce\3\2\2\2\23\u03d7\3\2\2\2\25\u03e2\3\2\2"+
- "\2\27\u03f6\3\2\2\2\31\u03f8\3\2\2\2\33\u03fd\3\2\2\2\35\u0400\3\2\2\2"+
- "\37\u0403\3\2\2\2!\u0406\3\2\2\2#\u0409\3\2\2\2%\u040b\3\2\2\2\'\u040d"+
- "\3\2\2\2)\u0410\3\2\2\2+\u0413\3\2\2\2-\u0415\3\2\2\2/\u0417\3\2\2\2\61"+
- "\u0419\3\2\2\2\63\u041b\3\2\2\2\65\u041d\3\2\2\2\67\u041f\3\2\2\29\u0421"+
- "\3\2\2\2;\u0423\3\2\2\2=\u0425\3\2\2\2?\u0427\3\2\2\2A\u0429\3\2\2\2C"+
- "\u042b\3\2\2\2E\u042d\3\2\2\2G\u042f\3\2\2\2I\u0431\3\2\2\2K\u0433\3\2"+
- "\2\2M\u0435\3\2\2\2O\u0437\3\2\2\2Q\u0439\3\2\2\2S\u043b\3\2\2\2U\u043d"+
- "\3\2\2\2W\u043f\3\2\2\2Y\u0441\3\2\2\2[\u0443\3\2\2\2]\u044d\3\2\2\2_"+
- "\u044f\3\2\2\2a\u0455\3\2\2\2c\u045b\3\2\2\2e\u045d\3\2\2\2g\u0463\3\2"+
- "\2\2i\u048d\3\2\2\2k\u0492\3\2\2\2m\u0498\3\2\2\2op\7k\2\2pq\7o\2\2qr"+
- "\7r\2\2rs\7q\2\2st\7t\2\2tu\7v\2\2u\4\3\2\2\2vw\7k\2\2wx\7p\2\2xy\7v\2"+
- "\2yz\7g\2\2z{\7p\2\2{|\7v\2\2|\6\3\2\2\2}~\7q\2\2~\177\7t\2\2\177\u0080"+
- "\7f\2\2\u0080\u0081\7g\2\2\u0081\u0082\7t\2\2\u0082\u0083\7g\2\2\u0083"+
- "\u0084\7f\2\2\u0084\b\3\2\2\2\u0085\u0086\7h\2\2\u0086\u0087\7n\2\2\u0087"+
- "\u0088\7q\2\2\u0088\u0089\7y\2\2\u0089\n\3\2\2\2\u008a\u008b\7o\2\2\u008b"+
- "\u008c\7g\2\2\u008c\u008d\7v\2\2\u008d\u008e\7c\2\2\u008e\f\3\2\2\2\u008f"+
- "\u0090\7v\2\2\u0090\u0091\7g\2\2\u0091\u0092\7t\2\2\u0092\u0093\7o\2\2"+
- "\u0093\16\3\2\2\2\u0094\u0095\7o\2\2\u0095\u0096\7g\2\2\u0096\u0097\7"+
- "v\2\2\u0097\u0098\7c\2\2\u0098\u0099\7a\2\2\u0099\u009a\7v\2\2\u009a\u009b"+
- "\7q\2\2\u009b\u009c\7m\2\2\u009c\u009d\7g\2\2\u009d\u03cd\7p\2\2\u009e"+
- "\u009f\7o\2\2\u009f\u00a0\7g\2\2\u00a0\u00a1\7v\2\2\u00a1\u00a2\7c\2\2"+
- "\u00a2\u00a3\7a\2\2\u00a3\u00a4\7r\2\2\u00a4\u00a5\7c\2\2\u00a5\u00a6"+
- "\7t\2\2\u00a6\u03cd\7v\2\2\u00a7\u00a8\7o\2\2\u00a8\u00a9\7g\2\2\u00a9"+
- "\u00aa\7v\2\2\u00aa\u00ab\7c\2\2\u00ab\u00ac\7a\2\2\u00ac\u00ad\7o\2\2"+
- "\u00ad\u00ae\7q\2\2\u00ae\u00af\7f\2\2\u00af\u00b0\7g\2\2\u00b0\u03cd"+
- "\7n\2\2\u00b1\u00b2\7o\2\2\u00b2\u00b3\7g\2\2\u00b3\u00b4\7v\2\2\u00b4"+
- "\u00b5\7c\2\2\u00b5\u00b6\7a\2\2\u00b6\u00b7\7k\2\2\u00b7\u00b8\7p\2\2"+
- "\u00b8\u00b9\7v\2\2\u00b9\u00ba\7g\2\2\u00ba\u00bb\7p\2\2\u00bb\u03cd"+
- "\7v\2\2\u00bc\u00bd\7o\2\2\u00bd\u00be\7g\2\2\u00be\u00bf\7v\2\2\u00bf"+
- "\u00c0\7c\2\2\u00c0\u00c1\7a\2\2\u00c1\u00c2\7t\2\2\u00c2\u00c3\7g\2\2"+
- "\u00c3\u03cd\7s\2\2\u00c4\u00c5\7o\2\2\u00c5\u00c6\7g\2\2\u00c6\u00c7"+
- "\7v\2\2\u00c7\u00c8\7c\2\2\u00c8\u00c9\7a\2\2\u00c9\u00ca\7w\2\2\u00ca"+
- "\u00cb\7u\2\2\u00cb\u00cc\7g\2\2\u00cc\u03cd\7t\2\2\u00cd\u00ce\7o\2\2"+
- "\u00ce\u00cf\7g\2\2\u00cf\u00d0\7v\2\2\u00d0\u00d1\7c\2\2\u00d1\u00d2"+
- "\7a\2\2\u00d2\u00d3\7e\2\2\u00d3\u00d4\7q\2\2\u00d4\u00d5\7o\2\2\u00d5"+
- "\u00d6\7r\2\2\u00d6\u00d7\7c\2\2\u00d7\u00d8\7p\2\2\u00d8\u03cd\7{\2\2"+
- "\u00d9\u00da\7o\2\2\u00da\u00db\7g\2\2\u00db\u00dc\7v\2\2\u00dc\u00dd"+
- "\7c\2\2\u00dd\u00de\7a\2\2\u00de\u00df\7u\2\2\u00df\u00e0\7{\2\2\u00e0"+
- "\u03cd\7u\2\2\u00e1\u00e2\7o\2\2\u00e2\u00e3\7g\2\2\u00e3\u00e4\7v\2\2"+
- "\u00e4\u00e5\7c\2\2\u00e5\u00e6\7a\2\2\u00e6\u00e7\7e\2\2\u00e7\u00e8"+
- "\7q\2\2\u00e8\u00e9\7p\2\2\u00e9\u03cd\7x\2\2\u00ea\u00eb\7o\2\2\u00eb"+
- "\u00ec\7g\2\2\u00ec\u00ed\7v\2\2\u00ed\u00ee\7c\2\2\u00ee\u00ef\7a\2\2"+
- "\u00ef\u00f0\7h\2\2\u00f0\u00f1\7t\2\2\u00f1\u00f2\7c\2\2\u00f2\u03cd"+
- "\7i\2\2\u00f3\u00f4\7l\2\2\u00f4\u00f5\7u\2\2\u00f5\u00f6\7q\2\2\u00f6"+
- "\u03cd\7p\2\2\u00f7\u00f8\7k\2\2\u00f8\u03cd\7h\2\2\u00f9\u00fa\7k\2\2"+
- "\u00fa\u03cd\7f\2\2\u00fb\u00fc\7v\2\2\u00fc\u00fd\7q\2\2\u00fd\u00fe"+
- "\7m\2\2\u00fe\u00ff\7g\2\2\u00ff\u03cd\7p\2\2\u0100\u0101\7h\2\2\u0101"+
- "\u0102\7k\2\2\u0102\u0103\7p\2\2\u0103\u0104\7f\2\2\u0104\u0105\7a\2\2"+
- "\u0105\u0106\7r\2\2\u0106\u0107\7c\2\2\u0107\u0108\7t\2\2\u0108\u03cd"+
- "\7v\2\2\u0109\u010a\7h\2\2\u010a\u010b\7k\2\2\u010b\u010c\7p\2\2\u010c"+
- "\u010d\7f\2\2\u010d\u010e\7a\2\2\u010e\u010f\7r\2\2\u010f\u0110\7c\2\2"+
- "\u0110\u0111\7t\2\2\u0111\u0112\7v\2\2\u0112\u03cd\7u\2\2\u0113\u0114"+
- "\7c\2\2\u0114\u0115\7p\2\2\u0115\u0116\7e\2\2\u0116\u0117\7g\2\2\u0117"+
- "\u0118\7u\2\2\u0118\u0119\7v\2\2\u0119\u011a\7q\2\2\u011a\u011b\7t\2\2"+
- "\u011b\u03cd\7u\2\2\u011c\u011d\7r\2\2\u011d\u011e\7c\2\2\u011e\u011f"+
- "\7t\2\2\u011f\u0120\7g\2\2\u0120\u0121\7p\2\2\u0121\u03cd\7v\2\2\u0122"+
- "\u0123\7i\2\2\u0123\u0124\7t\2\2\u0124\u0125\7q\2\2\u0125\u0126\7w\2\2"+
- "\u0126\u0127\7r\2\2\u0127\u03cd\7u\2\2\u0128\u0129\7x\2\2\u0129\u012a"+
- "\7c\2\2\u012a\u012b\7n\2\2\u012b\u012c\7w\2\2\u012c\u03cd\7g\2\2\u012d"+
- "\u012e\7c\2\2\u012e\u012f\7n\2\2\u012f\u0130\7k\2\2\u0130\u0131\7c\2\2"+
- "\u0131\u0132\7u\2\2\u0132\u0133\7g\2\2\u0133\u03cd\7u\2\2\u0134\u0135"+
- "\7u\2\2\u0135\u0136\7v\2\2\u0136\u0137\7c\2\2\u0137\u0138\7t\2\2\u0138"+
- "\u0139\7v\2\2\u0139\u013a\7a\2\2\u013a\u013b\7k\2\2\u013b\u013c\7f\2\2"+
- "\u013c\u03cd\7z\2\2\u013d\u013e\7g\2\2\u013e\u013f\7p\2\2\u013f\u0140"+
- "\7f\2\2\u0140\u0141\7a\2\2\u0141\u0142\7k\2\2\u0142\u0143\7f\2\2\u0143"+
- "\u03cd\7z\2\2\u0144\u0145\7t\2\2\u0145\u0146\7g\2\2\u0146\u0147\7s\2\2"+
- "\u0147\u0148\7a\2\2\u0148\u0149\7k\2\2\u0149\u03cd\7f\2\2\u014a\u014b"+
- "\7t\2\2\u014b\u014c\7g\2\2\u014c\u014d\7s\2\2\u014d\u014e\7a\2\2\u014e"+
- "\u014f\7p\2\2\u014f\u0150\7q\2\2\u0150\u0151\7t\2\2\u0151\u0152\7o\2\2"+
- "\u0152\u0153\7v\2\2\u0153\u0154\7g\2\2\u0154\u0155\7z\2\2\u0155\u03cd"+
- "\7v\2\2\u0156\u0157\7t\2\2\u0157\u0158\7g\2\2\u0158\u0159\7s\2\2\u0159"+
- "\u015a\7a\2\2\u015a\u015b\7v\2\2\u015b\u015c\7u\2\2\u015c\u015d\7v\2\2"+
- "\u015d\u015e\7c\2\2\u015e\u015f\7o\2\2\u015f\u03cd\7r\2\2\u0160\u0161"+
- "\7t\2\2\u0161\u0162\7g\2\2\u0162\u0163\7s\2\2\u0163\u0164\7a\2\2\u0164"+
- "\u0165\7c\2\2\u0165\u0166\7f\2\2\u0166\u0167\7f\2\2\u0167\u03cd\7t\2\2"+
- "\u0168\u0169\7t\2\2\u0169\u016a\7g\2\2\u016a\u016b\7s\2\2\u016b\u016c"+
- "\7a\2\2\u016c\u016d\7c\2\2\u016d\u016e\7i\2\2\u016e\u016f\7g\2\2\u016f"+
- "\u0170\7p\2\2\u0170\u03cd\7v\2\2\u0171\u0172\7w\2\2\u0172\u0173\7u\2\2"+
- "\u0173\u0174\7g\2\2\u0174\u0175\7t\2\2\u0175\u0176\7a\2\2\u0176\u0177"+
- "\7k\2\2\u0177\u03cd\7f\2\2\u0178\u0179\7w\2\2\u0179\u017a\7u\2\2\u017a"+
- "\u017b\7g\2\2\u017b\u017c\7t\2\2\u017c\u017d\7a\2\2\u017d\u017e\7h\2\2"+
- "\u017e\u017f\7p\2\2\u017f\u0180\7c\2\2\u0180\u0181\7o\2\2\u0181\u03cd"+
- "\7g\2\2\u0182\u0183\7w\2\2\u0183\u0184\7u\2\2\u0184\u0185\7g\2\2\u0185"+
- "\u0186\7t\2\2\u0186\u0187\7a\2\2\u0187\u0188\7n\2\2\u0188\u0189\7p\2\2"+
- "\u0189\u018a\7c\2\2\u018a\u018b\7o\2\2\u018b\u03cd\7g\2\2\u018c\u018d"+
- "\7w\2\2\u018d\u018e\7u\2\2\u018e\u018f\7g\2\2\u018f\u0190\7t\2\2\u0190"+
- "\u0191\7a\2\2\u0191\u0192\7g\2\2\u0192\u0193\7o\2\2\u0193\u0194\7c\2\2"+
- "\u0194\u0195\7k\2\2\u0195\u03cd\7n\2\2\u0196\u0197\7w\2\2\u0197\u0198"+
- "\7u\2\2\u0198\u0199\7g\2\2\u0199\u019a\7t\2\2\u019a\u019b\7a\2\2\u019b"+
- "\u019c\7c\2\2\u019c\u019d\7f\2\2\u019d\u019e\7o\2\2\u019e\u019f\7k\2\2"+
- "\u019f\u03cd\7p\2\2\u01a0\u01a1\7w\2\2\u01a1\u01a2\7u\2\2\u01a2\u01a3"+
- "\7g\2\2\u01a3\u01a4\7t\2\2\u01a4\u01a5\7a\2\2\u01a5\u01a6\7u\2\2\u01a6"+
- "\u01a7\7k\2\2\u01a7\u01a8\7i\2\2\u01a8\u01a9\7p\2\2\u01a9\u01aa\7w\2\2"+
- "\u01aa\u01ab\7r\2\2\u01ab\u01ac\7a\2\2\u01ac\u01ad\7v\2\2\u01ad\u01ae"+
- "\7u\2\2\u01ae\u01af\7v\2\2\u01af\u01b0\7c\2\2\u01b0\u01b1\7o\2\2\u01b1"+
- "\u03cd\7r\2\2\u01b2\u01b3\7e\2\2\u01b3\u01b4\7q\2\2\u01b4\u01b5\7o\2\2"+
- "\u01b5\u01b6\7r\2\2\u01b6\u01b7\7a\2\2\u01b7\u01b8\7k\2\2\u01b8\u03cd"+
- "\7f\2\2\u01b9\u01ba\7e\2\2\u01ba\u01bb\7q\2\2\u01bb\u01bc\7o\2\2\u01bc"+
- "\u01bd\7r\2\2\u01bd\u01be\7a\2\2\u01be\u01bf\7p\2\2\u01bf\u01c0\7c\2\2"+
- "\u01c0\u01c1\7o\2\2\u01c1\u03cd\7g\2\2\u01c2\u01c3\7e\2\2\u01c3\u01c4"+
- "\7q\2\2\u01c4\u01c5\7o\2\2\u01c5\u01c6\7r\2\2\u01c6\u01c7\7a\2\2\u01c7"+
- "\u01c8\7y\2\2\u01c8\u01c9\7g\2\2\u01c9\u01ca\7d\2\2\u01ca\u01cb\7u\2\2"+
- "\u01cb\u01cc\7k\2\2\u01cc\u01cd\7v\2\2\u01cd\u03cd\7g\2\2\u01ce\u01cf"+
- "\7e\2\2\u01cf\u01d0\7q\2\2\u01d0\u01d1\7o\2\2\u01d1\u01d2\7r\2\2\u01d2"+
- "\u01d3\7a\2\2\u01d3\u01d4\7e\2\2\u01d4\u01d5\7q\2\2\u01d5\u01d6\7w\2\2"+
- "\u01d6\u01d7\7p\2\2\u01d7\u01d8\7v\2\2\u01d8\u01d9\7t\2\2\u01d9\u03cd"+
- "\7{\2\2\u01da\u01db\7e\2\2\u01db\u01dc\7q\2\2\u01dc\u01dd\7o\2\2\u01dd"+
- "\u01de\7r\2\2\u01de\u01df\7a\2\2\u01df\u01e0\7t\2\2\u01e0\u01e1\7g\2\2"+
- "\u01e1\u01e2\7i\2\2\u01e2\u01e3\7k\2\2\u01e3\u01e4\7q\2\2\u01e4\u03cd"+
- "\7p\2\2\u01e5\u01e6\7e\2\2\u01e6\u01e7\7q\2\2\u01e7\u01e8\7o\2\2\u01e8"+
- "\u01e9\7r\2\2\u01e9\u01ea\7a\2\2\u01ea\u01eb\7e\2\2\u01eb\u01ec\7k\2\2"+
- "\u01ec\u01ed\7v\2\2\u01ed\u03cd\7{\2\2\u01ee\u01ef\7e\2\2\u01ef\u01f0"+
- "\7q\2\2\u01f0\u01f1\7o\2\2\u01f1\u01f2\7r\2\2\u01f2\u01f3\7a\2\2\u01f3"+
- "\u01f4\7c\2\2\u01f4\u01f5\7f\2\2\u01f5\u01f6\7f\2\2\u01f6\u03cd\7t\2\2"+
- "\u01f7\u01f8\7e\2\2\u01f8\u01f9\7q\2\2\u01f9\u01fa\7o\2\2\u01fa\u01fb"+
- "\7r\2\2\u01fb\u01fc\7a\2\2\u01fc\u01fd\7r\2\2\u01fd\u01fe\7q\2\2\u01fe"+
- "\u01ff\7u\2\2\u01ff\u0200\7v\2\2\u0200\u0201\7e\2\2\u0201\u0202\7q\2\2"+
- "\u0202\u0203\7f\2\2\u0203\u03cd\7g\2\2\u0204\u0205\7v\2\2\u0205\u0206"+
- "\7t\2\2\u0206\u0207\7k\2\2\u0207\u03cd\7o\2\2\u0208\u0209\7u\2\2\u0209"+
- "\u020a\7v\2\2\u020a\u020b\7t\2\2\u020b\u020c\7k\2\2\u020c\u03cd\7r\2\2"+
- "\u020d\u020e\7w\2\2\u020e\u020f\7r\2\2\u020f\u0210\7r\2\2\u0210\u0211"+
- "\7g\2\2\u0211\u0212\7t\2\2\u0212\u0213\7e\2\2\u0213\u0214\7c\2\2\u0214"+
- "\u0215\7u\2\2\u0215\u03cd\7g\2\2\u0216\u0217\7n\2\2\u0217\u0218\7q\2\2"+
- "\u0218\u0219\7y\2\2\u0219\u021a\7g\2\2\u021a\u021b\7t\2\2\u021b\u021c"+
- "\7e\2\2\u021c\u021d\7c\2\2\u021d\u021e\7u\2\2\u021e\u03cd\7g\2\2\u021f"+
- "\u0220\7k\2\2\u0220\u0221\7u\2\2\u0221\u0222\7a\2\2\u0222\u0223\7c\2\2"+
- "\u0223\u0224\7n\2\2\u0224\u0225\7r\2\2\u0225\u0226\7j\2\2\u0226\u03cd"+
- "\7c\2\2\u0227\u0228\7k\2\2\u0228\u0229\7u\2\2\u0229\u022a\7a\2\2\u022a"+
- "\u022b\7c\2\2\u022b\u022c\7n\2\2\u022c\u022d\7r\2\2\u022d\u022e\7j\2\2"+
- "\u022e\u022f\7c\2\2\u022f\u0230\7p\2\2\u0230\u0231\7w\2\2\u0231\u03cd"+
- "\7o\2\2\u0232\u0233\7k\2\2\u0233\u0234\7u\2\2\u0234\u0235\7a\2\2\u0235"+
- "\u0236\7y\2\2\u0236\u0237\7j\2\2\u0237\u0238\7k\2\2\u0238\u0239\7v\2\2"+
- "\u0239\u023a\7g\2\2\u023a\u023b\7u\2\2\u023b\u023c\7r\2\2\u023c\u023d"+
- "\7c\2\2\u023d\u023e\7e\2\2\u023e\u03cd\7g\2\2\u023f\u0240\7k\2\2\u0240"+
- "\u0241\7u\2\2\u0241\u0242\7a\2\2\u0242\u0243\7p\2\2\u0243\u0244\7w\2\2"+
- "\u0244\u03cd\7o\2\2\u0245\u0246\7k\2\2\u0246\u0247\7u\2\2\u0247\u0248"+
- "\7a\2\2\u0248\u0249\7p\2\2\u0249\u024a\7w\2\2\u024a\u024b\7o\2\2\u024b"+
- "\u024c\7u\2\2\u024c\u024d\7r\2\2\u024d\u024e\7c\2\2\u024e\u024f\7e\2\2"+
- "\u024f\u03cd\7g\2\2\u0250\u0251\7k\2\2\u0251\u0252\7u\2\2\u0252\u0253"+
- "\7a\2\2\u0253\u0254\7c\2\2\u0254\u0255\7n\2\2\u0255\u0256\7r\2\2\u0256"+
- "\u0257\7j\2\2\u0257\u0258\7c\2\2\u0258\u0259\7u\2\2\u0259\u025a\7r\2\2"+
- "\u025a\u025b\7c\2\2\u025b\u025c\7e\2\2\u025c\u03cd\7g\2\2\u025d\u025e"+
- "\7k\2\2\u025e\u025f\7u\2\2\u025f\u0260\7a\2\2\u0260\u0261\7c\2\2\u0261"+
- "\u0262\7n\2\2\u0262\u0263\7r\2\2\u0263\u0264\7j\2\2\u0264\u0265\7c\2\2"+
- "\u0265\u0266\7p\2\2\u0266\u0267\7w\2\2\u0267\u0268\7o\2\2\u0268\u0269"+
- "\7u\2\2\u0269\u026a\7r\2\2\u026a\u026b\7c\2\2\u026b\u026c\7e\2\2\u026c"+
- "\u03cd\7g\2\2\u026d\u026e\7u\2\2\u026e\u026f\7r\2\2\u026f\u0270\7n\2\2"+
- "\u0270\u0271\7k\2\2\u0271\u03cd\7v\2\2\u0272\u0273\7u\2\2\u0273\u0274"+
- "\7r\2\2\u0274\u0275\7n\2\2\u0275\u0276\7k\2\2\u0276\u0277\7v\2\2\u0277"+
- "\u0278\7a\2\2\u0278\u0279\7v\2\2\u0279\u027a\7t\2\2\u027a\u027b\7k\2\2"+
- "\u027b\u03cd\7o\2\2\u027c\u027d\7c\2\2\u027d\u027e\7d\2\2\u027e\u03cd"+
- "\7u\2\2\u027f\u0280\7e\2\2\u0280\u0281\7g\2\2\u0281\u0282\7k\2\2\u0282"+
- "\u03cd\7n\2\2\u0283\u0284\7h\2\2\u0284\u0285\7n\2\2\u0285\u0286\7q\2\2"+
- "\u0286\u0287\7q\2\2\u0287\u03cd\7t\2\2\u0288\u0289\7t\2\2\u0289\u028a"+
- "\7k\2\2\u028a\u028b\7p\2\2\u028b\u03cd\7v\2\2\u028c\u028d\7t\2\2\u028d"+
- "\u028e\7q\2\2\u028e\u028f\7w\2\2\u028f\u0290\7p\2\2\u0290\u03cd\7f\2\2"+
- "\u0291\u0292\7u\2\2\u0292\u0293\7k\2\2\u0293\u0294\7i\2\2\u0294\u0295"+
- "\7p\2\2\u0295\u0296\7w\2\2\u0296\u03cd\7o\2\2\u0297\u0298\7u\2\2\u0298"+
- "\u0299\7s\2\2\u0299\u029a\7t\2\2\u029a\u03cd\7v\2\2\u029b\u029c\7e\2\2"+
- "\u029c\u029d\7d\2\2\u029d\u029e\7t\2\2\u029e\u03cd\7v\2\2\u029f\u02a0"+
- "\7r\2\2\u02a0\u03cd\7k\2\2\u02a1\u02a2\7v\2\2\u02a2\u02a3\7q\2\2\u02a3"+
- "\u02a4\7a\2\2\u02a4\u02a5\7f\2\2\u02a5\u02a6\7q\2\2\u02a6\u02a7\7w\2\2"+
- "\u02a7\u02a8\7d\2\2\u02a8\u02a9\7n\2\2\u02a9\u03cd\7g\2\2\u02aa\u02ab"+
- "\7g\2\2\u02ab\u02ac\7w\2\2\u02ac\u02ad\7n\2\2\u02ad\u02ae\7g\2\2\u02ae"+
- "\u03cd\7t\2\2\u02af\u02b0\7c\2\2\u02b0\u02b1\7e\2\2\u02b1\u02b2\7q\2\2"+
- "\u02b2\u03cd\7u\2\2\u02b3\u02b4\7c\2\2\u02b4\u02b5\7u\2\2\u02b5\u02b6"+
- "\7k\2\2\u02b6\u03cd\7p\2\2\u02b7\u02b8\7c\2\2\u02b8\u02b9\7v\2\2\u02b9"+
- "\u02ba\7c\2\2\u02ba\u03cd\7p\2\2\u02bb\u02bc\7e\2\2\u02bc\u02bd\7q\2\2"+
- "\u02bd\u03cd\7u\2\2\u02be\u02bf\7u\2\2\u02bf\u02c0\7k\2\2\u02c0\u03cd"+
- "\7p\2\2\u02c1\u02c2\7v\2\2\u02c2\u02c3\7c\2\2\u02c3\u03cd\7p\2\2\u02c4"+
- "\u02c5\7e\2\2\u02c5\u02c6\7q\2\2\u02c6\u02c7\7u\2\2\u02c7\u03cd\7j\2\2"+
- "\u02c8\u02c9\7u\2\2\u02c9\u02ca\7k\2\2\u02ca\u02cb\7p\2\2\u02cb\u03cd"+
- "\7j\2\2\u02cc\u02cd\7v\2\2\u02cd\u02ce\7c\2\2\u02ce\u02cf\7p\2\2\u02cf"+
- "\u03cd\7j\2\2\u02d0\u02d1\7c\2\2\u02d1\u02d2\7v\2\2\u02d2\u02d3\7p\2\2"+
- "\u02d3\u03cd\7\64\2\2\u02d4\u02d5\7f\2\2\u02d5\u02d6\7g\2\2\u02d6\u02d7"+
- "\7i\2\2\u02d7\u02d8\7t\2\2\u02d8\u02d9\7g\2\2\u02d9\u02da\7g\2\2\u02da"+
- "\u03cd\7u\2\2\u02db\u02dc\7t\2\2\u02dc\u02dd\7c\2\2\u02dd\u02de\7f\2\2"+
- "\u02de\u02df\7k\2\2\u02df\u02e0\7c\2\2\u02e0\u02e1\7p\2\2\u02e1\u03cd"+
- "\7u\2\2\u02e2\u02e3\7g\2\2\u02e3\u02e4\7z\2\2\u02e4\u03cd\7r\2\2\u02e5"+
- "\u02e6\7g\2\2\u02e6\u02e7\7z\2\2\u02e7\u02e8\7r\2\2\u02e8\u02e9\7o\2\2"+
- "\u02e9\u03cd\7\63\2\2\u02ea\u02eb\7j\2\2\u02eb\u02ec\7{\2\2\u02ec\u02ed"+
- "\7r\2\2\u02ed\u02ee\7q\2\2\u02ee\u03cd\7v\2\2\u02ef\u02f0\7n\2\2\u02f0"+
- "\u02f1\7q\2\2\u02f1\u03cd\7i\2\2\u02f2\u02f3\7n\2\2\u02f3\u02f4\7q\2\2"+
- "\u02f4\u02f5\7i\2\2\u02f5\u02f6\7\63\2\2\u02f6\u03cd\7\62\2\2\u02f7\u02f8"+
- "\7n\2\2\u02f8\u02f9\7q\2\2\u02f9\u02fa\7i\2\2\u02fa\u02fb\7\63\2\2\u02fb"+
- "\u03cd\7r\2\2\u02fc\u02fd\7r\2\2\u02fd\u02fe\7q\2\2\u02fe\u03cd\7y\2\2"+
- "\u02ff\u0300\7t\2\2\u0300\u0301\7c\2\2\u0301\u0302\7p\2\2\u0302\u03cd"+
- "\7f\2\2\u0303\u0304\7u\2\2\u0304\u0305\7s\2\2\u0305\u0306\7w\2\2\u0306"+
- "\u0307\7c\2\2\u0307\u0308\7t\2\2\u0308\u03cd\7g\2\2\u0309\u030a\7n\2\2"+
- "\u030a\u030b\7k\2\2\u030b\u030c\7u\2\2\u030c\u03cd\7v\2\2\u030d\u030e"+
- "\7i\2\2\u030e\u030f\7g\2\2\u030f\u03cd\7v\2\2\u0310\u0311\7j\2\2\u0311"+
- "\u0312\7c\2\2\u0312\u03cd\7u\2\2\u0313\u0314\7j\2\2\u0314\u0315\7c\2\2"+
- "\u0315\u0316\7u\2\2\u0316\u0317\7a\2\2\u0317\u0318\7c\2\2\u0318\u0319"+
- "\7p\2\2\u0319\u03cd\7{\2\2\u031a\u031b\7j\2\2\u031b\u031c\7c\2\2\u031c"+
- "\u031d\7u\2\2\u031d\u031e\7a\2\2\u031e\u031f\7c\2\2\u031f\u0320\7n\2\2"+
- "\u0320\u03cd\7n\2\2\u0321\u0322\7h\2\2\u0322\u0323\7k\2\2\u0323\u0324"+
- "\7t\2\2\u0324\u0325\7u\2\2\u0325\u03cd\7v\2\2\u0326\u0327\7n\2\2\u0327"+
- "\u0328\7c\2\2\u0328\u0329\7u\2\2\u0329\u03cd\7v\2\2\u032a\u032b\7m\2\2"+
- "\u032b\u032c\7g\2\2\u032c\u032d\7{\2\2\u032d\u03cd\7u\2\2\u032e\u032f"+
- "\7x\2\2\u032f\u0330\7c\2\2\u0330\u0331\7n\2\2\u0331\u0332\7w\2\2\u0332"+
- "\u0333\7g\2\2\u0333\u03cd\7u\2\2\u0334\u0335\7n\2\2\u0335\u0336\7g\2\2"+
- "\u0336\u0337\7p\2\2\u0337\u0338\7i\2\2\u0338\u0339\7v\2\2\u0339\u03cd"+
- "\7j\2\2\u033a\u033b\7e\2\2\u033b\u033c\7q\2\2\u033c\u033d\7w\2\2\u033d"+
- "\u033e\7p\2\2\u033e\u03cd\7v\2\2\u033f\u0340\7u\2\2\u0340\u0341\7k\2\2"+
- "\u0341\u0342\7|\2\2\u0342\u03cd\7g\2\2\u0343\u0344\7u\2\2\u0344\u0345"+
- "\7q\2\2\u0345\u0346\7t\2\2\u0346\u03cd\7v\2\2\u0347\u0348\7t\2\2\u0348"+
- "\u0349\7g\2\2\u0349\u034a\7x\2\2\u034a\u034b\7g\2\2\u034b\u034c\7t\2\2"+
- "\u034c\u034d\7u\2\2\u034d\u03cd\7g\2\2\u034e\u034f\7k\2\2\u034f\u0350"+
- "\7u\2\2\u0350\u0351\7a\2\2\u0351\u0352\7g\2\2\u0352\u0353\7o\2\2\u0353"+
- "\u0354\7r\2\2\u0354\u0355\7v\2\2\u0355\u03cd\7{\2\2\u0356\u0357\7p\2\2"+
- "\u0357\u0358\7q\2\2\u0358\u0359\7p\2\2\u0359\u035a\7a\2\2\u035a\u035b"+
- "\7g\2\2\u035b\u035c\7o\2\2\u035c\u035d\7r\2\2\u035d\u035e\7v\2\2\u035e"+
- "\u03cd\7{\2\2\u035f\u0360\7v\2\2\u0360\u0361\7q\2\2\u0361\u0362\7a\2\2"+
- "\u0362\u0363\7u\2\2\u0363\u0364\7v\2\2\u0364\u0365\7t\2\2\u0365\u0366"+
- "\7k\2\2\u0366\u0367\7p\2\2\u0367\u03cd\7i\2\2\u0368\u0369\7o\2\2\u0369"+
- "\u036a\7c\2\2\u036a\u03cd\7z\2\2\u036b\u036c\7o\2\2\u036c\u036d\7k\2\2"+
- "\u036d\u03cd\7p\2\2\u036e\u036f\7{\2\2\u036f\u0370\7g\2\2\u0370\u0371"+
- "\7c\2\2\u0371\u03cd\7t\2\2\u0372\u0373\7o\2\2\u0373\u0374\7q\2\2\u0374"+
- "\u0375\7p\2\2\u0375\u0376\7v\2\2\u0376\u03cd\7j\2\2\u0377\u0378\7f\2\2"+
- "\u0378\u0379\7c\2\2\u0379\u037a\7{\2\2\u037a\u037b\7a\2\2\u037b\u037c"+
- "\7q\2\2\u037c\u037d\7h\2\2\u037d\u037e\7a\2\2\u037e\u037f\7o\2\2\u037f"+
- "\u0380\7q\2\2\u0380\u0381\7p\2\2\u0381\u0382\7v\2\2\u0382\u03cd\7j\2\2"+
- "\u0383\u0384\7f\2\2\u0384\u0385\7c\2\2\u0385\u0386\7{\2\2\u0386\u0387"+
- "\7a\2\2\u0387\u0388\7q\2\2\u0388\u0389\7h\2\2\u0389\u038a\7a\2\2\u038a"+
- "\u038b\7y\2\2\u038b\u038c\7g\2\2\u038c\u038d\7g\2\2\u038d\u03cd\7m\2\2"+
- "\u038e\u038f\7f\2\2\u038f\u0390\7c\2\2\u0390\u0391\7{\2\2\u0391\u0392"+
- "\7a\2\2\u0392\u0393\7q\2\2\u0393\u0394\7h\2\2\u0394\u0395\7a\2\2\u0395"+
- "\u0396\7{\2\2\u0396\u0397\7g\2\2\u0397\u0398\7c\2\2\u0398\u03cd\7t\2\2"+
- "\u0399\u039a\7j\2\2\u039a\u039b\7q\2\2\u039b\u039c\7w\2\2\u039c\u03cd"+
- "\7t\2\2\u039d\u039e\7o\2\2\u039e\u039f\7k\2\2\u039f\u03a0\7p\2\2\u03a0"+
- "\u03a1\7w\2\2\u03a1\u03a2\7v\2\2\u03a2\u03cd\7g\2\2\u03a3\u03a4\7u\2\2"+
- "\u03a4\u03a5\7g\2\2\u03a5\u03a6\7e\2\2\u03a6\u03a7\7q\2\2\u03a7\u03a8"+
- "\7p\2\2\u03a8\u03cd\7f\2\2\u03a9\u03aa\7y\2\2\u03aa\u03ab\7g\2\2\u03ab"+
- "\u03ac\7g\2\2\u03ac\u03ad\7m\2\2\u03ad\u03ae\7a\2\2\u03ae\u03af\7q\2\2"+
- "\u03af\u03b0\7h\2\2\u03b0\u03b1\7a\2\2\u03b1\u03b2\7o\2\2\u03b2\u03b3"+
- "\7q\2\2\u03b3\u03b4\7p\2\2\u03b4\u03b5\7v\2\2\u03b5\u03cd\7j\2\2\u03b6"+
- "\u03b7\7y\2\2\u03b7\u03b8\7g\2\2\u03b8\u03b9\7g\2\2\u03b9\u03ba\7m\2\2"+
- "\u03ba\u03bb\7a\2\2\u03bb\u03bc\7q\2\2\u03bc\u03bd\7h\2\2\u03bd\u03be"+
- "\7a\2\2\u03be\u03bf\7{\2\2\u03bf\u03c0\7g\2\2\u03c0\u03c1\7c\2\2\u03c1"+
- "\u03cd\7t\2\2\u03c2\u03c3\7s\2\2\u03c3\u03c4\7w\2\2\u03c4\u03c5\7c\2\2"+
- "\u03c5\u03c6\7t\2\2\u03c6\u03c7\7v\2\2\u03c7\u03c8\7g\2\2\u03c8\u03cd"+
- "\7t\2\2\u03c9\u03ca\7p\2\2\u03ca\u03cb\7q\2\2\u03cb\u03cd\7y\2\2\u03cc"+
- "\u0094\3\2\2\2\u03cc\u009e\3\2\2\2\u03cc\u00a7\3\2\2\2\u03cc\u00b1\3\2"+
- "\2\2\u03cc\u00bc\3\2\2\2\u03cc\u00c4\3\2\2\2\u03cc\u00cd\3\2\2\2\u03cc"+
- "\u00d9\3\2\2\2\u03cc\u00e1\3\2\2\2\u03cc\u00ea\3\2\2\2\u03cc\u00f3\3\2"+
- "\2\2\u03cc\u00f7\3\2\2\2\u03cc\u00f9\3\2\2\2\u03cc\u00fb\3\2\2\2\u03cc"+
- "\u0100\3\2\2\2\u03cc\u0109\3\2\2\2\u03cc\u0113\3\2\2\2\u03cc\u011c\3\2"+
- "\2\2\u03cc\u0122\3\2\2\2\u03cc\u0128\3\2\2\2\u03cc\u012d\3\2\2\2\u03cc"+
- "\u0134\3\2\2\2\u03cc\u013d\3\2\2\2\u03cc\u0144\3\2\2\2\u03cc\u014a\3\2"+
- "\2\2\u03cc\u0156\3\2\2\2\u03cc\u0160\3\2\2\2\u03cc\u0168\3\2\2\2\u03cc"+
- "\u0171\3\2\2\2\u03cc\u0178\3\2\2\2\u03cc\u0182\3\2\2\2\u03cc\u018c\3\2"+
- "\2\2\u03cc\u0196\3\2\2\2\u03cc\u01a0\3\2\2\2\u03cc\u01b2\3\2\2\2\u03cc"+
- "\u01b9\3\2\2\2\u03cc\u01c2\3\2\2\2\u03cc\u01ce\3\2\2\2\u03cc\u01da\3\2"+
- "\2\2\u03cc\u01e5\3\2\2\2\u03cc\u01ee\3\2\2\2\u03cc\u01f7\3\2\2\2\u03cc"+
- "\u0204\3\2\2\2\u03cc\u0208\3\2\2\2\u03cc\u020d\3\2\2\2\u03cc\u0216\3\2"+
- "\2\2\u03cc\u021f\3\2\2\2\u03cc\u0227\3\2\2\2\u03cc\u0232\3\2\2\2\u03cc"+
- "\u023f\3\2\2\2\u03cc\u0245\3\2\2\2\u03cc\u0250\3\2\2\2\u03cc\u025d\3\2"+
- "\2\2\u03cc\u026d\3\2\2\2\u03cc\u0272\3\2\2\2\u03cc\u027c\3\2\2\2\u03cc"+
- "\u027f\3\2\2\2\u03cc\u0283\3\2\2\2\u03cc\u0288\3\2\2\2\u03cc\u028c\3\2"+
- "\2\2\u03cc\u0291\3\2\2\2\u03cc\u0297\3\2\2\2\u03cc\u029b\3\2\2\2\u03cc"+
- "\u029f\3\2\2\2\u03cc\u02a1\3\2\2\2\u03cc\u02aa\3\2\2\2\u03cc\u02af\3\2"+
- "\2\2\u03cc\u02b3\3\2\2\2\u03cc\u02b7\3\2\2\2\u03cc\u02bb\3\2\2\2\u03cc"+
- "\u02be\3\2\2\2\u03cc\u02c1\3\2\2\2\u03cc\u02c4\3\2\2\2\u03cc\u02c8\3\2"+
- "\2\2\u03cc\u02cc\3\2\2\2\u03cc\u02d0\3\2\2\2\u03cc\u02d4\3\2\2\2\u03cc"+
- "\u02db\3\2\2\2\u03cc\u02e2\3\2\2\2\u03cc\u02e5\3\2\2\2\u03cc\u02ea\3\2"+
- "\2\2\u03cc\u02ef\3\2\2\2\u03cc\u02f2\3\2\2\2\u03cc\u02f7\3\2\2\2\u03cc"+
- "\u02fc\3\2\2\2\u03cc\u02ff\3\2\2\2\u03cc\u0303\3\2\2\2\u03cc\u0309\3\2"+
- "\2\2\u03cc\u030d\3\2\2\2\u03cc\u0310\3\2\2\2\u03cc\u0313\3\2\2\2\u03cc"+
- "\u031a\3\2\2\2\u03cc\u0321\3\2\2\2\u03cc\u0326\3\2\2\2\u03cc\u032a\3\2"+
- "\2\2\u03cc\u032e\3\2\2\2\u03cc\u0334\3\2\2\2\u03cc\u033a\3\2\2\2\u03cc"+
- "\u033f\3\2\2\2\u03cc\u0343\3\2\2\2\u03cc\u0347\3\2\2\2\u03cc\u034e\3\2"+
- "\2\2\u03cc\u0356\3\2\2\2\u03cc\u035f\3\2\2\2\u03cc\u0368\3\2\2\2\u03cc"+
- "\u036b\3\2\2\2\u03cc\u036e\3\2\2\2\u03cc\u0372\3\2\2\2\u03cc\u0377\3\2"+
- "\2\2\u03cc\u0383\3\2\2\2\u03cc\u038e\3\2\2\2\u03cc\u0399\3\2\2\2\u03cc"+
- "\u039d\3\2\2\2\u03cc\u03a3\3\2\2\2\u03cc\u03a9\3\2\2\2\u03cc\u03b6\3\2"+
- "\2\2\u03cc\u03c2\3\2\2\2\u03cc\u03c9\3\2\2\2\u03cd\20\3\2\2\2\u03ce\u03cf"+
- "\7h\2\2\u03cf\u03d0\7t\2\2\u03d0\u03d1\7c\2\2\u03d1\u03d2\7i\2\2\u03d2"+
- "\u03d3\7o\2\2\u03d3\u03d4\7g\2\2\u03d4\u03d5\7p\2\2\u03d5\u03d6\7v\2\2"+
- "\u03d6\22\3\2\2\2\u03d7\u03dd\5\67\34\2\u03d8\u03dc\n\2\2\2\u03d9\u03da"+
- "\7^\2\2\u03da\u03dc\7)\2\2\u03db\u03d8\3\2\2\2\u03db\u03d9\3\2\2\2\u03dc"+
- "\u03df\3\2\2\2\u03dd\u03db\3\2\2\2\u03dd\u03de\3\2\2\2\u03de\u03e0\3\2"+
- "\2\2\u03df\u03dd\3\2\2\2\u03e0\u03e1\5\67\34\2\u03e1\24\3\2\2\2\u03e2"+
- "\u03e8\59\35\2\u03e3\u03e7\n\3\2\2\u03e4\u03e5\7^\2\2\u03e5\u03e7\7$\2"+
- "\2\u03e6\u03e3\3\2\2\2\u03e6\u03e4\3\2\2\2\u03e7\u03ea\3\2\2\2\u03e8\u03e6"+
- "\3\2\2\2\u03e8\u03e9\3\2\2\2\u03e9\u03eb\3\2\2\2\u03ea\u03e8\3\2\2\2\u03eb"+
- "\u03ec\59\35\2\u03ec\26\3\2\2\2\u03ed\u03ee\7v\2\2\u03ee\u03ef\7t\2\2"+
- "\u03ef\u03f0\7w\2\2\u03f0\u03f7\7g\2\2\u03f1\u03f2\7h\2\2\u03f2\u03f3"+
- "\7c\2\2\u03f3\u03f4\7n\2\2\u03f4\u03f5\7u\2\2\u03f5\u03f7\7g\2\2\u03f6"+
- "\u03ed\3\2\2\2\u03f6\u03f1\3\2\2\2\u03f7\30\3\2\2\2\u03f8\u03f9\7p\2\2"+
- "\u03f9\u03fa\7w\2\2\u03fa\u03fb\7n\2\2\u03fb\u03fc\7n\2\2\u03fc\32\3\2"+
- "\2\2\u03fd\u03fe\7?\2\2\u03fe\u03ff\7?\2\2\u03ff\34\3\2\2\2\u0400\u0401"+
- "\7#\2\2\u0401\u0402\7?\2\2\u0402\36\3\2\2\2\u0403\u0404\7@\2\2\u0404\u0405"+
- "\7?\2\2\u0405 \3\2\2\2\u0406\u0407\7>\2\2\u0407\u0408\7?\2\2\u0408\"\3"+
- "\2\2\2\u0409\u040a\7@\2\2\u040a$\3\2\2\2\u040b\u040c\7>\2\2\u040c&\3\2"+
- "\2\2\u040d\u040e\7(\2\2\u040e\u040f\7(\2\2\u040f(\3\2\2\2\u0410\u0411"+
- "\7~\2\2\u0411\u0412\7~\2\2\u0412*\3\2\2\2\u0413\u0414\7~\2\2\u0414,\3"+
- "\2\2\2\u0415\u0416\7#\2\2\u0416.\3\2\2\2\u0417\u0418\7*\2\2\u0418\60\3"+
- "\2\2\2\u0419\u041a\7+\2\2\u041a\62\3\2\2\2\u041b\u041c\7}\2\2\u041c\64"+
- "\3\2\2\2\u041d\u041e\7\177\2\2\u041e\66\3\2\2\2\u041f\u0420\7)\2\2\u0420"+
- "8\3\2\2\2\u0421\u0422\7$\2\2\u0422:\3\2\2\2\u0423\u0424\7\u0080\2\2\u0424"+
- "<\3\2\2\2\u0425\u0426\7]\2\2\u0426>\3\2\2\2\u0427\u0428\7_\2\2\u0428@"+
- "\3\2\2\2\u0429\u042a\7%\2\2\u042aB\3\2\2\2\u042b\u042c\7.\2\2\u042cD\3"+
- "\2\2\2\u042d\u042e\7<\2\2\u042eF\3\2\2\2\u042f\u0430\7/\2\2\u0430H\3\2"+
- "\2\2\u0431\u0432\7\60\2\2\u0432J\3\2\2\2\u0433\u0434\7a\2\2\u0434L\3\2"+
- "\2\2\u0435\u0436\7?\2\2\u0436N\3\2\2\2\u0437\u0438\7-\2\2\u0438P\3\2\2"+
- "\2\u0439\u043a\7A\2\2\u043aR\3\2\2\2\u043b\u043c\7,\2\2\u043cT\3\2\2\2"+
- "\u043d\u043e\7\61\2\2\u043eV\3\2\2\2\u043f\u0440\7\'\2\2\u0440X\3\2\2"+
- "\2\u0441\u0442\7B\2\2\u0442Z\3\2\2\2\u0443\u0444\7&\2\2\u0444\\\3\2\2"+
- "\2\u0445\u044e\7\62\2\2\u0446\u044a\t\4\2\2\u0447\u0449\t\5\2\2\u0448"+
- "\u0447\3\2\2\2\u0449\u044c\3\2\2\2\u044a\u0448\3\2\2\2\u044a\u044b\3\2"+
- "\2\2\u044b\u044e\3\2\2\2\u044c\u044a\3\2\2\2\u044d\u0445\3\2\2\2\u044d"+
- "\u0446\3\2\2\2\u044e^\3\2\2\2\u044f\u0451\5I%\2\u0450\u0452\t\6\2\2\u0451"+
- "\u0450\3\2\2\2\u0452\u0453\3\2\2\2\u0453\u0451\3\2\2\2\u0453\u0454\3\2"+
- "\2\2\u0454`\3\2\2\2\u0455\u0457\t\7\2\2\u0456\u0458\t\b\2\2\u0457\u0456"+
- "\3\2\2\2\u0457\u0458\3\2\2\2\u0458\u0459\3\2\2\2\u0459\u045a\5]/\2\u045a"+
- "b\3\2\2\2\u045b\u045c\t\t\2\2\u045cd\3\2\2\2\u045d\u045e\t\n\2\2\u045e"+
- "f\3\2\2\2\u045f\u0464\5c\62\2\u0460\u0464\5K&\2\u0461\u0464\5e\63\2\u0462"+
- "\u0464\5[.\2\u0463\u045f\3\2\2\2\u0463\u0460\3\2\2\2\u0463\u0461\3\2\2"+
- "\2\u0463\u0462\3\2\2\2\u0464\u0465\3\2\2\2\u0465\u0463\3\2\2\2\u0465\u0466"+
- "\3\2\2\2\u0466\u0470\3\2\2\2\u0467\u046f\5c\62\2\u0468\u046f\5[.\2\u0469"+
- "\u046f\5e\63\2\u046a\u046f\t\6\2\2\u046b\u046f\5E#\2\u046c\u046f\5G$\2"+
- "\u046d\u046f\5K&\2\u046e\u0467\3\2\2\2\u046e\u0468\3\2\2\2\u046e\u0469"+
- "\3\2\2\2\u046e\u046a\3\2\2\2\u046e\u046b\3\2\2\2\u046e\u046c\3\2\2\2\u046e"+
- "\u046d\3\2\2\2\u046f\u0472\3\2\2\2\u0470\u046e\3\2\2\2\u0470\u0471\3\2"+
- "\2\2\u0471h\3\2\2\2\u0472\u0470\3\2\2\2\u0473\u0474\7\61\2\2\u0474\u0475"+
- "\7\61\2\2\u0475\u0479\3\2\2\2\u0476\u0478\n\13\2\2\u0477\u0476\3\2\2\2"+
- "\u0478\u047b\3\2\2\2\u0479\u0477\3\2\2\2\u0479\u047a\3\2\2\2\u047a\u047d"+
- "\3\2\2\2\u047b\u0479\3\2\2\2\u047c\u047e\7\17\2\2\u047d\u047c\3\2\2\2"+
- "\u047d\u047e\3\2\2\2\u047e\u0480\3\2\2\2\u047f\u0481\t\f\2\2\u0480\u047f"+
- "\3\2\2\2\u0481\u048e\3\2\2\2\u0482\u0483\7\61\2\2\u0483\u0484\7,\2\2\u0484"+
- "\u0488\3\2\2\2\u0485\u0487\13\2\2\2\u0486\u0485\3\2\2\2\u0487\u048a\3"+
- "\2\2\2\u0488\u0489\3\2\2\2\u0488\u0486\3\2\2\2\u0489\u048b\3\2\2\2\u048a"+
- "\u0488\3\2\2\2\u048b\u048c\7,\2\2\u048c\u048e\7\61\2\2\u048d\u0473\3\2"+
- "\2\2\u048d\u0482\3\2\2\2\u048e\u048f\3\2\2\2\u048f\u0490\b\65\2\2\u0490"+
- "j\3\2\2\2\u0491\u0493\t\r\2\2\u0492\u0491\3\2\2\2\u0493\u0494\3\2\2\2"+
- "\u0494\u0492\3\2\2\2\u0494\u0495\3\2\2\2\u0495\u0496\3\2\2\2\u0496\u0497"+
- "\b\66\2\2\u0497l\3\2\2\2\u0498\u0499\13\2\2\2\u0499n\3\2\2\2\27\2\u03cc"+
- "\u03db\u03dd\u03e6\u03e8\u03f6\u044a\u044d\u0453\u0457\u0463\u0465\u046e"+
- "\u0470\u0479\u047d\u0480\u0488\u048d\u0494\3\b\2\2";
+ "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3"+
+ "\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b"+
+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\5\b\u04ae\n\b\3\t\3\t\3\t\3\t"+
+ "\3\t\3\t\3\t\3\t\3\t\3\n\3\n\3\n\3\n\7\n\u04bd\n\n\f\n\16\n\u04c0\13\n"+
+ "\3\n\3\n\3\13\3\13\3\13\3\13\7\13\u04c8\n\13\f\13\16\13\u04cb\13\13\3"+
+ "\13\3\13\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\3\f\5\f\u04d8\n\f\3\r\3\r\3\r"+
+ "\3\r\3\r\3\16\3\16\3\16\3\17\3\17\3\17\3\20\3\20\3\20\3\21\3\21\3\21\3"+
+ "\22\3\22\3\23\3\23\3\24\3\24\3\24\3\25\3\25\3\25\3\26\3\26\3\27\3\27\3"+
+ "\30\3\30\3\31\3\31\3\32\3\32\3\33\3\33\3\34\3\34\3\35\3\35\3\36\3\36\3"+
+ "\37\3\37\3 \3 \3!\3!\3\"\3\"\3#\3#\3$\3$\3%\3%\3&\3&\3\'\3\'\3(\3(\3)"+
+ "\3)\3*\3*\3+\3+\3,\3,\3-\3-\3.\3.\3/\3/\3/\7/\u052a\n/\f/\16/\u052d\13"+
+ "/\5/\u052f\n/\3\60\3\60\6\60\u0533\n\60\r\60\16\60\u0534\3\61\3\61\5\61"+
+ "\u0539\n\61\3\61\3\61\3\62\3\62\3\63\3\63\3\64\3\64\3\64\3\64\6\64\u0545"+
+ "\n\64\r\64\16\64\u0546\3\64\3\64\3\64\3\64\3\64\3\64\3\64\7\64\u0550\n"+
+ "\64\f\64\16\64\u0553\13\64\3\65\3\65\3\65\3\65\7\65\u0559\n\65\f\65\16"+
+ "\65\u055c\13\65\3\65\5\65\u055f\n\65\3\65\5\65\u0562\n\65\3\65\3\65\3"+
+ "\65\3\65\7\65\u0568\n\65\f\65\16\65\u056b\13\65\3\65\3\65\5\65\u056f\n"+
+ "\65\3\65\3\65\3\66\6\66\u0574\n\66\r\66\16\66\u0575\3\66\3\66\3\67\3\67"+
+ "\3\u0569\28\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33"+
+ "\17\35\20\37\21!\22#\23%\24\'\25)\26+\27-\30/\31\61\32\63\33\65\34\67"+
+ "\359\36;\37= ?!A\"C#E$G%I&K\'M(O)Q*S+U,W-Y.[/]\60_\61a\62c\2e\2g\63i\64"+
+ "k\65m\66\3\2\16\3\2))\3\2$$\3\2\63;\4\2\62;aa\3\2\62;\4\2GGgg\4\2--//"+
+ "\17\2\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\4\2C\\c|\4\2\f\f\17\17\3\3\f\f\5\2\13\f\16\17\"\"\2"+
+ "\u0615\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2"+
+ "\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3"+
+ "\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\2\35\3\2\2\2\2\37\3\2\2\2\2!\3\2\2\2"+
+ "\2#\3\2\2\2\2%\3\2\2\2\2\'\3\2\2\2\2)\3\2\2\2\2+\3\2\2\2\2-\3\2\2\2\2"+
+ "/\3\2\2\2\2\61\3\2\2\2\2\63\3\2\2\2\2\65\3\2\2\2\2\67\3\2\2\2\29\3\2\2"+
+ "\2\2;\3\2\2\2\2=\3\2\2\2\2?\3\2\2\2\2A\3\2\2\2\2C\3\2\2\2\2E\3\2\2\2\2"+
+ "G\3\2\2\2\2I\3\2\2\2\2K\3\2\2\2\2M\3\2\2\2\2O\3\2\2\2\2Q\3\2\2\2\2S\3"+
+ "\2\2\2\2U\3\2\2\2\2W\3\2\2\2\2Y\3\2\2\2\2[\3\2\2\2\2]\3\2\2\2\2_\3\2\2"+
+ "\2\2a\3\2\2\2\2g\3\2\2\2\2i\3\2\2\2\2k\3\2\2\2\2m\3\2\2\2\3o\3\2\2\2\5"+
+ "v\3\2\2\2\7}\3\2\2\2\t\u0085\3\2\2\2\13\u008a\3\2\2\2\r\u008f\3\2\2\2"+
+ "\17\u04ad\3\2\2\2\21\u04af\3\2\2\2\23\u04b8\3\2\2\2\25\u04c3\3\2\2\2\27"+
+ "\u04d7\3\2\2\2\31\u04d9\3\2\2\2\33\u04de\3\2\2\2\35\u04e1\3\2\2\2\37\u04e4"+
+ "\3\2\2\2!\u04e7\3\2\2\2#\u04ea\3\2\2\2%\u04ec\3\2\2\2\'\u04ee\3\2\2\2"+
+ ")\u04f1\3\2\2\2+\u04f4\3\2\2\2-\u04f6\3\2\2\2/\u04f8\3\2\2\2\61\u04fa"+
+ "\3\2\2\2\63\u04fc\3\2\2\2\65\u04fe\3\2\2\2\67\u0500\3\2\2\29\u0502\3\2"+
+ "\2\2;\u0504\3\2\2\2=\u0506\3\2\2\2?\u0508\3\2\2\2A\u050a\3\2\2\2C\u050c"+
+ "\3\2\2\2E\u050e\3\2\2\2G\u0510\3\2\2\2I\u0512\3\2\2\2K\u0514\3\2\2\2M"+
+ "\u0516\3\2\2\2O\u0518\3\2\2\2Q\u051a\3\2\2\2S\u051c\3\2\2\2U\u051e\3\2"+
+ "\2\2W\u0520\3\2\2\2Y\u0522\3\2\2\2[\u0524\3\2\2\2]\u052e\3\2\2\2_\u0530"+
+ "\3\2\2\2a\u0536\3\2\2\2c\u053c\3\2\2\2e\u053e\3\2\2\2g\u0544\3\2\2\2i"+
+ "\u056e\3\2\2\2k\u0573\3\2\2\2m\u0579\3\2\2\2op\7k\2\2pq\7o\2\2qr\7r\2"+
+ "\2rs\7q\2\2st\7t\2\2tu\7v\2\2u\4\3\2\2\2vw\7k\2\2wx\7p\2\2xy\7v\2\2yz"+
+ "\7g\2\2z{\7p\2\2{|\7v\2\2|\6\3\2\2\2}~\7q\2\2~\177\7t\2\2\177\u0080\7"+
+ "f\2\2\u0080\u0081\7g\2\2\u0081\u0082\7t\2\2\u0082\u0083\7g\2\2\u0083\u0084"+
+ "\7f\2\2\u0084\b\3\2\2\2\u0085\u0086\7h\2\2\u0086\u0087\7n\2\2\u0087\u0088"+
+ "\7q\2\2\u0088\u0089\7y\2\2\u0089\n\3\2\2\2\u008a\u008b\7o\2\2\u008b\u008c"+
+ "\7g\2\2\u008c\u008d\7v\2\2\u008d\u008e\7c\2\2\u008e\f\3\2\2\2\u008f\u0090"+
+ "\7v\2\2\u0090\u0091\7g\2\2\u0091\u0092\7t\2\2\u0092\u0093\7o\2\2\u0093"+
+ "\16\3\2\2\2\u0094\u0095\7o\2\2\u0095\u0096\7g\2\2\u0096\u0097\7v\2\2\u0097"+
+ "\u0098\7c\2\2\u0098\u0099\7a\2\2\u0099\u009a\7v\2\2\u009a\u009b\7q\2\2"+
+ "\u009b\u009c\7m\2\2\u009c\u009d\7g\2\2\u009d\u04ae\7p\2\2\u009e\u009f"+
+ "\7o\2\2\u009f\u00a0\7g\2\2\u00a0\u00a1\7v\2\2\u00a1\u00a2\7c\2\2\u00a2"+
+ "\u00a3\7a\2\2\u00a3\u00a4\7r\2\2\u00a4\u00a5\7c\2\2\u00a5\u00a6\7t\2\2"+
+ "\u00a6\u04ae\7v\2\2\u00a7\u00a8\7o\2\2\u00a8\u00a9\7g\2\2\u00a9\u00aa"+
+ "\7v\2\2\u00aa\u00ab\7c\2\2\u00ab\u00ac\7a\2\2\u00ac\u00ad\7o\2\2\u00ad"+
+ "\u00ae\7q\2\2\u00ae\u00af\7f\2\2\u00af\u00b0\7g\2\2\u00b0\u04ae\7n\2\2"+
+ "\u00b1\u00b2\7o\2\2\u00b2\u00b3\7g\2\2\u00b3\u00b4\7v\2\2\u00b4\u00b5"+
+ "\7c\2\2\u00b5\u00b6\7a\2\2\u00b6\u00b7\7k\2\2\u00b7\u00b8\7p\2\2\u00b8"+
+ "\u00b9\7v\2\2\u00b9\u00ba\7g\2\2\u00ba\u00bb\7p\2\2\u00bb\u04ae\7v\2\2"+
+ "\u00bc\u00bd\7o\2\2\u00bd\u00be\7g\2\2\u00be\u00bf\7v\2\2\u00bf\u00c0"+
+ "\7c\2\2\u00c0\u00c1\7a\2\2\u00c1\u00c2\7t\2\2\u00c2\u00c3\7g\2\2\u00c3"+
+ "\u04ae\7s\2\2\u00c4\u00c5\7o\2\2\u00c5\u00c6\7g\2\2\u00c6\u00c7\7v\2\2"+
+ "\u00c7\u00c8\7c\2\2\u00c8\u00c9\7a\2\2\u00c9\u00ca\7w\2\2\u00ca\u00cb"+
+ "\7u\2\2\u00cb\u00cc\7g\2\2\u00cc\u04ae\7t\2\2\u00cd\u00ce\7o\2\2\u00ce"+
+ "\u00cf\7g\2\2\u00cf\u00d0\7v\2\2\u00d0\u00d1\7c\2\2\u00d1\u00d2\7a\2\2"+
+ "\u00d2\u00d3\7e\2\2\u00d3\u00d4\7q\2\2\u00d4\u00d5\7o\2\2\u00d5\u00d6"+
+ "\7r\2\2\u00d6\u00d7\7c\2\2\u00d7\u00d8\7p\2\2\u00d8\u04ae\7{\2\2\u00d9"+
+ "\u00da\7o\2\2\u00da\u00db\7g\2\2\u00db\u00dc\7v\2\2\u00dc\u00dd\7c\2\2"+
+ "\u00dd\u00de\7a\2\2\u00de\u00df\7u\2\2\u00df\u00e0\7{\2\2\u00e0\u04ae"+
+ "\7u\2\2\u00e1\u00e2\7o\2\2\u00e2\u00e3\7g\2\2\u00e3\u00e4\7v\2\2\u00e4"+
+ "\u00e5\7c\2\2\u00e5\u00e6\7a\2\2\u00e6\u00e7\7e\2\2\u00e7\u00e8\7q\2\2"+
+ "\u00e8\u00e9\7p\2\2\u00e9\u04ae\7x\2\2\u00ea\u00eb\7o\2\2\u00eb\u00ec"+
+ "\7g\2\2\u00ec\u00ed\7v\2\2\u00ed\u00ee\7c\2\2\u00ee\u00ef\7a\2\2\u00ef"+
+ "\u00f0\7h\2\2\u00f0\u00f1\7t\2\2\u00f1\u00f2\7c\2\2\u00f2\u04ae\7i\2\2"+
+ "\u00f3\u00f4\7l\2\2\u00f4\u00f5\7u\2\2\u00f5\u00f6\7q\2\2\u00f6\u04ae"+
+ "\7p\2\2\u00f7\u00f8\7k\2\2\u00f8\u04ae\7h\2\2\u00f9\u00fa\7v\2\2\u00fa"+
+ "\u00fb\7q\2\2\u00fb\u00fc\7m\2\2\u00fc\u00fd\7a\2\2\u00fd\u00fe\7k\2\2"+
+ "\u00fe\u04ae\7f\2\2\u00ff\u0100\7v\2\2\u0100\u0101\7q\2\2\u0101\u0102"+
+ "\7m\2\2\u0102\u0103\7a\2\2\u0103\u0104\7n\2\2\u0104\u0105\7g\2\2\u0105"+
+ "\u0106\7o\2\2\u0106\u0107\7o\2\2\u0107\u04ae\7c\2\2\u0108\u0109\7v\2\2"+
+ "\u0109\u010a\7q\2\2\u010a\u010b\7m\2\2\u010b\u010c\7a\2\2\u010c\u010d"+
+ "\7u\2\2\u010d\u010e\7v\2\2\u010e\u010f\7g\2\2\u010f\u04ae\7o\2\2\u0110"+
+ "\u0111\7v\2\2\u0111\u0112\7q\2\2\u0112\u0113\7m\2\2\u0113\u0114\7a\2\2"+
+ "\u0114\u0115\7r\2\2\u0115\u0116\7q\2\2\u0116\u04ae\7u\2\2\u0117\u0118"+
+ "\7v\2\2\u0118\u0119\7q\2\2\u0119\u011a\7m\2\2\u011a\u011b\7a\2\2\u011b"+
+ "\u011c\7u\2\2\u011c\u011d\7r\2\2\u011d\u011e\7c\2\2\u011e\u011f\7t\2\2"+
+ "\u011f\u0120\7u\2\2\u0120\u0121\7k\2\2\u0121\u0122\7v\2\2\u0122\u04ae"+
+ "\7{\2\2\u0123\u0124\7v\2\2\u0124\u0125\7q\2\2\u0125\u0126\7m\2\2\u0126"+
+ "\u0127\7a\2\2\u0127\u0128\7w\2\2\u0128\u0129\7p\2\2\u0129\u012a\7k\2\2"+
+ "\u012a\u04ae\7f\2\2\u012b\u012c\7v\2\2\u012c\u012d\7q\2\2\u012d\u012e"+
+ "\7m\2\2\u012e\u012f\7a\2\2\u012f\u0130\7k\2\2\u0130\u0131\7u\2\2\u0131"+
+ "\u0132\7a\2\2\u0132\u0133\7c\2\2\u0133\u0134\7d\2\2\u0134\u0135\7u\2\2"+
+ "\u0135\u0136\7v\2\2\u0136\u0137\7t\2\2\u0137\u0138\7c\2\2\u0138\u0139"+
+ "\7e\2\2\u0139\u04ae\7v\2\2\u013a\u013b\7v\2\2\u013b\u013c\7q\2\2\u013c"+
+ "\u013d\7m\2\2\u013d\u013e\7a\2\2\u013e\u013f\7k\2\2\u013f\u0140\7u\2\2"+
+ "\u0140\u0141\7a\2\2\u0141\u0142\7d\2\2\u0142\u0143\7t\2\2\u0143\u0144"+
+ "\7c\2\2\u0144\u0145\7e\2\2\u0145\u0146\7m\2\2\u0146\u0147\7g\2\2\u0147"+
+ "\u0148\7v\2\2\u0148\u0149\7g\2\2\u0149\u04ae\7f\2\2\u014a\u014b\7v\2\2"+
+ "\u014b\u014c\7q\2\2\u014c\u014d\7m\2\2\u014d\u014e\7a\2\2\u014e\u014f"+
+ "\7k\2\2\u014f\u0150\7u\2\2\u0150\u0151\7a\2\2\u0151\u0152\7f\2\2\u0152"+
+ "\u0153\7k\2\2\u0153\u0154\7t\2\2\u0154\u0155\7g\2\2\u0155\u0156\7e\2\2"+
+ "\u0156\u04ae\7v\2\2\u0157\u0158\7v\2\2\u0158\u0159\7q\2\2\u0159\u015a"+
+ "\7m\2\2\u015a\u015b\7a\2\2\u015b\u015c\7k\2\2\u015c\u015d\7u\2\2\u015d"+
+ "\u015e\7a\2\2\u015e\u015f\7g\2\2\u015f\u0160\7p\2\2\u0160\u0161\7i\2\2"+
+ "\u0161\u0162\7n\2\2\u0162\u0163\7k\2\2\u0163\u0164\7u\2\2\u0164\u04ae"+
+ "\7j\2\2\u0165\u0166\7v\2\2\u0166\u0167\7q\2\2\u0167\u0168\7m\2\2\u0168"+
+ "\u0169\7a\2\2\u0169\u016a\7k\2\2\u016a\u016b\7u\2\2\u016b\u016c\7a\2\2"+
+ "\u016c\u016d\7h\2\2\u016d\u016e\7t\2\2\u016e\u016f\7g\2\2\u016f\u0170"+
+ "\7g\2\2\u0170\u0171\7Y\2\2\u0171\u0172\7q\2\2\u0172\u0173\7t\2\2\u0173"+
+ "\u04ae\7f\2\2\u0174\u0175\7v\2\2\u0175\u0176\7q\2\2\u0176\u0177\7m\2\2"+
+ "\u0177\u0178\7a\2\2\u0178\u0179\7k\2\2\u0179\u017a\7u\2\2\u017a\u017b"+
+ "\7a\2\2\u017b\u017c\7s\2\2\u017c\u017d\7w\2\2\u017d\u017e\7q\2\2\u017e"+
+ "\u017f\7v\2\2\u017f\u0180\7g\2\2\u0180\u04ae\7f\2\2\u0181\u0182\7v\2\2"+
+ "\u0182\u0183\7q\2\2\u0183\u0184\7m\2\2\u0184\u0185\7a\2\2\u0185\u0186"+
+ "\7k\2\2\u0186\u0187\7u\2\2\u0187\u0188\7a\2\2\u0188\u0189\7u\2\2\u0189"+
+ "\u018a\7v\2\2\u018a\u018b\7q\2\2\u018b\u018c\7r\2\2\u018c\u018d\7y\2\2"+
+ "\u018d\u018e\7q\2\2\u018e\u018f\7t\2\2\u018f\u04ae\7f\2\2\u0190\u0191"+
+ "\7v\2\2\u0191\u0192\7q\2\2\u0192\u0193\7m\2\2\u0193\u0194\7a\2\2\u0194"+
+ "\u0195\7k\2\2\u0195\u0196\7u\2\2\u0196\u0197\7a\2\2\u0197\u0198\7u\2\2"+
+ "\u0198\u0199\7y\2\2\u0199\u019a\7g\2\2\u019a\u019b\7c\2\2\u019b\u04ae"+
+ "\7t\2\2\u019c\u019d\7v\2\2\u019d\u019e\7q\2\2\u019e\u019f\7m\2\2\u019f"+
+ "\u01a0\7a\2\2\u01a0\u01a1\7k\2\2\u01a1\u01a2\7u\2\2\u01a2\u01a3\7a\2\2"+
+ "\u01a3\u01a4\7w\2\2\u01a4\u01a5\7u\2\2\u01a5\u01a6\7g\2\2\u01a6\u04ae"+
+ "\7t\2\2\u01a7\u01a8\7v\2\2\u01a8\u01a9\7q\2\2\u01a9\u01aa\7m\2\2\u01aa"+
+ "\u01ab\7a\2\2\u01ab\u01ac\7k\2\2\u01ac\u01ad\7u\2\2\u01ad\u01ae\7a\2\2"+
+ "\u01ae\u01af\7y\2\2\u01af\u01b0\7q\2\2\u01b0\u01b1\7t\2\2\u01b1\u01b2"+
+ "\7f\2\2\u01b2\u01b3\7p\2\2\u01b3\u01b4\7g\2\2\u01b4\u04ae\7v\2\2\u01b5"+
+ "\u01b6\7v\2\2\u01b6\u01b7\7q\2\2\u01b7\u01b8\7m\2\2\u01b8\u01b9\7a\2\2"+
+ "\u01b9\u01ba\7c\2\2\u01ba\u01bb\7p\2\2\u01bb\u01bc\7e\2\2\u01bc\u01bd"+
+ "\7g\2\2\u01bd\u01be\7u\2\2\u01be\u01bf\7v\2\2\u01bf\u01c0\7q\2\2\u01c0"+
+ "\u01c1\7t\2\2\u01c1\u04ae\7u\2\2\u01c2\u01c3\7v\2\2\u01c3\u01c4\7q\2\2"+
+ "\u01c4\u01c5\7m\2\2\u01c5\u01c6\7a\2\2\u01c6\u01c7\7r\2\2\u01c7\u01c8"+
+ "\7c\2\2\u01c8\u01c9\7t\2\2\u01c9\u01ca\7g\2\2\u01ca\u01cb\7p\2\2\u01cb"+
+ "\u04ae\7v\2\2\u01cc\u01cd\7v\2\2\u01cd\u01ce\7q\2\2\u01ce\u01cf\7m\2\2"+
+ "\u01cf\u01d0\7a\2\2\u01d0\u01d1\7i\2\2\u01d1\u01d2\7t\2\2\u01d2\u01d3"+
+ "\7q\2\2\u01d3\u01d4\7w\2\2\u01d4\u01d5\7r\2\2\u01d5\u04ae\7u\2\2\u01d6"+
+ "\u01d7\7v\2\2\u01d7\u01d8\7q\2\2\u01d8\u01d9\7m\2\2\u01d9\u01da\7a\2\2"+
+ "\u01da\u01db\7x\2\2\u01db\u01dc\7c\2\2\u01dc\u01dd\7n\2\2\u01dd\u01de"+
+ "\7w\2\2\u01de\u04ae\7g\2\2\u01df\u01e0\7v\2\2\u01e0\u01e1\7q\2\2\u01e1"+
+ "\u01e2\7m\2\2\u01e2\u01e3\7a\2\2\u01e3\u01e4\7c\2\2\u01e4\u01e5\7n\2\2"+
+ "\u01e5\u01e6\7k\2\2\u01e6\u01e7\7c\2\2\u01e7\u01e8\7u\2\2\u01e8\u01e9"+
+ "\7g\2\2\u01e9\u04ae\7u\2\2\u01ea\u01eb\7v\2\2\u01eb\u01ec\7q\2\2\u01ec"+
+ "\u01ed\7m\2\2\u01ed\u01ee\7a\2\2\u01ee\u01ef\7u\2\2\u01ef\u01f0\7v\2\2"+
+ "\u01f0\u01f1\7c\2\2\u01f1\u01f2\7t\2\2\u01f2\u01f3\7v\2\2\u01f3\u01f4"+
+ "\7a\2\2\u01f4\u01f5\7k\2\2\u01f5\u01f6\7f\2\2\u01f6\u04ae\7z\2\2\u01f7"+
+ "\u01f8\7v\2\2\u01f8\u01f9\7q\2\2\u01f9\u01fa\7m\2\2\u01fa\u01fb\7a\2\2"+
+ "\u01fb\u01fc\7g\2\2\u01fc\u01fd\7p\2\2\u01fd\u01fe\7f\2\2\u01fe\u01ff"+
+ "\7a\2\2\u01ff\u0200\7k\2\2\u0200\u0201\7f\2\2\u0201\u04ae\7z\2\2\u0202"+
+ "\u0203\7v\2\2\u0203\u0204\7q\2\2\u0204\u0205\7m\2\2\u0205\u0206\7a\2\2"+
+ "\u0206\u0207\7v\2\2\u0207\u0208\7j\2\2\u0208\u0209\7k\2\2\u0209\u04ae"+
+ "\7u\2\2\u020a\u020b\7v\2\2\u020b\u020c\7q\2\2\u020c\u020d\7m\2\2\u020d"+
+ "\u020e\7a\2\2\u020e\u020f\7h\2\2\u020f\u0210\7k\2\2\u0210\u0211\7p\2\2"+
+ "\u0211\u0212\7f\2\2\u0212\u0213\7a\2\2\u0213\u0214\7r\2\2\u0214\u0215"+
+ "\7c\2\2\u0215\u0216\7t\2\2\u0216\u04ae\7v\2\2\u0217\u0218\7v\2\2\u0218"+
+ "\u0219\7q\2\2\u0219\u021a\7m\2\2\u021a\u021b\7a\2\2\u021b\u021c\7h\2\2"+
+ "\u021c\u021d\7k\2\2\u021d\u021e\7p\2\2\u021e\u021f\7f\2\2\u021f\u0220"+
+ "\7a\2\2\u0220\u0221\7r\2\2\u0221\u0222\7c\2\2\u0222\u0223\7t\2\2\u0223"+
+ "\u0224\7v\2\2\u0224\u04ae\7u\2\2\u0225\u0226\7t\2\2\u0226\u0227\7g\2\2"+
+ "\u0227\u0228\7s\2\2\u0228\u0229\7a\2\2\u0229\u022a\7k\2\2\u022a\u04ae"+
+ "\7f\2\2\u022b\u022c\7t\2\2\u022c\u022d\7g\2\2\u022d\u022e\7s\2\2\u022e"+
+ "\u022f\7a\2\2\u022f\u0230\7p\2\2\u0230\u0231\7q\2\2\u0231\u0232\7t\2\2"+
+ "\u0232\u0233\7o\2\2\u0233\u0234\7v\2\2\u0234\u0235\7g\2\2\u0235\u0236"+
+ "\7z\2\2\u0236\u04ae\7v\2\2\u0237\u0238\7t\2\2\u0238\u0239\7g\2\2\u0239"+
+ "\u023a\7s\2\2\u023a\u023b\7a\2\2\u023b\u023c\7v\2\2\u023c\u023d\7u\2\2"+
+ "\u023d\u023e\7v\2\2\u023e\u023f\7c\2\2\u023f\u0240\7o\2\2\u0240\u04ae"+
+ "\7r\2\2\u0241\u0242\7t\2\2\u0242\u0243\7g\2\2\u0243\u0244\7s\2\2\u0244"+
+ "\u0245\7a\2\2\u0245\u0246\7c\2\2\u0246\u0247\7f\2\2\u0247\u0248\7f\2\2"+
+ "\u0248\u04ae\7t\2\2\u0249\u024a\7t\2\2\u024a\u024b\7g\2\2\u024b\u024c"+
+ "\7s\2\2\u024c\u024d\7a\2\2\u024d\u024e\7c\2\2\u024e\u024f\7i\2\2\u024f"+
+ "\u0250\7g\2\2\u0250\u0251\7p\2\2\u0251\u04ae\7v\2\2\u0252\u0253\7w\2\2"+
+ "\u0253\u0254\7u\2\2\u0254\u0255\7g\2\2\u0255\u0256\7t\2\2\u0256\u0257"+
+ "\7a\2\2\u0257\u0258\7k\2\2\u0258\u04ae\7f\2\2\u0259\u025a\7w\2\2\u025a"+
+ "\u025b\7u\2\2\u025b\u025c\7g\2\2\u025c\u025d\7t\2\2\u025d\u025e\7a\2\2"+
+ "\u025e\u025f\7h\2\2\u025f\u0260\7p\2\2\u0260\u0261\7c\2\2\u0261\u0262"+
+ "\7o\2\2\u0262\u04ae\7g\2\2\u0263\u0264\7w\2\2\u0264\u0265\7u\2\2\u0265"+
+ "\u0266\7g\2\2\u0266\u0267\7t\2\2\u0267\u0268\7a\2\2\u0268\u0269\7n\2\2"+
+ "\u0269\u026a\7p\2\2\u026a\u026b\7c\2\2\u026b\u026c\7o\2\2\u026c\u04ae"+
+ "\7g\2\2\u026d\u026e\7w\2\2\u026e\u026f\7u\2\2\u026f\u0270\7g\2\2\u0270"+
+ "\u0271\7t\2\2\u0271\u0272\7a\2\2\u0272\u0273\7g\2\2\u0273\u0274\7o\2\2"+
+ "\u0274\u0275\7c\2\2\u0275\u0276\7k\2\2\u0276\u04ae\7n\2\2\u0277\u0278"+
+ "\7w\2\2\u0278\u0279\7u\2\2\u0279\u027a\7g\2\2\u027a\u027b\7t\2\2\u027b"+
+ "\u027c\7a\2\2\u027c\u027d\7c\2\2\u027d\u027e\7f\2\2\u027e\u027f\7o\2\2"+
+ "\u027f\u0280\7k\2\2\u0280\u04ae\7p\2\2\u0281\u0282\7w\2\2\u0282\u0283"+
+ "\7u\2\2\u0283\u0284\7g\2\2\u0284\u0285\7t\2\2\u0285\u0286\7a\2\2\u0286"+
+ "\u0287\7u\2\2\u0287\u0288\7k\2\2\u0288\u0289\7i\2\2\u0289\u028a\7p\2\2"+
+ "\u028a\u028b\7w\2\2\u028b\u028c\7r\2\2\u028c\u028d\7a\2\2\u028d\u028e"+
+ "\7v\2\2\u028e\u028f\7u\2\2\u028f\u0290\7v\2\2\u0290\u0291\7c\2\2\u0291"+
+ "\u0292\7o\2\2\u0292\u04ae\7r\2\2\u0293\u0294\7e\2\2\u0294\u0295\7q\2\2"+
+ "\u0295\u0296\7o\2\2\u0296\u0297\7r\2\2\u0297\u0298\7a\2\2\u0298\u0299"+
+ "\7k\2\2\u0299\u04ae\7f\2\2\u029a\u029b\7e\2\2\u029b\u029c\7q\2\2\u029c"+
+ "\u029d\7o\2\2\u029d\u029e\7r\2\2\u029e\u029f\7a\2\2\u029f\u02a0\7p\2\2"+
+ "\u02a0\u02a1\7c\2\2\u02a1\u02a2\7o\2\2\u02a2\u04ae\7g\2\2\u02a3\u02a4"+
+ "\7e\2\2\u02a4\u02a5\7q\2\2\u02a5\u02a6\7o\2\2\u02a6\u02a7\7r\2\2\u02a7"+
+ "\u02a8\7a\2\2\u02a8\u02a9\7y\2\2\u02a9\u02aa\7g\2\2\u02aa\u02ab\7d\2\2"+
+ "\u02ab\u02ac\7u\2\2\u02ac\u02ad\7k\2\2\u02ad\u02ae\7v\2\2\u02ae\u04ae"+
+ "\7g\2\2\u02af\u02b0\7e\2\2\u02b0\u02b1\7q\2\2\u02b1\u02b2\7o\2\2\u02b2"+
+ "\u02b3\7r\2\2\u02b3\u02b4\7a\2\2\u02b4\u02b5\7e\2\2\u02b5\u02b6\7q\2\2"+
+ "\u02b6\u02b7\7w\2\2\u02b7\u02b8\7p\2\2\u02b8\u02b9\7v\2\2\u02b9\u02ba"+
+ "\7t\2\2\u02ba\u04ae\7{\2\2\u02bb\u02bc\7e\2\2\u02bc\u02bd\7q\2\2\u02bd"+
+ "\u02be\7o\2\2\u02be\u02bf\7r\2\2\u02bf\u02c0\7a\2\2\u02c0\u02c1\7t\2\2"+
+ "\u02c1\u02c2\7g\2\2\u02c2\u02c3\7i\2\2\u02c3\u02c4\7k\2\2\u02c4\u02c5"+
+ "\7q\2\2\u02c5\u04ae\7p\2\2\u02c6\u02c7\7e\2\2\u02c7\u02c8\7q\2\2\u02c8"+
+ "\u02c9\7o\2\2\u02c9\u02ca\7r\2\2\u02ca\u02cb\7a\2\2\u02cb\u02cc\7e\2\2"+
+ "\u02cc\u02cd\7k\2\2\u02cd\u02ce\7v\2\2\u02ce\u04ae\7{\2\2\u02cf\u02d0"+
+ "\7e\2\2\u02d0\u02d1\7q\2\2\u02d1\u02d2\7o\2\2\u02d2\u02d3\7r\2\2\u02d3"+
+ "\u02d4\7a\2\2\u02d4\u02d5\7c\2\2\u02d5\u02d6\7f\2\2\u02d6\u02d7\7f\2\2"+
+ "\u02d7\u04ae\7t\2\2\u02d8\u02d9\7e\2\2\u02d9\u02da\7q\2\2\u02da\u02db"+
+ "\7o\2\2\u02db\u02dc\7r\2\2\u02dc\u02dd\7a\2\2\u02dd\u02de\7r\2\2\u02de"+
+ "\u02df\7q\2\2\u02df\u02e0\7u\2\2\u02e0\u02e1\7v\2\2\u02e1\u02e2\7e\2\2"+
+ "\u02e2\u02e3\7q\2\2\u02e3\u02e4\7f\2\2\u02e4\u04ae\7g\2\2\u02e5\u02e6"+
+ "\7v\2\2\u02e6\u02e7\7t\2\2\u02e7\u02e8\7k\2\2\u02e8\u04ae\7o\2\2\u02e9"+
+ "\u02ea\7u\2\2\u02ea\u02eb\7v\2\2\u02eb\u02ec\7t\2\2\u02ec\u02ed\7k\2\2"+
+ "\u02ed\u04ae\7r\2\2\u02ee\u02ef\7w\2\2\u02ef\u02f0\7r\2\2\u02f0\u02f1"+
+ "\7r\2\2\u02f1\u02f2\7g\2\2\u02f2\u02f3\7t\2\2\u02f3\u02f4\7e\2\2\u02f4"+
+ "\u02f5\7c\2\2\u02f5\u02f6\7u\2\2\u02f6\u04ae\7g\2\2\u02f7\u02f8\7n\2\2"+
+ "\u02f8\u02f9\7q\2\2\u02f9\u02fa\7y\2\2\u02fa\u02fb\7g\2\2\u02fb\u02fc"+
+ "\7t\2\2\u02fc\u02fd\7e\2\2\u02fd\u02fe\7c\2\2\u02fe\u02ff\7u\2\2\u02ff"+
+ "\u04ae\7g\2\2\u0300\u0301\7k\2\2\u0301\u0302\7u\2\2\u0302\u0303\7a\2\2"+
+ "\u0303\u0304\7c\2\2\u0304\u0305\7n\2\2\u0305\u0306\7r\2\2\u0306\u0307"+
+ "\7j\2\2\u0307\u04ae\7c\2\2\u0308\u0309\7k\2\2\u0309\u030a\7u\2\2\u030a"+
+ "\u030b\7a\2\2\u030b\u030c\7c\2\2\u030c\u030d\7n\2\2\u030d\u030e\7r\2\2"+
+ "\u030e\u030f\7j\2\2\u030f\u0310\7c\2\2\u0310\u0311\7p\2\2\u0311\u0312"+
+ "\7w\2\2\u0312\u04ae\7o\2\2\u0313\u0314\7k\2\2\u0314\u0315\7u\2\2\u0315"+
+ "\u0316\7a\2\2\u0316\u0317\7y\2\2\u0317\u0318\7j\2\2\u0318\u0319\7k\2\2"+
+ "\u0319\u031a\7v\2\2\u031a\u031b\7g\2\2\u031b\u031c\7u\2\2\u031c\u031d"+
+ "\7r\2\2\u031d\u031e\7c\2\2\u031e\u031f\7e\2\2\u031f\u04ae\7g\2\2\u0320"+
+ "\u0321\7k\2\2\u0321\u0322\7u\2\2\u0322\u0323\7a\2\2\u0323\u0324\7p\2\2"+
+ "\u0324\u0325\7w\2\2\u0325\u04ae\7o\2\2\u0326\u0327\7k\2\2\u0327\u0328"+
+ "\7u\2\2\u0328\u0329\7a\2\2\u0329\u032a\7p\2\2\u032a\u032b\7w\2\2\u032b"+
+ "\u032c\7o\2\2\u032c\u032d\7u\2\2\u032d\u032e\7r\2\2\u032e\u032f\7c\2\2"+
+ "\u032f\u0330\7e\2\2\u0330\u04ae\7g\2\2\u0331\u0332\7k\2\2\u0332\u0333"+
+ "\7u\2\2\u0333\u0334\7a\2\2\u0334\u0335\7c\2\2\u0335\u0336\7n\2\2\u0336"+
+ "\u0337\7r\2\2\u0337\u0338\7j\2\2\u0338\u0339\7c\2\2\u0339\u033a\7u\2\2"+
+ "\u033a\u033b\7r\2\2\u033b\u033c\7c\2\2\u033c\u033d\7e\2\2\u033d\u04ae"+
+ "\7g\2\2\u033e\u033f\7k\2\2\u033f\u0340\7u\2\2\u0340\u0341\7a\2\2\u0341"+
+ "\u0342\7c\2\2\u0342\u0343\7n\2\2\u0343\u0344\7r\2\2\u0344\u0345\7j\2\2"+
+ "\u0345\u0346\7c\2\2\u0346\u0347\7p\2\2\u0347\u0348\7w\2\2\u0348\u0349"+
+ "\7o\2\2\u0349\u034a\7u\2\2\u034a\u034b\7r\2\2\u034b\u034c\7c\2\2\u034c"+
+ "\u034d\7e\2\2\u034d\u04ae\7g\2\2\u034e\u034f\7u\2\2\u034f\u0350\7r\2\2"+
+ "\u0350\u0351\7n\2\2\u0351\u0352\7k\2\2\u0352\u04ae\7v\2\2\u0353\u0354"+
+ "\7u\2\2\u0354\u0355\7r\2\2\u0355\u0356\7n\2\2\u0356\u0357\7k\2\2\u0357"+
+ "\u0358\7v\2\2\u0358\u0359\7a\2\2\u0359\u035a\7v\2\2\u035a\u035b\7t\2\2"+
+ "\u035b\u035c\7k\2\2\u035c\u04ae\7o\2\2\u035d\u035e\7c\2\2\u035e\u035f"+
+ "\7d\2\2\u035f\u04ae\7u\2\2\u0360\u0361\7e\2\2\u0361\u0362\7g\2\2\u0362"+
+ "\u0363\7k\2\2\u0363\u04ae\7n\2\2\u0364\u0365\7h\2\2\u0365\u0366\7n\2\2"+
+ "\u0366\u0367\7q\2\2\u0367\u0368\7q\2\2\u0368\u04ae\7t\2\2\u0369\u036a"+
+ "\7t\2\2\u036a\u036b\7k\2\2\u036b\u036c\7p\2\2\u036c\u04ae\7v\2\2\u036d"+
+ "\u036e\7t\2\2\u036e\u036f\7q\2\2\u036f\u0370\7w\2\2\u0370\u0371\7p\2\2"+
+ "\u0371\u04ae\7f\2\2\u0372\u0373\7u\2\2\u0373\u0374\7k\2\2\u0374\u0375"+
+ "\7i\2\2\u0375\u0376\7p\2\2\u0376\u0377\7w\2\2\u0377\u04ae\7o\2\2\u0378"+
+ "\u0379\7u\2\2\u0379\u037a\7s\2\2\u037a\u037b\7t\2\2\u037b\u04ae\7v\2\2"+
+ "\u037c\u037d\7e\2\2\u037d\u037e\7d\2\2\u037e\u037f\7t\2\2\u037f\u04ae"+
+ "\7v\2\2\u0380\u0381\7r\2\2\u0381\u04ae\7k\2\2\u0382\u0383\7v\2\2\u0383"+
+ "\u0384\7q\2\2\u0384\u0385\7a\2\2\u0385\u0386\7f\2\2\u0386\u0387\7q\2\2"+
+ "\u0387\u0388\7w\2\2\u0388\u0389\7d\2\2\u0389\u038a\7n\2\2\u038a\u04ae"+
+ "\7g\2\2\u038b\u038c\7g\2\2\u038c\u038d\7w\2\2\u038d\u038e\7n\2\2\u038e"+
+ "\u038f\7g\2\2\u038f\u04ae\7t\2\2\u0390\u0391\7c\2\2\u0391\u0392\7e\2\2"+
+ "\u0392\u0393\7q\2\2\u0393\u04ae\7u\2\2\u0394\u0395\7c\2\2\u0395\u0396"+
+ "\7u\2\2\u0396\u0397\7k\2\2\u0397\u04ae\7p\2\2\u0398\u0399\7c\2\2\u0399"+
+ "\u039a\7v\2\2\u039a\u039b\7c\2\2\u039b\u04ae\7p\2\2\u039c\u039d\7e\2\2"+
+ "\u039d\u039e\7q\2\2\u039e\u04ae\7u\2\2\u039f\u03a0\7u\2\2\u03a0\u03a1"+
+ "\7k\2\2\u03a1\u04ae\7p\2\2\u03a2\u03a3\7v\2\2\u03a3\u03a4\7c\2\2\u03a4"+
+ "\u04ae\7p\2\2\u03a5\u03a6\7e\2\2\u03a6\u03a7\7q\2\2\u03a7\u03a8\7u\2\2"+
+ "\u03a8\u04ae\7j\2\2\u03a9\u03aa\7u\2\2\u03aa\u03ab\7k\2\2\u03ab\u03ac"+
+ "\7p\2\2\u03ac\u04ae\7j\2\2\u03ad\u03ae\7v\2\2\u03ae\u03af\7c\2\2\u03af"+
+ "\u03b0\7p\2\2\u03b0\u04ae\7j\2\2\u03b1\u03b2\7c\2\2\u03b2\u03b3\7v\2\2"+
+ "\u03b3\u03b4\7p\2\2\u03b4\u04ae\7\64\2\2\u03b5\u03b6\7f\2\2\u03b6\u03b7"+
+ "\7g\2\2\u03b7\u03b8\7i\2\2\u03b8\u03b9\7t\2\2\u03b9\u03ba\7g\2\2\u03ba"+
+ "\u03bb\7g\2\2\u03bb\u04ae\7u\2\2\u03bc\u03bd\7t\2\2\u03bd\u03be\7c\2\2"+
+ "\u03be\u03bf\7f\2\2\u03bf\u03c0\7k\2\2\u03c0\u03c1\7c\2\2\u03c1\u03c2"+
+ "\7p\2\2\u03c2\u04ae\7u\2\2\u03c3\u03c4\7g\2\2\u03c4\u03c5\7z\2\2\u03c5"+
+ "\u04ae\7r\2\2\u03c6\u03c7\7g\2\2\u03c7\u03c8\7z\2\2\u03c8\u03c9\7r\2\2"+
+ "\u03c9\u03ca\7o\2\2\u03ca\u04ae\7\63\2\2\u03cb\u03cc\7j\2\2\u03cc\u03cd"+
+ "\7{\2\2\u03cd\u03ce\7r\2\2\u03ce\u03cf\7q\2\2\u03cf\u04ae\7v\2\2\u03d0"+
+ "\u03d1\7n\2\2\u03d1\u03d2\7q\2\2\u03d2\u04ae\7i\2\2\u03d3\u03d4\7n\2\2"+
+ "\u03d4\u03d5\7q\2\2\u03d5\u03d6\7i\2\2\u03d6\u03d7\7\63\2\2\u03d7\u04ae"+
+ "\7\62\2\2\u03d8\u03d9\7n\2\2\u03d9\u03da\7q\2\2\u03da\u03db\7i\2\2\u03db"+
+ "\u03dc\7\63\2\2\u03dc\u04ae\7r\2\2\u03dd\u03de\7r\2\2\u03de\u03df\7q\2"+
+ "\2\u03df\u04ae\7y\2\2\u03e0\u03e1\7t\2\2\u03e1\u03e2\7c\2\2\u03e2\u03e3"+
+ "\7p\2\2\u03e3\u04ae\7f\2\2\u03e4\u03e5\7u\2\2\u03e5\u03e6\7s\2\2\u03e6"+
+ "\u03e7\7w\2\2\u03e7\u03e8\7c\2\2\u03e8\u03e9\7t\2\2\u03e9\u04ae\7g\2\2"+
+ "\u03ea\u03eb\7n\2\2\u03eb\u03ec\7k\2\2\u03ec\u03ed\7u\2\2\u03ed\u04ae"+
+ "\7v\2\2\u03ee\u03ef\7i\2\2\u03ef\u03f0\7g\2\2\u03f0\u04ae\7v\2\2\u03f1"+
+ "\u03f2\7j\2\2\u03f2\u03f3\7c\2\2\u03f3\u04ae\7u\2\2\u03f4\u03f5\7j\2\2"+
+ "\u03f5\u03f6\7c\2\2\u03f6\u03f7\7u\2\2\u03f7\u03f8\7a\2\2\u03f8\u03f9"+
+ "\7c\2\2\u03f9\u03fa\7p\2\2\u03fa\u04ae\7{\2\2\u03fb\u03fc\7j\2\2\u03fc"+
+ "\u03fd\7c\2\2\u03fd\u03fe\7u\2\2\u03fe\u03ff\7a\2\2\u03ff\u0400\7c\2\2"+
+ "\u0400\u0401\7n\2\2\u0401\u04ae\7n\2\2\u0402\u0403\7h\2\2\u0403\u0404"+
+ "\7k\2\2\u0404\u0405\7t\2\2\u0405\u0406\7u\2\2\u0406\u04ae\7v\2\2\u0407"+
+ "\u0408\7n\2\2\u0408\u0409\7c\2\2\u0409\u040a\7u\2\2\u040a\u04ae\7v\2\2"+
+ "\u040b\u040c\7m\2\2\u040c\u040d\7g\2\2\u040d\u040e\7{\2\2\u040e\u04ae"+
+ "\7u\2\2\u040f\u0410\7x\2\2\u0410\u0411\7c\2\2\u0411\u0412\7n\2\2\u0412"+
+ "\u0413\7w\2\2\u0413\u0414\7g\2\2\u0414\u04ae\7u\2\2\u0415\u0416\7n\2\2"+
+ "\u0416\u0417\7g\2\2\u0417\u0418\7p\2\2\u0418\u0419\7i\2\2\u0419\u041a"+
+ "\7v\2\2\u041a\u04ae\7j\2\2\u041b\u041c\7e\2\2\u041c\u041d\7q\2\2\u041d"+
+ "\u041e\7w\2\2\u041e\u041f\7p\2\2\u041f\u04ae\7v\2\2\u0420\u0421\7u\2\2"+
+ "\u0421\u0422\7k\2\2\u0422\u0423\7|\2\2\u0423\u04ae\7g\2\2\u0424\u0425"+
+ "\7u\2\2\u0425\u0426\7q\2\2\u0426\u0427\7t\2\2\u0427\u04ae\7v\2\2\u0428"+
+ "\u0429\7t\2\2\u0429\u042a\7g\2\2\u042a\u042b\7x\2\2\u042b\u042c\7g\2\2"+
+ "\u042c\u042d\7t\2\2\u042d\u042e\7u\2\2\u042e\u04ae\7g\2\2\u042f\u0430"+
+ "\7k\2\2\u0430\u0431\7u\2\2\u0431\u0432\7a\2\2\u0432\u0433\7g\2\2\u0433"+
+ "\u0434\7o\2\2\u0434\u0435\7r\2\2\u0435\u0436\7v\2\2\u0436\u04ae\7{\2\2"+
+ "\u0437\u0438\7p\2\2\u0438\u0439\7q\2\2\u0439\u043a\7p\2\2\u043a\u043b"+
+ "\7a\2\2\u043b\u043c\7g\2\2\u043c\u043d\7o\2\2\u043d\u043e\7r\2\2\u043e"+
+ "\u043f\7v\2\2\u043f\u04ae\7{\2\2\u0440\u0441\7v\2\2\u0441\u0442\7q\2\2"+
+ "\u0442\u0443\7a\2\2\u0443\u0444\7u\2\2\u0444\u0445\7v\2\2\u0445\u0446"+
+ "\7t\2\2\u0446\u0447\7k\2\2\u0447\u0448\7p\2\2\u0448\u04ae\7i\2\2\u0449"+
+ "\u044a\7o\2\2\u044a\u044b\7c\2\2\u044b\u04ae\7z\2\2\u044c\u044d\7o\2\2"+
+ "\u044d\u044e\7k\2\2\u044e\u04ae\7p\2\2\u044f\u0450\7{\2\2\u0450\u0451"+
+ "\7g\2\2\u0451\u0452\7c\2\2\u0452\u04ae\7t\2\2\u0453\u0454\7o\2\2\u0454"+
+ "\u0455\7q\2\2\u0455\u0456\7p\2\2\u0456\u0457\7v\2\2\u0457\u04ae\7j\2\2"+
+ "\u0458\u0459\7f\2\2\u0459\u045a\7c\2\2\u045a\u045b\7{\2\2\u045b\u045c"+
+ "\7a\2\2\u045c\u045d\7q\2\2\u045d\u045e\7h\2\2\u045e\u045f\7a\2\2\u045f"+
+ "\u0460\7o\2\2\u0460\u0461\7q\2\2\u0461\u0462\7p\2\2\u0462\u0463\7v\2\2"+
+ "\u0463\u04ae\7j\2\2\u0464\u0465\7f\2\2\u0465\u0466\7c\2\2\u0466\u0467"+
+ "\7{\2\2\u0467\u0468\7a\2\2\u0468\u0469\7q\2\2\u0469\u046a\7h\2\2\u046a"+
+ "\u046b\7a\2\2\u046b\u046c\7y\2\2\u046c\u046d\7g\2\2\u046d\u046e\7g\2\2"+
+ "\u046e\u04ae\7m\2\2\u046f\u0470\7f\2\2\u0470\u0471\7c\2\2\u0471\u0472"+
+ "\7{\2\2\u0472\u0473\7a\2\2\u0473\u0474\7q\2\2\u0474\u0475\7h\2\2\u0475"+
+ "\u0476\7a\2\2\u0476\u0477\7{\2\2\u0477\u0478\7g\2\2\u0478\u0479\7c\2\2"+
+ "\u0479\u04ae\7t\2\2\u047a\u047b\7j\2\2\u047b\u047c\7q\2\2\u047c\u047d"+
+ "\7w\2\2\u047d\u04ae\7t\2\2\u047e\u047f\7o\2\2\u047f\u0480\7k\2\2\u0480"+
+ "\u0481\7p\2\2\u0481\u0482\7w\2\2\u0482\u0483\7v\2\2\u0483\u04ae\7g\2\2"+
+ "\u0484\u0485\7u\2\2\u0485\u0486\7g\2\2\u0486\u0487\7e\2\2\u0487\u0488"+
+ "\7q\2\2\u0488\u0489\7p\2\2\u0489\u04ae\7f\2\2\u048a\u048b\7y\2\2\u048b"+
+ "\u048c\7g\2\2\u048c\u048d\7g\2\2\u048d\u048e\7m\2\2\u048e\u048f\7a\2\2"+
+ "\u048f\u0490\7q\2\2\u0490\u0491\7h\2\2\u0491\u0492\7a\2\2\u0492\u0493"+
+ "\7o\2\2\u0493\u0494\7q\2\2\u0494\u0495\7p\2\2\u0495\u0496\7v\2\2\u0496"+
+ "\u04ae\7j\2\2\u0497\u0498\7y\2\2\u0498\u0499\7g\2\2\u0499\u049a\7g\2\2"+
+ "\u049a\u049b\7m\2\2\u049b\u049c\7a\2\2\u049c\u049d\7q\2\2\u049d\u049e"+
+ "\7h\2\2\u049e\u049f\7a\2\2\u049f\u04a0\7{\2\2\u04a0\u04a1\7g\2\2\u04a1"+
+ "\u04a2\7c\2\2\u04a2\u04ae\7t\2\2\u04a3\u04a4\7s\2\2\u04a4\u04a5\7w\2\2"+
+ "\u04a5\u04a6\7c\2\2\u04a6\u04a7\7t\2\2\u04a7\u04a8\7v\2\2\u04a8\u04a9"+
+ "\7g\2\2\u04a9\u04ae\7t\2\2\u04aa\u04ab\7p\2\2\u04ab\u04ac\7q\2\2\u04ac"+
+ "\u04ae\7y\2\2\u04ad\u0094\3\2\2\2\u04ad\u009e\3\2\2\2\u04ad\u00a7\3\2"+
+ "\2\2\u04ad\u00b1\3\2\2\2\u04ad\u00bc\3\2\2\2\u04ad\u00c4\3\2\2\2\u04ad"+
+ "\u00cd\3\2\2\2\u04ad\u00d9\3\2\2\2\u04ad\u00e1\3\2\2\2\u04ad\u00ea\3\2"+
+ "\2\2\u04ad\u00f3\3\2\2\2\u04ad\u00f7\3\2\2\2\u04ad\u00f9\3\2\2\2\u04ad"+
+ "\u00ff\3\2\2\2\u04ad\u0108\3\2\2\2\u04ad\u0110\3\2\2\2\u04ad\u0117\3\2"+
+ "\2\2\u04ad\u0123\3\2\2\2\u04ad\u012b\3\2\2\2\u04ad\u013a\3\2\2\2\u04ad"+
+ "\u014a\3\2\2\2\u04ad\u0157\3\2\2\2\u04ad\u0165\3\2\2\2\u04ad\u0174\3\2"+
+ "\2\2\u04ad\u0181\3\2\2\2\u04ad\u0190\3\2\2\2\u04ad\u019c\3\2\2\2\u04ad"+
+ "\u01a7\3\2\2\2\u04ad\u01b5\3\2\2\2\u04ad\u01c2\3\2\2\2\u04ad\u01cc\3\2"+
+ "\2\2\u04ad\u01d6\3\2\2\2\u04ad\u01df\3\2\2\2\u04ad\u01ea\3\2\2\2\u04ad"+
+ "\u01f7\3\2\2\2\u04ad\u0202\3\2\2\2\u04ad\u020a\3\2\2\2\u04ad\u0217\3\2"+
+ "\2\2\u04ad\u0225\3\2\2\2\u04ad\u022b\3\2\2\2\u04ad\u0237\3\2\2\2\u04ad"+
+ "\u0241\3\2\2\2\u04ad\u0249\3\2\2\2\u04ad\u0252\3\2\2\2\u04ad\u0259\3\2"+
+ "\2\2\u04ad\u0263\3\2\2\2\u04ad\u026d\3\2\2\2\u04ad\u0277\3\2\2\2\u04ad"+
+ "\u0281\3\2\2\2\u04ad\u0293\3\2\2\2\u04ad\u029a\3\2\2\2\u04ad\u02a3\3\2"+
+ "\2\2\u04ad\u02af\3\2\2\2\u04ad\u02bb\3\2\2\2\u04ad\u02c6\3\2\2\2\u04ad"+
+ "\u02cf\3\2\2\2\u04ad\u02d8\3\2\2\2\u04ad\u02e5\3\2\2\2\u04ad\u02e9\3\2"+
+ "\2\2\u04ad\u02ee\3\2\2\2\u04ad\u02f7\3\2\2\2\u04ad\u0300\3\2\2\2\u04ad"+
+ "\u0308\3\2\2\2\u04ad\u0313\3\2\2\2\u04ad\u0320\3\2\2\2\u04ad\u0326\3\2"+
+ "\2\2\u04ad\u0331\3\2\2\2\u04ad\u033e\3\2\2\2\u04ad\u034e\3\2\2\2\u04ad"+
+ "\u0353\3\2\2\2\u04ad\u035d\3\2\2\2\u04ad\u0360\3\2\2\2\u04ad\u0364\3\2"+
+ "\2\2\u04ad\u0369\3\2\2\2\u04ad\u036d\3\2\2\2\u04ad\u0372\3\2\2\2\u04ad"+
+ "\u0378\3\2\2\2\u04ad\u037c\3\2\2\2\u04ad\u0380\3\2\2\2\u04ad\u0382\3\2"+
+ "\2\2\u04ad\u038b\3\2\2\2\u04ad\u0390\3\2\2\2\u04ad\u0394\3\2\2\2\u04ad"+
+ "\u0398\3\2\2\2\u04ad\u039c\3\2\2\2\u04ad\u039f\3\2\2\2\u04ad\u03a2\3\2"+
+ "\2\2\u04ad\u03a5\3\2\2\2\u04ad\u03a9\3\2\2\2\u04ad\u03ad\3\2\2\2\u04ad"+
+ "\u03b1\3\2\2\2\u04ad\u03b5\3\2\2\2\u04ad\u03bc\3\2\2\2\u04ad\u03c3\3\2"+
+ "\2\2\u04ad\u03c6\3\2\2\2\u04ad\u03cb\3\2\2\2\u04ad\u03d0\3\2\2\2\u04ad"+
+ "\u03d3\3\2\2\2\u04ad\u03d8\3\2\2\2\u04ad\u03dd\3\2\2\2\u04ad\u03e0\3\2"+
+ "\2\2\u04ad\u03e4\3\2\2\2\u04ad\u03ea\3\2\2\2\u04ad\u03ee\3\2\2\2\u04ad"+
+ "\u03f1\3\2\2\2\u04ad\u03f4\3\2\2\2\u04ad\u03fb\3\2\2\2\u04ad\u0402\3\2"+
+ "\2\2\u04ad\u0407\3\2\2\2\u04ad\u040b\3\2\2\2\u04ad\u040f\3\2\2\2\u04ad"+
+ "\u0415\3\2\2\2\u04ad\u041b\3\2\2\2\u04ad\u0420\3\2\2\2\u04ad\u0424\3\2"+
+ "\2\2\u04ad\u0428\3\2\2\2\u04ad\u042f\3\2\2\2\u04ad\u0437\3\2\2\2\u04ad"+
+ "\u0440\3\2\2\2\u04ad\u0449\3\2\2\2\u04ad\u044c\3\2\2\2\u04ad\u044f\3\2"+
+ "\2\2\u04ad\u0453\3\2\2\2\u04ad\u0458\3\2\2\2\u04ad\u0464\3\2\2\2\u04ad"+
+ "\u046f\3\2\2\2\u04ad\u047a\3\2\2\2\u04ad\u047e\3\2\2\2\u04ad\u0484\3\2"+
+ "\2\2\u04ad\u048a\3\2\2\2\u04ad\u0497\3\2\2\2\u04ad\u04a3\3\2\2\2\u04ad"+
+ "\u04aa\3\2\2\2\u04ae\20\3\2\2\2\u04af\u04b0\7h\2\2\u04b0\u04b1\7t\2\2"+
+ "\u04b1\u04b2\7c\2\2\u04b2\u04b3\7i\2\2\u04b3\u04b4\7o\2\2\u04b4\u04b5"+
+ "\7g\2\2\u04b5\u04b6\7p\2\2\u04b6\u04b7\7v\2\2\u04b7\22\3\2\2\2\u04b8\u04be"+
+ "\5\67\34\2\u04b9\u04bd\n\2\2\2\u04ba\u04bb\7^\2\2\u04bb\u04bd\7)\2\2\u04bc"+
+ "\u04b9\3\2\2\2\u04bc\u04ba\3\2\2\2\u04bd\u04c0\3\2\2\2\u04be\u04bc\3\2"+
+ "\2\2\u04be\u04bf\3\2\2\2\u04bf\u04c1\3\2\2\2\u04c0\u04be\3\2\2\2\u04c1"+
+ "\u04c2\5\67\34\2\u04c2\24\3\2\2\2\u04c3\u04c9\59\35\2\u04c4\u04c8\n\3"+
+ "\2\2\u04c5\u04c6\7^\2\2\u04c6\u04c8\7$\2\2\u04c7\u04c4\3\2\2\2\u04c7\u04c5"+
+ "\3\2\2\2\u04c8\u04cb\3\2\2\2\u04c9\u04c7\3\2\2\2\u04c9\u04ca\3\2\2\2\u04ca"+
+ "\u04cc\3\2\2\2\u04cb\u04c9\3\2\2\2\u04cc\u04cd\59\35\2\u04cd\26\3\2\2"+
+ "\2\u04ce\u04cf\7v\2\2\u04cf\u04d0\7t\2\2\u04d0\u04d1\7w\2\2\u04d1\u04d8"+
+ "\7g\2\2\u04d2\u04d3\7h\2\2\u04d3\u04d4\7c\2\2\u04d4\u04d5\7n\2\2\u04d5"+
+ "\u04d6\7u\2\2\u04d6\u04d8\7g\2\2\u04d7\u04ce\3\2\2\2\u04d7\u04d2\3\2\2"+
+ "\2\u04d8\30\3\2\2\2\u04d9\u04da\7p\2\2\u04da\u04db\7w\2\2\u04db\u04dc"+
+ "\7n\2\2\u04dc\u04dd\7n\2\2\u04dd\32\3\2\2\2\u04de\u04df\7?\2\2\u04df\u04e0"+
+ "\7?\2\2\u04e0\34\3\2\2\2\u04e1\u04e2\7#\2\2\u04e2\u04e3\7?\2\2\u04e3\36"+
+ "\3\2\2\2\u04e4\u04e5\7@\2\2\u04e5\u04e6\7?\2\2\u04e6 \3\2\2\2\u04e7\u04e8"+
+ "\7>\2\2\u04e8\u04e9\7?\2\2\u04e9\"\3\2\2\2\u04ea\u04eb\7@\2\2\u04eb$\3"+
+ "\2\2\2\u04ec\u04ed\7>\2\2\u04ed&\3\2\2\2\u04ee\u04ef\7(\2\2\u04ef\u04f0"+
+ "\7(\2\2\u04f0(\3\2\2\2\u04f1\u04f2\7~\2\2\u04f2\u04f3\7~\2\2\u04f3*\3"+
+ "\2\2\2\u04f4\u04f5\7~\2\2\u04f5,\3\2\2\2\u04f6\u04f7\7#\2\2\u04f7.\3\2"+
+ "\2\2\u04f8\u04f9\7*\2\2\u04f9\60\3\2\2\2\u04fa\u04fb\7+\2\2\u04fb\62\3"+
+ "\2\2\2\u04fc\u04fd\7}\2\2\u04fd\64\3\2\2\2\u04fe\u04ff\7\177\2\2\u04ff"+
+ "\66\3\2\2\2\u0500\u0501\7)\2\2\u05018\3\2\2\2\u0502\u0503\7$\2\2\u0503"+
+ ":\3\2\2\2\u0504\u0505\7\u0080\2\2\u0505<\3\2\2\2\u0506\u0507\7]\2\2\u0507"+
+ ">\3\2\2\2\u0508\u0509\7_\2\2\u0509@\3\2\2\2\u050a\u050b\7%\2\2\u050bB"+
+ "\3\2\2\2\u050c\u050d\7.\2\2\u050dD\3\2\2\2\u050e\u050f\7<\2\2\u050fF\3"+
+ "\2\2\2\u0510\u0511\7/\2\2\u0511H\3\2\2\2\u0512\u0513\7\60\2\2\u0513J\3"+
+ "\2\2\2\u0514\u0515\7a\2\2\u0515L\3\2\2\2\u0516\u0517\7?\2\2\u0517N\3\2"+
+ "\2\2\u0518\u0519\7-\2\2\u0519P\3\2\2\2\u051a\u051b\7A\2\2\u051bR\3\2\2"+
+ "\2\u051c\u051d\7,\2\2\u051dT\3\2\2\2\u051e\u051f\7\61\2\2\u051fV\3\2\2"+
+ "\2\u0520\u0521\7\'\2\2\u0521X\3\2\2\2\u0522\u0523\7B\2\2\u0523Z\3\2\2"+
+ "\2\u0524\u0525\7&\2\2\u0525\\\3\2\2\2\u0526\u052f\7\62\2\2\u0527\u052b"+
+ "\t\4\2\2\u0528\u052a\t\5\2\2\u0529\u0528\3\2\2\2\u052a\u052d\3\2\2\2\u052b"+
+ "\u0529\3\2\2\2\u052b\u052c\3\2\2\2\u052c\u052f\3\2\2\2\u052d\u052b\3\2"+
+ "\2\2\u052e\u0526\3\2\2\2\u052e\u0527\3\2\2\2\u052f^\3\2\2\2\u0530\u0532"+
+ "\5I%\2\u0531\u0533\t\6\2\2\u0532\u0531\3\2\2\2\u0533\u0534\3\2\2\2\u0534"+
+ "\u0532\3\2\2\2\u0534\u0535\3\2\2\2\u0535`\3\2\2\2\u0536\u0538\t\7\2\2"+
+ "\u0537\u0539\t\b\2\2\u0538\u0537\3\2\2\2\u0538\u0539\3\2\2\2\u0539\u053a"+
+ "\3\2\2\2\u053a\u053b\5]/\2\u053bb\3\2\2\2\u053c\u053d\t\t\2\2\u053dd\3"+
+ "\2\2\2\u053e\u053f\t\n\2\2\u053ff\3\2\2\2\u0540\u0545\5c\62\2\u0541\u0545"+
+ "\5K&\2\u0542\u0545\5e\63\2\u0543\u0545\5[.\2\u0544\u0540\3\2\2\2\u0544"+
+ "\u0541\3\2\2\2\u0544\u0542\3\2\2\2\u0544\u0543\3\2\2\2\u0545\u0546\3\2"+
+ "\2\2\u0546\u0544\3\2\2\2\u0546\u0547\3\2\2\2\u0547\u0551\3\2\2\2\u0548"+
+ "\u0550\5c\62\2\u0549\u0550\5[.\2\u054a\u0550\5e\63\2\u054b\u0550\t\6\2"+
+ "\2\u054c\u0550\5E#\2\u054d\u0550\5G$\2\u054e\u0550\5K&\2\u054f\u0548\3"+
+ "\2\2\2\u054f\u0549\3\2\2\2\u054f\u054a\3\2\2\2\u054f\u054b\3\2\2\2\u054f"+
+ "\u054c\3\2\2\2\u054f\u054d\3\2\2\2\u054f\u054e\3\2\2\2\u0550\u0553\3\2"+
+ "\2\2\u0551\u054f\3\2\2\2\u0551\u0552\3\2\2\2\u0552h\3\2\2\2\u0553\u0551"+
+ "\3\2\2\2\u0554\u0555\7\61\2\2\u0555\u0556\7\61\2\2\u0556\u055a\3\2\2\2"+
+ "\u0557\u0559\n\13\2\2\u0558\u0557\3\2\2\2\u0559\u055c\3\2\2\2\u055a\u0558"+
+ "\3\2\2\2\u055a\u055b\3\2\2\2\u055b\u055e\3\2\2\2\u055c\u055a\3\2\2\2\u055d"+
+ "\u055f\7\17\2\2\u055e\u055d\3\2\2\2\u055e\u055f\3\2\2\2\u055f\u0561\3"+
+ "\2\2\2\u0560\u0562\t\f\2\2\u0561\u0560\3\2\2\2\u0562\u056f\3\2\2\2\u0563"+
+ "\u0564\7\61\2\2\u0564\u0565\7,\2\2\u0565\u0569\3\2\2\2\u0566\u0568\13"+
+ "\2\2\2\u0567\u0566\3\2\2\2\u0568\u056b\3\2\2\2\u0569\u056a\3\2\2\2\u0569"+
+ "\u0567\3\2\2\2\u056a\u056c\3\2\2\2\u056b\u0569\3\2\2\2\u056c\u056d\7,"+
+ "\2\2\u056d\u056f\7\61\2\2\u056e\u0554\3\2\2\2\u056e\u0563\3\2\2\2\u056f"+
+ "\u0570\3\2\2\2\u0570\u0571\b\65\2\2\u0571j\3\2\2\2\u0572\u0574\t\r\2\2"+
+ "\u0573\u0572\3\2\2\2\u0574\u0575\3\2\2\2\u0575\u0573\3\2\2\2\u0575\u0576"+
+ "\3\2\2\2\u0576\u0577\3\2\2\2\u0577\u0578\b\66\2\2\u0578l\3\2\2\2\u0579"+
+ "\u057a\13\2\2\2\u057an\3\2\2\2\27\2\u04ad\u04bc\u04be\u04c7\u04c9\u04d7"+
+ "\u052b\u052e\u0534\u0538\u0544\u0546\u054f\u0551\u055a\u055e\u0561\u0569"+
+ "\u056e\u0575\3\b\2\2";
public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala
index 4f4533c..45a9d9d 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/common/makro/NCMacroParserSpec.scala
@@ -143,11 +143,11 @@ class NCMacroParserSpec {
checkEq("a {b|_|{//[]{}//}[1,2]}", Seq("a", "a b", "a //[]{}//", "a //[]{}// //[]{}//"))
checkEq("a {b|_|{//[]^^// ^^{_}^^}[1,2]}", Seq("a", "a b", "a //[]^^// ^^{_}^^", "a //[]^^// ^^{_}^^ //[]^^// ^^{_}^^"))
checkEq("//[a-zA-Z0-9]+//", Seq("//[a-zA-Z0-9]+//"))
- checkEq("the ^^[internal]{id() == 'anyWord'}^^", Seq("the ^^[internal]{id() == 'anyWord'}^^"))
- checkEq("{A}[0,1] ^^[internal]{id() == 'anyWord'}^^", Seq("^^[internal]{id() == 'anyWord'}^^", "A ^^[internal]{id() == 'anyWord'}^^"))
- checkEq("w1 ^^{id() == 'nlpcraft:num'}^^ w2", Seq("w1 ^^{id() == 'nlpcraft:num'}^^ w2"))
- checkEq("before limit ^^[limitAlias]{id() == 'nlpcraft:limit'}^^", Seq("before limit ^^[limitAlias]{id() == 'nlpcraft:limit'}^^"))
- checkEq("wrap ^^[wrapLimitAlias]{id() == 'wrapLimit'}^^", Seq("wrap ^^[wrapLimitAlias]{id() == 'wrapLimit'}^^"))
+ checkEq("the ^^[internal]{tok_id() == 'anyWord'}^^", Seq("the ^^[internal]{tok_id() == 'anyWord'}^^"))
+ checkEq("{A}[0,1] ^^[internal]{tok_id() == 'anyWord'}^^", Seq("^^[internal]{tok_id() == 'anyWord'}^^", "A ^^[internal]{tok_id() == 'anyWord'}^^"))
+ checkEq("w1 ^^{tok_id() == 'nlpcraft:num'}^^ w2", Seq("w1 ^^{tok_id() == 'nlpcraft:num'}^^ w2"))
+ checkEq("before limit ^^[limitAlias]{tok_id() == 'nlpcraft:limit'}^^", Seq("before limit ^^[limitAlias]{tok_id() == 'nlpcraft:limit'}^^"))
+ checkEq("wrap ^^[wrapLimitAlias]{tok_id() == 'wrapLimit'}^^", Seq("wrap ^^[wrapLimitAlias]{tok_id() == 'wrapLimit'}^^"))
checkError("a {| b")
checkError("{a}}")
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec.scala
index 0bba620..505832a 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec.scala
@@ -38,15 +38,15 @@ class NCIdlSpecModel extends NCModelAdapter(
// Moscow population filter.
@NCIntent("intent=bigCity " +
"term(city)={" +
- "id() == 'nlpcraft:city' && " +
+ "tok_id() == 'nlpcraft:city' && " +
"get(meta_token('nlpcraft:city:citymeta'), 'population') >= 10381222" +
"}")
private def onBigCity(ctx: NCIntentMatch): NCResult = "OK"
- @NCIntent("intent=otherCity term(city)={id() == 'nlpcraft:city'}")
+ @NCIntent("intent=otherCity term(city)={tok_id() == 'nlpcraft:city'}")
private def onOtherCity(ctx: NCIntentMatch): NCResult = "OK"
- @NCIntent("intent=userElement term(x)={id() == 'paris'}")
+ @NCIntent("intent=userElement term(x)={tok_id() == 'paris'}")
private def onUserElement(ctx: NCIntentMatch): NCResult = "OK"
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec2.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec2.scala
index 3f6143e..31b4808 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec2.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIdlSpec2.scala
@@ -31,19 +31,19 @@ class NCIdlSpecModel2 extends NCModelAdapter(
) {
override def getElements: util.Set[NCElement] = Set(NCTestElement("a"))
- @NCIntent("intent=a_11 term(a)={id() == 'a'}")
+ @NCIntent("intent=a_11 term(a)={tok_id() == 'a'}")
private def a11(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=a_23 term(a)={id() == 'a'}[2,3]")
+ @NCIntent("intent=a_23 term(a)={tok_id() == 'a'}[2,3]")
private def a23(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=a_15 term(a)={id() == 'a'}[1,5]")
+ @NCIntent("intent=a_15 term(a)={tok_id() == 'a'}[1,5]")
private def a15(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=a_plus term(a)={id() == 'a'}+")
+ @NCIntent("intent=a_plus term(a)={tok_id() == 'a'}+")
private def a1Inf(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=a_star term(a)={id() == 'a'}*")
+ @NCIntent("intent=a_star term(a)={tok_id() == 'a'}*")
private def a0Inf(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIntentPrioritiesSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIntentPrioritiesSpec.scala
index 940b70b..57ed41c 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIntentPrioritiesSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/NCIntentPrioritiesSpec.scala
@@ -31,10 +31,10 @@ class NCIntentPrioritiesSpecModel extends NCModelAdapter(
) {
override def getElements: util.Set[NCElement] = Set(NCTestElement("x"))
- @NCIntent("intent=low term(x)={id() == 'x'} term(city)={id() == 'nlpcraft:city'}?")
+ @NCIntent("intent=low term(x)={tok_id() == 'x'} term(city)={tok_id() == 'nlpcraft:city'}?")
private def onLow(ctx: NCIntentMatch): NCResult = NCResult.text("low")
- @NCIntent("intent=high term(x)={id() == 'x'} term(city)={id() == 'nlpcraft:city'}")
+ @NCIntent("intent=high term(x)={tok_id() == 'x'} term(city)={tok_id() == 'nlpcraft:city'}")
private def onHigh(ctx: NCIntentMatch): NCResult = NCResult.text("high")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensIntentsSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensIntentsSpec.scala
index 99fe178..65b572e 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensIntentsSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensIntentsSpec.scala
@@ -22,16 +22,16 @@ import org.apache.nlpcraft.{NCTestContext, NCTestEnvironment}
import org.junit.jupiter.api.Test
class NCAbstractTokensModelIntents extends NCAbstractTokensModel {
- @NCIntent("intent=wrapAnyWordIntent term(t)={id() == 'wrapAnyWord'}")
+ @NCIntent("intent=wrapAnyWordIntent term(t)={tok_id() == 'wrapAnyWord'}")
private def onWrapInternal(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=wrapNumIntent term(t)={id() == 'wrapNum'}")
+ @NCIntent("intent=wrapNumIntent term(t)={tok_id() == 'wrapNum'}")
private def onWrapNum(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=wrapLimitWrapAnyWord term(t1)={id() == 'wrapLimit'} term(t2)={id() == 'wrapAnyWord'}")
+ @NCIntent("intent=wrapLimitWrapAnyWord term(t1)={tok_id() == 'wrapLimit'} term(t2)={tok_id() == 'wrapAnyWord'}")
private def wrapLimitWrapAnyWord(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=wrapWrapLimit term(t1)={id() == 'wrapWrapLimit'} term(t2)={id() == 'wrapAnyWord'}")
+ @NCIntent("intent=wrapWrapLimit term(t1)={tok_id() == 'wrapWrapLimit'} term(t2)={tok_id() == 'wrapAnyWord'}")
private def wrapWrapLimit(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
index 1bcca79..cae42e0 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/abstract/NCAbstractTokensModel.scala
@@ -29,10 +29,10 @@ class NCAbstractTokensModel extends NCModelAdapter(
override def getElements: util.Set[NCElement] =
Set(
NCTestElement("anyWord", "//[a-zA-Z0-9]+//"),
- NCTestElement("wrapAnyWord", "the ^^[internal]{id() == 'anyWord'}^^"),
- NCTestElement("wrapNum", "w1 ^^{id() == 'nlpcraft:num'}^^ w2"),
- NCTestElement("wrapLimit", "before limit ^^[limitAlias]{id() == 'nlpcraft:limit'}^^"),
- NCTestElement("wrapWrapLimit", "wrap ^^[wrapLimitAlias]{id() == 'wrapLimit'}^^")
+ NCTestElement("wrapAnyWord", "the ^^[internal]{tok_id() == 'anyWord'}^^"),
+ NCTestElement("wrapNum", "w1 ^^{tok_id() == 'nlpcraft:num'}^^ w2"),
+ NCTestElement("wrapLimit", "before limit ^^[limitAlias]{tok_id() == 'nlpcraft:limit'}^^"),
+ NCTestElement("wrapWrapLimit", "wrap ^^[wrapLimitAlias]{tok_id() == 'wrapLimit'}^^")
)
override def getAbstractTokens: util.Set[String] = Set("nlpcraft:num", "anyWord").asJava
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala
index 0b0dfe8..5fdffdc 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationSpec.scala
@@ -35,7 +35,7 @@ class NCConversationSpecModel extends NCModel {
override def getElements: util.Set[NCElement] = Set(NCTestElement("test1"), NCTestElement("test2"))
// 'test1' is mandatory, 'test2' is optional.
- @NCIntent("intent=testIntentId term~{id() == 'test1'} term~{id() == 'test2'}?")
+ @NCIntent("intent=testIntentId term~{tok_id() == 'test1'} term~{tok_id() == 'test2'}?")
def onMatch(): NCResult = NCResult.text("ok")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationTimeoutSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationTimeoutSpec.scala
index bcec33d..0960ad7 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationTimeoutSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/conversation/NCConversationTimeoutSpec.scala
@@ -47,7 +47,7 @@ class NCTimeoutSpecModel extends NCModel {
override def getElements: util.Set[NCElement] = Collections.singleton(new NCTestElement("test"))
- @NCIntent("intent=req term~{id() == 'test'}")
+ @NCIntent("intent=req term~{tok_id() == 'test'}")
def onMatch(ctx: NCIntentMatch): NCResult = {
val conv = ctx.getContext.getConversation
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
index 5d5a0b7..60b234b 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/dialog/NCDialogSpec.scala
@@ -35,16 +35,16 @@ class NCDialogSpecModel extends NCModel {
override def getElements: util.Set[NCElement] =
Set((for (ch ← 'a' to 'y'; i ← 1 to 9) yield NCTestElement(s"$ch$i")):_*)
- @NCIntent("intent=onA1 term~{id() == 'a1'}")
+ @NCIntent("intent=onA1 term~{tok_id() == 'a1'}")
def onA1(): NCResult = NCResult.text("ok")
- @NCIntent("intent=onA2 flow='^(?:onA1)(^:onA1)*$' term~{id() == 'a2'}")
+ @NCIntent("intent=onA2 flow='^(?:onA1)(^:onA1)*$' term~{tok_id() == 'a2'}")
def onA2(): NCResult = NCResult.text("ok")
- @NCIntent("intent=onA3 flow='onA1' term~{id() == 'a3'}")
+ @NCIntent("intent=onA3 flow='onA1' term~{tok_id() == 'a3'}")
def onA3(): NCResult = NCResult.text("ok")
- @NCIntent("intent=onA4 flow='onA1 onA1' term~{id() == 'a4'}")
+ @NCIntent("intent=onA4 flow='onA1 onA1' term~{tok_id() == 'a4'}")
def onA4(): NCResult = NCResult.text("ok")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsToken.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsToken.scala
index 36c07f1..1d3919c 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsToken.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/functions/NCIdlFunctionsToken.scala
@@ -27,11 +27,11 @@ class NCIdlFunctionsToken extends NCIdlFunctions {
def test(): Unit =
test(
TestDesc(
- truth = "id() == 'a'",
+ truth = "tok_id() == 'a'",
token = tkn(id = "a")
),
TestDesc(
- truth = "parent() == 'a'",
+ truth = "tok_parent() == 'a'",
token = tkn(parentId = "a")
)
)
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl
index 9830ca5..4ca2b8c 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/compiler/test_ok.idl
@@ -21,7 +21,7 @@
// Re-usable predicate #1.
fragment=p1
- term={id(find_part(token(), "alias")) == 2}
+ term={id(tok_find_part(token(), "alias")) == 2}
term={meta_frag('a') && has_any(get(meta_frag('b'), 'Москва'), list(1, 2))}
term(userDefined)=/org.apache.MyShit#myMethod/
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/idl_test_model.yaml b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/idl_test_model.yaml
index e1f027d..033ead8 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/idl_test_model.yaml
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/intent/idl/idl_test_model.yaml
@@ -38,7 +38,7 @@ elements:
floatVal: 1.5
textVal: "a2"
synonyms:
- - "{second|2nd} ^^[alias1]{trim(id()) == 'a'}^^"
+ - "{second|2nd} ^^[alias1]{trim(tok_id()) == 'a'}^^"
- id: "a3"
metadata:
intVal: 2
@@ -49,7 +49,7 @@ elements:
- "{a33|a3}"
- id: "a4"
synonyms:
- - "{fourth|4th} ^^[alias4]{id() == 'a3'}^^"
+ - "{fourth|4th} ^^[alias4]{tok_id() == 'a3'}^^"
intents:
- - "intent=i1 term(t1)={id() == 'a' && meta_token('txt') == 'x'}"
+ - "intent=i1 term(t1)={tok_id() == 'a' && meta_token('txt') == 'x'}"
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
index 2ec6407..c13fe37 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/meta/NCMetaSpec.scala
@@ -36,7 +36,7 @@ class NcMetaModel extends NCAbstractTokensModel {
@NCIntent(
"intent=i " +
" term(t)={" +
- " id() == 'a' && " +
+ " tok_id() == 'a' && " +
" meta_user('k1') == 'v1' && " +
" meta_company('k1') == 'v1' && " +
" meta_sys('k1') == 'v1'" +
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala
index fffd3a3..f244901 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensPropertiesSpec.scala
@@ -30,10 +30,10 @@ abstract class NCTokenPropertiesModelAbstract extends NCModelAdapter(
) {
override def getElements: util.Set[NCElement] = Set(NCTestElement("ab", "a b"), NCTestElement("xy", "x y"))
- @NCIntent("intent=onAB term(t)={id() == 'ab'}")
+ @NCIntent("intent=onAB term(t)={tok_id() == 'ab'}")
def onAB(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onXY term(t)={id() == 'xy'}")
+ @NCIntent("intent=onXY term(t)={tok_id() == 'xy'}")
def onXY(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala
index f3137a1..a96fb37 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/properties/NCTokensRestrictionsSpec.scala
@@ -29,16 +29,16 @@ class NCTokensRestrictionsModelAbstract extends NCModelAdapter(
) {
override def getElements: util.Set[NCElement] = Set(NCTestElement("a"))
- @NCIntent("intent=onA term(t)={id() == 'a'}+")
+ @NCIntent("intent=onA term(t)={tok_id() == 'a'}+")
def onA(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onLimit term(t)={id() == 'nlpcraft:limit'} term(a)={id() == 'a'}")
+ @NCIntent("intent=onLimit term(t)={tok_id() == 'nlpcraft:limit'} term(a)={tok_id() == 'a'}")
def onLimit(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onSort term(t)={id() == 'nlpcraft:sort'} term(a)={id() == 'a'}")
+ @NCIntent("intent=onSort term(t)={tok_id() == 'nlpcraft:sort'} term(a)={tok_id() == 'a'}")
def onSort(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onRelation term(t)={id() == 'nlpcraft:relation'} term(a)={id() == 'a'}[2,2]")
+ @NCIntent("intent=onRelation term(t)={tok_id() == 'nlpcraft:relation'} term(a)={tok_id() == 'a'}[2,2]")
def onRelation(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala
index 1c98735..d5154c8 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/model/synonyms/NCSynonymsSpec.scala
@@ -39,19 +39,19 @@ class NCSynonymsSpecModel extends NCModelAdapter("nlpcraft.syns.test.mdl", "Syno
NCTestElement("e3", "{//AA//}[3, 3]"),
// Nested - 3 words.
- NCTestElement("e4", "{^^{id() == 'e1'}^^}[3, 3]")
+ NCTestElement("e4", "{^^{tok_id() == 'e1'}^^}[3, 3]")
)
- @NCIntent("intent=onE1 term(t)={id() == 'e1'}")
+ @NCIntent("intent=onE1 term(t)={tok_id() == 'e1'}")
def onE1(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onE2 term(t)={id() == 'e2'}")
+ @NCIntent("intent=onE2 term(t)={tok_id() == 'e2'}")
def onE2(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onE3 term(t)={id() == 'e3'}")
+ @NCIntent("intent=onE3 term(t)={tok_id() == 'e3'}")
def onE3(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onE4 term(t)={id() == 'e4'}")
+ @NCIntent("intent=onE4 term(t)={tok_id() == 'e4'}")
def onE4(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
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 dd2f67b..6bae68b 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,10 +30,10 @@ class NCSynonymsSpecModelTmp extends NCModelAdapter("nlpcraft.syns.test.mdl", "S
override def getElements: util.Set[NCElement] =
Set(
- NCTestElement("wrapper", "^^{id() == 'unknown'}^^")
+ NCTestElement("wrapper", "^^{tok_id() == 'unknown'}^^")
)
- @NCIntent("intent=onWrapper term(t)={id() == 'wrapper'}")
+ @NCIntent("intent=onWrapper term(t)={tok_id() == 'wrapper'}")
def onWrapper(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModel.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModel.scala
index c38bfb9..ac16a4d 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModel.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/models/stm/NCStmTestModel.scala
@@ -41,15 +41,15 @@ class NCStmTestModel extends NCModelAdapter("nlpcraft.stm.test", "STM Test Model
override def getGroups: util.List[String] = groups.asJava
}
- @NCIntent("intent=sale term~{id() == 'sale'}")
+ @NCIntent("intent=sale term~{tok_id() == 'sale'}")
private def onSale(ctx: NCIntentMatch): NCResult = NCResult.text("sale")
- @NCIntent("intent=buy term~{id() == 'buy'}")
+ @NCIntent("intent=buy term~{tok_id() == 'buy'}")
private def onBuy(ctx: NCIntentMatch): NCResult = NCResult.text("buy")
- @NCIntent("intent=sale_best_employee term~{id() == 'sale'} term~{id() == 'best_employee'}")
+ @NCIntent("intent=sale_best_employee term~{tok_id() == 'sale'} term~{tok_id() == 'best_employee'}")
private def onBestEmployeeSale(ctx: NCIntentMatch): NCResult = NCResult.text("sale_best_employee")
- @NCIntent("intent=buy_best_employee term~{id() =='buy'} term~{id() =='best_employee'}")
+ @NCIntent("intent=buy_best_employee term~{tok_id() =='buy'} term~{tok_id() =='best_employee'}")
private def onBestEmployeeBuy(ctx: NCIntentMatch): NCResult = NCResult.text("buy_best_employee")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala
index c9066f6..54f42f4 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec.scala
@@ -30,12 +30,12 @@ import java.util
class NCNestedTestModel extends NCDefaultTestModel {
override def getElements: util.Set[NCElement] =
Set(
- NCTestElement("x1", "{test|_} ^^{id() == 'nlpcraft:date'}^^"),
- NCTestElement("x2", "{test1|_} ^^{id() == 'x1'}^^"),
- NCTestElement("x3", "{test2|_} ^^{id() == 'x2'}^^"),
+ NCTestElement("x1", "{test|_} ^^{tok_id() == 'nlpcraft:date'}^^"),
+ NCTestElement("x2", "{test1|_} ^^{tok_id() == 'x1'}^^"),
+ NCTestElement("x3", "{test2|_} ^^{tok_id() == 'x2'}^^"),
NCTestElement("y1", "y"),
- NCTestElement("y2", "^^{id() == 'y1'}^^"),
- NCTestElement("y3", "^^{id() == 'y2'}^^ ^^{id() == 'y2'}^^")
+ NCTestElement("y2", "^^{tok_id() == 'y1'}^^"),
+ NCTestElement("y3", "^^{tok_id() == 'y2'}^^ ^^{tok_id() == 'y2'}^^")
)
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala
index 11c1468..1ad05e8 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec2.scala
@@ -28,12 +28,12 @@ import java.util
*/
class NCNestedTestModel21 extends NCModelAdapter("nlpcraft.nested2.test.mdl", "Nested Test Model", "1.0") {
override def getElements: util.Set[NCElement] =
- Set(NCTestElement("e1", "{^^{id() == 'nlpcraft:num'}^^|_} word"))
+ Set(NCTestElement("e1", "{^^{tok_id() == 'nlpcraft:num'}^^|_} word"))
- @NCIntent("intent=onE1 term(t1)={id() == 'e1'}")
+ @NCIntent("intent=onE1 term(t1)={tok_id() == 'e1'}")
def onAB(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
- @NCIntent("intent=onNumAndE1 term(t1)={id() == 'nlpcraft:num'} term(t2)={id() == 'e1'}")
+ @NCIntent("intent=onNumAndE1 term(t1)={tok_id() == 'nlpcraft:num'} term(t2)={tok_id() == 'e1'}")
def onNumAndE1(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
override def isPermutateSynonyms: Boolean = false
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
index 3f07c13..f1a1dd2 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec3.scala
@@ -33,13 +33,13 @@ class NCNestedTestModel3 extends NCModelAdapter(
override def getElements: util.Set[NCElement] =
Set(
NCTestElement("e1", "//[a-zA-Z0-9]+//"),
- NCTestElement("e2", "^^{id() == 'e1'}^^"),
+ NCTestElement("e2", "^^{tok_id() == 'e1'}^^"),
)
override def getAbstractTokens: util.Set[String] = Set("e1").asJava
override def getEnabledBuiltInTokens: util.Set[String] = Set.empty[String].asJava
- @NCIntent("intent=onE2 term(t1)={id() == 'e2'}[12, 100]")
+ @NCIntent("intent=onE2 term(t1)={tok_id() == 'e2'}[12, 100]")
def onAB(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala
index d308f56..43320e7 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec4.scala
@@ -33,13 +33,13 @@ class NCNestedTestModel4 extends NCModelAdapter(
override def getElements: util.Set[NCElement] =
Set(
NCTestElement("e1", "//[a-zA-Z0-9]+//"),
- NCTestElement("e2", "the ^^{id() == 'e1'}^^")
+ NCTestElement("e2", "the ^^{tok_id() == 'e1'}^^")
)
override def getAbstractTokens: util.Set[String] = Set("e1").asJava
override def getEnabledBuiltInTokens: util.Set[String] = Set.empty[String].asJava
- @NCIntent("intent=onE2 term(t1)={id() == 'e2'}[8, 100]")
+ @NCIntent("intent=onE2 term(t1)={tok_id() == 'e2'}[8, 100]")
def onAB(ctx: NCIntentMatch): NCResult = NCResult.text("OK")
}
diff --git a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala
index 264d078..24fd3ac 100644
--- a/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala
+++ b/nlpcraft/src/test/scala/org/apache/nlpcraft/probe/mgrs/nlp/enrichers/model/NCEnricherNestedModelSpec5.scala
@@ -31,12 +31,12 @@ class NCNestedTestModel5 extends NCModelAdapter(
) {
override def getElements: util.Set[NCElement] =
Set(
- NCTestElement("cityWrapper", "^^[cityAlias]{id() == 'nlpcraft:city'}^^"),
+ NCTestElement("cityWrapper", "^^[cityAlias]{tok_id() == 'nlpcraft:city'}^^"),
)
@NCIntent(
"intent=bigCity " +
"term(city)={" +
- " id() == 'cityWrapper' && " +
+ " tok_id() == 'cityWrapper' && " +
" get(meta_part('cityAlias', 'nlpcraft:city:citymeta'), 'population') >= 10381222" +
"}"
)