occam-grammars 1.3.367 → 1.3.370

package/lib/nominal/entries.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "default", {
         return _default;
     }
 });
-var LATIN = "[\\p{Script=Latin}]", GREEK = "[\\p{Script=Greek}]", DECIMAL = "[0-9]", MATHEMATICAL_SCRIPT = "[\\u{1D49C}-\\u{1D4CF}\\u{210A}\\u{210B}\\u{2110}\\u{2112}\\u{211B}\\u{212C}\\u{2130}\\u{2131}\\u{2133}\\u{2134}]", MATHEMATICAL_FRAKTUR = "[\\u{1D504}-\\u{1D537}\\u{210C}\\u{2111}\\u{211C}\\u{2128}\\u{212D}]", MATHEMATICAL_SANS_SERIF_BOLD = "[\\u{1D5D4}-\\u{1D607}]";
+var DECIMAL = "[0-9]", GREEK = "[\\p{Script=Greek}]", LATIN = "[\\p{Script=Latin}]", LOWER_CASE_LATIN = "[\\p{Script=Latin}&&\\p{Lowercase}]", UPPER_CASE_LATIN = "[\\p{Script=Latin}&&\\p{Uppercase}]", MATHEMATICAL_SCRIPT = "[\\p{Style=Math_Script}]", MATHEMATICAL_FRAKTUR = "[\\p{Style=Math_Fraktur}]", MATHEMATICAL_SANS_SERIF_BOLD = "[\\u{1D5D4}-\\u{1D607}]";
 var entries = [
     {
         "primary-keyword": "^(?:Rule|Axiom|Theorem|Lemma|Conjecture|MetaLemma|Metatheorem|Premises|Premise|Conclusion|Proof|Therefore|Suppose|Hence|Then|Provisional|Type|TypePrefix|Properties|Property|Variable|Constructor|Combinator|Metavariable|Given)\\b"
@@ -20,7 +20,7 @@ var entries = [
         "meta-type": "^(?:Statement|Reference|Frame)\\b"
     },
     {
-        "name": "^(?:[a-z][A-Za-z]+[0-9]*|[A-Z][A-Za-z]*[0-9]*)"
+        "name": "^(?:".concat(LOWER_CASE_LATIN).concat(LATIN, "+").concat(DECIMAL, "*|").concat(UPPER_CASE_LATIN).concat(LATIN, "*").concat(DECIMAL, "*)")
     },
     {
         "identifier": "^(?:".concat(LATIN, "+").concat(DECIMAL, "*|").concat(GREEK, "+|").concat(MATHEMATICAL_SCRIPT, "+|").concat(MATHEMATICAL_FRAKTUR, "+|").concat(MATHEMATICAL_SANS_SERIF_BOLD, "+)")
@@ -37,4 +37,4 @@ var entries = [
 ];
 var _default = entries;
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub21pbmFsL2VudHJpZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XHJcblxyXG5jb25zdCBMQVRJTiA9IFwiW1xcXFxwe1NjcmlwdD1MYXRpbn1dXCIsXHJcbiAgICAgIEdSRUVLID0gXCJbXFxcXHB7U2NyaXB0PUdyZWVrfV1cIixcclxuICAgICAgREVDSU1BTCA9IFwiWzAtOV1cIixcclxuICAgICAgTUFUSEVNQVRJQ0FMX1NDUklQVCA9IFwiW1xcXFx1ezFENDlDfS1cXFxcdXsxRDRDRn1cXFxcdXsyMTBBfVxcXFx1ezIxMEJ9XFxcXHV7MjExMH1cXFxcdXsyMTEyfVxcXFx1ezIxMUJ9XFxcXHV7MjEyQ31cXFxcdXsyMTMwfVxcXFx1ezIxMzF9XFxcXHV7MjEzM31cXFxcdXsyMTM0fV1cIixcclxuICAgICAgTUFUSEVNQVRJQ0FMX0ZSQUtUVVIgPSBcIltcXFxcdXsxRDUwNH0tXFxcXHV7MUQ1Mzd9XFxcXHV7MjEwQ31cXFxcdXsyMTExfVxcXFx1ezIxMUN9XFxcXHV7MjEyOH1cXFxcdXsyMTJEfV1cIixcclxuICAgICAgTUFUSEVNQVRJQ0FMX1NBTlNfU0VSSUZfQk9MRCA9IFwiW1xcXFx1ezFENUQ0fS1cXFxcdXsxRDYwN31dXCI7XHJcblxyXG5jb25zdCBlbnRyaWVzID0gW1xyXG4gIHtcclxuICAgIFwicHJpbWFyeS1rZXl3b3JkXCI6IFwiXig/OlJ1bGV8QXhpb218VGhlb3JlbXxMZW1tYXxDb25qZWN0dXJlfE1ldGFMZW1tYXxNZXRhdGhlb3JlbXxQcmVtaXNlc3xQcmVtaXNlfENvbmNsdXNpb258UHJvb2Z8VGhlcmVmb3JlfFN1cHBvc2V8SGVuY2V8VGhlbnxQcm92aXNpb25hbHxUeXBlfFR5cGVQcmVmaXh8UHJvcGVydGllc3xQcm9wZXJ0eXxWYXJpYWJsZXxDb25zdHJ1Y3RvcnxDb21iaW5hdG9yfE1ldGF2YXJpYWJsZXxHaXZlbilcXFxcYlwiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcInNlY29uZGFyeS1rZXl3b3JkXCI6IFwiXig/OmlzfGlufGFufGF8b2Z8Ynl8YmVjYXVzZXxmb3J8c2F0aXNmaWVzfHByb3Zpc2lvbmFsbHl8ZGVmaW5lZHx1bmRlZmluZWR8bWlzc2luZ3xwcmVzZW50KVxcXFxiXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwibWV0YS10eXBlXCI6IFwiXig/OlN0YXRlbWVudHxSZWZlcmVuY2V8RnJhbWUpXFxcXGJcIlxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJuYW1lXCI6IFwiXig/OlthLXpdW0EtWmEtel0rWzAtOV0qfFtBLVpdW0EtWmEtel0qWzAtOV0qKVwiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcImlkZW50aWZpZXJcIjogYF4oPzoke0xBVElOfSske0RFQ0lNQUx9Knwke0dSRUVLfSt8JHtNQVRIRU1BVElDQUxfU0NSSVBUfSt8JHtNQVRIRU1BVElDQUxfRlJBS1RVUn0rfCR7TUFUSEVNQVRJQ0FMX1NBTlNfU0VSSUZfQk9MRH0rKWBcclxuICB9LFxyXG4gIHtcclxuICAgIFwiZGVsaW1pdGVyXCI6IFwiXig/OlxcXFwuXFxcXC5cXFxcLnwsfFxcXFwofFxcXFwpfFxcXFxbfFxcXFxdKVwiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcInNwZWNpYWxcIjogXCJeKD86XFxcXHwtfEB8Ojp8Onw9KVwiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcInVuYXNzaWduZWRcIjogXCJeW15cXFxcc1xcXFwoXFxcXClcXFxcW1xcXFxdOixdK1wiXHJcbiAgfVxyXG5dO1xyXG5cclxuZXhwb3J0IGRlZmF1bHQgZW50cmllcztcclxuIl0sIm5hbWVzIjpbIkxBVElOIiwiR1JFRUsiLCJERUNJTUFMIiwiTUFUSEVNQVRJQ0FMX1NDUklQVCIsIk1BVEhFTUFUSUNBTF9GUkFLVFVSIiwiTUFUSEVNQVRJQ0FMX1NBTlNfU0VSSUZfQk9MRCIsImVudHJpZXMiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQW9DQTs7O2VBQUE7OztBQWxDQSxJQUFNQSxRQUFRLHVCQUNSQyxRQUFRLHVCQUNSQyxVQUFVLFNBQ1ZDLHNCQUFzQixxSEFDdEJDLHVCQUF1Qix3RUFDdkJDLCtCQUErQjtBQUVyQyxJQUFNQyxVQUFVO0lBQ2Q7UUFDRSxtQkFBbUI7SUFDckI7SUFDQTtRQUNFLHFCQUFxQjtJQUN2QjtJQUNBO1FBQ0UsYUFBYTtJQUNmO0lBQ0E7UUFDRSxRQUFRO0lBQ1Y7SUFDQTtRQUNFLGNBQWMsQUFBQyxPQUFlSixPQUFURixPQUFNLEtBQWVDLE9BQVpDLFNBQVEsTUFBY0MsT0FBVkYsT0FBTSxNQUE0QkcsT0FBeEJELHFCQUFvQixNQUE2QkUsT0FBekJELHNCQUFxQixNQUFpQyxPQUE3QkMsOEJBQTZCO0lBQ3BJO0lBQ0E7UUFDRSxhQUFhO0lBQ2Y7SUFDQTtRQUNFLFdBQVc7SUFDYjtJQUNBO1FBQ0UsY0FBYztJQUNoQjtDQUNEO0lBRUQsV0FBZUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ub21pbmFsL2VudHJpZXMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XHJcblxyXG5jb25zdCBERUNJTUFMID0gXCJbMC05XVwiLFxyXG4gICAgICBHUkVFSyA9IFwiW1xcXFxwe1NjcmlwdD1HcmVla31dXCIsXHJcbiAgICAgIExBVElOID0gXCJbXFxcXHB7U2NyaXB0PUxhdGlufV1cIixcclxuICAgICAgTE9XRVJfQ0FTRV9MQVRJTiA9IFwiW1xcXFxwe1NjcmlwdD1MYXRpbn0mJlxcXFxwe0xvd2VyY2FzZX1dXCIsXHJcbiAgICAgIFVQUEVSX0NBU0VfTEFUSU4gPSBcIltcXFxccHtTY3JpcHQ9TGF0aW59JiZcXFxccHtVcHBlcmNhc2V9XVwiLFxyXG4gICAgICBNQVRIRU1BVElDQUxfU0NSSVBUID0gXCJbXFxcXHB7U3R5bGU9TWF0aF9TY3JpcHR9XVwiLFxyXG4gICAgICBNQVRIRU1BVElDQUxfRlJBS1RVUiA9IFwiW1xcXFxwe1N0eWxlPU1hdGhfRnJha3R1cn1dXCIsXHJcbiAgICAgIE1BVEhFTUFUSUNBTF9TQU5TX1NFUklGX0JPTEQgPSBcIltcXFxcdXsxRDVENH0tXFxcXHV7MUQ2MDd9XVwiO1xyXG5cclxuY29uc3QgZW50cmllcyA9IFtcclxuICB7XHJcbiAgICBcInByaW1hcnkta2V5d29yZFwiOiBcIl4oPzpSdWxlfEF4aW9tfFRoZW9yZW18TGVtbWF8Q29uamVjdHVyZXxNZXRhTGVtbWF8TWV0YXRoZW9yZW18UHJlbWlzZXN8UHJlbWlzZXxDb25jbHVzaW9ufFByb29mfFRoZXJlZm9yZXxTdXBwb3NlfEhlbmNlfFRoZW58UHJvdmlzaW9uYWx8VHlwZXxUeXBlUHJlZml4fFByb3BlcnRpZXN8UHJvcGVydHl8VmFyaWFibGV8Q29uc3RydWN0b3J8Q29tYmluYXRvcnxNZXRhdmFyaWFibGV8R2l2ZW4pXFxcXGJcIlxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJzZWNvbmRhcnkta2V5d29yZFwiOiBcIl4oPzppc3xpbnxhbnxhfG9mfGJ5fGJlY2F1c2V8Zm9yfHNhdGlzZmllc3xwcm92aXNpb25hbGx5fGRlZmluZWR8dW5kZWZpbmVkfG1pc3Npbmd8cHJlc2VudClcXFxcYlwiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcIm1ldGEtdHlwZVwiOiBcIl4oPzpTdGF0ZW1lbnR8UmVmZXJlbmNlfEZyYW1lKVxcXFxiXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwibmFtZVwiOiBgXig/OiR7TE9XRVJfQ0FTRV9MQVRJTn0ke0xBVElOfSske0RFQ0lNQUx9Knwke1VQUEVSX0NBU0VfTEFUSU59JHtMQVRJTn0qJHtERUNJTUFMfSopYCxcclxuICB9LFxyXG4gIHtcclxuICAgIFwiaWRlbnRpZmllclwiOiBgXig/OiR7TEFUSU59KyR7REVDSU1BTH0qfCR7R1JFRUt9K3wke01BVEhFTUFUSUNBTF9TQ1JJUFR9K3wke01BVEhFTUFUSUNBTF9GUkFLVFVSfSt8JHtNQVRIRU1BVElDQUxfU0FOU19TRVJJRl9CT0xEfSspYFxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJkZWxpbWl0ZXJcIjogXCJeKD86XFxcXC5cXFxcLlxcXFwufCx8XFxcXCh8XFxcXCl8XFxcXFt8XFxcXF0pXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwic3BlY2lhbFwiOiBcIl4oPzpcXFxcfC18QHw6Onw6fD0pXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwidW5hc3NpZ25lZFwiOiBcIl5bXlxcXFxzXFxcXChcXFxcKVxcXFxbXFxcXF06LF0rXCJcclxuICB9XHJcbl07XHJcblxyXG5leHBvcnQgZGVmYXVsdCBlbnRyaWVzO1xyXG4iXSwibmFtZXMiOlsiREVDSU1BTCIsIkdSRUVLIiwiTEFUSU4iLCJMT1dFUl9DQVNFX0xBVElOIiwiVVBQRVJfQ0FTRV9MQVRJTiIsIk1BVEhFTUFUSUNBTF9TQ1JJUFQiLCJNQVRIRU1BVElDQUxfRlJBS1RVUiIsIk1BVEhFTUFUSUNBTF9TQU5TX1NFUklGX0JPTEQiLCJlbnRyaWVzIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFzQ0E7OztlQUFBOzs7QUFwQ0EsSUFBTUEsVUFBVSxTQUNWQyxRQUFRLHVCQUNSQyxRQUFRLHVCQUNSQyxtQkFBbUIsdUNBQ25CQyxtQkFBbUIsdUNBQ25CQyxzQkFBc0IsNEJBQ3RCQyx1QkFBdUIsNkJBQ3ZCQywrQkFBK0I7QUFFckMsSUFBTUMsVUFBVTtJQUNkO1FBQ0UsbUJBQW1CO0lBQ3JCO0lBQ0E7UUFDRSxxQkFBcUI7SUFDdkI7SUFDQTtRQUNFLGFBQWE7SUFDZjtJQUNBO1FBQ0UsUUFBUSxBQUFDLE9BQXlCTixPQUFuQkMsa0JBQTRCSCxPQUFURSxPQUFNLEtBQWVFLE9BQVpKLFNBQVEsTUFBdUJFLE9BQW5CRSxrQkFBNEJKLE9BQVRFLE9BQU0sS0FBVyxPQUFSRixTQUFRO0lBQzdGO0lBQ0E7UUFDRSxjQUFjLEFBQUMsT0FBZUEsT0FBVEUsT0FBTSxLQUFlRCxPQUFaRCxTQUFRLE1BQWNLLE9BQVZKLE9BQU0sTUFBNEJLLE9BQXhCRCxxQkFBb0IsTUFBNkJFLE9BQXpCRCxzQkFBcUIsTUFBaUMsT0FBN0JDLDhCQUE2QjtJQUNwSTtJQUNBO1FBQ0UsYUFBYTtJQUNmO0lBQ0E7UUFDRSxXQUFXO0lBQ2I7SUFDQTtRQUNFLGNBQWM7SUFDaEI7Q0FDRDtJQUVELFdBQWVDIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-grammars",
   "author": "James Smith",
-  "version": "1.3.367",
+  "version": "1.3.370",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-grammars",
   "description": "Occam's grammars.",
@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "necessary": "^15.0.1",
-    "occam-grammar-utilities": "^8.0.358",
-    "occam-lexers": "^23.1.3",
-    "occam-parsers": "^23.1.5",
-    "occam-query": "^4.1.110"
+    "occam-grammar-utilities": "^8.0.359",
+    "occam-lexers": "^23.1.6",
+    "occam-parsers": "^23.1.7",
+    "occam-query": "^4.1.112"
   },
   "devDependencies": {
     "@swc/core": "^1.5.6",

package/src/nominal/entries.js

@@ -1,10 +1,12 @@
 "use strict";
 
-const LATIN = "[\\p{Script=Latin}]",
+const DECIMAL = "[0-9]",
       GREEK = "[\\p{Script=Greek}]",
-      DECIMAL = "[0-9]",
-      MATHEMATICAL_SCRIPT = "[\\u{1D49C}-\\u{1D4CF}\\u{210A}\\u{210B}\\u{2110}\\u{2112}\\u{211B}\\u{212C}\\u{2130}\\u{2131}\\u{2133}\\u{2134}]",
-      MATHEMATICAL_FRAKTUR = "[\\u{1D504}-\\u{1D537}\\u{210C}\\u{2111}\\u{211C}\\u{2128}\\u{212D}]",
+      LATIN = "[\\p{Script=Latin}]",
+      LOWER_CASE_LATIN = "[\\p{Script=Latin}&&\\p{Lowercase}]",
+      UPPER_CASE_LATIN = "[\\p{Script=Latin}&&\\p{Uppercase}]",
+      MATHEMATICAL_SCRIPT = "[\\p{Style=Math_Script}]",
+      MATHEMATICAL_FRAKTUR = "[\\p{Style=Math_Fraktur}]",
       MATHEMATICAL_SANS_SERIF_BOLD = "[\\u{1D5D4}-\\u{1D607}]";
 
 const entries = [
@@ -18,7 +20,7 @@ const entries = [
     "meta-type": "^(?:Statement|Reference|Frame)\\b"
   },
   {
-    "name": "^(?:[a-z][A-Za-z]+[0-9]*|[A-Z][A-Za-z]*[0-9]*)"
+    "name": `^(?:${LOWER_CASE_LATIN}${LATIN}+${DECIMAL}*|${UPPER_CASE_LATIN}${LATIN}*${DECIMAL}*)`,
   },
   {
     "identifier": `^(?:${LATIN}+${DECIMAL}*|${GREEK}+|${MATHEMATICAL_SCRIPT}+|${MATHEMATICAL_FRAKTUR}+|${MATHEMATICAL_SANS_SERIF_BOLD}+)`