occam-verify-cli 1.0.824 → 1.0.826

package/src/utilities/element.js

@@ -29,11 +29,12 @@ export function typeFromTypeNode(typeNode, context) {
           provisional = provisionalFromTypeNode(typeNode, context),
           nominalTypeName = nominalTypeNameFromTypeNode(typeNode, context),
           typeString = typeStringFromNominalTypeName(nominalTypeName),
-          string = typeString;  ///
+          string = typeString,  ///
+          lineIndex = null;
 
     context = null;
 
-    type = new Type(context, string, node, name, prefixName, superTypes, properties, provisional);
+    type = new Type(context, string, node, lineIndex, prefixName, superTypes, properties, provisional);
   }
 
   return type;
@@ -43,11 +44,12 @@ export function termFromTermNode(termNode, context) {
   const { Term } = elements,
         node = termNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         type = typeFromTermNode(termNode, context);
 
   context = null;
 
-  const term = new Term(context, string, node, type);
+  const term = new Term(context, string, node, lineIndex, type);
 
   return term;
 }
@@ -56,13 +58,14 @@ export function stepFromStepNode(stepNode, context) {
   const { Step } = elements,
         node = stepNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         statement = statementFromStepNode(stepNode, context),
         reference = referenceFromStepNode(stepNode, context),
         satisfiesAssertion = satisfiesAssertionFromStepNode(stepNode, context);
 
   context = null;
 
-  const step = new Step(context, string, node, statement, reference, satisfiesAssertion);
+  const step = new Step(context, string, node, lineIndex, statement, reference, satisfiesAssertion);
 
   return step;
 }
@@ -76,7 +79,8 @@ export function ruleFromRuleNode(ruleNode, context) {
         ruleString = rulsStringFromLabelsPremisesAndConclusion(labels, premises, conclusion),
         node = ruleNode,  ///
         string = ruleString,  ///
-        rule = new Rule(context, string, node, proof, labels, premises, conclusion);
+        lineIndex = null,
+        rule = new Rule(context, string, node, lineIndex, proof, labels, premises, conclusion);
 
   return rule;
 }
@@ -85,8 +89,9 @@ export function labelFromLabelNode(labelNode, context) {
   const { Label } = elements,
         node = labelNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         metavariable = metavariableFromLabelNode(labelNode, context),
-        label = new Label(context, string, node, metavariable);
+        label = new Label(context, string, node, lineIndex, metavariable);
 
   return label;
 }
@@ -95,7 +100,8 @@ export function errorFromErrorNode(errorNode, context) {
   const { Error } = elements,
         node = errorNode, ///
         string = context.nodeAsString(node),
-        error = new Error(context, string, node);
+        lineIndex = null,
+        error = new Error(context, string, node, lineIndex);
 
   return error;
 }
@@ -112,7 +118,8 @@ export function lemmaFromLemmaNode(lemmaNode, context) {
         topLevelAsssertionString = topLevelAssertionStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
         node = lemmaNode, ///
         string = topLevelAsssertionString, ///
-        lemma = new Lemma(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses);
+        lineIndex = null,
+        lemma = new Lemma(context, string, node, lineIndex, labels, suppositions, deduction, proof, signature, hypotheses);
 
   return lemma;
 }
@@ -121,12 +128,10 @@ export function frameFromFrameNode(frameNode, context) {
   const { Frame } = elements,
         node = frameNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         assumptions = assumptionsFromFrameNode(frameNode, context),
-        metavariable = metavariableFromFrameNode(frameNode, context);
-
-  context = null;
-
-  const frame = new Frame(context, string, node, assumptions, metavariable);
+        metavariable = metavariableFromFrameNode(frameNode, context),
+        frame = new Frame(context, string, node, lineIndex, assumptions, metavariable);
 
   return frame;
 }
@@ -135,11 +140,9 @@ export function proofFromProofNode(proofNode, context) {
   const { Proof } = elements,
         node = proofNode, ///
         string = null,
-        derivation = derivationFromProofNode(proofNode, context);
-
-  context = null;
-
-  const proof = new Proof(context, string, node, derivation);
+        lineIndex = null,
+        derivation = derivationFromProofNode(proofNode, context),
+        proof = new Proof(context, string, node, lineIndex, derivation);
 
   return proof;
 }
