occam-nominal 1.0.428 → 1.0.430

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 (19) hide show
  1. package/lib/context/file/nominal.js +5 -1
  2. package/lib/context.js +5 -1
  3. package/lib/element/assertion/signature.js +69 -69
  4. package/lib/element/claim/axiom.js +37 -31
  5. package/lib/element/label.js +1 -1
  6. package/lib/element/signature.js +31 -48
  7. package/lib/node/assertion/signature.js +4 -4
  8. package/lib/node/header.js +2 -2
  9. package/lib/utilities/element.js +11 -12
  10. package/package.json +5 -5
  11. package/src/context/file/nominal.js +13 -6
  12. package/src/context.js +8 -1
  13. package/src/element/assertion/signature.js +77 -72
  14. package/src/element/claim/axiom.js +51 -42
  15. package/src/element/label.js +3 -3
  16. package/src/element/signature.js +34 -60
  17. package/src/node/assertion/signature.js +5 -5
  18. package/src/node/header.js +2 -3
  19. package/src/utilities/element.js +10 -15
package/src/utilities/element.js CHANGED
@@ -778,12 +778,12 @@ export function signatureAssertionFromSignatureAssertionNode(signatureAssertionN
778
778
  node = signatureAssertionNode, ///
779
779
  string = context.nodeAsString(node),
780
780
  breakPoint = null,
781
- signature = signatureFromSignatureAssertionNode(signatureAssertionNode, context),
781
+ terms = termsFromSignatureAssertionNode(signatureAssertionNode, context),
782
782
  reference = referenceFromSignatureAssertionNode(signatureAssertionNode, context);
783
783
 
784
784
  context = null;
785
785
 
786
- const signatureAssertion = new SignatureAssertion(context, string, node, breakPoint, signature, reference);
786
+ const signatureAssertion = new SignatureAssertion(context, string, node, breakPoint, terms, reference);
787
787
 
788
788
  return signatureAssertion;
789
789
  }
@@ -1208,10 +1208,7 @@ export function signatureFromClaimNode(claimNode, context) {
1208
1208
  const signatureNode = claimNode.getSignatureNode();
1209
1209
 
1210
1210
  if (signatureNode !== null) {
1211
- const { Signature } = elements,
1212
- signatureString = context.nodeAsString(signatureNode);
1213
-
1214
- signature = Signature.fromSignatureString(signatureString, context);
1211
+ signature = signatureFromSignatureNode(signatureNode, context);
1215
1212
  }
1216
1213
 
1217
1214
  return signature;
@@ -1810,6 +1807,13 @@ export function parametersFromProcedureCallNode(procedureCallNode, context) {
1810
1807
  return parameters;
1811
1808
  }
1812
1809
 
1810
+ export function termsFromSignatureAssertionNode(signatureAssertionNode, context) {
1811
+ const termNodes = signatureAssertionNode.getTermNodes(),
1812
+ terms = termsFromTermNodes(termNodes, context);
1813
+
1814
+ return terms;
1815
+ }
1816
+
1813
1817
  export function typeFromPropertyDeclarationNode(propertyDeclarationNode, context) {
1814
1818
  const typeNode = propertyDeclarationNode.getTypeNode(),
1815
1819
  type = typeFromTypeNode(typeNode, context);
@@ -2018,15 +2022,6 @@ export function statementFromContainedAssertionNode(containedAssertionNode, cont
2018
2022
  return statement;
2019
2023
  }
2020
2024
 
2021
- export function signatureFromSignatureAssertionNode(signatureAssertionNode, context) {
2022
- const { Signature } = elements,
2023
- signatureNode = signatureAssertionNode.getSignatureNode(),
2024
- signatureString = context.nodeAsString(signatureNode),
2025
- signature = Signature.fromSignatureString(signatureString, context);
2026
-
2027
- return signature;
2028
- }
2029
-
2030
2025
  export function referenceFromSignatureAssertionNode(signatureAssertionNode, context) {
2031
2026
  const metavariableNode = signatureAssertionNode.getMetavariableNode(),
2032
2027
  reference = referenceFromMetavariableNode(metavariableNode, context);