Include binary_properties and script Unicode categories in automatic …

…name resolution.

Fixes #23

cspell.json

@@ -137,6 +137,7 @@
     "ignorePaths": [
         ".eslintrc.json",
         "build/PropertyValueAliases.txt",
-        "src/generated/*"
+        "src/generated/*",
+        "templates/*"
     ]
 }

src/codegen/OutputModelController.ts

@@ -181,8 +181,7 @@ export class OutputModelController {
         ruleFunction.fillNamedActions(this.delegate, r);
 
         if (r instanceof LeftRecursiveRule) {
-            this.buildLeftRecursiveRuleFunction(r,
-                ruleFunction as LeftRecursiveRuleFunction);
+            this.buildLeftRecursiveRuleFunction(r, ruleFunction as LeftRecursiveRuleFunction);
         } else {
             this.buildNormalRuleFunction(r, ruleFunction);
         }

src/codegen/model/SemPred.ts

@@ -41,7 +41,9 @@ export class SemPred extends Action {
         super(factory, ast);
         const failNode = ast.getOptionAST("fail");
         const gen = factory.getGenerator()!;
-        this.predicate = ast.getText()!;
+
+        // Remove the outer braces and the trailing question mark.
+        this.predicate = ast.getText().substring(1, ast.getText().length - 2);
         if (this.predicate.startsWith("{") && this.predicate.endsWith("}")) {
             this.predicate = this.predicate.substring(1, this.predicate.length - 2);
         }

src/support/Unicode.ts

@@ -19,7 +19,7 @@ export interface ICodePointLookupResult {
 }
 
 /** Used in ambiguous cases (when an isolated property string (or value string) resolves to multiple entries). */
-const defaultCategories = ["block", "general_category"];
+const defaultCategories = ["block", "general_category", "binary_property", "script"];
 
 /**
  * Determines the Unicode codepoint range for a given Unicode attribute.

src/tool-parameters.ts

@@ -88,14 +88,18 @@ export const parseToolParameters = (args: string[]): IToolParameters => {
 
     const result = prepared.opts<IToolParameters>();
 
-    const list = globSync(prepared.args);
-    if (list.length > 0) {
-        // When using a glob pattern we cannot have exact output paths.
-        result.exactOutputDir = false;
-        result.args = list;
-    } else {
-        result.args = prepared.args;
-    }
+    result.args = [];
+    prepared.args.forEach((arg) => {
+        if (arg.includes("*")) {
+            const list = globSync(prepared.args);
+
+            // When using a glob pattern we cannot have exact output paths.
+            result.exactOutputDir = false;
+            result.args.push(...list);
+        } else {
+            result.args.push(arg);
+        }
+    });
 
     return result;
 };

src/tool/Alternative.ts

@@ -55,7 +55,8 @@ export class Alternative implements AttributeResolver, IAlternative {
     public actions = new Array<ActionAST>();
 
     public constructor(r: Rule, altNum: number) {
-        this.rule = r; this.altNum = altNum;
+        this.rule = r;
+        this.altNum = altNum;
     }
 
     public resolvesToToken(x: string, node: ActionAST): boolean {