@@ -156,7 +159,8 @@ export function axiomFromAxiomNode(axiomNode, context) {
         topLevelAsssertionString = topLevelAssertionStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
         node = axiomNode, ///
         string = topLevelAsssertionString, ///
-        axiom = new Axiom(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses);
+        lineIndex = null,
+        axiom = new Axiom(context, string, node, lineIndex, labels, suppositions, deduction, proof, signature, hypotheses);
 
   return axiom;
 }
@@ -170,11 +174,9 @@ export function sectionFromSectionNode(sectionNode, context) {
         conjecture = conjectureFromSectionNode(sectionNode, context),
         sectionString = sectionStringFromHypothesesTopLevelAssertion(hypotheses, axiom, lemma, theorem, conjecture),
         node = sectionNode, ///
-        string = sectionString; ///
-
-  context = null;
-
-  const section = new Section(context, string, node, hypotheses, axiom, lemma, theorem, conjecture);
+        string = sectionString, ///
+        lineIndex = null,
+        section = new Section(context, string, node, lineIndex, hypotheses, axiom, lemma, theorem, conjecture);
 
   return section;
 }
@@ -183,12 +185,10 @@ export function premiseFromPremiseNode(premiseNode, context) {
   const { Premise } = elements,
         node = premiseNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         statement = statementFromPremiseNode(premiseNode, context),
-        procedureCall = procedureCallFromPremiseNode(premiseNode, context);
-
-  context = null;
-
-  const premise = new Premise(context, string, node, statement, procedureCall);
+        procedureCall = procedureCallFromPremiseNode(premiseNode, context),
+        premise = new Premise(context, string, node, lineIndex, statement, procedureCall);
 
   return premise
 }
@@ -205,7 +205,8 @@ export function theoremFromTheoremNode(theoremNode, context) {
         topLevelAsssertionString = topLevelAssertionStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
         node = theoremNode, ///
         string = topLevelAsssertionString, ///
-        theorem = new Theorem(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses);
+        lineIndex = null,
+        theorem = new Theorem(context, string, node, lineIndex, labels, suppositions, deduction, proof, signature, hypotheses);
 
   return theorem;
 }
@@ -214,13 +215,11 @@ export function propertyFromPropertyNode(propertyNode, context) {
   const { Property } = elements,
         node = propertyNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         propertyName = propertyNode.getPropertyName(),
         nominalTypeName = null,
-        name = propertyName;  ///
-
-  context = null;
-
-  const property = new Property(context, string, node, name, nominalTypeName);
+        name = propertyName,  ///
+        property = new Property(context, string, node, lineIndex, name, nominalTypeName);
 
   return property;
 }
@@ -229,13 +228,11 @@ export function variableFromVariableNode(variableNode, context) {
   const { Variable } = elements,
         node = variableNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         type = null,
         identifier = identifierFromVarialbeNode(variableNode, context),
-        propertyRelations = [];
-
-  context = null;
-
-  const variable = new Variable(context, string, node, type, identifier, propertyRelations);
+        propertyRelations = [],
+        variable = new Variable(context, string, node, lineIndex, type, identifier, propertyRelations);
 
   return variable;
 }
@@ -246,11 +243,9 @@ export function subproofFromSubproofNode(subproofNode, context) {
         suppositions = suppositionsFromSubproofNode(subproofNode, context),
         subDerivation = subDerivationFromSubproofNode(subproofNode, context),
         subproofString = subproofStringFromSuppositionsAndSubDerivation(suppositions, subDerivation, context),
-        string = subproofString;  ///
-
-  context = null;
-
-  const subproof = new Subproof(context, string, node, suppositions, subDerivation);
+        string = subproofString,  ///
+        lineIndex = null,
+        subproof = new Subproof(context, string, node, lineIndex, suppositions, subDerivation);
 
   return subproof;
 }
@@ -259,12 +254,10 @@ export function equalityFromEqualityNode(equalityNode, context) {
   const { Equality } = elements,
         node = equalityNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         leftTerm = leftTermFromEqualityNode(equalityNode, context),
-        rightTerm = rightTermFromEqualityNode(equalityNode, context);
-
-  context = null;
-
-  const equality = new Equality(context, string, node, leftTerm, rightTerm);
+        rightTerm = rightTermFromEqualityNode(equalityNode, context),
+        equality = new Equality(context, string, node, lineIndex, leftTerm, rightTerm);
 
   return equality;
 }
