occam-furtle 2.0.291 → 2.0.293

package/src/element/{block/return.js → returnBlock.js}

@@ -1,11 +1,11 @@
 "use strict";
 
-import elements from "../../elements";
-import Exception from "../../exception";
-import BlockContext from "../../context/block";
+import elements from "../elements";
+import Exception from "../exception";
+import BlockContext from "../context/block";
 
-import { define } from "../../elements";
-import { nodeQuery, nodesQuery } from "../../utilities/query";
+import { define } from "../elements";
+import { nodeQuery, nodesQuery } from "../utilities/query";
 
 const stepNodesQuery = nodesQuery("/returnBlock/step"),
       nonsenseNodesQuery = nodesQuery("/returnBlock/nonsense"),

package/src/node/assignment/array.js

@@ -3,5 +3,5 @@
 import AssignmentrNode from "../../node/assignment";
 
 export default class ArrayAssignmentNode extends AssignmentrNode {
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ArrayAssignmentNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssignmentrNode.fromRuleNameChildNodesOpacityAndPrecedence(ArrayAssignmentNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assignment/object.js

@@ -3,5 +3,5 @@
 import AssignmentrNode from "../../node/assignment";
 
 export default class ObjectAssignmentNode extends AssignmentrNode {
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ObjectAssignmentNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssignmentrNode.fromRuleNameChildNodesOpacityAndPrecedence(ObjectAssignmentNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assignment/variable.js

@@ -3,5 +3,5 @@
 import AssignmentrNode from "../../node/assignment";
 
 export default class VariableAssignmentNode extends AssignmentrNode {
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(VariableAssignmentNode, ruleName, childNodes, opacity, precedence); }
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssignmentrNode.fromRuleNameChildNodesOpacityAndPrecedence(VariableAssignmentNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assignment.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class AssignmentrNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence); }

package/src/node/assignments/variable.js

@@ -1,7 +1,7 @@
 "use strict";
 
-import AssignmentrsNode from "../../node/assignment";
+import AssignmentsNode from "../../node/assignment";
 
-export default class VariableAssignmentsNode extends AssignmentrsNode {
-  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(VariableAssignmentsNode, ruleName, childNodes, opacity, precedence); }
+export default class VariableAssignmentsNode extends AssignmentsNode {
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return AssignmentsNode.fromRuleNameChildNodesOpacityAndPrecedence(VariableAssignmentsNode, ruleName, childNodes, opacity, precedence); }
 }

package/src/node/assignments.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class AssignmentrsNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence); }

package/src/node/comparison.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ComparisonNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ComparisonNode, ruleName, childNodes, opacity, precedence); }

package/src/node/declaration.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class DeclarationNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(DeclarationNode, ruleName, childNodes, opacity, precedence); }

package/src/node/error.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import NonTerminalNode from "../nonTerminalNode";
+
+export default class ErrorNode extends NonTerminalNode {
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ErrorNode, ruleName, childNodes, opacity, precedence); }
+}

package/src/node/every.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class QueryNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(QueryNode, ruleName, childNodes, opacity, precedence); }

package/src/node/expression.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ExpressionNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ExpressionNode, ruleName, childNodes, opacity, precedence); }

package/src/node/expressions.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ExpressionsNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ExpressionsNode, ruleName, childNodes, opacity, precedence); }

package/src/node/label.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class LabelNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(LabelNode, ruleName, childNodes, opacity, precedence); }

package/src/node/parameter.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ParamterNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ParamterNode, ruleName, childNodes, opacity, precedence); }

package/src/node/parameters.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ParamtersNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ParamtersNode, ruleName, childNodes, opacity, precedence); }

package/src/node/procedure.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ProcedureNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ProcedureNode, ruleName, childNodes, opacity, precedence); }

package/src/node/procedureCall.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ProcedureCallNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ProcedureCallNode, ruleName, childNodes, opacity, precedence); }

package/src/node/query.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class QueryNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(QueryNode, ruleName, childNodes, opacity, precedence); }

package/src/node/reduce.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ReduceNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ReduceNode, ruleName, childNodes, opacity, precedence); }

package/src/node/reference.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ReferenceNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ReferenceNode, ruleName, childNodes, opacity, precedence); }

package/src/node/returnBlock.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class ReturnBlockNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(ReturnBlockNode, ruleName, childNodes, opacity, precedence); }

package/src/node/some.js

@@ -0,0 +1,7 @@
+"use strict";
+
+import NonTerminalNode from "../nonTerminalNode";
+
+export default class SomeNode extends NonTerminalNode {
+  static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(SomeNode, ruleName, childNodes, opacity, precedence); }
+}

package/src/node/statement.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class StatementNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(StatementNode, ruleName, childNodes, opacity, precedence); }

package/src/node/step.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class StepNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(StepNode, ruleName, childNodes, opacity, precedence); }

package/src/node/ternary.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class TernaryNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(TernaryNode, ruleName, childNodes, opacity, precedence); }

package/src/node/variable.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { NonTerminalNode } from "occam-furtle";
+import NonTerminalNode from "../nonTerminalNode";
 
 export default class VariableNode extends NonTerminalNode {
   static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(VariableNode, ruleName, childNodes, opacity, precedence); }

package/src/nonTerminalNodeMap.js

@@ -6,7 +6,6 @@ import EveryNode from "./node/every";
 import LabelNode from "./node/label";
 import ErrorNode from "./node/error";
 import QueryNode from "./node/query";
-import BlockNode from "./node/block";
 import ReduceNode from "./node/reduce";
 import TernaryNode from "./node/ternary";
 import VariableNode from "./node/variable";
