occam-verify-cli 1.0.837 → 1.0.838

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/process/assign.js +3 -3
  2. package/package.json +1 -1
  3. package/src/process/assign.js +2 -3
package/lib/process/assign.js CHANGED
@@ -57,8 +57,8 @@ function variableAssignmentFromTypeAssertion(typeAssertion, context) {
57
57
  };
58
58
  const term = typeAssertion.getTerm(), termSingular = term.isSingular();
59
59
  if (termSingular) {
60
- const type = typeAssertion.getType(), variableNode = term.getVariableNode();
61
- variableAssignment = variableAssignmentFromTermAndType(variableNode, type, context);
60
+ const type = typeAssertion.getType();
61
+ variableAssignment = variableAssignmentFromTermAndType(term, type, context);
62
62
  }
63
63
  return variableAssignment;
64
64
  }
@@ -102,4 +102,4 @@ function variableAssignmentFromTermAndType(term, type, context) {
102
102
  return variableAssignment;
103
103
  }
104
104
 
105
- //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/process/assign.js"],"sourcesContent":["\"use strict\";\n\nimport { variableFromVariableNode } from \"../utilities/element\";\n\nexport function equalityAssignmentFromEquality(equality, context) {\n  const equalityAssignment = (context) => {\n    const equalityAdded = context.addEquality(equality);\n\n    return equalityAdded;\n  };\n\n  return equalityAssignment;\n}\n\nexport function judgementAssignmentFromJudgement(judgement, context) {\n  const judgementAssignment = (context) => {\n    const declaredJudgement = judgement,  ///\n          declaredJudgementAdded = context.addDeclaredJudgement(declaredJudgement);\n\n    return declaredJudgementAdded;\n  };\n\n  return judgementAssignment;\n}\n\nexport function leftVariableAssignmentFromEquality(equality, context) {\n  const type = equality.getType(),\n        leftTerm = equality.getLeftTerm(),\n        leftVariableAssignment = variableAssignmentFromTermAndType(leftTerm, type, context);\n\n  return leftVariableAssignment;\n}\n\nexport function rightVariableAssignmentFromEquality(equality, context) {\n  const type = equality.getType(),\n        rightTerm = equality.getRightTerm(),\n        rightVariableAssignment = variableAssignmentFromTermAndType(rightTerm, type, context);\n\n  return rightVariableAssignment;\n}\n\nexport function variableAssignmentFromTypeAssertion(typeAssertion, context) {\n  let variableAssignment = (context) => {\n    ///\n  };\n\n  const term = typeAssertion.getTerm(),\n        termSingular = term.isSingular();\n\n  if (termSingular) {\n    const type = typeAssertion.getType(),\n          variableNode = term.getVariableNode();\n\n    variableAssignment = variableAssignmentFromTermAndType(variableNode, type, context);\n  }\n\n  return variableAssignment;\n}\n\nexport function variableAssignmentFromPrepertyAssertion(propertyAssertion, context) {\n\n  debugger\n\n  // let variable;\n  //\n  // const { Variable } = elements,\n  //   termNode = this.term.getNode();\n  //\n  // variable = Variable.fromTermNode(termNode, context);\n  //\n  // if (variable !== null) {\n  //   const variableIdentifier = variable.getIdentifier();\n  //\n  //   variable = context.findVariableByVariableIdentifier(variableIdentifier);\n  //\n  //   variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);\n  //\n  //   const variableAssignment = variableAssignmentFromVariable(variable),\n\n  }\n\nfunction variableAssignmentFromTermAndType(term, type, context) {\n  let variableAssignment = (context) => {\n    ///\n  };\n\n  const termSingular = term.isSingular();\n\n  if (termSingular) {\n    const termType = term.getType(),\n          termTypeEqualToType = termType.isEqualTo(type);\n\n    if (!termTypeEqualToType) {\n      const variableNode = term.getVariableNode(),\n            variable = variableFromVariableNode(variableNode, context);\n\n      variable.setType(type);\n\n      variableAssignment = (context) => {\n        const declaredVariable = variable;  ///\n\n        context.addDeclaredVariable(declaredVariable);\n\n        const declaredVariableTypeString = declaredVariable.getTypeString(),\n              declaredVariableString = declaredVariable.getString(),\n              assigned = true;  ///\n\n        assigned ?\n          context.trace(`Assigned the '${declaredVariableString}' declared variable with type '${declaredVariableTypeString}'.`) :\n             context.debug(`Unable to assign the '${declaredVariableString}' declared variable with type '${declaredVariableTypeString}'.`);\n\n        return assigned;\n      };\n    }\n  }\n\n  return variableAssignment;\n}\n"],"names":["equalityAssignmentFromEquality","judgementAssignmentFromJudgement","leftVariableAssignmentFromEquality","rightVariableAssignmentFromEquality","variableAssignmentFromPrepertyAssertion","variableAssignmentFromTypeAssertion","equality","context","equalityAssignment","equalityAdded","addEquality","judgement","judgementAssignment","declaredJudgement","declaredJudgementAdded","addDeclaredJudgement","type","getType","leftTerm","getLeftTerm","leftVariableAssignment","variableAssignmentFromTermAndType","rightTerm","getRightTerm","rightVariableAssignment","typeAssertion","variableAssignment","term","getTerm","termSingular","isSingular","variableNode","getVariableNode","propertyAssertion","termType","termTypeEqualToType","isEqualTo","variable","variableFromVariableNode","setType","declaredVariable","addDeclaredVariable","declaredVariableTypeString","getTypeString","declaredVariableString","getString","assigned","trace","debug"],"mappings":"AAAA;;;;;;;;;;;QAIgBA;eAAAA;;QAUAC;eAAAA;;QAWAC;eAAAA;;QAQAC;eAAAA;;QA0BAC;eAAAA;;QAlBAC;eAAAA;;;yBAvCyB;AAElC,SAASL,+BAA+BM,QAAQ,EAAEC,OAAO;IAC9D,MAAMC,qBAAqB,CAACD;QAC1B,MAAME,gBAAgBF,QAAQG,WAAW,CAACJ;QAE1C,OAAOG;IACT;IAEA,OAAOD;AACT;AAEO,SAASP,iCAAiCU,SAAS,EAAEJ,OAAO;IACjE,MAAMK,sBAAsB,CAACL;QAC3B,MAAMM,oBAAoBF,WACpBG,yBAAyBP,QAAQQ,oBAAoB,CAACF;QAE5D,OAAOC;IACT;IAEA,OAAOF;AACT;AAEO,SAASV,mCAAmCI,QAAQ,EAAEC,OAAO;IAClE,MAAMS,OAAOV,SAASW,OAAO,IACvBC,WAAWZ,SAASa,WAAW,IAC/BC,yBAAyBC,kCAAkCH,UAAUF,MAAMT;IAEjF,OAAOa;AACT;AAEO,SAASjB,oCAAoCG,QAAQ,EAAEC,OAAO;IACnE,MAAMS,OAAOV,SAASW,OAAO,IACvBK,YAAYhB,SAASiB,YAAY,IACjCC,0BAA0BH,kCAAkCC,WAAWN,MAAMT;IAEnF,OAAOiB;AACT;AAEO,SAASnB,oCAAoCoB,aAAa,EAAElB,OAAO;IACxE,IAAImB,qBAAqB,CAACnB;IACxB,GAAG;IACL;IAEA,MAAMoB,OAAOF,cAAcG,OAAO,IAC5BC,eAAeF,KAAKG,UAAU;IAEpC,IAAID,cAAc;QAChB,MAAMb,OAAOS,cAAcR,OAAO,IAC5Bc,eAAeJ,KAAKK,eAAe;QAEzCN,qBAAqBL,kCAAkCU,cAAcf,MAAMT;IAC7E;IAEA,OAAOmB;AACT;AAEO,SAAStB,wCAAwC6B,iBAAiB,EAAE1B,OAAO;IAEhF,QAAQ;AAER,gBAAgB;AAChB,EAAE;AACF,iCAAiC;AACjC,oCAAoC;AACpC,EAAE;AACF,uDAAuD;AACvD,EAAE;AACF,2BAA2B;AAC3B,yDAAyD;AACzD,EAAE;AACF,6EAA6E;AAC7E,EAAE;AACF,0FAA0F;AAC1F,EAAE;AACF,yEAAyE;AAEzE;AAEF,SAASc,kCAAkCM,IAAI,EAAEX,IAAI,EAAET,OAAO;IAC5D,IAAImB,qBAAqB,CAACnB;IACxB,GAAG;IACL;IAEA,MAAMsB,eAAeF,KAAKG,UAAU;IAEpC,IAAID,cAAc;QAChB,MAAMK,WAAWP,KAAKV,OAAO,IACvBkB,sBAAsBD,SAASE,SAAS,CAACpB;QAE/C,IAAI,CAACmB,qBAAqB;YACxB,MAAMJ,eAAeJ,KAAKK,eAAe,IACnCK,WAAWC,IAAAA,iCAAwB,EAACP,cAAcxB;YAExD8B,SAASE,OAAO,CAACvB;YAEjBU,qBAAqB,CAACnB;gBACpB,MAAMiC,mBAAmBH,UAAW,GAAG;gBAEvC9B,QAAQkC,mBAAmB,CAACD;gBAE5B,MAAME,6BAA6BF,iBAAiBG,aAAa,IAC3DC,yBAAyBJ,iBAAiBK,SAAS,IACnDC,WAAW,MAAO,GAAG;gBAE3BA,WACEvC,QAAQwC,KAAK,CAAC,CAAC,cAAc,EAAEH,uBAAuB,+BAA+B,EAAEF,2BAA2B,EAAE,CAAC,IAClHnC,QAAQyC,KAAK,CAAC,CAAC,sBAAsB,EAAEJ,uBAAuB,+BAA+B,EAAEF,2BAA2B,EAAE,CAAC;gBAElI,OAAOI;YACT;QACF;IACF;IAEA,OAAOpB;AACT"}
105
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/process/assign.js"],"sourcesContent":["\"use strict\";\n\nimport { variableFromVariableNode } from \"../utilities/element\";\n\nexport function equalityAssignmentFromEquality(equality, context) {\n  const equalityAssignment = (context) => {\n    const equalityAdded = context.addEquality(equality);\n\n    return equalityAdded;\n  };\n\n  return equalityAssignment;\n}\n\nexport function judgementAssignmentFromJudgement(judgement, context) {\n  const judgementAssignment = (context) => {\n    const declaredJudgement = judgement,  ///\n          declaredJudgementAdded = context.addDeclaredJudgement(declaredJudgement);\n\n    return declaredJudgementAdded;\n  };\n\n  return judgementAssignment;\n}\n\nexport function leftVariableAssignmentFromEquality(equality, context) {\n  const type = equality.getType(),\n        leftTerm = equality.getLeftTerm(),\n        leftVariableAssignment = variableAssignmentFromTermAndType(leftTerm, type, context);\n\n  return leftVariableAssignment;\n}\n\nexport function rightVariableAssignmentFromEquality(equality, context) {\n  const type = equality.getType(),\n        rightTerm = equality.getRightTerm(),\n        rightVariableAssignment = variableAssignmentFromTermAndType(rightTerm, type, context);\n\n  return rightVariableAssignment;\n}\n\nexport function variableAssignmentFromTypeAssertion(typeAssertion, context) {\n  let variableAssignment = (context) => {\n    ///\n  };\n\n  const term = typeAssertion.getTerm(),\n        termSingular = term.isSingular();\n\n  if (termSingular) {\n    const type = typeAssertion.getType();\n\n    variableAssignment = variableAssignmentFromTermAndType(term, type, context);\n  }\n\n  return variableAssignment;\n}\n\nexport function variableAssignmentFromPrepertyAssertion(propertyAssertion, context) {\n\n  debugger\n\n  // let variable;\n  //\n  // const { Variable } = elements,\n  //   termNode = this.term.getNode();\n  //\n  // variable = Variable.fromTermNode(termNode, context);\n  //\n  // if (variable !== null) {\n  //   const variableIdentifier = variable.getIdentifier();\n  //\n  //   variable = context.findVariableByVariableIdentifier(variableIdentifier);\n  //\n  //   variable = Variable.fromVariableAndPropertyRelation(variable, this.propertyRelation);\n  //\n  //   const variableAssignment = variableAssignmentFromVariable(variable),\n\n  }\n\nfunction variableAssignmentFromTermAndType(term, type, context) {\n  let variableAssignment = (context) => {\n    ///\n  };\n\n  const termSingular = term.isSingular();\n\n  if (termSingular) {\n    const termType = term.getType(),\n          termTypeEqualToType = termType.isEqualTo(type);\n\n    if (!termTypeEqualToType) {\n      const variableNode = term.getVariableNode(),\n            variable = variableFromVariableNode(variableNode, context);\n\n      variable.setType(type);\n\n      variableAssignment = (context) => {\n        const declaredVariable = variable;  ///\n\n        context.addDeclaredVariable(declaredVariable);\n\n        const declaredVariableTypeString = declaredVariable.getTypeString(),\n              declaredVariableString = declaredVariable.getString(),\n              assigned = true;  ///\n\n        assigned ?\n          context.trace(`Assigned the '${declaredVariableString}' declared variable with type '${declaredVariableTypeString}'.`) :\n             context.debug(`Unable to assign the '${declaredVariableString}' declared variable with type '${declaredVariableTypeString}'.`);\n\n        return assigned;\n      };\n    }\n  }\n\n  return variableAssignment;\n}\n"],"names":["equalityAssignmentFromEquality","judgementAssignmentFromJudgement","leftVariableAssignmentFromEquality","rightVariableAssignmentFromEquality","variableAssignmentFromPrepertyAssertion","variableAssignmentFromTypeAssertion","equality","context","equalityAssignment","equalityAdded","addEquality","judgement","judgementAssignment","declaredJudgement","declaredJudgementAdded","addDeclaredJudgement","type","getType","leftTerm","getLeftTerm","leftVariableAssignment","variableAssignmentFromTermAndType","rightTerm","getRightTerm","rightVariableAssignment","typeAssertion","variableAssignment","term","getTerm","termSingular","isSingular","propertyAssertion","termType","termTypeEqualToType","isEqualTo","variableNode","getVariableNode","variable","variableFromVariableNode","setType","declaredVariable","addDeclaredVariable","declaredVariableTypeString","getTypeString","declaredVariableString","getString","assigned","trace","debug"],"mappings":"AAAA;;;;;;;;;;;QAIgBA;eAAAA;;QAUAC;eAAAA;;QAWAC;eAAAA;;QAQAC;eAAAA;;QAyBAC;eAAAA;;QAjBAC;eAAAA;;;yBAvCyB;AAElC,SAASL,+BAA+BM,QAAQ,EAAEC,OAAO;IAC9D,MAAMC,qBAAqB,CAACD;QAC1B,MAAME,gBAAgBF,QAAQG,WAAW,CAACJ;QAE1C,OAAOG;IACT;IAEA,OAAOD;AACT;AAEO,SAASP,iCAAiCU,SAAS,EAAEJ,OAAO;IACjE,MAAMK,sBAAsB,CAACL;QAC3B,MAAMM,oBAAoBF,WACpBG,yBAAyBP,QAAQQ,oBAAoB,CAACF;QAE5D,OAAOC;IACT;IAEA,OAAOF;AACT;AAEO,SAASV,mCAAmCI,QAAQ,EAAEC,OAAO;IAClE,MAAMS,OAAOV,SAASW,OAAO,IACvBC,WAAWZ,SAASa,WAAW,IAC/BC,yBAAyBC,kCAAkCH,UAAUF,MAAMT;IAEjF,OAAOa;AACT;AAEO,SAASjB,oCAAoCG,QAAQ,EAAEC,OAAO;IACnE,MAAMS,OAAOV,SAASW,OAAO,IACvBK,YAAYhB,SAASiB,YAAY,IACjCC,0BAA0BH,kCAAkCC,WAAWN,MAAMT;IAEnF,OAAOiB;AACT;AAEO,SAASnB,oCAAoCoB,aAAa,EAAElB,OAAO;IACxE,IAAImB,qBAAqB,CAACnB;IACxB,GAAG;IACL;IAEA,MAAMoB,OAAOF,cAAcG,OAAO,IAC5BC,eAAeF,KAAKG,UAAU;IAEpC,IAAID,cAAc;QAChB,MAAMb,OAAOS,cAAcR,OAAO;QAElCS,qBAAqBL,kCAAkCM,MAAMX,MAAMT;IACrE;IAEA,OAAOmB;AACT;AAEO,SAAStB,wCAAwC2B,iBAAiB,EAAExB,OAAO;IAEhF,QAAQ;AAER,gBAAgB;AAChB,EAAE;AACF,iCAAiC;AACjC,oCAAoC;AACpC,EAAE;AACF,uDAAuD;AACvD,EAAE;AACF,2BAA2B;AAC3B,yDAAyD;AACzD,EAAE;AACF,6EAA6E;AAC7E,EAAE;AACF,0FAA0F;AAC1F,EAAE;AACF,yEAAyE;AAEzE;AAEF,SAASc,kCAAkCM,IAAI,EAAEX,IAAI,EAAET,OAAO;IAC5D,IAAImB,qBAAqB,CAACnB;IACxB,GAAG;IACL;IAEA,MAAMsB,eAAeF,KAAKG,UAAU;IAEpC,IAAID,cAAc;QAChB,MAAMG,WAAWL,KAAKV,OAAO,IACvBgB,sBAAsBD,SAASE,SAAS,CAAClB;QAE/C,IAAI,CAACiB,qBAAqB;YACxB,MAAME,eAAeR,KAAKS,eAAe,IACnCC,WAAWC,IAAAA,iCAAwB,EAACH,cAAc5B;YAExD8B,SAASE,OAAO,CAACvB;YAEjBU,qBAAqB,CAACnB;gBACpB,MAAMiC,mBAAmBH,UAAW,GAAG;gBAEvC9B,QAAQkC,mBAAmB,CAACD;gBAE5B,MAAME,6BAA6BF,iBAAiBG,aAAa,IAC3DC,yBAAyBJ,iBAAiBK,SAAS,IACnDC,WAAW,MAAO,GAAG;gBAE3BA,WACEvC,QAAQwC,KAAK,CAAC,CAAC,cAAc,EAAEH,uBAAuB,+BAA+B,EAAEF,2BAA2B,EAAE,CAAC,IAClHnC,QAAQyC,KAAK,CAAC,CAAC,sBAAsB,EAAEJ,uBAAuB,+BAA+B,EAAEF,2BAA2B,EAAE,CAAC;gBAElI,OAAOI;YACT;QACF;IACF;IAEA,OAAOpB;AACT"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "occam-verify-cli",
3
3
  "author": "James Smith",
4
- "version": "1.0.837",
4
+ "version": "1.0.838",
5
5
  "license": "MIT, Anti-996",
6
6
  "homepage": "https://github.com/djalbat/occam-verify-cli",
7
7
  "description": "Occam's Verifier",
package/src/process/assign.js CHANGED
@@ -48,10 +48,9 @@ export function variableAssignmentFromTypeAssertion(typeAssertion, context) {
48
48
  termSingular = term.isSingular();
49
49
 
50
50
  if (termSingular) {
51
- const type = typeAssertion.getType(),
52
- variableNode = term.getVariableNode();
51
+ const type = typeAssertion.getType();
53
52
 
54
- variableAssignment = variableAssignmentFromTermAndType(variableNode, type, context);
53
+ variableAssignment = variableAssignmentFromTermAndType(term, type, context);
55
54
  }
56
55
 
57
56
  return variableAssignment;