@@ -273,11 +266,9 @@ export function deductionFromDeductionNode(deductionNode, context) {
   const { Deduction } = elements,
         node = deductionNode, ///
         string = context.nodeAsString(node),
-        statement = statementFromDeductionNode(deductionNode, context);
-
-  context = null;
-
-  const deduction = new Deduction(context, string, node, statement);
+        lineIndex = null,
+        statement = statementFromDeductionNode(deductionNode, context),
+        deduction = new Deduction(context, string, node, lineIndex, statement);
 
   return deduction;
 }
@@ -285,11 +276,9 @@ export function deductionFromDeductionNode(deductionNode, context) {
 export function statementFromStatementNode(statementNode, context) {
   const { Statement } = elements,
         node = statementNode, ///
-        string = context.nodeAsString(node);
-
-  context = null;
-
-  const statement = new Statement(context, string, node);
+        string = context.nodeAsString(node),
+        lineIndex = null,
+        statement = new Statement(context, string, node, lineIndex);
 
   return statement;
 }
@@ -298,11 +287,9 @@ export function signatureFromSignatureNode(signatureNode, context) {
   const { Signature } = elements,
         node = signatureNode, ///
         string = context.nodeAsString(node),
-        terms = termsFromSignatureNode(signatureNode, context);
-
-  context = null;
-
-  const signature = new Signature(context, string, node, terms);
+        lineIndex = null,
+        terms = termsFromSignatureNode(signatureNode, context),
+        signature = new Signature(context, string, node, lineIndex, terms);
 
   return signature;
 }
@@ -311,9 +298,10 @@ export function referenceFromReferenceNode(referenceNode, context) {
   const { Reference } = elements,
         node = referenceNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         metavariable = metavariableFromReferenceNode(referenceNode, context),
         topLevelMetaAssertion = topLevelMetaAssertionFromReferenceNode(referenceNode, context),
-        reference = new Reference(context, string, node, metavariable, topLevelMetaAssertion);
+        reference = new Reference(context, string, node, lineIndex, metavariable, topLevelMetaAssertion);
 
   return reference;
 }
@@ -322,12 +310,10 @@ export function judgementFromJudgementNode(judgementNode, context) {
   const { Judgement } = elements,
         node = judgementNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         frame = frameFromJudgementNode(judgementNode, context),
-        assumption = assumptionFromJudgementNode(judgementNode, context);
-
-  context = null;
-
-  const judgement = new Judgement(context, string, node, frame, assumption);
+        assumption = assumptionFromJudgementNode(judgementNode, context),
+        judgement = new Judgement(context, string, node, lineIndex, frame, assumption);
 
   return judgement;
 }
@@ -343,7 +329,8 @@ export function metaLemmaFromMetaLemmaNode(metaLemmaNode, context) {
         topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsDeductionAndMetaLevelAssumptions(label, suppositions, deduction, metaLevelAssumptions),
         node = metaLemmaMetathoremNode, ///
         string = topLevelMetaAssertionString, ///
-        metaLemma = new MetaLemma(context, string, node, label, suppositions, deduction, proof, metaLevelAssumptions);
+        lineIndex = null,
+        metaLemma = new MetaLemma(context, string, node, lineIndex, label, suppositions, deduction, proof, metaLevelAssumptions);
 
   return metaLemma;
 }
@@ -352,12 +339,10 @@ export function parameterFromParameterNode(parameterNode, context) {
   const { Parameter } = elements,
         node = parameterNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         name = parameterNode.getName(),
-        identifier = parameterNode.getIdentifier();
-
-  context = null;
-
-  const parameter = new Parameter(context, string, node, name, identifier);
+        identifier = parameterNode.getIdentifier(),
+        parameter = new Parameter(context, string, node, lineIndex, name, identifier);
 
   return parameter;
 }
@@ -366,11 +351,9 @@ export function signatureFromJSignatureNode(signatureNode, context) {
   const { Signature } = elements,
         node = signatureNode,
         string = context.nodeAsString(node),
-        terms = termsFromSignatureNode(signatureNode, context);
-
-  context = null;
-
-  const signature = new Signature(context, string, node, terms);
+        lineIndex = null,
+        terms = termsFromSignatureNode(signatureNode, context),
+        signature = new Signature(context, string, node, lineIndex, terms);
 
   return signature;
 }
@@ -379,11 +362,9 @@ export function hypothesisFromHypothesisNode(hypotheseNode, context) {
   const { Hypothsis } = elements,
         node = hypotheseNode, ///
         string = context.nodeAsString(node),
-        statement = statementFromHypothesisNode(hypotheseNode, context);
-
-  context = null;
-
-  const hypohtesis = new Hypothsis(context, string, node, statement);
+        lineIndex = null,
+        statement = statementFromHypothesisNode(hypotheseNode, context),
+        hypohtesis = new Hypothsis(context, string, node, lineIndex, statement);
 
   return hypohtesis;
 }
@@ -400,7 +381,8 @@ export function conjectureFromConjectureNode(conjectureNode, context) {
         topLevelAsssertionString = topLevelAssertionStringFromLabelsSuppositionsAndDeduction(labels, suppositions, deduction),
         node = conjectureNode, ///
         string = topLevelAsssertionString, ///
-        conjecture = new Conjecture(context, string, node, labels, suppositions, deduction, proof, signature, hypotheses);
+        lineIndex = null,
+        conjecture = new Conjecture(context, string, node, lineIndex, labels, suppositions, deduction, proof, signature, hypotheses);
 
   return conjecture;
 }
@@ -409,8 +391,9 @@ export function combinatorFromCombinatorNode(combinatorNode, context) {
   const { Combinator } = elements,
         node = combinatorNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         statement = statementFromCombinatorNode(combinatorNode, context),
-        combinator = new Combinator(context, string, node, statement);
+        combinator = new Combinator(context, string, node, lineIndex, statement);
 
   return combinator;
 }
@@ -419,11 +402,9 @@ export function conclusionFromConclusionNode(conclusionNode, context) {
   const { Conclusion } = elements,
         node = conclusionNode, ///
         string = context.nodeAsString(node),
-        statement = statementFromConclusionNode(conclusionNode, context);
-
-  context = null;
-
-  const conclusion = new Conclusion(context, string, node, statement);
+        lineIndex = null,
+        statement = statementFromConclusionNode(conclusionNode, context),
+        conclusion = new Conclusion(context, string, node, lineIndex, statement);
 
   return conclusion;
 }
@@ -432,11 +413,9 @@ export function derivationFromDerivationNode(derivationNode, context) {
   const { Derivation } = elements,
         node = derivationNode,  ///
         string = null,
-        stepsOrSubproofs = stepsOrSubproofsFromDerivationNode(derivationNode, context);
-
-  context = null;
-
-  const derivation = new Derivation(context, string, node, stepsOrSubproofs);
+        lineIndex = null,
+        stepsOrSubproofs = stepsOrSubproofsFromDerivationNode(derivationNode, context),
+        derivation = new Derivation(context, string, node, lineIndex, stepsOrSubproofs);
 
   return derivation;
 }
@@ -445,12 +424,10 @@ export function typePrefixFromTypePrefixNode(typePrefixNode, context) {
   const { TypePrefix } = elements,
         node = typePrefixNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         term = termFromTypePrefixNode(typePrefixNode, context),
-        type = typeFromTypePrefixNode(typePrefixNode, context);
-
-  context = null;
-
-  const typePrefix = new TypePrefix(context, string, node, term, type);
+        type = typeFromTypePrefixNode(typePrefixNode, context),
+        typePrefix = new TypePrefix(context, string, node, lineIndex, term, type);
 
   return typePrefix;
 }
@@ -459,9 +436,10 @@ export function assumptionFromAssumptionNode(assumptionNode, context) {
   const { Assumption } = elements,
         node = assumptionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         reference = referenceFromAssumptionNode(assumptionNode, context),
         statement = statementFromAssumptionNode(assumptionNode, context),
-        assumption = new Assumption(context, string, node, reference, statement);
+        assumption = new Assumption(context, string, node, lineIndex, reference, statement);
 
   return assumption;
 }
@@ -470,9 +448,10 @@ export function constructorFromConstructorNode(constructorNode, context) {
   const { Constructor } = elements,
         node = constructorNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         term = termFromConstructorNode(constructorNode, context),
         type = typeFromConstructorNode(constructorNode, context),
-        constructor = new Constructor(context, string, node, term, type);
+        constructor = new Constructor(context, string, node, lineIndex, term, type);
 
   return constructor;
 }
@@ -481,12 +460,10 @@ export function suppositionFromSuppositionNode(suppositionNode, context) {
   const { Supposition } = elements,
         node = suppositionNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         statement = statementFromSuppositionNode(suppositionNode, context),
-        procedureCall = procedureCallFromSuppositionNode(suppositionNode, context);
-
-  context = null;
-
-  const supposition = new Supposition(context, string, node, statement, procedureCall);
+        procedureCall = procedureCallFromSuppositionNode(suppositionNode, context),
+        supposition = new Supposition(context, string, node, lineIndex, statement, procedureCall);
 
   return supposition
 }
@@ -494,14 +471,12 @@ export function suppositionFromSuppositionNode(suppositionNode, context) {
 export function equivalenceFromEquivalenceNode(equivalenceNode, context) {
   const { Equivalence } = elements,
         node = equivalenceNode, ///
+        lineIndex = null,
         type = typeFromEquivalenceNode(equivalenceNode, context),
         terms = termsFromEquivalenceNode(equivalenceNode, context),
         equivalenceString = equivalenceStringFromTerms(terms),
-        string = equivalenceString; ///
-
-  context = null;
-
-  const equivalence = new Equivalence(context, string, node, type, terms);
+        string = equivalenceString, ///
+        equivalence = new Equivalence(context, string, node, lineIndex, type, terms);
 
   return equivalence;
 }
@@ -517,7 +492,11 @@ export function metatheoremFromMetatheoremNode(metatheoremNode, context) {
         topLevelMetaAssertionString = topLevelMetaAssertionStringFromLabelSuppositionsDeductionAndMetaLevelAssumptions(label, suppositions, deduction, metaLevelAssumptions),
         node = metaLemmaMetathoremNode, ///
         string = topLevelMetaAssertionString, ///
-        metatheorem = new Metatheorem(context, string, node, label, suppositions, deduction, proof, metaLevelAssumptions);
+        lineIndex = null;
+
+  context = null;
+
+  const metatheorem = new Metatheorem(context, string, node, lineIndex, label, suppositions, deduction, proof, metaLevelAssumptions);
 
   return metatheorem;
 }
@@ -526,11 +505,15 @@ export function metavariableFromMetavariableNode(metavariableNode, context) {
   const { Metavariable } = elements,
         node = metavariableNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         name = nameFromMetavariableNode(metavariableNode, context),
         term = termFromMetavariableNode(metavariableNode, context),
         type = typeFromMetavariableNode(metavariableNode, context),
-        metaType = null,
-        metavariable = new Metavariable(context, string, node, name, term, type, metaType);
+        metaType = null;
+
+  context = null;
+
+  const metavariable = new Metavariable(context, string, node, lineIndex, name, term, type, metaType);
 
   return metavariable;
 }
@@ -539,11 +522,12 @@ export function subDerivationFromSubDerivationNode(subDerivationNode, context) {
   const { SubDerivation } = elements,
         node = subDerivationNode, ///
         string = null,
+        lineIndex = null,
         stepsOrSubproofs = stepsOrSubproofsFromSubDerivationNode(subDerivationNode, context);
 
   context = null;
 
-  const subDerivation = new SubDerivation(context, string, node, stepsOrSubproofs);
+  const subDerivation = new SubDerivation(context, string, node, lineIndex, stepsOrSubproofs);
 
   return subDerivation;
 }
@@ -552,12 +536,13 @@ export function typeAssertionFromTypeAssertionNode(typeAssertionNode, context) {
   const { TypeAssertion } = elements,
         node = typeAssertionNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         term = termFromTypeAssertionNode(typeAssertionNode, context),
         type = typeFromTypeAssertionNode(typeAssertionNode, context);
 
   context = null;
 
-  const typeAssertion = new TypeAssertion(context, string, node, term, type);
+  const typeAssertion = new TypeAssertion(context, string, node, lineIndex, term, type);
 
   return typeAssertion;
 }
@@ -568,11 +553,12 @@ export function procedureCallFromProcedureCallNode(procedureCallNode, context) {
         procedureReference = procedureReferenceFromProcedureCallNode(procedureCallNode, context),
         procedureCallString = procedureCallStringFromProcedureReferenceAndParameters(procedureReference, parameters),
         node = procedureCallNode, ///
-        string = procedureCallString; ///
+        string = procedureCallString, ///
+        lineIndex = null;
 
   context = null;
 
-  const procedureCall = new ProcedureCall(context, string, node, parameters, procedureReference);
+  const procedureCall = new ProcedureCall(context, string, node, lineIndex, parameters, procedureReference);
 
   return procedureCall;
 }
@@ -589,13 +575,14 @@ export function definedAssertionFromDefinedAssertionNode(definedAssertionNode, c
   const { DefinedAssertion } = elements,
         node = definedAssertionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         negated = definedAssertionNode.isNegated(),
         term = termFromDefinedAssertionNode(definedAssertionNode, context),
         frame = frameFromDefinedAssertionNode(definedAssertionNode, context);
 
   context = null;
 
-  const definedAssertion = new DefinedAssertion(context, string, node, term, frame, negated);
+  const definedAssertion = new DefinedAssertion(context, string, node, lineIndex, term, frame, negated);
 
   return definedAssertion;
 }
@@ -604,12 +591,13 @@ export function propertyRelationFromPropertyRelationNode(propertyRelationNode, c
   const { PropertyRelation } = elements,
         node = propertyRelationNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         term = termFromPropertyRelationNode(propertyRelationNode, context),
         property = propertyFromPropertyRelationNode(propertyRelationNode, context);
 
   context = null;
 
-  const propertyRelation = new PropertyRelation(context, string, node, term, property);
+  const propertyRelation = new PropertyRelation(context, string, node, lineIndex, term, property);
 
   return propertyRelation;
 }
@@ -618,10 +606,14 @@ export function termSubstitutionFromTermSubstitutionNode(termSubstitutionNode, c
   const { TermSubstitution } = elements,
         node = termSubstitutionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         generalContext = generalContextFromTermSubstitutionNode(termSubstitutionNode, context),
         targetTerm = targetTermFromTermSubstitutionNode(termSubstitutionNode, context),
-        replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context),
-        termSubstitution = new TermSubstitution(context, string, node, generalContext, targetTerm, replacementTerm);
+        replacementTerm = replacementTermFromTermSubstitutionNode(termSubstitutionNode, context);
+
+  context = null;
+
+  const termSubstitution = new TermSubstitution(context, string, node, lineIndex, generalContext, targetTerm, replacementTerm);
 
   return termSubstitution;
 }
@@ -630,10 +622,14 @@ export function frameSubstitutionFromFrameSubstitutionNode(frameSubstitutionNode
   const { FrameSubstitution } = elements,
         node = frameSubstitutionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         generalContext = generalContextFromFrameSubstitutionNode(frameSubstitutionNode, context),
         targetFrame = targetFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
-        replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context),
-        frameSubstitution = new FrameSubstitution(context, string, node, generalContext, targetFrame, replacementFrame);
+        replacementFrame = replacementFrameFromFrameSubstitutionNode(frameSubstitutionNode, context);
+
+  context = null;
+
+  const frameSubstitution = new FrameSubstitution(context, string, node, lineIndex, generalContext, targetFrame, replacementFrame);
 
   return frameSubstitution;
 }
