occam-verify-cli 0.0.1192 → 0.0.1195

package/src/dom/procedureCall.js

@@ -9,11 +9,16 @@ const parameterNodesQuery = nodesQuery("/procedureCall/parameter"),
       procedureCallNodeQuery = nodeQuery("/statement/procedureCall");
 
 export default domAssigned(class ProcedureCall {
-  constructor(reference, parameters) {
+  constructor(string, reference, parameters) {
+    this.string = string;
     this.reference = reference;
     this.parameters = parameters;
   }
 
+  getString() {
+    return this.string;
+  }
+
   getReference() {
     return this.reference;
   }
@@ -29,7 +34,7 @@ export default domAssigned(class ProcedureCall {
 
     context.trace(`Verifying the '${procedureCallString}' procedure call...`);
 
-    debugger
+    const procedure = context.findProcedure
 
     if (verified) {
       context.debug(`...verified the '${procedureCallString}' procedure call.`);
@@ -46,9 +51,12 @@ export default domAssigned(class ProcedureCall {
     const procedureCallNode = procedureCallNodeQuery(statementNode);
 
     if (procedureCallNode !== null) {
-      const parameters = parametersFromProcedureCallNode(procedureCallNode, context);
+      const { Reference } = dom,
+            parameters = parametersFromProcedureCallNode(procedureCallNode, context),
+            reference = Reference.fromProcedureCallNode(procedureCallNode, context),
+            string = stringFromReferenceAndParameters(reference, parameters);
 
-      procedureCall = new ProcedureCall(parameters);
+      procedureCall = new ProcedureCall(string, reference, parameters);
     }
 
     return procedureCall;
@@ -66,3 +74,19 @@ function parametersFromProcedureCallNode(procedureCallNode, context) {
 
   return parameters;
 }
+
+function stringFromReferenceAndParameters(reference, parameters) {
+  const referenceString = reference.getString(),
+        parametersString = parameters.reduce((parametersString, parameter) => {
+          const parameterString = parameter.getString();
+
+          parametersString = (parametersString === null) ?
+                                parameterString : ///
+                                  `${parametersString}, ${parameterString}`;
+
+          return parametersString;
+        }, null),
+        string = `${referenceString}(${parametersString})`;
+
+  return string;
+}

package/src/dom/reference.js

@@ -10,7 +10,8 @@ import { unifyLabelWithReference } from "../utilities/unification";
 import { metavariableFromJSON, metavariableToMetavariableJSON } from "../utilities/json";
 
 const proofStepReferenceNodeQuery = nodeQuery("/proofStep/reference"),
-      declarationReferenceNodeQuery = nodeQuery("/declaration/reference");
+      declarationReferenceNodeQuery = nodeQuery("/declaration/reference"),
+      procedureCallReferenceNodeQuery = nodeQuery("/procedureCall/reference");
 
 export default domAssigned(class Reference {
   constructor(metavariable) {
@@ -165,4 +166,22 @@ export default domAssigned(class Reference {
 
     return reference;
   }
+
+  static fromProcedureCallNode(procedureCallNode, fileContext) {
+    let reference = null;
+
+    const procedureCallReferenceNode = procedureCallReferenceNodeQuery(procedureCallNode);
+
+    if (procedureCallReferenceNode !== null) {
+      const { Metavariable } = dom,
+            referenceNode = procedureCallReferenceNode, ///
+            localContext = LocalContext.fromFileContext(fileContext),
+            context = localContext, ///
+            metavariable = Metavariable.fromReferenceNode(referenceNode, context);
+
+      reference = new Reference(metavariable);
+    }
+
+    return reference;
+  }
 });

package/src/dom/statement.js

@@ -19,7 +19,6 @@ const { match, backwardsSome } = arrayUtilities;
 const statementTermNodesQuery = nodesQuery("/statement//term"),
       statementFrameNodesQuery = nodesQuery("/statement//frame"),
       premiseStatementNodeQuery = nodeQuery("/premise/statement"),
-      parameterStatementNodeQuery = nodeQuery("/parameter/statement"),
       proofStepStatementNodeQuery = nodeQuery("/proofStep/statement"),
       conclusionStatementNodeQuery = nodeQuery("/conclusion/statement"),
       consequentStatementNodeQuery = nodeQuery("/consequent/statement"),
@@ -336,20 +335,6 @@ export default domAssigned(class Statement {
     return statement;
   }
 
-  static fromParameterNode(parameterNode, context) {
-    let statement = null;
-
-    const parameterStatementNode = parameterStatementNodeQuery(parameterNode);
-
-    if (parameterStatementNode !== null) {
-      const statementNode = parameterStatementNode; ///
-
-      statement = statementFromStatementNode(statementNode, context);
-    }
-
-    return statement;
-  }
-
   static fromConclusionNode(conclusionNode, fileContext) {
     let statement = null;
 

package/src/dom/term.js

@@ -16,8 +16,7 @@ import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
 const { filter, compress } = arrayUtilities;
 
 const variableNodesQuery = nodesQuery("//variable"),
-      termVariableNodeQuery = nodeQuery("/*/term[0]/variable!"),
-      parameterTermNodeQuery = nodeQuery("/parameter/term");
+      termVariableNodeQuery = nodeQuery("/*/term[0]/variable!");
 
 export default domAssigned(class Term {
   constructor(string, node, type) {
@@ -270,22 +269,6 @@ export default domAssigned(class Term {
     return term;
   }
 
-  static fromParameterNode(parameterNode, context) {
-    let term = null;
-
-    const parameterTermNode = parameterTermNodeQuery(parameterNode);
-
-    if (parameterTermNode !== null) {
-      const node = parameterTermNode,  ///
-            string = context.nodeAsString(node),
-            type = null;
-
-      term = new Term(string, node, type);
-    }
-
-    return term;
-  }
-
   static fromTermNodeAndType(termNode, type, context) {
     const node = termNode,  ///
           string = context.nodeAsString(node),