occam-verify-cli 0.0.929 → 0.0.931
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/verifier/nodes/statementAgainstCombinator.js +3 -3
- package/lib/verifier/nodes/termAgainstConstructor.js +2 -2
- package/lib/verify/assertion/contained.js +36 -44
- package/lib/verify/assertion/defined.js +37 -45
- package/lib/verify/statement.js +62 -6
- package/lib/verify/statementAgainstMetaType.js +7 -3
- package/package.json +2 -2
- package/src/verifier/nodes/statementAgainstCombinator.js +4 -3
- package/src/verifier/nodes/termAgainstConstructor.js +1 -1
- package/src/verify/assertion/contained.js +39 -49
- package/src/verify/assertion/defined.js +38 -48
- package/src/verify/statement.js +56 -7
- package/src/verify/statementAgainstMetaType.js +10 -2
- package/lib/verify/metastatement.js +0 -92
- package/src/verify/metastatement.js +0 -114
package/src/verify/statement.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import verifyEquality from "../verify/equality";
|
|
4
4
|
import verifyJudgement from "../verify/judgement";
|
|
5
|
+
import bracketedCombinator from "../ocmbinator/bracketed";
|
|
5
6
|
import verifyTypeAssertion from "../verify/assertion/type";
|
|
6
7
|
import verifyDefinedAssertion from "../verify/assertion/defined";
|
|
7
8
|
import verifySubproofAssertion from "../verify/assertion/subproof";
|
|
@@ -11,9 +12,12 @@ import statementAgainstCombinatorNodesVerifier from "../verifier/nodes/statement
|
|
|
11
12
|
import { nodeQuery } from "../utilities/query";
|
|
12
13
|
import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
|
|
13
14
|
|
|
14
|
-
const
|
|
15
|
+
const variableNodeQuery = nodeQuery("/substitution/variable!"),
|
|
16
|
+
equalityNodeQuery = nodeQuery("/statement/equality!"),
|
|
15
17
|
judgementNodeQuery = nodeQuery("/statement/judgement!"),
|
|
18
|
+
termVariableNodeQuery = nodeQuery("/substitution/term/variable!"),
|
|
16
19
|
metavariableNodeQuery = nodeQuery("/statement/metavariable!"),
|
|
20
|
+
substitutionNodeQuery = nodeQuery("/statement/substitution!"),
|
|
17
21
|
typeAssertionNodeQuery = nodeQuery("/statement/typeAssertion!"),
|
|
18
22
|
definedAssertionNodeQuery = nodeQuery("/statement/definedAssertion!"),
|
|
19
23
|
subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion!"),
|
|
@@ -162,12 +166,13 @@ function verifyStatementAsMetavariable(statementNode, assignments, derived, loca
|
|
|
162
166
|
|
|
163
167
|
localContext.trace(`Verifying the '${statementString}' statement as a metavariable...`, statementNode);
|
|
164
168
|
|
|
165
|
-
const
|
|
169
|
+
const metavariableVerified = verifyMetavariable(metavariableNode, localContext);
|
|
166
170
|
|
|
167
|
-
if (
|
|
168
|
-
const
|
|
171
|
+
if (metavariableVerified) {
|
|
172
|
+
const substitutionNode = substitutionNodeQuery(statementNode),
|
|
173
|
+
substitutionVerified = verifySubstitution(substitutionNode, localContext);
|
|
169
174
|
|
|
170
|
-
if (
|
|
175
|
+
if (substitutionVerified) {
|
|
171
176
|
statementVerifiedAsMetavariable = true;
|
|
172
177
|
}
|
|
173
178
|
}
|
|
@@ -277,7 +282,12 @@ function verifyStatementAgainstCombinators(statementNode, assignments, derived,
|
|
|
277
282
|
(subproofAssertionNode === null) &&
|
|
278
283
|
(containedAssertionNode === null) ) {
|
|
279
284
|
|
|
280
|
-
|
|
285
|
+
let combinators = localContext.getCombinators();
|
|
286
|
+
|
|
287
|
+
combinators = [ ///
|
|
288
|
+
bracketedCombinator,
|
|
289
|
+
...combinators
|
|
290
|
+
];
|
|
281
291
|
|
|
282
292
|
statementVerifiedAgainstCombinators = combinators.some((combinator) => {
|
|
283
293
|
const statementVerifiedAgainstCombinator = verifyStatementAgainstCombinator(statementNode, combinator, localContext);
|
|
@@ -315,4 +325,43 @@ function verifyStatementAgainstCombinator(statementNode, combinator, localContex
|
|
|
315
325
|
}
|
|
316
326
|
|
|
317
327
|
return statementVerifiedAgainstCombinator;
|
|
318
|
-
}
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
function verifyMetavariable(metavariableNode, localContext) {
|
|
331
|
+
let metavariableVerified = false;
|
|
332
|
+
|
|
333
|
+
const metavariable = localContext.findMetavariableByMetavariableNode(metavariableNode);
|
|
334
|
+
|
|
335
|
+
if (metavariable !== null) {
|
|
336
|
+
const metaTypeName = metavariable.getMetaTypeName();
|
|
337
|
+
|
|
338
|
+
if (metaTypeName === STATEMENT_META_TYPE_NAME) {
|
|
339
|
+
metavariableVerified = true;
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
return metavariableVerified;
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
function verifySubstitution(substitutionNode, localContext) {
|
|
347
|
+
let substitutionVerified = false;
|
|
348
|
+
|
|
349
|
+
if (substitutionNode === null) {
|
|
350
|
+
substitutionVerified = true;
|
|
351
|
+
} else {
|
|
352
|
+
const variableNode = variableNodeQuery(substitutionNode),
|
|
353
|
+
variablePresent = localContext.isVariablePresentByVariableNode(variableNode);
|
|
354
|
+
|
|
355
|
+
if (variablePresent) {
|
|
356
|
+
const termVariableNode = termVariableNodeQuery(substitutionNode);
|
|
357
|
+
|
|
358
|
+
if (termVariableNode !== null) {
|
|
359
|
+
const termVariablePresent = localContext.isVariablePresentByVariableNode(termVariableNode);
|
|
360
|
+
|
|
361
|
+
substitutionVerified = termVariablePresent; ///
|
|
362
|
+
}
|
|
363
|
+
}
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
return substitutionVerified;
|
|
367
|
+
}
|
|
@@ -5,14 +5,22 @@ import { STATEMENT_META_TYPE_NAME } from "../metaTypeNames";
|
|
|
5
5
|
|
|
6
6
|
const metaTypeTerminalNodeQuery = nodeQuery("/metaType/@meta-type!");
|
|
7
7
|
|
|
8
|
-
export default function verifyStatementAgainstMetaType(statementNode, metaTypeNode, localContext, verifyAhead) {
|
|
8
|
+
export default function verifyStatementAgainstMetaType(statementNode, metaTypeNode, localContext, verifyAhead, verifyStatement) {
|
|
9
9
|
let statementVerifiedAgainstMetaType = false;
|
|
10
10
|
|
|
11
11
|
const metaTypeTerminalNode = metaTypeTerminalNodeQuery(metaTypeNode),
|
|
12
12
|
content = metaTypeTerminalNode.getContent();
|
|
13
13
|
|
|
14
14
|
if (content === STATEMENT_META_TYPE_NAME) {
|
|
15
|
-
|
|
15
|
+
let verifiedAhead = false;
|
|
16
|
+
|
|
17
|
+
const derived = false,
|
|
18
|
+
assignments = [],
|
|
19
|
+
statementVerified = verifyStatement(statementNode, assignments, derived, localContext);
|
|
20
|
+
|
|
21
|
+
if (statementVerified) {
|
|
22
|
+
verifiedAhead = verifyAhead();
|
|
23
|
+
}
|
|
16
24
|
|
|
17
25
|
statementVerifiedAgainstMetaType = verifiedAhead; ///
|
|
18
26
|
}
|
|
@@ -1,92 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
Object.defineProperty(exports, "default", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
get: function() {
|
|
8
|
-
return _default;
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
var _metaLevel = /*#__PURE__*/ _interop_require_default(require("../verifier/node/metaLevel"));
|
|
12
|
-
var _query = require("../utilities/query");
|
|
13
|
-
function _interop_require_default(obj) {
|
|
14
|
-
return obj && obj.__esModule ? obj : {
|
|
15
|
-
default: obj
|
|
16
|
-
};
|
|
17
|
-
}
|
|
18
|
-
var judgementNodeQuery = (0, _query.nodeQuery)("/statement/judgement!");
|
|
19
|
-
function verifyStatement(statementNode, assignments, derived, localContext) {
|
|
20
|
-
var statementVerified;
|
|
21
|
-
var statementString = localContext.nodeAsString(statementNode);
|
|
22
|
-
localContext.trace("Verifying the '".concat(statementString, "' statement..."), statementNode);
|
|
23
|
-
var verifyStatementFunctions = [
|
|
24
|
-
verifyStatementAsIs
|
|
25
|
-
];
|
|
26
|
-
statementVerified = verifyStatementFunctions.some(function(verifyStatementFunction) {
|
|
27
|
-
var statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);
|
|
28
|
-
if (statementVerified) {
|
|
29
|
-
return true;
|
|
30
|
-
}
|
|
31
|
-
});
|
|
32
|
-
if (statementVerified) {
|
|
33
|
-
localContext.debug("...verified the '".concat(statementString, "' statement."), statementNode);
|
|
34
|
-
}
|
|
35
|
-
return statementVerified;
|
|
36
|
-
}
|
|
37
|
-
Object.assign(_metaLevel.default, {
|
|
38
|
-
verifyStatement: verifyStatement
|
|
39
|
-
});
|
|
40
|
-
var _default = verifyStatement;
|
|
41
|
-
function verifyStatementAsIs(statementNode, assignments, derived, localContext) {
|
|
42
|
-
var statementVerifiedAsIs;
|
|
43
|
-
var statementJudgement = isStatementJudgement(statementNode);
|
|
44
|
-
if (!statementJudgement) {
|
|
45
|
-
var statementString = localContext.nodeAsString(statementNode);
|
|
46
|
-
localContext.trace("Verifying the '".concat(statementString, "' statement as is..."), statementNode);
|
|
47
|
-
var verifyStatementAsIsFunctions = [
|
|
48
|
-
verifyDerivedStatementAsIs,
|
|
49
|
-
verifyStatedStatementAsIs
|
|
50
|
-
];
|
|
51
|
-
statementVerifiedAsIs = verifyStatementAsIsFunctions.some(function(verifyStatementAsIsFunction) {
|
|
52
|
-
var statementVerifiedAsIs = verifyStatementAsIsFunction(statementNode, assignments, derived, localContext);
|
|
53
|
-
if (statementVerifiedAsIs) {
|
|
54
|
-
return true;
|
|
55
|
-
}
|
|
56
|
-
});
|
|
57
|
-
if (statementVerifiedAsIs) {
|
|
58
|
-
localContext.debug("...verified the '".concat(statementString, "' statement as is."), statementNode);
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
return statementVerifiedAsIs;
|
|
62
|
-
}
|
|
63
|
-
function verifyDerivedStatementAsIs(statementNode, assignments, derived, localContext) {
|
|
64
|
-
var derivedStatementVerifiedAsIs = false;
|
|
65
|
-
if (derived) {
|
|
66
|
-
var statementString = localContext.nodeAsString(statementNode);
|
|
67
|
-
localContext.debug("Cannot verify the '".concat(statementString, "' derived statement as is."), statementNode);
|
|
68
|
-
}
|
|
69
|
-
return derivedStatementVerifiedAsIs;
|
|
70
|
-
}
|
|
71
|
-
function verifyStatedStatementAsIs(statementNode, assignments, derived, localContext) {
|
|
72
|
-
var statedStatementVerifiedAsIs = false;
|
|
73
|
-
if (!derived) {
|
|
74
|
-
var statementString = localContext.nodeAsString(statementNode);
|
|
75
|
-
localContext.trace("Verifying the '".concat(statementString, "' stated statement as is..."), statementNode);
|
|
76
|
-
var nonTerminalNode = statementNode, nonTerminalNodeVerified = _metaLevel.default.verifyNonTerminalNode(nonTerminalNode, localContext, function() {
|
|
77
|
-
var verifiedAhead = true;
|
|
78
|
-
return verifiedAhead;
|
|
79
|
-
});
|
|
80
|
-
statedStatementVerifiedAsIs = nonTerminalNodeVerified; ///
|
|
81
|
-
if (statedStatementVerifiedAsIs) {
|
|
82
|
-
localContext.debug("...verified the '".concat(statementString, "' stated statement as is."), statementNode);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
return statedStatementVerifiedAsIs;
|
|
86
|
-
}
|
|
87
|
-
function isStatementJudgement(statementNode) {
|
|
88
|
-
var judgementNode = judgementNodeQuery(statementNode), statementJudgement = judgementNode !== null;
|
|
89
|
-
return statementJudgement;
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/verify/metastatement.js"],"sourcesContent":["\"use strict\";\n\nimport metaLevelNodeVerifier from \"../verifier/node/metaLevel\";\n\nimport { nodeQuery } from \"../utilities/query\";\n\nconst judgementNodeQuery = nodeQuery(\"/statement/judgement!\");\n\nfunction verifyStatement(statementNode, assignments, derived, localContext) {\n  let statementVerified;\n\n  const statementString = localContext.nodeAsString(statementNode);\n\n  localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);\n\n  const verifyStatementFunctions = [\n    verifyStatementAsIs\n  ];\n\n  statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {\n    const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);\n\n    if (statementVerified) {\n      return true;\n    }\n  });\n\n  if (statementVerified) {\n    localContext.debug(`...verified the '${statementString}' statement.`, statementNode);\n  }\n\n  return statementVerified;\n}\n\nObject.assign(metaLevelNodeVerifier, {\n  verifyStatement\n});\n\nexport default verifyStatement;\n\nfunction verifyStatementAsIs(statementNode, assignments, derived, localContext) {\n  let statementVerifiedAsIs;\n\n  const statementJudgement = isStatementJudgement(statementNode);\n\n  if (!statementJudgement) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' statement as is...`, statementNode);\n\n    const verifyStatementAsIsFunctions = [\n      verifyDerivedStatementAsIs,\n      verifyStatedStatementAsIs\n    ];\n\n    statementVerifiedAsIs = verifyStatementAsIsFunctions.some((verifyStatementAsIsFunction) => {\n      const statementVerifiedAsIs = verifyStatementAsIsFunction(statementNode, assignments, derived, localContext);\n\n      if (statementVerifiedAsIs) {\n        return true;\n      }\n    });\n\n    if (statementVerifiedAsIs) {\n      localContext.debug(`...verified the '${statementString}' statement as is.`, statementNode);\n    }\n  }\n\n  return statementVerifiedAsIs;\n}\n\nfunction verifyDerivedStatementAsIs(statementNode, assignments, derived, localContext) {\n  let derivedStatementVerifiedAsIs = false;\n\n  if (derived) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.debug(`Cannot verify the '${statementString}' derived statement as is.`, statementNode);\n  }\n\n  return derivedStatementVerifiedAsIs;\n}\n\nfunction verifyStatedStatementAsIs(statementNode, assignments, derived, localContext) {\n  let statedStatementVerifiedAsIs = false;\n\n  if (!derived) {\n    const statementString = localContext.nodeAsString(statementNode);\n\n    localContext.trace(`Verifying the '${statementString}' stated statement as is...`, statementNode);\n\n    const nonTerminalNode = statementNode, ///\n          nonTerminalNodeVerified = metaLevelNodeVerifier.verifyNonTerminalNode(nonTerminalNode, localContext, () => {\n            const verifiedAhead = true;\n\n            return verifiedAhead;\n          });\n\n    statedStatementVerifiedAsIs = nonTerminalNodeVerified;  ///\n\n    if (statedStatementVerifiedAsIs) {\n      localContext.debug(`...verified the '${statementString}' stated statement as is.`, statementNode);\n    }\n  }\n\n  return statedStatementVerifiedAsIs;\n}\n\nfunction isStatementJudgement(statementNode) {\n  const judgementNode = judgementNodeQuery(statementNode),\n        statementJudgement = (judgementNode !== null);\n\n  return statementJudgement;\n}"],"names":["judgementNodeQuery","nodeQuery","verifyStatement","statementNode","assignments","derived","localContext","statementVerified","statementString","nodeAsString","trace","verifyStatementFunctions","verifyStatementAsIs","some","verifyStatementFunction","debug","Object","assign","metaLevelNodeVerifier","statementVerifiedAsIs","statementJudgement","isStatementJudgement","verifyStatementAsIsFunctions","verifyDerivedStatementAsIs","verifyStatedStatementAsIs","verifyStatementAsIsFunction","derivedStatementVerifiedAsIs","statedStatementVerifiedAsIs","nonTerminalNode","nonTerminalNodeVerified","verifyNonTerminalNode","verifiedAhead","judgementNode"],"mappings":"AAAA;;;;+BAsCA;;;eAAA;;;gEApCkC;qBAER;;;;;;AAE1B,IAAMA,qBAAqBC,IAAAA,gBAAS,EAAC;AAErC,SAASC,gBAAgBC,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IACxE,IAAIC;IAEJ,IAAMC,kBAAkBF,aAAaG,YAAY,CAACN;IAElDG,aAAaI,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,mBAAiBL;IAEtE,IAAMQ,2BAA2B;QAC/BC;KACD;IAEDL,oBAAoBI,yBAAyBE,IAAI,CAAC,SAACC;QACjD,IAAMP,oBAAoBO,wBAAwBX,eAAeC,aAAaC,SAASC;QAEvF,IAAIC,mBAAmB;YACrB,OAAO;QACT;IACF;IAEA,IAAIA,mBAAmB;QACrBD,aAAaS,KAAK,CAAC,AAAC,oBAAmC,OAAhBP,iBAAgB,iBAAeL;IACxE;IAEA,OAAOI;AACT;AAEAS,OAAOC,MAAM,CAACC,kBAAqB,EAAE;IACnChB,iBAAAA;AACF;IAEA,WAAeA;AAEf,SAASU,oBAAoBT,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IAC5E,IAAIa;IAEJ,IAAMC,qBAAqBC,qBAAqBlB;IAEhD,IAAI,CAACiB,oBAAoB;QACvB,IAAMZ,kBAAkBF,aAAaG,YAAY,CAACN;QAElDG,aAAaI,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,yBAAuBL;QAE5E,IAAMmB,+BAA+B;YACnCC;YACAC;SACD;QAEDL,wBAAwBG,6BAA6BT,IAAI,CAAC,SAACY;YACzD,IAAMN,wBAAwBM,4BAA4BtB,eAAeC,aAAaC,SAASC;YAE/F,IAAIa,uBAAuB;gBACzB,OAAO;YACT;QACF;QAEA,IAAIA,uBAAuB;YACzBb,aAAaS,KAAK,CAAC,AAAC,oBAAmC,OAAhBP,iBAAgB,uBAAqBL;QAC9E;IACF;IAEA,OAAOgB;AACT;AAEA,SAASI,2BAA2BpB,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IACnF,IAAIoB,+BAA+B;IAEnC,IAAIrB,SAAS;QACX,IAAMG,kBAAkBF,aAAaG,YAAY,CAACN;QAElDG,aAAaS,KAAK,CAAC,AAAC,sBAAqC,OAAhBP,iBAAgB,+BAA6BL;IACxF;IAEA,OAAOuB;AACT;AAEA,SAASF,0BAA0BrB,aAAa,EAAEC,WAAW,EAAEC,OAAO,EAAEC,YAAY;IAClF,IAAIqB,8BAA8B;IAElC,IAAI,CAACtB,SAAS;QACZ,IAAMG,kBAAkBF,aAAaG,YAAY,CAACN;QAElDG,aAAaI,KAAK,CAAC,AAAC,kBAAiC,OAAhBF,iBAAgB,gCAA8BL;QAEnF,IAAMyB,kBAAkBzB,eAClB0B,0BAA0BX,kBAAqB,CAACY,qBAAqB,CAACF,iBAAiBtB,cAAc;YACnG,IAAMyB,gBAAgB;YAEtB,OAAOA;QACT;QAENJ,8BAA8BE,yBAA0B,GAAG;QAE3D,IAAIF,6BAA6B;YAC/BrB,aAAaS,KAAK,CAAC,AAAC,oBAAmC,OAAhBP,iBAAgB,8BAA4BL;QACrF;IACF;IAEA,OAAOwB;AACT;AAEA,SAASN,qBAAqBlB,aAAa;IACzC,IAAM6B,gBAAgBhC,mBAAmBG,gBACnCiB,qBAAsBY,kBAAkB;IAE9C,OAAOZ;AACT"}
|
|
@@ -1,114 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
import metaLevelNodeVerifier from "../verifier/node/metaLevel";
|
|
4
|
-
|
|
5
|
-
import { nodeQuery } from "../utilities/query";
|
|
6
|
-
|
|
7
|
-
const judgementNodeQuery = nodeQuery("/statement/judgement!");
|
|
8
|
-
|
|
9
|
-
function verifyStatement(statementNode, assignments, derived, localContext) {
|
|
10
|
-
let statementVerified;
|
|
11
|
-
|
|
12
|
-
const statementString = localContext.nodeAsString(statementNode);
|
|
13
|
-
|
|
14
|
-
localContext.trace(`Verifying the '${statementString}' statement...`, statementNode);
|
|
15
|
-
|
|
16
|
-
const verifyStatementFunctions = [
|
|
17
|
-
verifyStatementAsIs
|
|
18
|
-
];
|
|
19
|
-
|
|
20
|
-
statementVerified = verifyStatementFunctions.some((verifyStatementFunction) => {
|
|
21
|
-
const statementVerified = verifyStatementFunction(statementNode, assignments, derived, localContext);
|
|
22
|
-
|
|
23
|
-
if (statementVerified) {
|
|
24
|
-
return true;
|
|
25
|
-
}
|
|
26
|
-
});
|
|
27
|
-
|
|
28
|
-
if (statementVerified) {
|
|
29
|
-
localContext.debug(`...verified the '${statementString}' statement.`, statementNode);
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
return statementVerified;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
Object.assign(metaLevelNodeVerifier, {
|
|
36
|
-
verifyStatement
|
|
37
|
-
});
|
|
38
|
-
|
|
39
|
-
export default verifyStatement;
|
|
40
|
-
|
|
41
|
-
function verifyStatementAsIs(statementNode, assignments, derived, localContext) {
|
|
42
|
-
let statementVerifiedAsIs;
|
|
43
|
-
|
|
44
|
-
const statementJudgement = isStatementJudgement(statementNode);
|
|
45
|
-
|
|
46
|
-
if (!statementJudgement) {
|
|
47
|
-
const statementString = localContext.nodeAsString(statementNode);
|
|
48
|
-
|
|
49
|
-
localContext.trace(`Verifying the '${statementString}' statement as is...`, statementNode);
|
|
50
|
-
|
|
51
|
-
const verifyStatementAsIsFunctions = [
|
|
52
|
-
verifyDerivedStatementAsIs,
|
|
53
|
-
verifyStatedStatementAsIs
|
|
54
|
-
];
|
|
55
|
-
|
|
56
|
-
statementVerifiedAsIs = verifyStatementAsIsFunctions.some((verifyStatementAsIsFunction) => {
|
|
57
|
-
const statementVerifiedAsIs = verifyStatementAsIsFunction(statementNode, assignments, derived, localContext);
|
|
58
|
-
|
|
59
|
-
if (statementVerifiedAsIs) {
|
|
60
|
-
return true;
|
|
61
|
-
}
|
|
62
|
-
});
|
|
63
|
-
|
|
64
|
-
if (statementVerifiedAsIs) {
|
|
65
|
-
localContext.debug(`...verified the '${statementString}' statement as is.`, statementNode);
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
return statementVerifiedAsIs;
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
function verifyDerivedStatementAsIs(statementNode, assignments, derived, localContext) {
|
|
73
|
-
let derivedStatementVerifiedAsIs = false;
|
|
74
|
-
|
|
75
|
-
if (derived) {
|
|
76
|
-
const statementString = localContext.nodeAsString(statementNode);
|
|
77
|
-
|
|
78
|
-
localContext.debug(`Cannot verify the '${statementString}' derived statement as is.`, statementNode);
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
return derivedStatementVerifiedAsIs;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
function verifyStatedStatementAsIs(statementNode, assignments, derived, localContext) {
|
|
85
|
-
let statedStatementVerifiedAsIs = false;
|
|
86
|
-
|
|
87
|
-
if (!derived) {
|
|
88
|
-
const statementString = localContext.nodeAsString(statementNode);
|
|
89
|
-
|
|
90
|
-
localContext.trace(`Verifying the '${statementString}' stated statement as is...`, statementNode);
|
|
91
|
-
|
|
92
|
-
const nonTerminalNode = statementNode, ///
|
|
93
|
-
nonTerminalNodeVerified = metaLevelNodeVerifier.verifyNonTerminalNode(nonTerminalNode, localContext, () => {
|
|
94
|
-
const verifiedAhead = true;
|
|
95
|
-
|
|
96
|
-
return verifiedAhead;
|
|
97
|
-
});
|
|
98
|
-
|
|
99
|
-
statedStatementVerifiedAsIs = nonTerminalNodeVerified; ///
|
|
100
|
-
|
|
101
|
-
if (statedStatementVerifiedAsIs) {
|
|
102
|
-
localContext.debug(`...verified the '${statementString}' stated statement as is.`, statementNode);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
return statedStatementVerifiedAsIs;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
function isStatementJudgement(statementNode) {
|
|
110
|
-
const judgementNode = judgementNodeQuery(statementNode),
|
|
111
|
-
statementJudgement = (judgementNode !== null);
|
|
112
|
-
|
|
113
|
-
return statementJudgement;
|
|
114
|
-
}
|