@@ -642,12 +638,13 @@ export function propertyAssertionFromPropertyAssertionNode(propertyAssertionNode
   const { PropertyAssertion } = elements,
         node = propertyAssertionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         term = termFromPropertyAssertionNode(propertyAssertionNode, context),
         propertyRelation = propertyRelationFromPropertyAssertionNode(propertyAssertionNode, context);
 
   context = null;
 
-  const propertyAssertion = new PropertyAssertion(context, string, node, term, propertyRelation);
+  const propertyAssertion = new PropertyAssertion(context, string, node, lineIndex, term, propertyRelation);
 
   return propertyAssertion;
 }
@@ -656,11 +653,12 @@ export function subproofAssertionFromSubproofAssertionNode(subproofAssertionNode
   const { SubproofAssertion } = elements,
         node = subproofAssertionNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         statements = statementsFromSubproofAssertionNode(subproofAssertionNode, context);
 
   context = null;
 
-  const subproofAssertion = new SubproofAssertion(context, string, node, statements);
+  const subproofAssertion = new SubproofAssertion(context, string, node, lineIndex, statements);
 
   return subproofAssertion;
 }
@@ -669,6 +667,7 @@ export function containedAssertionFromContainedAssertionNode(containedAssertionN
   const { ContainedAssertion } = elements,
         node = containedAssertionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         negated = containedAssertionNode.isNegated(),
         term = termFromContainedAssertionNode(containedAssertionNode, context),
         frame = frameFromContainedAssertionNode(containedAssertionNode, context),
@@ -676,7 +675,7 @@ export function containedAssertionFromContainedAssertionNode(containedAssertionN
 
   context = null;
 
-  const containedAssertion = new ContainedAssertion(context, string, node, term, frame, negated, statement);
+  const containedAssertion = new ContainedAssertion(context, string, node, lineIndex, term, frame, negated, statement);
 
   return containedAssertion;
 }
@@ -685,12 +684,13 @@ export function satisfiesAssertionFromSatisfiesAssertionNode(satisfiesAssertionN
   const { SatisfiesAssertion } = elements,
         node = satisfiesAssertionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         signature = signatureFromSatisfiesAssertionNode(satisfiesAssertionNode, context),
         reference = referenceFromSatisfiesAssertionNode(satisfiesAssertionNode, context);
 
   context = null;
 
-  const satisfiesAssertion = new SatisfiesAssertion(context, string, node, signature, reference);
+  const satisfiesAssertion = new SatisfiesAssertion(context, string, node, lineIndex, signature, reference);
 
   return satisfiesAssertion;
 }
@@ -699,11 +699,12 @@ export function procedureReferenceFromProcedureReferenceNode(procedureReferenceN
   const { ProcedureReference } = elements,
         node = procedureReferenceNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         name = nameFromProcedureReferenceNode(procedureReferenceNode, context);
 
   context = null;
 
-  const procedureRefereence = new ProcedureReference(context, string, node, name);
+  const procedureRefereence = new ProcedureReference(context, string, node, lineIndex, name);
 
   return procedureRefereence;
 }
@@ -712,12 +713,16 @@ export function variableDeclarationFromVariableDeclarationNode(variableDeclarati
   const { VariableDeclaration } = elements,
         node = variableDeclarationNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         typeNode = variableDeclarationNode.getTypeNode(),
         provisional = variableDeclarationNode.isProvisional(),
         variableNode = variableDeclarationNode.getVariableNode(),
         type = typeFromTypeNode(typeNode, context),
-        variable = variableFromVariableNode(variableNode, context),
-        variableDeclaration = new VariableDeclaration(context, string, node, type, variable, provisional);
+        variable = variableFromVariableNode(variableNode, context);
+
+  context = null;
+
+  const variableDeclaration = new VariableDeclaration(context, string, node, lineIndex, type, variable, provisional);
 
   return variableDeclaration;
 }
@@ -726,9 +731,13 @@ export function metaLevelAssumptionFromMetaLevelAssumptionNode(metaLevelAssumpti
   const { MetaLevelAssumption } = elements,
         node = metaLevelAssumptionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         reference = referenceFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context),
-        statement = statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context),
-        metaLevelAssumption = new MetaLevelAssumption(context, string, node, reference, statement);
+        statement = statementFromMetaLevelAssumptionNode(metaLevelAssumptionNode, context);
+
+  context = null;
+
+  const metaLevelAssumption = new MetaLevelAssumption(context, string, node, lineIndex, reference, statement);
 
   return metaLevelAssumption;
 }
