occam-verify-cli 1.0.181 → 1.0.185

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 (105) hide show
  1. package/lib/node/assertion/contained.js +4 -4
  2. package/lib/node/assertion/defined.js +4 -4
  3. package/lib/node/assertion/property.js +4 -4
  4. package/lib/node/assertion/satisfies.js +4 -4
  5. package/lib/node/assertion/subproof.js +4 -4
  6. package/lib/node/assertion/type.js +4 -4
  7. package/lib/node/axiom.js +4 -4
  8. package/lib/node/combinator.js +4 -4
  9. package/lib/node/conclusion.js +4 -4
  10. package/lib/node/conjecture.js +4 -4
  11. package/lib/node/constructor.js +4 -4
  12. package/lib/node/declaration/combinator.js +4 -4
  13. package/lib/node/declaration/complexType.js +4 -4
  14. package/lib/node/declaration/constructor.js +4 -4
  15. package/lib/node/declaration/metavariable.js +4 -4
  16. package/lib/node/declaration/property.js +4 -4
  17. package/lib/node/declaration/type.js +4 -4
  18. package/lib/node/declaration/variable.js +4 -4
  19. package/lib/node/declaration.js +4 -4
  20. package/lib/node/deduction.js +4 -4
  21. package/lib/node/derivation.js +4 -4
  22. package/lib/node/equality.js +4 -4
  23. package/lib/node/error.js +4 -4
  24. package/lib/node/frame.js +4 -4
  25. package/lib/node/judgement.js +4 -4
  26. package/lib/node/label.js +4 -4
  27. package/lib/node/lemma.js +4 -4
  28. package/lib/node/metaLemma.js +4 -4
  29. package/lib/node/metaType.js +4 -4
  30. package/lib/node/metatheorem.js +4 -4
  31. package/lib/node/metavariable.js +4 -4
  32. package/lib/node/parameter.js +4 -4
  33. package/lib/node/premise.js +4 -4
  34. package/lib/node/procedureCall.js +4 -4
  35. package/lib/node/proof.js +4 -4
  36. package/lib/node/property.js +4 -4
  37. package/lib/node/propertyRelation.js +4 -4
  38. package/lib/node/reference.js +4 -4
  39. package/lib/node/rule.js +4 -4
  40. package/lib/node/statement.js +4 -4
  41. package/lib/node/step.js +4 -4
  42. package/lib/node/subDerivation.js +4 -4
  43. package/lib/node/subproof.js +4 -4
  44. package/lib/node/supposition.js +4 -4
  45. package/lib/node/term.js +4 -4
  46. package/lib/node/theorem.js +4 -4
  47. package/lib/node/topLevelAssertion.js +4 -4
  48. package/lib/node/topLevelMetaAssertion.js +4 -4
  49. package/lib/node/type.js +4 -4
  50. package/lib/node/variable.js +4 -4
  51. package/lib/node.js +6 -5
  52. package/lib/utilities/nominal.js +10 -3
  53. package/package.json +8 -8
  54. package/src/node/assertion/contained.js +1 -1
  55. package/src/node/assertion/defined.js +1 -1
  56. package/src/node/assertion/property.js +1 -1
  57. package/src/node/assertion/satisfies.js +1 -1
  58. package/src/node/assertion/subproof.js +1 -1
  59. package/src/node/assertion/type.js +1 -1
  60. package/src/node/axiom.js +1 -1
  61. package/src/node/combinator.js +1 -1
  62. package/src/node/conclusion.js +1 -1
  63. package/src/node/conjecture.js +1 -1
  64. package/src/node/constructor.js +1 -1
  65. package/src/node/declaration/combinator.js +1 -1
  66. package/src/node/declaration/complexType.js +1 -1
  67. package/src/node/declaration/constructor.js +1 -1
  68. package/src/node/declaration/metavariable.js +1 -1
  69. package/src/node/declaration/property.js +1 -1
  70. package/src/node/declaration/type.js +1 -1
  71. package/src/node/declaration/variable.js +1 -1
  72. package/src/node/declaration.js +1 -1
  73. package/src/node/deduction.js +1 -1
  74. package/src/node/derivation.js +1 -1
  75. package/src/node/equality.js +1 -1
  76. package/src/node/error.js +1 -1
  77. package/src/node/frame.js +1 -1
  78. package/src/node/judgement.js +1 -1
  79. package/src/node/label.js +1 -1
  80. package/src/node/lemma.js +1 -1
  81. package/src/node/metaLemma.js +1 -1
  82. package/src/node/metaType.js +1 -1
  83. package/src/node/metatheorem.js +1 -1
  84. package/src/node/metavariable.js +1 -1
  85. package/src/node/parameter.js +1 -1
  86. package/src/node/premise.js +1 -1
  87. package/src/node/procedureCall.js +1 -1
  88. package/src/node/proof.js +1 -1
  89. package/src/node/property.js +1 -1
  90. package/src/node/propertyRelation.js +1 -1
  91. package/src/node/reference.js +1 -1
  92. package/src/node/rule.js +1 -1
  93. package/src/node/statement.js +1 -1
  94. package/src/node/step.js +1 -1
  95. package/src/node/subDerivation.js +1 -1
  96. package/src/node/subproof.js +1 -1
  97. package/src/node/supposition.js +1 -1
  98. package/src/node/term.js +1 -1
  99. package/src/node/theorem.js +1 -1
  100. package/src/node/topLevelAssertion.js +1 -1
  101. package/src/node/topLevelMetaAssertion.js +1 -1
  102. package/src/node/type.js +1 -1
  103. package/src/node/variable.js +1 -1
  104. package/src/node.js +5 -3
  105. package/src/utilities/nominal.js +5 -2