@@ -32,7 +31,6 @@ import { STEP_RULE_NAME,
          LABEL_RULE_NAME,
          ERROR_RULE_NAME,
          QUERY_RULE_NAME,
-         BLOCK_RULE_NAME,
          REDUCE_RULE_NAME,
          TERNARY_RULE_NAME,
          VARIABLE_RULE_NAME,
@@ -59,7 +57,6 @@ const NonTerminalNodeMap = {
   [LABEL_RULE_NAME]: LabelNode,
   [ERROR_RULE_NAME]: ErrorNode,
   [QUERY_RULE_NAME]: QueryNode,
-  [BLOCK_RULE_NAME]: BlockNode,
   [REDUCE_RULE_NAME]: ReduceNode,
   [TERNARY_RULE_NAME]: TernaryNode,
   [VARIABLE_RULE_NAME]: VariableNode,

package/src/preamble.js

@@ -17,7 +17,7 @@ import NodesQuery from "./element/query/nodes";
 import Comparison from "./element/comparison";
 import Expression from "./element/expression";
 import Expressions from "./element/expressions";
-import ReturnBlock from "./element/block/return";
+import ReturnBlock from "./element/returnBlock";
 import ProcedureCall from "./element/procedureCall";
 import NamedParameter from "./element/parameter/named";
 import ArrayAssigment from "./element/assignment/array";

package/src/ruleNames.js

@@ -6,7 +6,6 @@ export const EVERY_RULE_NAME = "every";
 export const LABEL_RULE_NAME = "label";
 export const ERROR_RULE_NAME = "error";
 export const QUERY_RULE_NAME = "query";
-export const BLOCK_RULE_NAME = "block";
 export const REDUCE_RULE_NAME = "reduce";
 export const TERNARY_RULE_NAME = "ternary";
 export const VARIABLE_RULE_NAME = "variable";

package/src/utilities/furtle.js

@@ -0,0 +1,11 @@
+"use strict";
+
+import FurtleLexer from "../furtle/Lexer";
+import FurtleParser from "../furtle/Parser";
+
+import { furtleLexerFromNothing } from "../utilities/lexers";
+import { furtleParserFromNothing } from "../utilities/parsers";
+
+export const furtleLexer = furtleLexerFromNothing(FurtleLexer);
+
+export const furtleParser = furtleParserFromNothing(FurtleParser);

package/src/utilities/lexers.js

@@ -0,0 +1,44 @@
+"use strict";
+
+import { lexerUtilities } from "occam-lexers";
+
+import FurtleLexer from "../furtle/lexer";
+
+const { lexerFromRules, rulesFromEntries } = lexerUtilities;
+
+export function furtleLexerFromNothing(Class) {
+  if (Class === undefined) {
+    Class = FurtleLexer;  ///
+  }
+
+  const { entries } = FurtleLexer;
+
+  let rules;
+
+  rules = rulesFromEntries(entries);
+
+  const furtleLexer = lexerFromRules(Class, rules);
+
+  return furtleLexer;
+}
+
+export function furtleLexerFromEntries(Class, entries) {
+  if (entries === undefined) {
+    entries = Class;  ///
+
+    Class = FurtleLexer;  ///
+  }
+
+  let rules;
+
+  rules = rulesFromEntries(entries);
+
+  const furtleLexer = lexerFromRules(Class, rules);
+
+  return furtleLexer;
+}
+
+export default {
+  furtleLexerFromEntries,
+  furtleLexerFromNothing
+};

package/src/utilities/parsers.js

@@ -0,0 +1,70 @@
+"use strict";
+
+import { parserUtilities } from "occam-parsers";
+import { eliminateLeftRecursion } from "occam-grammar-utilities";
+
+import FurtleParser from "../furtle/parser";
+
+const { rulesFromBNF, parserFromRules, parserFromRulesAndStartRuleName } = parserUtilities;
+
+export function furtleParserFromBNF(Class, bnf) {
+  if (bnf === undefined) {
+    bnf = Class;  ///
+
+    Class = FurtleParser;  ///
+  }
+
+  let rules;
+
+  rules = rulesFromBNF(bnf);
+
+  rules = eliminateLeftRecursion(rules);  ///
+
+  const furtleParser = parserFromRules(Class, rules);
+
+  return furtleParser;
+}
+
+export function furtleParserFromNothing(Class) {
+  if (Class === undefined) {
+    Class = FurtleParser;  ///
+  }
+
+  const { bnf } = FurtleParser;
+
+  let rules;
+
+  rules = rulesFromBNF(bnf);
+
+  rules = eliminateLeftRecursion(rules);  ///
+
+  const furtleParser = parserFromRules(Class, rules);
+
+  return furtleParser;
+}
+
+export function furtleParserFromBNFAndStartRuleName(Class, bnf, startRuleName) {
+  if (startRuleName === undefined) {
+    startRuleName = bnf;  ///
+
+    bnf = Class;  ///
+
+    Class = FurtleParser;  ///
+  }
+
+  let rules;
+
+  rules = rulesFromBNF(bnf);
+
+  rules = eliminateLeftRecursion(rules);  ///
+
+  const furtleParser = parserFromRulesAndStartRuleName(Class, rules, startRuleName);
+
+  return furtleParser;
+}
+
+export default {
+  furtleParserFromBNF,
+  furtleParserFromNothing,
+  furtleParserFromBNFAndStartRuleName
+};

package/test/main.js

@@ -9,7 +9,7 @@ const { furtleFileFromNothing } = require("./helpers/furtle"),
       { procedureFromReleaseContext } = require("./helpers/procedure"),
       { nominalFileContextFromReleaseContext } = require("./helpers/nominal");
 
-describe("src/eliminateLeftRecursion", () => {
+describe("src/main", () => {
   let fileContext,
       releaseContext;