@@ -737,8 +746,12 @@ export function typePrefixDeclarationFromTypePrefixDeclarationNode(typePrefixDec
   const { TypePrefixDeclaration } = elements,
         node = typePrefixDeclarationNode, ///
         string = context.nodeAsString(node),  ///
-        typePrefix = typePrefixFromTypePrefixDeclarationNode(typePrefixDeclarationNode, context),
-        typePrefixDeclaration = new TypePrefixDeclaration(context, string, node, typePrefix);
+        lineIndex = null,
+        typePrefix = typePrefixFromTypePrefixDeclarationNode(typePrefixDeclarationNode, context);
+
+  context = null;
+
+  const typePrefixDeclaration = new TypePrefixDeclaration(context, string, node, lineIndex, typePrefix);
 
   return typePrefixDeclaration;
 }
@@ -747,8 +760,12 @@ export function combinatorDeclarationFromCombinatorDeclarationNode(combinatorDec
   const { CombinatorDeclaration } = elements,
         node = combinatorDeclarationNode, ///
         string = context.nodeAsString(node),
-        combinator = combinatorFromCombinatorDeclarationNode(combinatorDeclarationNode, context),
-        combinatorDeclaration = new CombinatorDeclaration(context, string, node, combinator);
+        lineIndex = null,
+        combinator = combinatorFromCombinatorDeclarationNode(combinatorDeclarationNode, context);
+
+  context = null;
+
+  const combinatorDeclaration = new CombinatorDeclaration(context, string, node, lineIndex, combinator);
 
   return combinatorDeclaration;
 }
