occam-verify-cli 1.0.682 → 1.0.685

package/src/element/assertion/contained.js

@@ -3,6 +3,7 @@
 import Assertion from "../assertion";
 
 import { define } from "../../elements";
+import { termToTermJSON, frameToFrameJSON, negatedToNegatedJSON, statementToStatementJSON } from "../../utilities/json";
 import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions, statementFromStatementAndSubstitutions } from "../../utilities/substitutions";
 
 export default define(class ContainedAssertion extends Assertion {
@@ -237,13 +238,23 @@ export default define(class ContainedAssertion extends Assertion {
   }
 
   toJSON() {
-    debugger
-
     const { name } = this.constructor,
+          termJSON = termToTermJSON(this.term),
+          frameJSON = frameToFrameJSON(this.frame),
+          negatedJSON = negatedToNegatedJSON(this.negated),
+          statementJSON = statementToStatementJSON(this.statement),
+          term = termJSON,  ///
+          frame = frameJSON,  ///
+          negated = negatedJSON,  ///
+          statement = statementJSON,  ///
           string = this.getString(),
           json = {
             name,
-            string
+            string,
+            term,
+            frame,
+            negated,
+            statement
           };
 
     return json;

package/src/element/assertion/defined.js

@@ -3,6 +3,7 @@
 import Assertion from "../assertion";
 
 import { define } from "../../elements";
+import { termToTermJSON, frameToFrameJSON, negatedToNegatedJSON } from "../../utilities/json";
 import { termFromTermAndSubstitutions, frameFromFrameAndSubstitutions } from "../../utilities/substitutions";
 
 export default define(class DefinedAssertion extends Assertion {
@@ -206,13 +207,20 @@ export default define(class DefinedAssertion extends Assertion {
   }
 
   toJSON() {
-    debugger
-
     const { name } = this.constructor,
+          termJSON = termToTermJSON(this.term),
+          frameJSON = frameToFrameJSON(this.frame),
+          negatedJSON = negatedToNegatedJSON(this.negated),
+          term = termJSON,  ///
+          frame = frameJSON,  ///
+          negated = negatedJSON,  ///
           string = this.getString(),
           json = {
             name,
-            string
+            string,
+            term,
+            frame,
+            negated
           };
 
     return json;

package/src/element/assertion/type.js

@@ -199,10 +199,10 @@ export default define(class TypeAssertion extends Assertion {
           type = typeJSON,  ///
           string = this.getString(),
           json = {
+            string,
             name,
             term,
-            type,
-            string
+            type
           };
 
     return json;

package/src/element/assumption.js

@@ -319,18 +319,7 @@ export default define(class Assumption extends Element {
   }
 
   toJSON() {
-    let json = null;
-
-    const simple = this.isSimple();
-
-    if (simple) {
-      const reference = this, ///
-            referenceJSON = referenceToReferenceJSON(reference);
-
-      json = referenceJSON;  ///
-    }
-
-    return json;
+    debugger
   }
 
   static name = "Assumption";

package/src/element/constructor.js

@@ -114,9 +114,11 @@ export default define(class Constructor extends Element {
 
   toJSON() {
     const termJSON = termToTermJSON(this.term),
+          string = this.getString(),
           term = termJSON,  ///
           json = {
-            term
+            term,
+            string
           };
 
     return json;

package/src/element/frame.js

@@ -4,8 +4,8 @@ import { Element } from "occam-languages";
 
 import { define } from "../elements";
 import { FRAME_META_TYPE_NAME } from "../metaTypeNames";
-import { findMetaTypeByMetaTypeName } from "../metaTypes";
 import { assumptionsStringFromAssumptions } from "../utilities/string";
+import { assumptionsToAssumptionsJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
 export default define(class Frame extends Element {
   constructor(context, string, node, assumptions, metavairable) {
@@ -346,16 +346,16 @@ export default define(class Frame extends Element {
   }
 
   toJSON() {
-    let json = null;
-
-    const singular = this.isSingular();
-
-    if (singular) {
-      const assumption = this.getAssumption(),
-            assumptionJSON = assumption.toJSON();
-
-      json = assumptionJSON;  ///
-    }
+    const metavariableJSON = metavariableToMetavariableJSON(this.metavariable),
+          assumptionsJSON = assumptionsToAssumptionsJSON(this.assumptions),
+          metavariable = metavariableJSON,  ///
+          assumptions = assumptionsJSON,  ///
+          string = this.getString(),
+          json = {
+            string,
+            assumptions,
+            metavariable
+          };
 
     return json;
   }

package/src/element/hypothesis.js

@@ -89,7 +89,9 @@ export default define(class Hypothesis extends Element {
   toJSON() {
     const statementJSON = statementToStatementJSON(this.statement),
           statement = statementJSON,  ///
+          string = this.getString(),
           json = {
+            string,
             statement
           };
 

package/src/element/metaType.js

@@ -3,6 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
+import { nameToNameJSON } from "../utilities/json";
 
 export default define(class MetaType extends Element {
   constructor(context, string, node, name) {
@@ -35,8 +36,11 @@ export default define(class MetaType extends Element {
   }
 
   toJSON() {
-    const name = this.name,
+    const nameJSON = nameToNameJSON(this.name),
+          string = this.getString(),
+          name = nameJSON,  ///
           json = {
+            string,
             name
           };
 

package/src/element/metavariable.js

@@ -438,13 +438,13 @@ export default define(class Metavariable extends Element {
   }
 
   toJSON() {
-    const metaTypeJSON = metaTypeToMetaTypeJSON(this.metaType),
-          typeJSON = typeToTypeJSON(this.type),
+    const typeJSON = typeToTypeJSON(this.type),
           nameJSON = nameToNameJSON(this.name),
+          metaTypeJSON = metaTypeToMetaTypeJSON(this.metaType),
+          name = nameJSON,  ///
           type = typeJSON,  ///
           metaType = metaTypeJSON,  ///
           string = this.getString(), ///
-          name = this.name,
           json = {
             string,
             name,

package/src/element/parameter.js

@@ -3,6 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
+import { nameToNameJSON, identifierToIdentifierJSON } from "../utilities/json";
 
 export default define(class Parameter extends Element {
   constructor(context, string, node, name, identifier) {
@@ -47,9 +48,15 @@ export default define(class Parameter extends Element {
   }
 
   toJSON() {
-    const name = this.name,
+    const nameJSON = nameToNameJSON(this.name),
+          identifierJSON = identifierToIdentifierJSON(this.identifier),
+          name = nameJSON,  ///
+          identifier = identifierJSON,  ///
+          string = this.getString(),
           json = {
-            name
+            string,
+            name,
+            identifier
           };
 
     return json;

package/src/element/procedureCall.js

@@ -4,7 +4,7 @@ import { Element } from "occam-languages";
 import { termsUtilities } from "occam-furtle";
 
 import { define } from "../elements";
-import { parametersFromJSON, procedureReferenceFromJSON, parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from "../utilities/json";
+import { parametersToParametersJSON, procedureReferenceToProcedureReferenceJSON } from "../utilities/json";
 
 const { termsFromPrimitives } = termsUtilities;
 
@@ -113,11 +113,14 @@ export default define(class ProcedureCall extends Element {
 
   toJSON() {
     const parametersJSON = parametersToParametersJSON(this.parameters),
-          procedureReference = procedureReferenceToProcedureReferenceJSON(this.procedureReference),
+          procedureReferenceJSON = procedureReferenceToProcedureReferenceJSON(this.procedureReference),
           parameters = parametersJSON,  ///
+          procedureReference = procedureReferenceJSON,  ///
+          string = this.getString(),
           json = {
-            procedureReference,
-            parameters
+            string,
+            parameters,
+            procedureReference
           };
 
     return json;

package/src/element/procedureReference.js

@@ -3,6 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
+import {nameToNameJSON} from "../utilities/json";
 
 export default define(class ProcedureReference extends Element {
   constructor(context, string, node, name) {
@@ -28,8 +29,11 @@ export default define(class ProcedureReference extends Element {
   }
 
   toJSON() {
-    const name = this.name,
+    const nameJSON = nameToNameJSON(this.name),
+          name = nameJSON,  ///
+          string = this.getString(),
           json = {
+            string,
             name
           };
 

package/src/element/property.js

@@ -3,6 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
+import {nameToNameJSON} from "../utilities/json";
 
 export default define(class Property extends Element {
   constructor(context, string, node, name, nominalTypeName) {
@@ -40,9 +41,13 @@ export default define(class Property extends Element {
   }
 
   toJSON() {
-    const name = this.name, ///
-          nominalTypeName = this.nominalTypeName,  ///
+    const nominalTypeNameJSON = nameToNameJSON(this.nominalTypeName),
+          nameJSON = nameToNameJSON(this.name),
+          nominalTypeName = nominalTypeNameJSON,  ///
+          name = nameJSON,  ///
+          string = this.getString(),
           json = {
+            string,
             name,
             nominalTypeName
           };

package/src/element/reference.js

@@ -5,9 +5,8 @@ import { Element } from "occam-languages";
 import { define } from "../elements";
 import { attempt } from "../utilities/context";
 import { REFERENCE_META_TYPE_NAME } from "../metaTypeNames";
-import { findMetaTypeByMetaTypeName } from "../metaTypes";
 import { unifyMetavariableIntrinsically } from "../process/unify";
-import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
+import { metavariableToMetavariableJSON } from "../utilities/json";
 
 export default define(class Reference extends Element {
   constructor(context, string, node, metavariable) {
@@ -294,7 +293,9 @@ export default define(class Reference extends Element {
   toJSON() {
     const metavariableJSON = metavariableToMetavariableJSON(this.metavariable),
           metavariable = metavariableJSON,  ///
+          string = this.getString(),
           json = {
+            string,
             metavariable
           };
 

package/src/element/rule.js

@@ -290,7 +290,9 @@ export default define(class Rule extends Element {
           labels = labelsJSON,  ///
           premises = premisesJSON,  ///
           conclusion = conclusionJSON,  ///
+          string = this.getString(),
           json = {
+            string,
             labels,
             premises,
             conclusion

package/src/element/substitution/frame.js

@@ -4,6 +4,7 @@ import Substitution from "../substitution";
 
 import { define } from "../../elements";
 import { literally } from "../../utilities/context";
+import { frameToFrameJSON } from "../../utilities/json";
 import { instantiateFrameSubstitution } from "../../process/instantiate";
 import { frameSubstitutionStringFromFrameAndMetavariable } from "../../utilities/string";
 import { frameSubstitutionFromStatementNode, frameSubstitutionFromFrameSubstitutionNode } from "../../utilities/element";
@@ -170,8 +171,37 @@ export default define(class FrameSubstitution extends Substitution {
     return replacementFrameValidates;
   }
 
+  toJSON() {
+    const { name } = this.constructor,
+          targetFrameJSON = frameToFrameJSON(this.targetFrame),
+          replacementFrameJSON = frameToFrameJSON(this.replacementFrame),
+          targetFrame = targetFrameJSON,  ///
+          replacementFrame = replacementFrameJSON,  ///
+          string = this.getString(),
+          json = {
+            name,
+            string,
+            targetFrame,
+            replacementFrame
+          };
+
+    return json;
+  }
+
   static name = "FrameSubstitution";
 
+  static fromJSON(json, context) {
+    let frameSubstitutionn = null;
+
+    const { name } = json;
+
+    if (this.name === name) {
+      debugger
+    }
+
+    return frameSubstitutionn;
+  }
+
   static fromStatement(statement, context) {
     const statementNode = statement.getNode(),
           frameSubstitution = frameSubstitutionFromStatementNode(statementNode, context);

package/src/element/substitution/reference.js

@@ -4,6 +4,7 @@ import Substitution from "../substitution";
 
 import { define } from "../../elements";
 import { literally } from "../../utilities/context";
+import { statementToStatementJSON } from "../../utilities/json";
 import { instantiateReferenceSubstitution } from "../../process/instantiate";
 import { referenceSubstitutionFromReferenceSubstitutionNode } from "../../utilities/element";
 import { referenceSubstitutionStringFromReferenceAndMetavariable } from "../../utilities/string";
@@ -164,6 +165,34 @@ export default define(class ReferenceSubstitution extends Substitution {
     return replacementReferenceValidates;
   }
 
+  toJSON() {
+    const { name } = this.constructor,
+          targetStatementJSON = statementToStatementJSON(this.targetStatement),
+          replacementStatementJSON = statementToStatementJSON(this.replacementStatement),
+          targetStatement = targetStatementJSON,  ///
+          replacementStatement = replacementStatementJSON,  ///
+          string = this.getString(),
+          json = {
+            name,
+            string,
+            targetStatement,
+            replacementStatement
+          };
+
+    return json;
+  }
+  static fromJSON(json, context) {
+    let referenceSubstitutionn = null;
+
+    const { name } = json;
+
+    if (this.name === name) {
+      debugger
+    }
+
+    return referenceSubstitutionn;
+  }
+
   static name = "ReferenceSubstitution";
 
   static fromReferenceAndMetavariable(reference, metavariable, context) {

package/src/element/substitution/statement.js

@@ -4,11 +4,11 @@ import Substitution from "../substitution";
 
 import { define } from "../../elements";
 import { unifySubstitution } from "../../process/unify";
+import { statementToStatementJSON } from "../../utilities/json";
 import { stripBracketsFromStatement } from "../../utilities/brackets";
 import { instantiateStatementSubstitution } from "../../process/instantiate";
 import { liminally, literally, synthetically } from "../../utilities/context";
 import { statementSubstitutionFromStatementSubstitutionNode } from "../../utilities/element";
-import { statementToStatementJSON, metavariableToMetavariableJSON } from "../../utilities/json";
 import { statementSubstitutionStringFromStatementAndMetavariable, statementSubstitutionStringFromStatementMetavariableAndSubstitution } from "../../utilities/string";
 
 export default define(class StatementSubstitution extends Substitution {
@@ -321,15 +321,17 @@ export default define(class StatementSubstitution extends Substitution {
   }
 
   toJSON() {
-    const metavariableJSON = metavariableToMetavariableJSON(this.targetStatement),
-          statementJSON = statementToStatementJSON(this.replacementStatement),
-          metavariable = metavariableJSON,  ///
-          statement = statementJSON,  ///
-          string = this.getString(), ///
+    const { name } = this.constructor,
+          targetStatementJSON = statementToStatementJSON(this.targetStatement),
+          replacementStatementJSON = statementToStatementJSON(this.replacementStatement),
+          targetStatement = targetStatementJSON,  ///
+          replacementStatement = replacementStatementJSON,  ///
+          string = this.getString(),
           json = {
+            name,
             string,
-            statement,
-            metavariable
+            targetStatement,
+            replacementStatement
           };
 
     return json;
@@ -338,7 +340,15 @@ export default define(class StatementSubstitution extends Substitution {
   static name = "StatementSubstitution";
 
   static fromJSON(json, context) {
-    debugger
+    let statementSubstitutionn = null;
+
+    const { name } = json;
+
+    if (this.name === name) {
+      debugger
+    }
+
+    return statementSubstitutionn;
   }
 
   static fromStatementAndMetavariable(statement, metavariable, context) {

package/src/element/substitution/term.js

@@ -4,6 +4,7 @@ import Substitution from "../substitution";
 
 import { define } from "../../elements";
 import { literally } from "../../utilities/context";
+import { termToTermJSON } from "../../utilities/json";
 import { stripBracketsFromTerm } from "../../utilities/brackets";
 import { instantiateTermSubstitution } from "../../process/instantiate";
 import { termSubstitutionStringFromTermAndVariable } from "../../utilities/string";
@@ -179,8 +180,37 @@ export default define(class TermSubstitution extends Substitution {
     return replacementTermValidates;
   }
 
+  toJSON() {
+    const { name } = this.constructor,
+          targetTermJSON = termToTermJSON(this.targetTerm),
+          replacementTermJSON = termToTermJSON(this.replacementTerm),
+          targetTerm = targetTermJSON,  ///
+          replacementTerm = replacementTermJSON,  ///
+          string = this.getString(),
+          json = {
+            name,
+            string,
+            targetTerm,
+            replacementTerm
+          };
+
+    return json;
+  }
+
   static name = "TermSubstitution";
 
+  static fromJSON(json, context) {
+    let termSubstitutionn = null;
+
+    const { name } = json;
+
+    if (this.name === name) {
+      debugger
+    }
+
+    return termSubstitutionn;
+  }
+
   static fromStatement(statement, context) {
     const statementNode = statement.getNode(),
           termSubstitution = termSubstitutionFromStatementNode(statementNode, context);

package/src/element/type.js

@@ -5,8 +5,7 @@ import { arrayUtilities } from "necessary";
 
 import { define } from "../elements";
 import { baseTypeFromNothing } from "../utilities/type";
-import { typeStringFromTypeNameTypePrefixNameAndSuperTypes } from "../utilities/string";
-import { superTypesFromJSON, propertiesFromJSON, superTypesToSuperTypesJSON, propertiesToPropertiesJSON } from "../utilities/json";
+import { nameToNameJSON, superTypesToSuperTypesJSON, propertiesToPropertiesJSON, provisionalToProvisionalJSON } from "../utilities/json";
 
 const { push, first } = arrayUtilities;
 
@@ -293,18 +292,23 @@ export default define(class Type extends Element {
   }
 
   toJSON() {
-    const propertiesJSON = propertiesToPropertiesJSON(this.properties),
+    const nameJSON = nameToNameJSON(this.name),
+          prefixNameJSON = nameToNameJSON(this.prefixName),
+          propertiesJSON = propertiesToPropertiesJSON(this.properties),
           superTypesJSON = superTypesToSuperTypesJSON(this.superTypes),
-          provisional = this.provisional,
+          provisionalJSON = provisionalToProvisionalJSON(this.provisional),
+          name = nameJSON,  ///
+          prefixName = prefixNameJSON,  ///
           properties = propertiesJSON,  ///
           superTypes = superTypesJSON,  ///
-          name = this.name,
-          prefixName = this.prefixName,
+          provisional = provisionalJSON,  ///
+          string = this.getString(),
           json = {
+            string,
             name,
             prefixName,
-            superTypes,
             properties,
+            superTypes,
             provisional
           };
 

package/src/element/typePrefix.js

@@ -3,6 +3,7 @@
 import { Element } from "occam-languages";
 
 import { define } from "../elements";
+import {nameToNameJSON} from "../utilities/json";
 
 export default define(class TypePrefix extends Element {
   constructor(context, string, node, name) {
@@ -29,8 +30,11 @@ export default define(class TypePrefix extends Element {
   }
 
   toJSON() {
-    const name = this.name,
+    const nameJSON = nameToNameJSON(this.name),
+          name = nameJSON,  ///
+          string = this.getString(),
           json = {
+            string,
             name
           };
 

package/src/element/variable.js

@@ -5,7 +5,7 @@ import { Element } from "occam-languages";
 import elements from "../elements";
 
 import { define } from "../elements";
-import { typeToTypeJSON } from "../utilities/json";
+import { typeToTypeJSON, identifierToIdentifierJSON, propertyRelationsToPropertyRelationsJSON } from "../utilities/json";
 
 export default define(class Variable extends Element {
   constructor(context, string, node, type, identifier, propertyRelations) {
@@ -189,11 +189,17 @@ export default define(class Variable extends Element {
 
   toJSON() {
     const typeJSON = typeToTypeJSON(this.type),
-          string = this.getString(), ///
+          identifierJSON = identifierToIdentifierJSON(this.identifier),
+          propertyRelationsJSON = propertyRelationsToPropertyRelationsJSON(this.propertyRelations),
           type = typeJSON,  ///
+          identifier = identifierJSON,  ///
+          propertyRelations = propertyRelationsJSON,  ///
+          string = this.getString(), ///
           json = {
+            string,
             type,
-            string
+            identifier,
+            propertyRelations
           };
 
     return json;