occam-verify-cli 1.0.476 → 1.0.479

package/src/element/topLevelAssertion/conjecture.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelAssertion from "../topLevelAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Conjecture extends TopLevelAssertion {
   verify() {

package/src/element/topLevelAssertion/lemma.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelAssertion from "../topLevelAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Lemma extends TopLevelAssertion {
   verify() {

package/src/element/topLevelAssertion/theorem.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelAssertion from "../topLevelAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Theorem extends TopLevelAssertion {
   verify() {

package/src/element/topLevelMetaAssertion/metaLemma.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelMetaAssertion from "./../topLevelMetaAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class MetaLemma extends TopLevelMetaAssertion {
   verify() {

package/src/element/topLevelMetaAssertion/metatheorem.js

@@ -1,10 +1,8 @@
 "use strict";
 
-import { elements } from "occam-furtle";
-
 import TopLevelMetaAssertion from "../topLevelMetaAssertion";
 
-const { define } = elements;
+import { define } from "../../elements";
 
 export default define(class Metatheorem extends TopLevelMetaAssertion {
   verify() {

package/src/element/type.js

@@ -1,14 +1,14 @@
 "use strict";
 
+import { Element } from "occam-furtle";
 import { arrayUtilities } from "necessary";
-import { Element, elements } from "occam-furtle";
 
+import { define } from "../elements";
 import { baseTypeFromNothing } from "../types";
 import { typeStringFromTypeNameTypePrefixNameAndSuperTypes } from "../utilities/string";
 import { superTypesFromJSON, propertiesFromJSON, superTypesToSuperTypesJSON, propertiesToPropertiesJSON } from "../utilities/json";
 
-const { define } = elements,
-      { push, first } = arrayUtilities;
+const { push, first } = arrayUtilities;
 
 export default define(class Type extends Element {
   constructor(context, string, node, name, prefixName, superTypes, properties, provisional) {

package/src/element/typePrefix.js

@@ -1,8 +1,8 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
-const { define } = elements;
+import { define } from "../elements";
 
 export default define(class TypePrefix extends Element {
   constructor(context, string, node, name) {

package/src/element/variable.js

@@ -1,12 +1,11 @@
 "use strict";
 
-import { Element, elements } from "occam-furtle";
+import { Element } from "occam-furtle";
 
+import { define } from "../elements";
 import { synthetically } from "../utilities/context";
 import { typeToTypeJSON } from "../utilities/json";
 
-const { define } = elements;
-
 export default define(class Variable extends Element {
   constructor(context, string, node, type, identifier, propertyRelations) {
     super(context, string, node);

package/src/elements.js

@@ -0,0 +1,13 @@
+"use strict";
+
+const elements = {};
+
+export function define(Element) {
+  const { name } = Element;
+
+  elements[name] = Element;
+
+  return Element;
+}
+
+export default elements;

package/src/metaTypes.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "./elements";
 
 import { FRAME_META_TYPE_NAME, REFERENCE_META_TYPE_NAME, STATEMENT_META_TYPE_NAME } from "./metaTypeNames";
 

package/src/node/argument.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME, TYPE_RULE_NAME } from "../ruleNames";
 

package/src/node/assertion.js

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

package/src/node/assumption.js

@@ -1,10 +1,10 @@
 "use strict";
 
-import DocumentNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { STATEMENT_RULE_NAME, METAVARIABLE_RULE_NAME } from "../ruleNames";
 
-export default class AssumptionpNode extends DocumentNode {
+export default class AssumptionpNode extends NonTerminalNode {
   isSingular() {
     let singular = false;
 

package/src/node/body.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { PROOF_RULE_NAME, DEDUCTION_RULE_NAME, SUPPOSITION_RULE_NAME } from "../ruleNames";
 

package/src/node/combinator.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { STATEMENT_RULE_NAME } from "../ruleNames";
 

package/src/node/conclusion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { NONSENSE_RULE_NAME, STATEMENT_RULE_NAME } from "../ruleNames";
 

package/src/node/constructor.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME } from "../ruleNames";
 

package/src/node/declaration.js

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

package/src/node/deduction.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { NONSENSE_RULE_NAME, STATEMENT_RULE_NAME } from "../ruleNames";
 

package/src/node/derivation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { STEP_RULE_NAME, SUBPROOF_RULE_NAME } from "../ruleNames";
 

package/src/node/document.js

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

package/src/node/equality.js

@@ -1,8 +1,7 @@
 "use strict";
 
 import { arrayUtilities } from "necessary";
-
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME } from "../ruleNames";
 

package/src/node/equivalence.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME } from "../ruleNames";
 

package/src/node/equivalences.js

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

package/src/node/error.js

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

package/src/node/frame.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { ASSUMPTION_RULE_NAME, METAVARIABLE_RULE_NAME } from "../ruleNames";
 

package/src/node/header.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { SIGNATURE_RULE_NAME, PARENTHESISED_LABEL_RULE_NAME, PARENTHESISED_LABELS_RULE_NAME } from "../ruleNames";
 

package/src/node/hypothesis.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { NONSENSE_RULE_NAME, STATEMENT_RULE_NAME } from "../ruleNames";
 

package/src/node/judgement.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { FRAME_RULE_NAME, ASSUMPTION_RULE_NAME } from "../ruleNames";
 

package/src/node/label.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { METAVARIABLE_RULE_NAME } from "../ruleNames";
 

package/src/node/labels.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { LABEL_RULE_NAME } from "../ruleNames";
 

package/src/node/metaArgument.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { STATEMENT_RULE_NAME } from "../ruleNames";
 

package/src/node/metaType.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 export default class MetaTypeNode extends NonTerminalNode {
   getMetaTypeName() {

package/src/node/metavariable.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME, TYPE_RULE_NAME } from "../ruleNames";
 

package/src/node/parameter.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { NAME_TOKEN_TYPE, IDENTIFIER_TOKEN_TYPE } from "../tokenTypes";
 

package/src/node/parenthesisedLabel.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { LABEL_RULE_NAME } from "../ruleNames";
 

package/src/node/parenthesisedLabels.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { LABELS_RULE_NAME } from "../ruleNames";
 

package/src/node/placeholder.js

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

package/src/node/procedureCall.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { PARAMETER_RULE_NAME, PROCEDURE_REFERENCE_RULE_NAME } from "../ruleNames";
 

package/src/node/procedureReference.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 export default class ProcedureReferenceNode extends NonTerminalNode {
   getName() {

package/src/node/proof.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { DERIVATION_RULE_NAME } from "../ruleNames";
 

package/src/node/proofAssertion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { NONSENSE_RULE_NAME, STATEMENT_RULE_NAME } from "../ruleNames";
 

package/src/node/property.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { SINGLE_SPACE } from "../constants";
 

package/src/node/propertyRelation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME, PROPERTY_RULE_NAME } from "../ruleNames";
 

package/src/node/qualification.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { REFERENCE_RULE_NAME, SATISFIES_ASSERTION_RULE_NAME } from "../ruleNames";
 

package/src/node/reference.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { METAVARIABLE_RULE_NAME } from "../ruleNames";
 

package/src/node/rule.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { RULE_BODY_RULE_NAME, RULE_HEADER_RULE_NAME } from "../ruleNames";
 

package/src/node/section.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { AXIOM_RULE_NAME, LEMMA_RULE_NAME, THEOREM_RULE_NAME, CONJECTURE_RULE_NAME, HYPOTHESIS_RULE_NAME } from "../ruleNames";
 

package/src/node/signature.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME } from "../ruleNames";
 

package/src/node/statement.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TERM_RULE_NAME,
          FRAME_RULE_NAME,

package/src/node/subDerivation.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { STEP_RULE_NAME, SUBPROOF_RULE_NAME } from "../ruleNames";
 

package/src/node/subproof.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { SUPPOSITION_RULE_NAME, SUB_DERIVATION_RULE_NAME } from "../ruleNames";
 

package/src/node/substitution.js

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

package/src/node/term.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { ARGUMENT_RULE_NAME, VARIABLE_RULE_NAME } from "../ruleNames";
 

package/src/node/topLevelAssertion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 export default class TopLevelAssertionNode extends NonTerminalNode {
   getBodyNode() {

package/src/node/topLevelMetaAssertion.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 export default class TopLevelMetaAssertionNode extends NonTerminalNode {
   getBodyNode() {

package/src/node/type.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 export default class TypeNode extends NonTerminalNode {
   isPrefixed() {

package/src/node/typePrefix.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 export default class TypePrefixNode extends NonTerminalNode {
   getTypePrefixName() {

package/src/node/types.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 import { TYPE_RULE_NAME } from "../ruleNames";
 

package/src/node/variable.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import NonTerminalNode from "../nonTerminalNode";
+import { NonTerminalNode } from "occam-furtle";
 
 export default class VariableNode extends NonTerminalNode {
   getVariableIdentifier() {

package/src/nominal/parser.js

@@ -1,8 +1,8 @@
 "use strict";
 
+import { NonTerminalNode } from "occam-furtle";
 import { NominalParser as NominalParserBase } from "occam-grammars";
 
-import NonTerminalNode from "../nonTerminalNode";
 import NonTerminalNodeMap from "../nonTerminalNodeMap";
 
 export default class NominalParser extends NominalParserBase {

package/src/types.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "./elements";
 
 import { BASE_TYPE_SYMBOL } from "./constants";
 

package/src/utilities/element.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { elements } from "occam-furtle";
+import elements from "../elements";
 
 import { literally } from "../utilities/context";
 import { baseTypeFromNothing } from "../types";