@@ -757,10 +774,14 @@ export function simpleTypeDeclarationFromSimpleTypeDeclarationNode(simpleTypeDec
   const { SimpleTypeDeclaration } = elements,
         node = simpleTypeDeclarationNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         type = typeFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context),
         superTypes = superTypesFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context),
-        provisional = provisionalFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context),
-        simpleTypeDeclaration = new SimpleTypeDeclaration(context, string, node, type, superTypes, provisional);
+        provisional = provisionalFromSimpleTypeDeclarationNode(simpleTypeDeclarationNode, context);
+
+  context = null;
+
+  const simpleTypeDeclaration = new SimpleTypeDeclaration(context, string, node, lineIndex, type, superTypes, provisional);
 
   return simpleTypeDeclaration;
 }
@@ -769,10 +790,14 @@ export function referenceSubstitutionFromReferenceSubstitutionNode(referenceSubs
   const { ReferenceSubstitution } = elements,
         node = referenceSubstitutionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         generalContext = generalContextFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
         targetReference = targetReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
-        replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context),
-        referenceSubstitution = new ReferenceSubstitution(context, string, node, generalContext, targetReference, replacementReference);
+        replacementReference = replacementReferenceFromReferenceSubstitutionNode(referenceSubstitutionNode, context);
+
+  context = null;
+
+  const referenceSubstitution = new ReferenceSubstitution(context, string, node, lineIndex, generalContext, targetReference, replacementReference);
 
   return referenceSubstitution;
 }
