occam-verify-cli 1.0.944 → 1.0.945

package/src/element/rule.js

@@ -346,11 +346,11 @@ export default define(class Rule extends Element {
   static fromJSON(json, context) {
     const { string } = json,
           node = null,
-          proof = null,
           breakPoint = breakPointFromJSON(json),
           labels = labelsFromJSON(json, context),
           premises = premisesFromJSON(json, context),
           conclusion = conclusionFromJSON(json, context),
+          proof = null,
           rule = new Rule(context, string, node, breakPoint, proof, labels, premises, conclusion);
 
     return rule;

package/src/element/substitution/frame.js

@@ -197,16 +197,16 @@ export default define(class FrameSubstitution extends Substitution {
 
         instantiate((context) => {
           const { string } = json,
-                specificContext = context,  ///
-                contexts = [
-                  generalContext,
-                  specificContext
-                ],
                 frameSubstitutionNode = instantiateFrameSubstitution(string, context),
                 node = frameSubstitutionNode, ///
                 breakPoint = breakPointFromJSON(json),
                 targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
-                replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
+                replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ];
 
           frameSubstitutionn = new FrameSubstitution(contexts, string, node, breakPoint, targetFrame, replacementFrame);
         }, context);

package/src/element/substitution/reference.js

@@ -202,16 +202,16 @@ export default define(class ReferenceSubstitution extends Substitution {
 
         instantiate((context) => {
           const { string } = json,
-                specificContext = context,  ///
-                contexts = [
-                  generalContext,
-                  specificContext
-                ],
                 referenceSubstitutionNode = instantiateReferenceSubstitution(string, context),
                 node = referenceSubstitutionNode, ///
                 breakPoint = breakPointFromJSON(json),
                 targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
-                replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
+                replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ];
 
           referenceSubstitutionn = new ReferenceSubstitution(contexts, string, node, breakPoint, targetReference, replacementReference);
         }, context);

package/src/element/substitution/statement.js

@@ -362,18 +362,18 @@ export default define(class StatementSubstitution extends Substitution {
 
         instantiate((context) => {
           const { string } = json,
-                specificContext = context,  ///
-                contexts = [
-                  generalContext,
-                  specificContext
-                ],
                 statementSubstitutionNode = instantiateStatementSubstitution(string, context),
                 node = statementSubstitutionNode, ///
                 breakPoint = breakPointFromJSON(json),
                 resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
                 substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, generalContext, specificContext),
                 targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
-                replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context);
+                replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ];
 
           statementSubstitutionn = new StatementSubstitution(contexts, string, node, breakPoint, resolved, substitution, targetStatement, replacementStatement);
         }, context);

package/src/element/substitution/term.js

@@ -208,16 +208,16 @@ export default define(class TermSubstitution extends Substitution {
 
         instantiate((context) => {
           const { string } = json,
-                specificContext = context,  ///
-                contexts = [
-                  generalContext,
-                  specificContext
-                ],
                 termSubstitutionNode = instantiateTermSubstitution(string, context),
                 node = termSubstitutionNode,  ///
                 breakPoint = breakPointFromJSON(json),
                 targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
-                replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
+                replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context),
+                specificContext = context,  ///
+                contexts = [
+                  generalContext,
+                  specificContext
+                ];
 
           termSubstitutionn = new TermSubstitution(contexts, string, node, breakPoint, targetTerm, replacementTerm);
         }, context);

package/src/element/topLevelAssertion.js

@@ -4,7 +4,7 @@ import { arrayUtilities } from "necessary";
 import { Element, asynchronousUtilities } from "occam-languages";
 
 import { enclose } from "../utilities/context";
-import { breakPointToBreakPointJSON } from "../utilities/breakPoint";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { topLevelAssertionStringFromLabelsSignatureSuppositionsAndDeduction } from "../utilities/string";
 import { labelsFromJSON,
          deductionFromJSON,
@@ -383,16 +383,16 @@ export default class TopLevelAssertion extends Element {
   }
 
   static fromJSON(Class, json, context) {
-    const { breakPoint } = json,
-          labels = labelsFromJSON(json, context),
+    const labels = labelsFromJSON(json, context),
           deduction = deductionFromJSON(json, context),
           suppositions = suppositionsFromJSON(json, context),
           signature = signatureFromJSON(json, context),
           hypotheses = hypothesesFromJSON(json, context),
           topLevelAssertionString = topLevelAssertionStringFromLabelsSignatureSuppositionsAndDeduction(labels, signature, suppositions, deduction),
+          string = topLevelAssertionString, ///
           node = null,
+          breakPoint = breakPointFromJSON(json),
           proof = null,
-          string = topLevelAssertionString, ///
           topLevelAssertion = new Class(context, string, node, breakPoint, labels, suppositions, deduction, proof, signature, hypotheses);
 
     return topLevelAssertion;

package/src/element/topLevelMetaAssertion.js

@@ -3,7 +3,7 @@
 import { Element, asynchronousUtilities } from "occam-languages";
 
 import { enclose } from "../utilities/context";
-import { breakPointToBreakPointJSON } from "../utilities/breakPoint";
+import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
 import { topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction } from "../utilities/string";
 import { labelFromJSON,
          labelToLabelJSON,
@@ -261,14 +261,14 @@ export default class TopLevelMetaAssertion extends Element {
   }
 
   static fromJSON(Class, json, context) {
-    const { breakPoint } = json,
-          label = labelFromJSON(json, context),
+    const label = labelFromJSON(json, context),
           deduction = deductionFromJSON(json, context),
           suppositions = suppositionsFromJSON(json, context),
           metaLevelAssumptions = metaLevelAssumptionsFromJSON(json, context),
+          string = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
           node = null,
+          breakPoint = breakPointFromJSON(json),
           proof = null,
-          string = topLevelMetaAssertionStringFromLabelSuppositionsAndDeduction(label, suppositions, deduction),
           topLevelMetaAssertion = new Class(context, string, node, breakPoint, label, suppositions, deduction, proof, metaLevelAssumptions);
 
     return topLevelMetaAssertion;