package/src/node/term.js CHANGED
@@ -3,5 +3,5 @@
3
3
  import Node from "../node";
4
4
 
5
5
  export default class TermNode extends Node {
6
- static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return Node.fromRuleNameChildNodesAndOpacity(TermNode, ruleName, childNodes, opacity); }
6
+ static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return Node.fromRuleNameChildNodesOpacityAndPrecedence(TermNode, ruleName, childNodes, opacity, precedence); }
7
7
  }
package/src/node/theorem.js CHANGED
@@ -3,5 +3,5 @@
3
3
  import Node from "../node";
4
4
 
5
5
  export default class TheoremNode extends Node {
6
- static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return Node.fromRuleNameChildNodesAndOpacity(TheoremNode, ruleName, childNodes, opacity); }
6
+ static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return Node.fromRuleNameChildNodesOpacityAndPrecedence(TheoremNode, ruleName, childNodes, opacity, precedence); }
7
7
  }
package/src/node/topLevelAssertion.js CHANGED
@@ -3,5 +3,5 @@
3
3
  import Node from "../node";
4
4
 
5
5
  export default class TopLevelAssertionNode extends Node {
6
- static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return Node.fromRuleNameChildNodesAndOpacity(TopLevelAssertionNode, ruleName, childNodes, opacity); }
6
+ static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return Node.fromRuleNameChildNodesOpacityAndPrecedence(TopLevelAssertionNode, ruleName, childNodes, opacity, precedence); }
7
7
  }
package/src/node/topLevelMetaAssertion.js CHANGED
@@ -3,5 +3,5 @@
3
3
  import Node from "../node";
4
4
 
5
5
  export default class TopLevelMetaAssertionNode extends Node {
6
- static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return Node.fromRuleNameChildNodesAndOpacity(TopLevelMetaAssertionNode, ruleName, childNodes, opacity); }
6
+ static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return Node.fromRuleNameChildNodesOpacityAndPrecedence(TopLevelMetaAssertionNode, ruleName, childNodes, opacity, precedence); }
7
7
  }
package/src/node/type.js CHANGED
@@ -15,5 +15,5 @@ export default class TypeNode extends Node {
15
15
  return typeName;
16
16
  }
17
17
 
18
- static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return Node.fromRuleNameChildNodesAndOpacity(TypeNode, ruleName, childNodes, opacity); }
18
+ static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return Node.fromRuleNameChildNodesOpacityAndPrecedence(TypeNode, ruleName, childNodes, opacity, precedence); }
19
19
  }
package/src/node/variable.js CHANGED
@@ -15,5 +15,5 @@ export default class VariableNode extends Node {
15
15
  return variableName;
16
16
  }
17
17
 
18
- static fromRuleNameChildNodesAndOpacity(ruleName, childNodes, opacity) { return Node.fromRuleNameChildNodesAndOpacity(VariableNode, ruleName, childNodes, opacity); }
18
+ static fromRuleNameChildNodesOpacityAndPrecedence(ruleName, childNodes, opacity, precedence) { return Node.fromRuleNameChildNodesOpacityAndPrecedence(VariableNode, ruleName, childNodes, opacity, precedence); }
19
19
  }
package/src/node.js CHANGED
@@ -5,8 +5,10 @@ import { NonTerminalNode } from "occam-parsers";
5
5
  import nodeMixins from "./mixins/node";
6
6
 
7
7
  class Node extends NonTerminalNode {
8
- static fromRuleNameChildNodesAndOpacity(Class, ruleName, childNodes, opacity) {
9
- if (opacity === undefined) {
8
+ static fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence) {
9
+ if (precedence === undefined) {
10
+ precedence = opacity; ///
11
+
10
12
  opacity = childNodes; ///
11
13
 
12
14
  childNodes = ruleName; ///
@@ -16,7 +18,7 @@ class Node extends NonTerminalNode {
16
18
  Class = Node; ///
17
19
  }
18
20
 
19
- const node = NonTerminalNode.fromRuleNameChildNodesAndOpacity(Class, ruleName, childNodes, opacity);
21
+ const node = NonTerminalNode.fromRuleNameChildNodesOpacityAndPrecedence(Class, ruleName, childNodes, opacity, precedence);
20
22
 
21
23
  return node;
22
24
  }
package/src/utilities/nominal.js CHANGED
@@ -2,6 +2,9 @@
2
2
 
3
3
  import { lexersUtilities, parsersUtilities } from "occam-custom-grammars";
4
4
 
5
+ import NominalLexer from "../nominal/lexer";
6
+ import NominalParser from "../nominal/parser";
7
+
5
8
  import { combinedCustomGrammarFromNothing } from "./customGrammar";
6
9
 
7
10
  const { nominalLexerFromCombinedCustomGrammar } = lexersUtilities,
@@ -9,6 +12,6 @@ const { nominalLexerFromCombinedCustomGrammar } = lexersUtilities,
9
12
 
10
13
  const combinedCustomGrammar = combinedCustomGrammarFromNothing();
11
14
 
12
- export const nominalLexer = nominalLexerFromCombinedCustomGrammar(combinedCustomGrammar);
15
+ export const nominalLexer = nominalLexerFromCombinedCustomGrammar(NominalLexer, combinedCustomGrammar);
13
16
 
14
- export const nominalParser = nominalParserFromCombinedCustomGrammar(combinedCustomGrammar);
17
+ export const nominalParser = nominalParserFromCombinedCustomGrammar(NominalParser, combinedCustomGrammar);