@@ -782,12 +807,16 @@ export function statementSubstitutionFromStatementSubstitutionNode(statementSubs
   const { StatementSubstitution } = elements,
         node = statementSubstitutionNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         generalContext = generalContextFromStatementSubstitutionNode(statementSubstitutionNode, context),
         resolved = resolvedFromStatementSubstitutionNode(statementSubstitutionNode, context),
         substitution = substitutionFromStatementSubstitutionNode(statementSubstitutionNode, context),
         targetStatement = targetStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
-        replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context),
-        statementSubstitution = new StatementSubstitution(context, string, node, generalContext, resolved, substitution, targetStatement, replacementStatement);
+        replacementStatement = replacementStatementFromStatementSubstitutionNode(statementSubstitutionNode, context);
+
+  context = null;
+
+  const statementSubstitution = new StatementSubstitution(context, string, node, lineIndex, generalContext, resolved, substitution, targetStatement, replacementStatement);
 
   return statementSubstitution;
 }
@@ -796,10 +825,14 @@ export function constructorDeclarationFromConstructorDeclarationNode(constructor
   const { ConstructorDeclaration } = elements,
         node = constructorDeclarationNode, ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         type = typeFromConstructorDeclarationNode(constructorDeclarationNode, context),
         provisional = provisionalFromConstructorDeclarationNode(constructorDeclarationNode, context),
-        constructor = constructorFromConstructorDeclarationNode(constructorDeclarationNode, context),
-        constructorDeclaration = new ConstructorDeclaration(context, string, node, type, provisional, constructor);
+        constructor = constructorFromConstructorDeclarationNode(constructorDeclarationNode, context);
+
+  context = null;
+
+  const constructorDeclaration = new ConstructorDeclaration(context, string, node, lineIndex, type, provisional, constructor);
 
   return constructorDeclaration;
 }
