occam-verify-cli 1.0.951 → 1.0.956
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.
- package/lib/context/aphasic.js +27 -0
- package/lib/context/ephemeral.js +28 -0
- package/lib/context/liminal.js +2 -2
- package/lib/context/synoptic.js +6 -2
- package/lib/element/assertion/signature.js +2 -2
- package/lib/element/assertion/subproof.js +2 -2
- package/lib/element/conclusion.js +2 -2
- package/lib/element/constructor.js +2 -2
- package/lib/element/deduction.js +2 -2
- package/lib/element/label.js +8 -6
- package/lib/element/metavariable.js +3 -3
- package/lib/element/parameter.js +2 -2
- package/lib/element/procedureCall.js +1 -1
- package/lib/element/proofAssertion/step.js +3 -3
- package/lib/element/property.js +1 -2
- package/lib/element/reference.js +7 -5
- package/lib/element/section.js +1 -1
- package/lib/element/signature.js +7 -5
- package/lib/element/statement.js +2 -2
- package/lib/element/substitution/frame.js +87 -13
- package/lib/element/substitution/reference.js +3 -3
- package/lib/element/substitution/statement.js +53 -58
- package/lib/element/substitution/term.js +75 -4
- package/lib/element/substitution.js +1 -5
- package/lib/element/variable.js +2 -2
- package/lib/process/unify.js +2 -51
- package/lib/utilities/context.js +50 -14
- package/package.json +4 -4
- package/src/context/aphasic.js +15 -0
- package/src/context/ephemeral.js +17 -0
- package/src/context/liminal.js +1 -1
- package/src/context/synoptic.js +9 -1
- package/src/element/assertion/signature.js +1 -1
- package/src/element/assertion/subproof.js +1 -2
- package/src/element/conclusion.js +2 -2
- package/src/element/constructor.js +1 -1
- package/src/element/deduction.js +2 -2
- package/src/element/label.js +9 -7
- package/src/element/metavariable.js +2 -2
- package/src/element/parameter.js +1 -1
- package/src/element/procedureCall.js +1 -1
- package/src/element/proofAssertion/step.js +3 -2
- package/src/element/property.js +0 -1
- package/src/element/reference.js +8 -6
- package/src/element/section.js +1 -1
- package/src/element/signature.js +8 -6
- package/src/element/statement.js +1 -1
- package/src/element/substitution/frame.js +159 -22
- package/src/element/substitution/reference.js +3 -3
- package/src/element/substitution/statement.js +84 -83
- package/src/element/substitution/term.js +137 -4
- package/src/element/substitution.js +0 -6
- package/src/element/variable.js +1 -1
- package/src/process/unify.js +0 -76
- package/src/utilities/context.js +68 -19
package/lib/utilities/context.js
CHANGED
|
@@ -51,9 +51,15 @@ _export(exports, {
|
|
|
51
51
|
get manifest () {
|
|
52
52
|
return manifest;
|
|
53
53
|
},
|
|
54
|
+
get posit () {
|
|
55
|
+
return posit;
|
|
56
|
+
},
|
|
54
57
|
get reconcile () {
|
|
55
58
|
return reconcile;
|
|
56
59
|
},
|
|
60
|
+
get sequester () {
|
|
61
|
+
return sequester;
|
|
62
|
+
},
|
|
57
63
|
get serialise () {
|
|
58
64
|
return serialise;
|
|
59
65
|
},
|
|
@@ -70,6 +76,7 @@ _export(exports, {
|
|
|
70
76
|
const _mnemic = /*#__PURE__*/ _interop_require_default(require("../context/mnemic"));
|
|
71
77
|
const _nested = /*#__PURE__*/ _interop_require_default(require("../context/nested"));
|
|
72
78
|
const _thetic = /*#__PURE__*/ _interop_require_default(require("../context/thetic"));
|
|
79
|
+
const _aphasic = /*#__PURE__*/ _interop_require_default(require("../context/aphasic"));
|
|
73
80
|
const _bounded = /*#__PURE__*/ _interop_require_default(require("../context/bounded"));
|
|
74
81
|
const _nominal = /*#__PURE__*/ _interop_require_default(require("../context/nominal"));
|
|
75
82
|
const _literal = /*#__PURE__*/ _interop_require_default(require("../context/literal"));
|
|
@@ -77,6 +84,7 @@ const _liminal = /*#__PURE__*/ _interop_require_default(require("../context/limi
|
|
|
77
84
|
const _phaneric = /*#__PURE__*/ _interop_require_default(require("../context/phaneric"));
|
|
78
85
|
const _synoptic = /*#__PURE__*/ _interop_require_default(require("../context/synoptic"));
|
|
79
86
|
const _illative = /*#__PURE__*/ _interop_require_default(require("../context/illative"));
|
|
87
|
+
const _ephemeral = /*#__PURE__*/ _interop_require_default(require("../context/ephemeral"));
|
|
80
88
|
const _branching = /*#__PURE__*/ _interop_require_default(require("../context/branching"));
|
|
81
89
|
const _nominal1 = /*#__PURE__*/ _interop_require_default(require("../context/file/nominal"));
|
|
82
90
|
const _json = require("../utilities/json");
|
|
@@ -94,6 +102,11 @@ function join(innerFunction, ...contexts) {
|
|
|
94
102
|
const synopticContext = _synoptic.default.fromContexts(contexts), context = synopticContext; ///
|
|
95
103
|
return innerFunction(context);
|
|
96
104
|
}
|
|
105
|
+
function posit(innerFunction, context) {
|
|
106
|
+
const ephemeralContext = _ephemeral.default.fromNothing(context);
|
|
107
|
+
context = ephemeralContext; ///
|
|
108
|
+
return innerFunction(context);
|
|
109
|
+
}
|
|
97
110
|
function ground(innerFunction) {
|
|
98
111
|
let context;
|
|
99
112
|
const nominalContext = _nominal.default.fromNothing();
|
|
@@ -102,14 +115,14 @@ function ground(innerFunction) {
|
|
|
102
115
|
context = literalContext; ///
|
|
103
116
|
return innerFunction(context);
|
|
104
117
|
}
|
|
105
|
-
function ablate(innerFunction, context) {
|
|
118
|
+
function ablate(innerFunction, forced, context) {
|
|
119
|
+
if (context === undefined) {
|
|
120
|
+
context = forced; ///
|
|
121
|
+
forced = false;
|
|
122
|
+
}
|
|
106
123
|
const released = context.isReleased();
|
|
107
|
-
if (!released) {
|
|
108
|
-
|
|
109
|
-
while(contextExtraneousContext){
|
|
110
|
-
context = context.getContext();
|
|
111
|
-
contextExtraneousContext = isContextExtraneousContext(context);
|
|
112
|
-
}
|
|
124
|
+
if (forced || !released) {
|
|
125
|
+
context = ablateContext(context);
|
|
113
126
|
}
|
|
114
127
|
return innerFunction(context);
|
|
115
128
|
}
|
|
@@ -159,6 +172,11 @@ function reconcile(innerFunction, context) {
|
|
|
159
172
|
context = liminalContext; ///
|
|
160
173
|
return innerFunction(context);
|
|
161
174
|
}
|
|
175
|
+
function sequester(innerFunction, context) {
|
|
176
|
+
const aphasicContext = _aphasic.default.fromNothing(context);
|
|
177
|
+
context = aphasicContext; ///
|
|
178
|
+
return innerFunction(context);
|
|
179
|
+
}
|
|
162
180
|
function serialise(innerFunction, context) {
|
|
163
181
|
const mnemicContext = context, mnemicContextJSON = (0, _json.mnemicContextToMnemicContextJSON)(mnemicContext), contextJSON = mnemicContextJSON; ///
|
|
164
182
|
context = contextJSON; ///
|
|
@@ -178,11 +196,7 @@ function ablates(innerFunction, ...contexts) {
|
|
|
178
196
|
contexts = contexts.map((context)=>{
|
|
179
197
|
const released = context.isReleased();
|
|
180
198
|
if (!released) {
|
|
181
|
-
|
|
182
|
-
while(contextExtraneousContext){
|
|
183
|
-
context = context.getContext();
|
|
184
|
-
contextExtraneousContext = isContextExtraneousContext(context);
|
|
185
|
-
}
|
|
199
|
+
context = ablateContext(context);
|
|
186
200
|
}
|
|
187
201
|
return context;
|
|
188
202
|
});
|
|
@@ -212,9 +226,31 @@ function evaluate(procedure, terms) {
|
|
|
212
226
|
const context = procedure.getContext();
|
|
213
227
|
return procedure.call(terms, context);
|
|
214
228
|
}
|
|
229
|
+
function ablateContext(context) {
|
|
230
|
+
const stated = context.isStated();
|
|
231
|
+
let contextExtraneousContext = isContextExtraneousContext(context);
|
|
232
|
+
while(contextExtraneousContext){
|
|
233
|
+
context = context.getContext();
|
|
234
|
+
contextExtraneousContext = isContextExtraneousContext(context);
|
|
235
|
+
}
|
|
236
|
+
const Context = stated ? _thetic.default : _illative.default;
|
|
237
|
+
context = augmentContext(context, Context);
|
|
238
|
+
return context;
|
|
239
|
+
}
|
|
240
|
+
function augmentContext(context, Context) {
|
|
241
|
+
const contextContext = context instanceof Context;
|
|
242
|
+
if (!contextContext) {
|
|
243
|
+
context = Context.fromNothing(context);
|
|
244
|
+
}
|
|
245
|
+
return context;
|
|
246
|
+
}
|
|
215
247
|
function isContextExtraneousContext(context) {
|
|
216
|
-
const
|
|
248
|
+
const contextSubstantiveContext = isContextSubstantiveContext(context), contextExtraneousContext = !contextSubstantiveContext;
|
|
217
249
|
return contextExtraneousContext;
|
|
218
250
|
}
|
|
251
|
+
function isContextSubstantiveContext(context) {
|
|
252
|
+
const contextTheticContext = context instanceof _thetic.default, contextIllativeContext = context instanceof _illative.default, contextBoundedContext = context instanceof _bounded.default, contextNominalFileContext = context instanceof _nominal1.default, contextSubstantiveContext = contextTheticContext || contextIllativeContext || contextBoundedContext || contextNominalFileContext;
|
|
253
|
+
return contextSubstantiveContext;
|
|
254
|
+
}
|
|
219
255
|
|
|
220
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/context.js"],"sourcesContent":["\"use strict\";\n\nimport MenmicContext from \"../context/mnemic\";\nimport NestedContext from \"../context/nested\";\nimport TheticContext from \"../context/thetic\";\nimport BoundedContext from \"../context/bounded\";\nimport NominalContext from \"../context/nominal\";\nimport LiteralContext from \"../context/literal\";\nimport LiminalContext from \"../context/liminal\";\nimport PhanericContext from \"../context/phaneric\";\nimport SynopticContext from \"../context/synoptic\";\nimport IllativeContext from \"../context/illative\";\nimport BranchingContext from \"../context/branching\";\nimport NominalFileContext from \"../context/file/nominal\";\n\nimport { mnemicContextFromJSON, mnemicContextsFromJSON, mnemicContextToMnemicContextJSON, mnemicContextsToMnemicContextsJSON } from \"../utilities/json\";\n\nexport function join(innerFunction, ...contexts) {\n  contexts = contexts.filter((context) => {\n    if (context !== null) {\n      return true;\n    }\n  });\n\n  const synopticContext = SynopticContext.fromContexts(contexts),\n        context = synopticContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function ground(innerFunction) {\n  let context;\n\n  const nominalContext = NominalContext.fromNothing();\n\n  context = nominalContext; ///\n\n  const literalContext = LiteralContext.fromNothing(context);\n\n  context = literalContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function ablate(innerFunction, context) {\n  const released = context.isReleased();\n\n  if (!released) {\n    let contextExtraneousContext = isContextExtraneousContext(context);\n\n    while (contextExtraneousContext) {\n      context = context.getContext();\n\n      contextExtraneousContext = isContextExtraneousContext(context);\n    }\n  }\n\n  return innerFunction(context);\n}\n\nexport function choose(innerFunction, context) {\n  const branchingContext = BranchingContext.fromNothing(context);\n\n  context = branchingContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function derive(innerFunction, context) {\n  const illativeContext = IllativeContext.fromNothing(context);\n\n  context = illativeContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function declare(innerFunction, context) {\n  const theticContext = TheticContext.fromNothing(context);\n\n  context = theticContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function descend(innerFunction, context) {\n  const nestedContext = NestedContext.fromNothing(context);\n\n  context = nestedContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function attempt(innerFunction, context) {\n  const released = context.isReleased();\n\n  if (!released) {\n    const mnemicContext = MenmicContext.fromNothing(context);\n\n    context = mnemicContext;  ///\n  }\n\n  return innerFunction(context);\n}\n\nexport function enclose(innerFunction, metaLevelAssumptions, context) {\n  if (context === undefined) {\n    context = metaLevelAssumptions;  ///\n\n    metaLevelAssumptions = null;\n  }\n\n  const boundedContext = BoundedContext.fromMetaLevelAssumptions(metaLevelAssumptions, context);\n\n  context = boundedContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function manifest(innerFunction, ...contexts) {\n  const phanericContext = PhanericContext.fromContexts(contexts),\n        context = phanericContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function reconcile(innerFunction, context) {\n  const liminalContext = LiminalContext.fromNothing(context);\n\n  context = liminalContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function serialise(innerFunction, context) {\n  const mnemicContext = context, ///\n        mnemicContextJSON = mnemicContextToMnemicContextJSON(mnemicContext),\n        contextJSON = mnemicContextJSON; ///\n\n  context = contextJSON;  ///\n\n  return innerFunction(context);\n}\n\nexport function instantiate(innerFunction, context) {\n  const literalContext = LiteralContext.fromNothing(context);\n\n  context = literalContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function unserialise(innerFunction, json, context) {\n  const mnemicContext = mnemicContextFromJSON(json, context);\n\n  context = mnemicContext; ///\n\n  return innerFunction(json, context);\n}\n\nexport function ablates(innerFunction, ...contexts) {\n  contexts = contexts.map((context) => {  ///\n    const released = context.isReleased();\n\n    if (!released) {\n      let contextExtraneousContext = isContextExtraneousContext(context);\n\n      while (contextExtraneousContext) {\n        context = context.getContext();\n\n        contextExtraneousContext = isContextExtraneousContext(context);\n      }\n    }\n\n    return context;\n  });\n\n  return innerFunction(...contexts);\n}\n\nexport function attempts(innerFunction, ...contexts) {\n  contexts = contexts.map((context) => {  ///\n    const released = context.isReleased();\n\n    if (!released) {\n      const mnemicContext = MenmicContext.fromNothing(context);\n\n      context = mnemicContext;  ///\n    }\n\n    return context;\n  });\n\n  return innerFunction(...contexts);\n}\n\nexport function serialises(innerFunction, ...contexts) {\n  const mnemicContexts = contexts, ///\n        mnemicContextsJSON = mnemicContextsToMnemicContextsJSON(mnemicContexts),\n        contextsJSON = mnemicContextsJSON; ///\n\n  contexts = contextsJSON;  ///\n\n  return innerFunction(...contexts);\n}\n\nexport function unserialises(innerFunction, json, context) {\n  const mnemicContexts = mnemicContextsFromJSON(json, context),\n        contexts = mnemicContexts; ///\n\n  return innerFunction(json, ...contexts);\n}\n\nexport function evaluate(procedure, terms) {\n  const context = procedure.getContext();\n\n  return procedure.call(terms, context);\n}\n\nfunction isContextExtraneousContext(context) {\n  const contextBoundedContext = (context instanceof BoundedContext),\n        contextNominalFileContext = (context instanceof NominalFileContext),\n        contextExtraneousContext = (!contextBoundedContext && !contextNominalFileContext);\n\n  return contextExtraneousContext;\n}"],"names":["ablate","ablates","attempt","attempts","choose","declare","derive","descend","enclose","evaluate","ground","instantiate","join","manifest","reconcile","serialise","serialises","unserialise","unserialises","innerFunction","contexts","filter","context","synopticContext","SynopticContext","fromContexts","nominalContext","NominalContext","fromNothing","literalContext","LiteralContext","released","isReleased","contextExtraneousContext","isContextExtraneousContext","getContext","branchingContext","BranchingContext","illativeContext","IllativeContext","theticContext","TheticContext","nestedContext","NestedContext","mnemicContext","MenmicContext","metaLevelAssumptions","undefined","boundedContext","BoundedContext","fromMetaLevelAssumptions","phanericContext","PhanericContext","liminalContext","LiminalContext","mnemicContextJSON","mnemicContextToMnemicContextJSON","contextJSON","json","mnemicContextFromJSON","map","mnemicContexts","mnemicContextsJSON","mnemicContextsToMnemicContextsJSON","contextsJSON","mnemicContextsFromJSON","procedure","terms","call","contextBoundedContext","contextNominalFileContext","NominalFileContext"],"mappings":"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"}
|
|
256
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/context.js"],"sourcesContent":["\"use strict\";\n\nimport MenmicContext from \"../context/mnemic\";\nimport NestedContext from \"../context/nested\";\nimport TheticContext from \"../context/thetic\";\nimport AphasicContext from \"../context/aphasic\";\nimport BoundedContext from \"../context/bounded\";\nimport NominalContext from \"../context/nominal\";\nimport LiteralContext from \"../context/literal\";\nimport LiminalContext from \"../context/liminal\";\nimport PhanericContext from \"../context/phaneric\";\nimport SynopticContext from \"../context/synoptic\";\nimport IllativeContext from \"../context/illative\";\nimport EphemeralContext from \"../context/ephemeral\";\nimport BranchingContext from \"../context/branching\";\nimport NominalFileContext from \"../context/file/nominal\";\n\nimport { mnemicContextFromJSON, mnemicContextsFromJSON, mnemicContextToMnemicContextJSON, mnemicContextsToMnemicContextsJSON } from \"../utilities/json\";\n\nexport function join(innerFunction, ...contexts) {\n  contexts = contexts.filter((context) => {\n    if (context !== null) {\n      return true;\n    }\n  });\n\n  const synopticContext = SynopticContext.fromContexts(contexts),\n        context = synopticContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function posit(innerFunction, context) {\n  const ephemeralContext = EphemeralContext.fromNothing(context);\n\n  context = ephemeralContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function ground(innerFunction) {\n  let context;\n\n  const nominalContext = NominalContext.fromNothing();\n\n  context = nominalContext; ///\n\n  const literalContext = LiteralContext.fromNothing(context);\n\n  context = literalContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function ablate(innerFunction, forced, context) {\n  if (context === undefined) {\n    context = forced; ///\n\n    forced = false;\n  }\n\n  const released = context.isReleased();\n\n  if (forced || !released) {\n    context = ablateContext(context);\n  }\n\n  return innerFunction(context);\n}\n\nexport function choose(innerFunction, context) {\n  const branchingContext = BranchingContext.fromNothing(context);\n\n  context = branchingContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function derive(innerFunction, context) {\n  const illativeContext = IllativeContext.fromNothing(context);\n\n  context = illativeContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function declare(innerFunction, context) {\n  const theticContext = TheticContext.fromNothing(context);\n\n  context = theticContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function descend(innerFunction, context) {\n  const nestedContext = NestedContext.fromNothing(context);\n\n  context = nestedContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function attempt(innerFunction, context) {\n  const released = context.isReleased();\n\n  if (!released) {\n    const mnemicContext = MenmicContext.fromNothing(context);\n\n    context = mnemicContext;  ///\n  }\n\n  return innerFunction(context);\n}\n\nexport function enclose(innerFunction, metaLevelAssumptions, context) {\n  if (context === undefined) {\n    context = metaLevelAssumptions;  ///\n\n    metaLevelAssumptions = null;\n  }\n\n  const boundedContext = BoundedContext.fromMetaLevelAssumptions(metaLevelAssumptions, context);\n\n  context = boundedContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function manifest(innerFunction, ...contexts) {\n  const phanericContext = PhanericContext.fromContexts(contexts),\n        context = phanericContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function reconcile(innerFunction, context) {\n  const liminalContext = LiminalContext.fromNothing(context);\n\n  context = liminalContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function sequester(innerFunction, context) {\n  const aphasicContext = AphasicContext.fromNothing(context);\n\n  context = aphasicContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function serialise(innerFunction, context) {\n  const mnemicContext = context, ///\n        mnemicContextJSON = mnemicContextToMnemicContextJSON(mnemicContext),\n        contextJSON = mnemicContextJSON; ///\n\n  context = contextJSON;  ///\n\n  return innerFunction(context);\n}\n\nexport function instantiate(innerFunction, context) {\n  const literalContext = LiteralContext.fromNothing(context);\n\n  context = literalContext;  ///\n\n  return innerFunction(context);\n}\n\nexport function unserialise(innerFunction, json, context) {\n  const mnemicContext = mnemicContextFromJSON(json, context);\n\n  context = mnemicContext; ///\n\n  return innerFunction(json, context);\n}\n\nexport function ablates(innerFunction, ...contexts) {\n  contexts = contexts.map((context) => {  ///\n    const released = context.isReleased();\n\n    if (!released) {\n      context = ablateContext(context);\n    }\n\n    return context;\n  });\n\n  return innerFunction(...contexts);\n}\n\nexport function attempts(innerFunction, ...contexts) {\n  contexts = contexts.map((context) => {  ///\n    const released = context.isReleased();\n\n    if (!released) {\n      const mnemicContext = MenmicContext.fromNothing(context);\n\n      context = mnemicContext;  ///\n    }\n\n    return context;\n  });\n\n  return innerFunction(...contexts);\n}\n\nexport function serialises(innerFunction, ...contexts) {\n  const mnemicContexts = contexts, ///\n        mnemicContextsJSON = mnemicContextsToMnemicContextsJSON(mnemicContexts),\n        contextsJSON = mnemicContextsJSON; ///\n\n  contexts = contextsJSON;  ///\n\n  return innerFunction(...contexts);\n}\n\nexport function unserialises(innerFunction, json, context) {\n  const mnemicContexts = mnemicContextsFromJSON(json, context),\n        contexts = mnemicContexts; ///\n\n  return innerFunction(json, ...contexts);\n}\n\nexport function evaluate(procedure, terms) {\n  const context = procedure.getContext();\n\n  return procedure.call(terms, context);\n}\n\nfunction ablateContext(context) {\n  const stated = context.isStated();\n\n  let contextExtraneousContext = isContextExtraneousContext(context);\n\n  while (contextExtraneousContext) {\n    context = context.getContext();\n\n    contextExtraneousContext = isContextExtraneousContext(context);\n  }\n\n  const Context = stated ? TheticContext : IllativeContext;\n\n  context = augmentContext(context, Context);\n\n  return context;\n}\n\nfunction augmentContext(context, Context) {\n  const contextContext = (context instanceof Context);\n\n  if (!contextContext) {\n    context = Context.fromNothing(context);\n  }\n\n  return context;\n}\n\nfunction isContextExtraneousContext(context) {\n  const contextSubstantiveContext = isContextSubstantiveContext(context),\n        contextExtraneousContext = !contextSubstantiveContext;\n\n  return contextExtraneousContext;\n}\n\nfunction isContextSubstantiveContext(context) {\n  const contextTheticContext = (context instanceof TheticContext),\n        contextIllativeContext = (context instanceof IllativeContext),\n        contextBoundedContext = (context instanceof BoundedContext),\n        contextNominalFileContext = (context instanceof NominalFileContext),\n        contextSubstantiveContext = (contextTheticContext || contextIllativeContext || contextBoundedContext || contextNominalFileContext);\n\n  return contextSubstantiveContext;\n}\n"],"names":["ablate","ablates","attempt","attempts","choose","declare","derive","descend","enclose","evaluate","ground","instantiate","join","manifest","posit","reconcile","sequester","serialise","serialises","unserialise","unserialises","innerFunction","contexts","filter","context","synopticContext","SynopticContext","fromContexts","ephemeralContext","EphemeralContext","fromNothing","nominalContext","NominalContext","literalContext","LiteralContext","forced","undefined","released","isReleased","ablateContext","branchingContext","BranchingContext","illativeContext","IllativeContext","theticContext","TheticContext","nestedContext","NestedContext","mnemicContext","MenmicContext","metaLevelAssumptions","boundedContext","BoundedContext","fromMetaLevelAssumptions","phanericContext","PhanericContext","liminalContext","LiminalContext","aphasicContext","AphasicContext","mnemicContextJSON","mnemicContextToMnemicContextJSON","contextJSON","json","mnemicContextFromJSON","map","mnemicContexts","mnemicContextsJSON","mnemicContextsToMnemicContextsJSON","contextsJSON","mnemicContextsFromJSON","procedure","terms","getContext","call","stated","isStated","contextExtraneousContext","isContextExtraneousContext","Context","augmentContext","contextContext","contextSubstantiveContext","isContextSubstantiveContext","contextTheticContext","contextIllativeContext","contextBoundedContext","contextNominalFileContext","NominalFileContext"],"mappings":"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"}
|
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.
|
|
4
|
+
"version": "1.0.956",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-verify-cli",
|
|
7
7
|
"description": "Occam's Verifier",
|
|
@@ -12,12 +12,12 @@
|
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"argumentative": "^2.0.47",
|
|
14
14
|
"necessary": "^17.1.7",
|
|
15
|
-
"occam-furtle": "^3.0.
|
|
15
|
+
"occam-furtle": "^3.0.207",
|
|
16
16
|
"occam-grammars": "^1.3.524",
|
|
17
|
-
"occam-languages": "^0.0.
|
|
17
|
+
"occam-languages": "^0.0.214",
|
|
18
18
|
"occam-lexers": "^23.1.44",
|
|
19
19
|
"occam-model": "^1.0.506",
|
|
20
|
-
"occam-nominal": "^1.0.
|
|
20
|
+
"occam-nominal": "^1.0.111",
|
|
21
21
|
"occam-parsers": "^23.1.50",
|
|
22
22
|
"occam-server": "^7.0.7"
|
|
23
23
|
},
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import Context from "../context";
|
|
4
|
+
|
|
5
|
+
export default class AphasicContext extends Context {
|
|
6
|
+
addAssignment(assignment) {
|
|
7
|
+
///
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
static fromNothing(context) {
|
|
11
|
+
const aphasicContext = new AphasicContext(context);
|
|
12
|
+
|
|
13
|
+
return aphasicContext;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import Context from "../context";
|
|
4
|
+
|
|
5
|
+
export default class EphemeralContext extends Context {
|
|
6
|
+
isStated() {
|
|
7
|
+
const stated = true;
|
|
8
|
+
|
|
9
|
+
return stated;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
static fromNothing(context) {
|
|
13
|
+
const ephemeralContext = new EphemeralContext(context);
|
|
14
|
+
|
|
15
|
+
return ephemeralContext;
|
|
16
|
+
}
|
|
17
|
+
}
|
package/src/context/liminal.js
CHANGED
|
@@ -163,7 +163,7 @@ export default class LiminalContext extends Context {
|
|
|
163
163
|
context = this.getContext();
|
|
164
164
|
}
|
|
165
165
|
|
|
166
|
-
context.debug(`Committing the
|
|
166
|
+
context.debug(`Committing the liminal context`);
|
|
167
167
|
|
|
168
168
|
context.addDerivedSubstitutions(this.derivedSubstitutions);
|
|
169
169
|
}
|
package/src/context/synoptic.js
CHANGED
|
@@ -18,7 +18,7 @@ import { compressTerms,
|
|
|
18
18
|
compressSubstitutions,
|
|
19
19
|
compressPropertyRelations,} from "../utilities/synoptic";
|
|
20
20
|
|
|
21
|
-
const { last } = arrayUtilities;
|
|
21
|
+
const { first, last } = arrayUtilities;
|
|
22
22
|
|
|
23
23
|
export default class SynopticContext extends Context {
|
|
24
24
|
constructor(context, contexts) {
|
|
@@ -31,6 +31,14 @@ export default class SynopticContext extends Context {
|
|
|
31
31
|
return this.contexts;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
+
isStated() {
|
|
35
|
+
const firstContext = first(this.contexts),
|
|
36
|
+
context = firstContext, ///
|
|
37
|
+
stated = context.isStated();
|
|
38
|
+
|
|
39
|
+
return stated;
|
|
40
|
+
}
|
|
41
|
+
|
|
34
42
|
getTerms(terms = []) {
|
|
35
43
|
this.contexts.forEach((context) => {
|
|
36
44
|
context.getTerms(terms);
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
import Assertion from "../assertion";
|
|
4
4
|
|
|
5
5
|
import { define } from "../../elements";
|
|
6
|
-
import { join, reconcile, instantiate } from "../../utilities/context";
|
|
7
6
|
import { breakPointFromJSON } from "../../utilities/breakPoint";
|
|
7
|
+
import { join, reconcile, instantiate } from "../../utilities/context";
|
|
8
8
|
import { instantiateSignatureAssertion } from "../../process/instantiate";
|
|
9
9
|
import { signatureFromSignatureAssertionNode, referenceFromSignatureAssertionNode, signatureAssertionFromStatementNode } from "../../utilities/element";
|
|
10
10
|
|
|
@@ -5,11 +5,10 @@ import { arrayUtilities } from "necessary";
|
|
|
5
5
|
import Assertion from "../assertion";
|
|
6
6
|
|
|
7
7
|
import { define } from "../../elements";
|
|
8
|
-
import { reconcile } from "../../utilities/context";
|
|
9
|
-
import { join, descend, instantiate } from "../../utilities/context";
|
|
10
8
|
import { breakPointFromJSON } from "../../utilities/breakPoint";
|
|
11
9
|
import { instantiateSubproofAssertion } from "../../process/instantiate";
|
|
12
10
|
import { subproofAssertionFromStatementNode } from "../../utilities/element";
|
|
11
|
+
import { join, descend, reconcile, instantiate } from "../../utilities/context";
|
|
13
12
|
|
|
14
13
|
const { last, front, backwardsEvery } = arrayUtilities;
|
|
15
14
|
|
|
@@ -5,7 +5,7 @@ import { Element } from "occam-languages";
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
6
|
import { instantiateConclusion } from "../process/instantiate";
|
|
7
7
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
8
|
-
import { declare, attempt,
|
|
8
|
+
import { declare, attempt, sequester, serialise, unserialise, instantiate } from "../utilities/context";
|
|
9
9
|
|
|
10
10
|
export default define(class Conclusion extends Element {
|
|
11
11
|
constructor(context, string, node, breakPoint, statement) {
|
|
@@ -86,7 +86,7 @@ export default define(class Conclusion extends Element {
|
|
|
86
86
|
|
|
87
87
|
context.trace(`Validating the '${conclusionString}' conclusion's statement...`);
|
|
88
88
|
|
|
89
|
-
|
|
89
|
+
sequester((context) => {
|
|
90
90
|
const statement = this.statement.validate(context);
|
|
91
91
|
|
|
92
92
|
if (statement !== null) {
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
import { Element } from "occam-languages";
|
|
4
4
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
|
-
import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
|
|
7
6
|
import { instantiateConstructor } from "../process/instantiate";
|
|
8
7
|
import { termFromConstructorNode } from "../utilities/element";
|
|
9
8
|
import { unifyTermWithConstructor } from "../process/unify";
|
|
10
9
|
import { validateTermAsConstructor } from "../process/validate";
|
|
10
|
+
import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
|
|
11
11
|
import { attempt, serialise, unserialise, instantiate } from "../utilities/context";
|
|
12
12
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
13
13
|
|
package/src/element/deduction.js
CHANGED
|
@@ -5,7 +5,7 @@ import { Element } from "occam-languages";
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
6
|
import { instantiateDeduction } from "../process/instantiate";
|
|
7
7
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
8
|
-
import { declare, attempt,
|
|
8
|
+
import { declare, attempt, sequester, serialise, unserialise, instantiate } from "../utilities/context";
|
|
9
9
|
|
|
10
10
|
export default define(class Deduction extends Element {
|
|
11
11
|
constructor(context, string, node, breakPoint, statement) {
|
|
@@ -86,7 +86,7 @@ export default define(class Deduction extends Element {
|
|
|
86
86
|
|
|
87
87
|
context.trace(`Validating the '${deductionnString}' deductionn's statement...`);
|
|
88
88
|
|
|
89
|
-
|
|
89
|
+
sequester((context) => {
|
|
90
90
|
const statement = this.statement.validate(context);
|
|
91
91
|
|
|
92
92
|
if (statement !== null) {
|
package/src/element/label.js
CHANGED
|
@@ -4,9 +4,9 @@ import { Element } from "occam-languages";
|
|
|
4
4
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
6
|
import { instantiateLabel } from "../process/instantiate";
|
|
7
|
-
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
8
7
|
import { labelFromLabelNode, metavariableFromLabelNode } from "../utilities/element";
|
|
9
|
-
import {
|
|
8
|
+
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
9
|
+
import { posit, ablate, attempt, serialise, unserialise, instantiate } from "../utilities/context";
|
|
10
10
|
|
|
11
11
|
export default define(class Label extends Element {
|
|
12
12
|
constructor(context, string, node, breakPoint, metavariable) {
|
|
@@ -172,12 +172,14 @@ export default define(class Label extends Element {
|
|
|
172
172
|
static fromLabelString(labelString, context) {
|
|
173
173
|
let label;
|
|
174
174
|
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
175
|
+
posit((context) => {
|
|
176
|
+
ablate((context) => {
|
|
177
|
+
instantiate((context) => {
|
|
178
|
+
const string = labelString, ///
|
|
179
|
+
labelNode = instantiateLabel(string, context);
|
|
179
180
|
|
|
180
|
-
|
|
181
|
+
label = labelFromLabelNode(labelNode, context);
|
|
182
|
+
}, context);
|
|
181
183
|
}, context);
|
|
182
184
|
}, context);
|
|
183
185
|
|
|
@@ -5,12 +5,12 @@ import { Element } from "occam-languages";
|
|
|
5
5
|
import elements from "../elements";
|
|
6
6
|
|
|
7
7
|
import { define } from "../elements";
|
|
8
|
-
import { EMPTY_STRING } from "../constants";
|
|
9
8
|
import { instantiate } from "../utilities/context";
|
|
9
|
+
import { EMPTY_STRING } from "../constants";
|
|
10
10
|
import { instantiateMetavariable } from "../process/instantiate";
|
|
11
11
|
import { metaTypeFromJSON, metaTypeToMetaTypeJSON } from "../utilities/json";
|
|
12
|
-
import { unifyMetavariable, unifyMetavariableIntrinsically } from "../process/unify";
|
|
13
12
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
13
|
+
import { unifyMetavariable, unifyMetavariableIntrinsically } from "../process/unify";
|
|
14
14
|
import { nameFromMetavariableNode, termFromMetavariableNode, typeFromMetavariableNode, metavariableFromStatementNode } from "../utilities/element";
|
|
15
15
|
|
|
16
16
|
export default define(class Metavariable extends Element {
|
package/src/element/parameter.js
CHANGED
|
@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
6
|
import { instantiate } from "../utilities/context";
|
|
7
7
|
import { instantiateParameter } from "../process/instantiate";
|
|
8
|
-
import { nameFromParaneterNode, identifierFromParameterNode } from "../utilities/element";
|
|
9
8
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
9
|
+
import { nameFromParaneterNode, identifierFromParameterNode } from "../utilities/element";
|
|
10
10
|
|
|
11
11
|
export default define(class Parameter extends Element {
|
|
12
12
|
constructor(context, string, node, breakPoint, name, identifier) {
|
|
@@ -4,7 +4,7 @@ import { Element } from "occam-languages";
|
|
|
4
4
|
import { termsUtilities } from "occam-furtle";
|
|
5
5
|
|
|
6
6
|
import { define } from "../elements";
|
|
7
|
-
import {
|
|
7
|
+
import { evaluate, instantiate } from "../utilities/context";
|
|
8
8
|
import { instantiateProcedureCall } from "../process/instantiate";
|
|
9
9
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
10
10
|
import { parametersFromProcedureCallNode, procedureReferenceFromProcedureCallNode } from "../utilities/element";
|
|
@@ -127,9 +127,10 @@ export default define(class Step extends ProofAssertion {
|
|
|
127
127
|
|
|
128
128
|
context.trace(`Validating the '${stepString}' step...`);
|
|
129
129
|
|
|
130
|
-
const qualified = this.isQualified()
|
|
130
|
+
const qualified = this.isQualified(),
|
|
131
|
+
stated = qualified; ///
|
|
131
132
|
|
|
132
|
-
(
|
|
133
|
+
(stated ? declare : derive)((context) => {
|
|
133
134
|
attempt((context) => {
|
|
134
135
|
const statementValidates = this.validateStatement(context);
|
|
135
136
|
|
package/src/element/property.js
CHANGED
|
@@ -8,7 +8,6 @@ import { instantiateProperty } from "../process/instantiate";
|
|
|
8
8
|
import { nameFromPropertyNode } from "../utilities/element";
|
|
9
9
|
import { typeFromJSON, typeToTypeJSON } from "../utilities/json";
|
|
10
10
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
11
|
-
import {validateTerms} from "../utilities/validation";
|
|
12
11
|
|
|
13
12
|
export default define(class Property extends Element {
|
|
14
13
|
constructor(context, string, node, breakPoint, name, type) {
|
package/src/element/reference.js
CHANGED
|
@@ -6,7 +6,7 @@ import { define } from "../elements";
|
|
|
6
6
|
import { instantiateReference } from "../process/instantiate";
|
|
7
7
|
import { REFERENCE_META_TYPE_NAME } from "../metaTypeNames";
|
|
8
8
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
9
|
-
import { join, ablate, attempt, serialise, reconcile, unserialise, instantiate } from "../utilities/context";
|
|
9
|
+
import { join, posit, ablate, attempt, serialise, reconcile, unserialise, instantiate } from "../utilities/context";
|
|
10
10
|
import { referenceFromReferenceNode, metavariableFromReferenceNode, topLevelMetaAssertionFromReferenceNode } from "../utilities/element";
|
|
11
11
|
|
|
12
12
|
export default define(class Reference extends Element {
|
|
@@ -340,12 +340,14 @@ export default define(class Reference extends Element {
|
|
|
340
340
|
static fromReferenceString(referenceString, context) {
|
|
341
341
|
let reference;
|
|
342
342
|
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
343
|
+
posit((context) => {
|
|
344
|
+
ablate((context) => {
|
|
345
|
+
instantiate((context) => {
|
|
346
|
+
const string = referenceString, ///
|
|
347
|
+
referenceNode = instantiateReference(string, context);
|
|
347
348
|
|
|
348
|
-
|
|
349
|
+
reference = referenceFromReferenceNode(referenceNode, context);
|
|
350
|
+
}, context);
|
|
349
351
|
}, context);
|
|
350
352
|
}, context);
|
|
351
353
|
|
package/src/element/section.js
CHANGED
package/src/element/signature.js
CHANGED
|
@@ -6,7 +6,7 @@ import { arrayUtilities } from "necessary";
|
|
|
6
6
|
import { define } from "../elements";
|
|
7
7
|
import { signatureFromSignatureNode } from "../utilities/element";
|
|
8
8
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
9
|
-
import { join, ablate, attempt, reconcile, serialise, unserialise, instantiate } from "../utilities/context";
|
|
9
|
+
import { join, posit, ablate, attempt, reconcile, serialise, unserialise, instantiate } from "../utilities/context";
|
|
10
10
|
|
|
11
11
|
const { match } = arrayUtilities;
|
|
12
12
|
|
|
@@ -276,12 +276,14 @@ export default define(class Signature extends Element {
|
|
|
276
276
|
static fromSignatureString(signatureString, context) {
|
|
277
277
|
let signature;
|
|
278
278
|
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
279
|
+
posit((context) => {
|
|
280
|
+
ablate((context) => {
|
|
281
|
+
instantiate((context) => {
|
|
282
|
+
const string = signatureString, ///
|
|
283
|
+
signatureNode = instantiateSignature(string, context);
|
|
283
284
|
|
|
284
|
-
|
|
285
|
+
signature = signatureFromSignatureNode(signatureNode, context);
|
|
286
|
+
}, context);
|
|
285
287
|
}, context);
|
|
286
288
|
}, context);
|
|
287
289
|
|
package/src/element/statement.js
CHANGED
|
@@ -5,8 +5,8 @@ import { Element } from "occam-languages";
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
6
|
import { unifyStatement } from "../process/unify";
|
|
7
7
|
import { validateStatements } from "../utilities/validation";
|
|
8
|
-
import { reconcile, instantiate } from "../utilities/context";
|
|
9
8
|
import { instantiateStatement } from "../process/instantiate";
|
|
9
|
+
import { reconcile, instantiate } from "../utilities/context";
|
|
10
10
|
import { breakPointFromJSON, breakPointToBreakPointJSON } from "../utilities/breakPoint";
|
|
11
11
|
|
|
12
12
|
export default define(class Statement extends Element {
|