@@ -808,10 +841,14 @@ export function complexTypeDeclarationFromComplexTypeDeclarationNode(complexType
   const { ComplexTypeDeclaration } = elements,
         node = complexTypeDeclarationNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         type = typeFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
         superTypes = superTypesFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
-        provisional = provisionalFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context),
-        complexTypeDeclaration = new ComplexTypeDeclaration(context, string, node, type, superTypes, provisional);
+        provisional = provisionalFromComplexTypeDeclarationNode(complexTypeDeclarationNode, context);
+
+  context = null;
+
+  const complexTypeDeclaration = new ComplexTypeDeclaration(context, string, node, lineIndex, type, superTypes, provisional);
 
   return complexTypeDeclaration;
 }
@@ -820,9 +857,13 @@ export function metavariableDeclarationFromMetavariableDeclarationNode(metavaria
   const { MetavariableDeclaration } = elements,
         node = metavariableDeclarationNode,  ///
         string = context.nodeAsString(node),
+        lineIndex = null,
         metaType = metaTypeFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
-        metavariable = metavariableFromMetavariableDeclarationNode(metavariableDeclarationNode, context),
-        metavariableDeclaration = new MetavariableDeclaration(context, string, node, metaType, metavariable);
+        metavariable = metavariableFromMetavariableDeclarationNode(metavariableDeclarationNode, context);
+
+  context = null;
+
+  const metavariableDeclaration = new MetavariableDeclaration(context, string, node, lineIndex, metaType, metavariable);
 
   return metavariableDeclaration;
 }