occam-verify-cli 0.0.1037 → 0.0.1039
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/assertion/subproof.js +13 -6
- package/lib/metavariable.js +43 -2
- package/lib/premise.js +3 -3
- package/lib/ruleNames.js +5 -1
- package/lib/statement.js +19 -5
- package/lib/substitution/frameForMetavariable.js +4 -4
- package/lib/substitution/statement.js +148 -0
- package/lib/substitution/statementForMetavariable.js +28 -19
- package/lib/substitution/termForVariable.js +17 -16
- package/lib/unifier/intrinsicLevel.js +4 -4
- package/lib/unifier/metaLevel.js +22 -19
- package/lib/utilities/node.js +15 -1
- package/lib/utilities/tokens.js +8 -1
- package/lib/verifier/intrinsicLevel.js +2 -2
- package/lib/verifier/metaLevel.js +2 -2
- package/package.json +1 -1
- package/src/assertion/subproof.js +11 -4
- package/src/metavariable.js +47 -1
- package/src/premise.js +1 -1
- package/src/ruleNames.js +1 -0
- package/src/statement.js +27 -5
- package/src/substitution/frameForMetavariable.js +3 -2
- package/src/substitution/statement.js +61 -0
- package/src/substitution/statementForMetavariable.js +32 -21
- package/src/substitution/termForVariable.js +21 -19
- package/src/unifier/intrinsicLevel.js +6 -7
- package/src/unifier/metaLevel.js +34 -33
- package/src/utilities/node.js +16 -0
- package/src/utilities/tokens.js +7 -0
- package/src/verifier/intrinsicLevel.js +3 -3
- package/src/verifier/metaLevel.js +3 -3
- package/lib/unify/metavariableWithStatementGivenSubstitution.js +0 -40
- package/src/unify/metavariableWithStatementGivenSubstitution.js +0 -41
package/lib/utilities/node.js
CHANGED
|
@@ -21,6 +21,12 @@ _export(exports, {
|
|
|
21
21
|
statementNodeFromStatementString: function() {
|
|
22
22
|
return statementNodeFromStatementString;
|
|
23
23
|
},
|
|
24
|
+
substitutionNodeFromSubstitutionString: function() {
|
|
25
|
+
return substitutionNodeFromSubstitutionString;
|
|
26
|
+
},
|
|
27
|
+
substitutionNodeFromSubstitutionTokens: function() {
|
|
28
|
+
return substitutionNodeFromSubstitutionTokens;
|
|
29
|
+
},
|
|
24
30
|
termNodeFromTermString: function() {
|
|
25
31
|
return termNodeFromTermString;
|
|
26
32
|
},
|
|
@@ -58,6 +64,10 @@ function metavariableNodeFromMetavariableString(metavariableString, lexer, parse
|
|
|
58
64
|
var metavariableTokens = (0, _tokens.metavariableTokensFromMetavariableString)(metavariableString, lexer), metavariableNode = metavariableNodeFromMetavariableTokens(metavariableTokens, parser);
|
|
59
65
|
return metavariableNode;
|
|
60
66
|
}
|
|
67
|
+
function substitutionNodeFromSubstitutionString(substitutionString, lexer, parser) {
|
|
68
|
+
var substitutionTokens = (0, _tokens.substitutionTokensFromSubstitutionString)(substitutionString, lexer), substitutionNode = substitutionNodeFromSubstitutionTokens(substitutionTokens, parser);
|
|
69
|
+
return substitutionNode;
|
|
70
|
+
}
|
|
61
71
|
function variableNodeFromVariableTokens(variableTokens, parser) {
|
|
62
72
|
var ruleName = _ruleNames.VARIABLE_RULE_NAME, variableNode = nodeFromTokensRuleNameAndParser(variableTokens, ruleName, parser);
|
|
63
73
|
return variableNode;
|
|
@@ -66,6 +76,10 @@ function metavariableNodeFromMetavariableTokens(metavariableTokens, parser) {
|
|
|
66
76
|
var ruleName = _ruleNames.METAVARIABLE_RULE_NAME, metavariableNode = nodeFromTokensRuleNameAndParser(metavariableTokens, ruleName, parser);
|
|
67
77
|
return metavariableNode;
|
|
68
78
|
}
|
|
79
|
+
function substitutionNodeFromSubstitutionTokens(substitutionTokens, parser) {
|
|
80
|
+
var ruleName = _ruleNames.SUBSTITUTION_RULE_NAME, substitutionNode = nodeFromTokensRuleNameAndParser(substitutionTokens, ruleName, parser);
|
|
81
|
+
return substitutionNode;
|
|
82
|
+
}
|
|
69
83
|
function unqualifiedStatementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser) {
|
|
70
84
|
var tokens = unqualifiedStatementTokens, ruleName = _ruleNames.UNQUALIFIED_STATEMENT_RULE_NAME, unqualifiedStatementNode = nodeFromTokensRuleNameAndParser(tokens, ruleName, parser);
|
|
71
85
|
return unqualifiedStatementNode;
|
|
@@ -80,4 +94,4 @@ function nodeFromTokensRuleNameAndParser(tokens, ruleName) {
|
|
|
80
94
|
return node;
|
|
81
95
|
}
|
|
82
96
|
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/node.js"],"sourcesContent":["\"use strict\";\n\nimport { parsersUtilities } from \"occam-custom-grammars\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { combinedCustomGrammarFromNothing } from \"./customGrammar\";\nimport { VARIABLE_RULE_NAME,\n         METAVARIABLE_RULE_NAME,\n         UNQUALIFIED_STATEMENT_RULE_NAME,\n         CONSTRUCTOR_DECLARATION_RULE_NAME } from \"../ruleNames\";\nimport { variableTokensFromVariableString,\n         metavariableTokensFromMetavariableString,\n         unqualifiedStatementTokensFromUnqualifiedStatementString,\n         constructorDeclarationTokensFromConstructorDeclarationString } from \"../utilities/tokens\";\n\nconst { nominalParserFromCombinedCustomGrammar } = parsersUtilities;\n\nconst combinedCustomGrammar = combinedCustomGrammarFromNothing(),\n      nominalParser = nominalParserFromCombinedCustomGrammar(combinedCustomGrammar);\n\nconst termNodeQuery = nodeQuery(\"/constructorDeclaration/term\"),\n      statementNodeQuery = nodeQuery(\"/unqualifiedStatement/statement\");\n\nexport function termNodeFromTermString(termString, lexer, parser) {\n  const constructorDeclarationString = `Constructor ${termString}\n`,\n        constructorDeclarationTokens = constructorDeclarationTokensFromConstructorDeclarationString(constructorDeclarationString, lexer),\n        constructorDeclarationNode = constructorDeclarationNodeFromConstructorDeclarationTokens(constructorDeclarationTokens, parser),\n        termNode = termNodeQuery(constructorDeclarationNode, constructorDeclarationNode);\n\n  return termNode;\n}\n\nexport function variableNodeFromVariableString(variableString, lexer, parser) {\n  const variableTokens = variableTokensFromVariableString(variableString, lexer),\n        variableNode = variableNodeFromVariableTokens(variableTokens, parser);\n\n  return variableNode;\n}\n\nexport function statementNodeFromStatementString(statementString, lexer, parser) {\n  const unqualifiedStatementString = `${statementString}\n`,\n        unqualifiedStatementTokens = unqualifiedStatementTokensFromUnqualifiedStatementString(unqualifiedStatementString, lexer),\n        unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser),\n        statementNode = statementNodeQuery(unqualifiedStatementNode);\n\n  return statementNode;\n}\n\nexport function metavariableNodeFromMetavariableString(metavariableString, lexer, parser) {\n  const metavariableTokens = metavariableTokensFromMetavariableString(metavariableString, lexer),\n        metavariableNode = metavariableNodeFromMetavariableTokens(metavariableTokens, parser);\n\n  return metavariableNode;\n}\n\nexport function variableNodeFromVariableTokens(variableTokens, parser) {\n  const ruleName = VARIABLE_RULE_NAME,\n        variableNode = nodeFromTokensRuleNameAndParser(variableTokens, ruleName, parser);\n\n  return variableNode;\n}\n\nexport function metavariableNodeFromMetavariableTokens(metavariableTokens, parser) {\n  const ruleName = METAVARIABLE_RULE_NAME,\n        metavariableNode = nodeFromTokensRuleNameAndParser(metavariableTokens, ruleName, parser);\n\n  return metavariableNode;\n}\n\nexport function unqualifiedStatementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser) {\n  const tokens = unqualifiedStatementTokens,  ///\n        ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,\n        unqualifiedStatementNode = nodeFromTokensRuleNameAndParser(tokens, ruleName, parser);\n\n  return unqualifiedStatementNode;\n}\n\nexport function constructorDeclarationNodeFromConstructorDeclarationTokens(constructorDeclarationTokens, parser) {\n  const tokens = constructorDeclarationTokens,  ///\n        ruleName = CONSTRUCTOR_DECLARATION_RULE_NAME,\n        constructorDeclarationNode = nodeFromTokensRuleNameAndParser(tokens, ruleName, parser);\n\n  return constructorDeclarationNode;\n}\n\nfunction nodeFromTokensRuleNameAndParser(tokens, ruleName, parser = nominalParser) {\n  const ruleMap = parser.getRuleMap(),\n        rule = ruleMap[ruleName],\n        node = parser.parse(tokens, rule);\n\n  return node;\n}\n"],"names":["constructorDeclarationNodeFromConstructorDeclarationTokens","metavariableNodeFromMetavariableString","metavariableNodeFromMetavariableTokens","statementNodeFromStatementString","termNodeFromTermString","unqualifiedStatementNodeFromUnqualifiedStatementTokens","variableNodeFromVariableString","variableNodeFromVariableTokens","nominalParserFromCombinedCustomGrammar","parsersUtilities","combinedCustomGrammar","combinedCustomGrammarFromNothing","nominalParser","termNodeQuery","nodeQuery","statementNodeQuery","termString","lexer","parser","constructorDeclarationString","constructorDeclarationTokens","constructorDeclarationTokensFromConstructorDeclarationString","constructorDeclarationNode","termNode","variableString","variableTokens","variableTokensFromVariableString","variableNode","statementString","unqualifiedStatementString","unqualifiedStatementTokens","unqualifiedStatementTokensFromUnqualifiedStatementString","unqualifiedStatementNode","statementNode","metavariableString","metavariableTokens","metavariableTokensFromMetavariableString","metavariableNode","ruleName","VARIABLE_RULE_NAME","nodeFromTokensRuleNameAndParser","METAVARIABLE_RULE_NAME","tokens","UNQUALIFIED_STATEMENT_RULE_NAME","CONSTRUCTOR_DECLARATION_RULE_NAME","ruleMap","getRuleMap","rule","node","parse"],"mappings":"AAAA;;;;;;;;;;;IA+EgBA,0DAA0D;eAA1DA;;IA7BAC,sCAAsC;eAAtCA;;IAcAC,sCAAsC;eAAtCA;;IAxBAC,gCAAgC;eAAhCA;;IAjBAC,sBAAsB;eAAtBA;;IAgDAC,sDAAsD;eAAtDA;;IAtCAC,8BAA8B;eAA9BA;;IAwBAC,8BAA8B;eAA9BA;;;mCAvDiB;qBAEP;6BACuB;yBAIC;sBAI2B;AAE7E,IAAM,AAAEC,yCAA2CC,qCAAgB,CAA3DD;AAER,IAAME,wBAAwBC,IAAAA,+CAAgC,KACxDC,gBAAgBJ,uCAAuCE;AAE7D,IAAMG,gBAAgBC,IAAAA,gBAAS,EAAC,iCAC1BC,qBAAqBD,IAAAA,gBAAS,EAAC;AAE9B,SAASV,uBAAuBY,UAAU,EAAEC,KAAK,EAAEC,MAAM;IAC9D,IAAMC,+BAA+B,AAAC,eAAyB,OAAXH,YAAW,OAEzDI,+BAA+BC,IAAAA,oEAA4D,EAACF,8BAA8BF,QAC1HK,6BAA6BtB,2DAA2DoB,8BAA8BF,SACtHK,WAAWV,cAAcS,4BAA4BA;IAE3D,OAAOC;AACT;AAEO,SAASjB,+BAA+BkB,cAAc,EAAEP,KAAK,EAAEC,MAAM;IAC1E,IAAMO,iBAAiBC,IAAAA,wCAAgC,EAACF,gBAAgBP,QAClEU,eAAepB,+BAA+BkB,gBAAgBP;IAEpE,OAAOS;AACT;AAEO,SAASxB,iCAAiCyB,eAAe,EAAEX,KAAK,EAAEC,MAAM;IAC7E,IAAMW,6BAA6B,AAAC,GAAkB,OAAhBD,iBAAgB,OAEhDE,6BAA6BC,IAAAA,gEAAwD,EAACF,4BAA4BZ,QAClHe,2BAA2B3B,uDAAuDyB,4BAA4BZ,SAC9Ge,gBAAgBlB,mBAAmBiB;IAEzC,OAAOC;AACT;AAEO,SAAShC,uCAAuCiC,kBAAkB,EAAEjB,KAAK,EAAEC,MAAM;IACtF,IAAMiB,qBAAqBC,IAAAA,gDAAwC,EAACF,oBAAoBjB,QAClFoB,mBAAmBnC,uCAAuCiC,oBAAoBjB;IAEpF,OAAOmB;AACT;AAEO,SAAS9B,+BAA+BkB,cAAc,EAAEP,MAAM;IACnE,IAAMoB,WAAWC,6BAAkB,EAC7BZ,eAAea,gCAAgCf,gBAAgBa,UAAUpB;IAE/E,OAAOS;AACT;AAEO,SAASzB,uCAAuCiC,kBAAkB,EAAEjB,MAAM;IAC/E,IAAMoB,WAAWG,iCAAsB,EACjCJ,mBAAmBG,gCAAgCL,oBAAoBG,UAAUpB;IAEvF,OAAOmB;AACT;AAEO,SAAShC,uDAAuDyB,0BAA0B,EAAEZ,MAAM;IACvG,IAAMwB,SAASZ,4BACTQ,WAAWK,0CAA+B,EAC1CX,2BAA2BQ,gCAAgCE,QAAQJ,UAAUpB;IAEnF,OAAOc;AACT;AAEO,SAAShC,2DAA2DoB,4BAA4B,EAAEF,MAAM;IAC7G,IAAMwB,SAAStB,8BACTkB,WAAWM,4CAAiC,EAC5CtB,6BAA6BkB,gCAAgCE,QAAQJ,UAAUpB;IAErF,OAAOI;AACT;AAEA,SAASkB,gCAAgCE,MAAM,EAAEJ,QAAQ;QAAEpB,SAAAA,iEAASN;IAClE,IAAMiC,UAAU3B,OAAO4B,UAAU,IAC3BC,OAAOF,OAAO,CAACP,SAAS,EACxBU,OAAO9B,OAAO+B,KAAK,CAACP,QAAQK;IAElC,OAAOC;AACT"}
|
|
97
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/utilities/node.js"],"sourcesContent":["\"use strict\";\n\nimport { parsersUtilities } from \"occam-custom-grammars\";\n\nimport { nodeQuery } from \"../utilities/query\";\nimport { combinedCustomGrammarFromNothing } from \"./customGrammar\";\nimport { VARIABLE_RULE_NAME,\n         METAVARIABLE_RULE_NAME,\n         SUBSTITUTION_RULE_NAME,\n         UNQUALIFIED_STATEMENT_RULE_NAME,\n         CONSTRUCTOR_DECLARATION_RULE_NAME } from \"../ruleNames\";\nimport { variableTokensFromVariableString,\n         metavariableTokensFromMetavariableString,\n         substitutionTokensFromSubstitutionString,\n         unqualifiedStatementTokensFromUnqualifiedStatementString,\n         constructorDeclarationTokensFromConstructorDeclarationString } from \"../utilities/tokens\";\n\nconst { nominalParserFromCombinedCustomGrammar } = parsersUtilities;\n\nconst combinedCustomGrammar = combinedCustomGrammarFromNothing(),\n      nominalParser = nominalParserFromCombinedCustomGrammar(combinedCustomGrammar);\n\nconst termNodeQuery = nodeQuery(\"/constructorDeclaration/term\"),\n      statementNodeQuery = nodeQuery(\"/unqualifiedStatement/statement\");\n\nexport function termNodeFromTermString(termString, lexer, parser) {\n  const constructorDeclarationString = `Constructor ${termString}\n`,\n        constructorDeclarationTokens = constructorDeclarationTokensFromConstructorDeclarationString(constructorDeclarationString, lexer),\n        constructorDeclarationNode = constructorDeclarationNodeFromConstructorDeclarationTokens(constructorDeclarationTokens, parser),\n        termNode = termNodeQuery(constructorDeclarationNode, constructorDeclarationNode);\n\n  return termNode;\n}\n\nexport function variableNodeFromVariableString(variableString, lexer, parser) {\n  const variableTokens = variableTokensFromVariableString(variableString, lexer),\n        variableNode = variableNodeFromVariableTokens(variableTokens, parser);\n\n  return variableNode;\n}\n\nexport function statementNodeFromStatementString(statementString, lexer, parser) {\n  const unqualifiedStatementString = `${statementString}\n`,\n        unqualifiedStatementTokens = unqualifiedStatementTokensFromUnqualifiedStatementString(unqualifiedStatementString, lexer),\n        unqualifiedStatementNode = unqualifiedStatementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser),\n        statementNode = statementNodeQuery(unqualifiedStatementNode);\n\n  return statementNode;\n}\n\nexport function metavariableNodeFromMetavariableString(metavariableString, lexer, parser) {\n  const metavariableTokens = metavariableTokensFromMetavariableString(metavariableString, lexer),\n        metavariableNode = metavariableNodeFromMetavariableTokens(metavariableTokens, parser);\n\n  return metavariableNode;\n}\n\nexport function substitutionNodeFromSubstitutionString(substitutionString, lexer, parser) {\n  const substitutionTokens = substitutionTokensFromSubstitutionString(substitutionString, lexer),\n        substitutionNode = substitutionNodeFromSubstitutionTokens(substitutionTokens, parser);\n\n  return substitutionNode;\n}\n\nexport function variableNodeFromVariableTokens(variableTokens, parser) {\n  const ruleName = VARIABLE_RULE_NAME,\n        variableNode = nodeFromTokensRuleNameAndParser(variableTokens, ruleName, parser);\n\n  return variableNode;\n}\n\nexport function metavariableNodeFromMetavariableTokens(metavariableTokens, parser) {\n  const ruleName = METAVARIABLE_RULE_NAME,\n        metavariableNode = nodeFromTokensRuleNameAndParser(metavariableTokens, ruleName, parser);\n\n  return metavariableNode;\n}\n\nexport function substitutionNodeFromSubstitutionTokens(substitutionTokens, parser) {\n  const ruleName = SUBSTITUTION_RULE_NAME,\n        substitutionNode = nodeFromTokensRuleNameAndParser(substitutionTokens, ruleName, parser);\n\n  return substitutionNode;\n}\n\nexport function unqualifiedStatementNodeFromUnqualifiedStatementTokens(unqualifiedStatementTokens, parser) {\n  const tokens = unqualifiedStatementTokens,  ///\n        ruleName = UNQUALIFIED_STATEMENT_RULE_NAME,\n        unqualifiedStatementNode = nodeFromTokensRuleNameAndParser(tokens, ruleName, parser);\n\n  return unqualifiedStatementNode;\n}\n\nexport function constructorDeclarationNodeFromConstructorDeclarationTokens(constructorDeclarationTokens, parser) {\n  const tokens = constructorDeclarationTokens,  ///\n        ruleName = CONSTRUCTOR_DECLARATION_RULE_NAME,\n        constructorDeclarationNode = nodeFromTokensRuleNameAndParser(tokens, ruleName, parser);\n\n  return constructorDeclarationNode;\n}\n\nfunction nodeFromTokensRuleNameAndParser(tokens, ruleName, parser = nominalParser) {\n  const ruleMap = parser.getRuleMap(),\n        rule = ruleMap[ruleName],\n        node = parser.parse(tokens, rule);\n\n  return node;\n}\n"],"names":["constructorDeclarationNodeFromConstructorDeclarationTokens","metavariableNodeFromMetavariableString","metavariableNodeFromMetavariableTokens","statementNodeFromStatementString","substitutionNodeFromSubstitutionString","substitutionNodeFromSubstitutionTokens","termNodeFromTermString","unqualifiedStatementNodeFromUnqualifiedStatementTokens","variableNodeFromVariableString","variableNodeFromVariableTokens","nominalParserFromCombinedCustomGrammar","parsersUtilities","combinedCustomGrammar","combinedCustomGrammarFromNothing","nominalParser","termNodeQuery","nodeQuery","statementNodeQuery","termString","lexer","parser","constructorDeclarationString","constructorDeclarationTokens","constructorDeclarationTokensFromConstructorDeclarationString","constructorDeclarationNode","termNode","variableString","variableTokens","variableTokensFromVariableString","variableNode","statementString","unqualifiedStatementString","unqualifiedStatementTokens","unqualifiedStatementTokensFromUnqualifiedStatementString","unqualifiedStatementNode","statementNode","metavariableString","metavariableTokens","metavariableTokensFromMetavariableString","metavariableNode","substitutionString","substitutionTokens","substitutionTokensFromSubstitutionString","substitutionNode","ruleName","VARIABLE_RULE_NAME","nodeFromTokensRuleNameAndParser","METAVARIABLE_RULE_NAME","SUBSTITUTION_RULE_NAME","tokens","UNQUALIFIED_STATEMENT_RULE_NAME","CONSTRUCTOR_DECLARATION_RULE_NAME","ruleMap","getRuleMap","rule","node","parse"],"mappings":"AAAA;;;;;;;;;;;IA+FgBA,0DAA0D;eAA1DA;;IA3CAC,sCAAsC;eAAtCA;;IAqBAC,sCAAsC;eAAtCA;;IA/BAC,gCAAgC;eAAhCA;;IAiBAC,sCAAsC;eAAtCA;;IAqBAC,sCAAsC;eAAtCA;;IAvDAC,sBAAsB;eAAtBA;;IA8DAC,sDAAsD;eAAtDA;;IApDAC,8BAA8B;eAA9BA;;IA+BAC,8BAA8B;eAA9BA;;;mCAhEiB;qBAEP;6BACuB;yBAKC;sBAK2B;AAE7E,IAAM,AAAEC,yCAA2CC,qCAAgB,CAA3DD;AAER,IAAME,wBAAwBC,IAAAA,+CAAgC,KACxDC,gBAAgBJ,uCAAuCE;AAE7D,IAAMG,gBAAgBC,IAAAA,gBAAS,EAAC,iCAC1BC,qBAAqBD,IAAAA,gBAAS,EAAC;AAE9B,SAASV,uBAAuBY,UAAU,EAAEC,KAAK,EAAEC,MAAM;IAC9D,IAAMC,+BAA+B,AAAC,eAAyB,OAAXH,YAAW,OAEzDI,+BAA+BC,IAAAA,oEAA4D,EAACF,8BAA8BF,QAC1HK,6BAA6BxB,2DAA2DsB,8BAA8BF,SACtHK,WAAWV,cAAcS,4BAA4BA;IAE3D,OAAOC;AACT;AAEO,SAASjB,+BAA+BkB,cAAc,EAAEP,KAAK,EAAEC,MAAM;IAC1E,IAAMO,iBAAiBC,IAAAA,wCAAgC,EAACF,gBAAgBP,QAClEU,eAAepB,+BAA+BkB,gBAAgBP;IAEpE,OAAOS;AACT;AAEO,SAAS1B,iCAAiC2B,eAAe,EAAEX,KAAK,EAAEC,MAAM;IAC7E,IAAMW,6BAA6B,AAAC,GAAkB,OAAhBD,iBAAgB,OAEhDE,6BAA6BC,IAAAA,gEAAwD,EAACF,4BAA4BZ,QAClHe,2BAA2B3B,uDAAuDyB,4BAA4BZ,SAC9Ge,gBAAgBlB,mBAAmBiB;IAEzC,OAAOC;AACT;AAEO,SAASlC,uCAAuCmC,kBAAkB,EAAEjB,KAAK,EAAEC,MAAM;IACtF,IAAMiB,qBAAqBC,IAAAA,gDAAwC,EAACF,oBAAoBjB,QAClFoB,mBAAmBrC,uCAAuCmC,oBAAoBjB;IAEpF,OAAOmB;AACT;AAEO,SAASnC,uCAAuCoC,kBAAkB,EAAErB,KAAK,EAAEC,MAAM;IACtF,IAAMqB,qBAAqBC,IAAAA,gDAAwC,EAACF,oBAAoBrB,QAClFwB,mBAAmBtC,uCAAuCoC,oBAAoBrB;IAEpF,OAAOuB;AACT;AAEO,SAASlC,+BAA+BkB,cAAc,EAAEP,MAAM;IACnE,IAAMwB,WAAWC,6BAAkB,EAC7BhB,eAAeiB,gCAAgCnB,gBAAgBiB,UAAUxB;IAE/E,OAAOS;AACT;AAEO,SAAS3B,uCAAuCmC,kBAAkB,EAAEjB,MAAM;IAC/E,IAAMwB,WAAWG,iCAAsB,EACjCR,mBAAmBO,gCAAgCT,oBAAoBO,UAAUxB;IAEvF,OAAOmB;AACT;AAEO,SAASlC,uCAAuCoC,kBAAkB,EAAErB,MAAM;IAC/E,IAAMwB,WAAWI,iCAAsB,EACjCL,mBAAmBG,gCAAgCL,oBAAoBG,UAAUxB;IAEvF,OAAOuB;AACT;AAEO,SAASpC,uDAAuDyB,0BAA0B,EAAEZ,MAAM;IACvG,IAAM6B,SAASjB,4BACTY,WAAWM,0CAA+B,EAC1ChB,2BAA2BY,gCAAgCG,QAAQL,UAAUxB;IAEnF,OAAOc;AACT;AAEO,SAASlC,2DAA2DsB,4BAA4B,EAAEF,MAAM;IAC7G,IAAM6B,SAAS3B,8BACTsB,WAAWO,4CAAiC,EAC5C3B,6BAA6BsB,gCAAgCG,QAAQL,UAAUxB;IAErF,OAAOI;AACT;AAEA,SAASsB,gCAAgCG,MAAM,EAAEL,QAAQ;QAAExB,SAAAA,iEAASN;IAClE,IAAMsC,UAAUhC,OAAOiC,UAAU,IAC3BC,OAAOF,OAAO,CAACR,SAAS,EACxBW,OAAOnC,OAAOoC,KAAK,CAACP,QAAQK;IAElC,OAAOC;AACT"}
|
package/lib/utilities/tokens.js
CHANGED
|
@@ -15,6 +15,9 @@ _export(exports, {
|
|
|
15
15
|
metavariableTokensFromMetavariableString: function() {
|
|
16
16
|
return metavariableTokensFromMetavariableString;
|
|
17
17
|
},
|
|
18
|
+
substitutionTokensFromSubstitutionString: function() {
|
|
19
|
+
return substitutionTokensFromSubstitutionString;
|
|
20
|
+
},
|
|
18
21
|
unqualifiedStatementTokensFromUnqualifiedStatementString: function() {
|
|
19
22
|
return unqualifiedStatementTokensFromUnqualifiedStatementString;
|
|
20
23
|
},
|
|
@@ -34,6 +37,10 @@ function metavariableTokensFromMetavariableString(metavariableString, lexer) {
|
|
|
34
37
|
var metavariableContent = "".concat(metavariableString), metavariableTokens = tokensFromContentAndLexer(metavariableContent, lexer);
|
|
35
38
|
return metavariableTokens;
|
|
36
39
|
}
|
|
40
|
+
function substitutionTokensFromSubstitutionString(substitutionString, lexer) {
|
|
41
|
+
var substitutionContent = "".concat(substitutionString), substitutionTokens = tokensFromContentAndLexer(substitutionContent, lexer);
|
|
42
|
+
return substitutionTokens;
|
|
43
|
+
}
|
|
37
44
|
function unqualifiedStatementTokensFromUnqualifiedStatementString(unqualifiedStatementString, lexer) {
|
|
38
45
|
var content = unqualifiedStatementString, unqualifiedStatementTokens = tokensFromContentAndLexer(content, lexer);
|
|
39
46
|
return unqualifiedStatementTokens;
|
|
@@ -48,4 +55,4 @@ function tokensFromContentAndLexer(content) {
|
|
|
48
55
|
return tokens;
|
|
49
56
|
}
|
|
50
57
|
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdG9rZW5zLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xuXG5pbXBvcnQgeyBsZXhlcnNVdGlsaXRpZXMgfSBmcm9tIFwib2NjYW0tY3VzdG9tLWdyYW1tYXJzXCI7XG5cbmltcG9ydCB7IGNvbWJpbmVkQ3VzdG9tR3JhbW1hckZyb21Ob3RoaW5nIH0gZnJvbSBcIi4vY3VzdG9tR3JhbW1hclwiO1xuXG5jb25zdCB7IG5vbWluYWxMZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIgfSA9IGxleGVyc1V0aWxpdGllcztcblxuY29uc3QgY29tYmluZWRDdXN0b21HcmFtbWFyID0gY29tYmluZWRDdXN0b21HcmFtbWFyRnJvbU5vdGhpbmcoKSxcbiAgICAgIG5vbWluYWxMZXhlciA9IG5vbWluYWxMZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIoY29tYmluZWRDdXN0b21HcmFtbWFyKTtcblxuZXhwb3J0IGZ1bmN0aW9uIHZhcmlhYmxlVG9rZW5zRnJvbVZhcmlhYmxlU3RyaW5nKHZhcmlhYmxlU3RyaW5nLCBsZXhlcikge1xuICBjb25zdCB2YXJpYWJsZUNvbnRlbnQgPSBgJHt2YXJpYWJsZVN0cmluZ31gLFxuICAgICAgICB2YXJpYWJsZVRva2VucyA9IHRva2Vuc0Zyb21Db250ZW50QW5kTGV4ZXIodmFyaWFibGVDb250ZW50LCBsZXhlcik7XG5cbiAgcmV0dXJuIHZhcmlhYmxlVG9rZW5zO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gbWV0YXZhcmlhYmxlVG9rZW5zRnJvbU1ldGF2YXJpYWJsZVN0cmluZyhtZXRhdmFyaWFibGVTdHJpbmcsIGxleGVyKSB7XG4gIGNvbnN0IG1ldGF2YXJpYWJsZUNvbnRlbnQgPSBgJHttZXRhdmFyaWFibGVTdHJpbmd9YCxcbiAgICAgICAgbWV0YXZhcmlhYmxlVG9rZW5zID0gdG9rZW5zRnJvbUNvbnRlbnRBbmRMZXhlcihtZXRhdmFyaWFibGVDb250ZW50LCBsZXhlcik7XG5cbiAgcmV0dXJuIG1ldGF2YXJpYWJsZVRva2Vucztcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHN1YnN0aXR1dGlvblRva2Vuc0Zyb21TdWJzdGl0dXRpb25TdHJpbmcoc3Vic3RpdHV0aW9uU3RyaW5nLCBsZXhlcikge1xuICBjb25zdCBzdWJzdGl0dXRpb25Db250ZW50ID0gYCR7c3Vic3RpdHV0aW9uU3RyaW5nfWAsXG4gICAgICAgIHN1YnN0aXR1dGlvblRva2VucyA9IHRva2Vuc0Zyb21Db250ZW50QW5kTGV4ZXIoc3Vic3RpdHV0aW9uQ29udGVudCwgbGV4ZXIpO1xuXG4gIHJldHVybiBzdWJzdGl0dXRpb25Ub2tlbnM7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiB1bnF1YWxpZmllZFN0YXRlbWVudFRva2Vuc0Zyb21VbnF1YWxpZmllZFN0YXRlbWVudFN0cmluZyh1bnF1YWxpZmllZFN0YXRlbWVudFN0cmluZywgbGV4ZXIpIHtcbiAgY29uc3QgY29udGVudCA9IHVucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nLCAgLy8vXG4gICAgICAgIHVucXVhbGlmaWVkU3RhdGVtZW50VG9rZW5zID0gdG9rZW5zRnJvbUNvbnRlbnRBbmRMZXhlcihjb250ZW50LCBsZXhlcik7XG5cbiAgcmV0dXJuIHVucXVhbGlmaWVkU3RhdGVtZW50VG9rZW5zO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2Vuc0Zyb21Db25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nKGNvbnN0cnVjdG9yRGVjbGFyYXRpb25TdHJpbmcsIGxleGVyKSB7XG4gIGNvbnN0IGNvbnRlbnQgPSBjb25zdHJ1Y3RvckRlY2xhcmF0aW9uU3RyaW5nLCAgLy8vXG4gICAgICAgIGNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMgPSB0b2tlbnNGcm9tQ29udGVudEFuZExleGVyKGNvbnRlbnQsIGxleGVyKTtcblxuICByZXR1cm4gY29uc3RydWN0b3JEZWNsYXJhdGlvblRva2Vucztcbn1cblxuZnVuY3Rpb24gdG9rZW5zRnJvbUNvbnRlbnRBbmRMZXhlcihjb250ZW50LCBsZXhlciA9IG5vbWluYWxMZXhlcikge1xuICBjb25zdCB0b2tlbnMgPSBsZXhlci50b2tlbmlzZShjb250ZW50KTtcblxuICByZXR1cm4gdG9rZW5zO1xufVxuIl0sIm5hbWVzIjpbImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnNGcm9tQ29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZyIsIm1ldGF2YXJpYWJsZVRva2Vuc0Zyb21NZXRhdmFyaWFibGVTdHJpbmciLCJzdWJzdGl0dXRpb25Ub2tlbnNGcm9tU3Vic3RpdHV0aW9uU3RyaW5nIiwidW5xdWFsaWZpZWRTdGF0ZW1lbnRUb2tlbnNGcm9tVW5xdWFsaWZpZWRTdGF0ZW1lbnRTdHJpbmciLCJ2YXJpYWJsZVRva2Vuc0Zyb21WYXJpYWJsZVN0cmluZyIsIm5vbWluYWxMZXhlckZyb21Db21iaW5lZEN1c3RvbUdyYW1tYXIiLCJsZXhlcnNVdGlsaXRpZXMiLCJjb21iaW5lZEN1c3RvbUdyYW1tYXIiLCJjb21iaW5lZEN1c3RvbUdyYW1tYXJGcm9tTm90aGluZyIsIm5vbWluYWxMZXhlciIsInZhcmlhYmxlU3RyaW5nIiwibGV4ZXIiLCJ2YXJpYWJsZUNvbnRlbnQiLCJ2YXJpYWJsZVRva2VucyIsInRva2Vuc0Zyb21Db250ZW50QW5kTGV4ZXIiLCJtZXRhdmFyaWFibGVTdHJpbmciLCJtZXRhdmFyaWFibGVDb250ZW50IiwibWV0YXZhcmlhYmxlVG9rZW5zIiwic3Vic3RpdHV0aW9uU3RyaW5nIiwic3Vic3RpdHV0aW9uQ29udGVudCIsInN1YnN0aXR1dGlvblRva2VucyIsInVucXVhbGlmaWVkU3RhdGVtZW50U3RyaW5nIiwiY29udGVudCIsInVucXVhbGlmaWVkU3RhdGVtZW50VG9rZW5zIiwiY29uc3RydWN0b3JEZWNsYXJhdGlvblN0cmluZyIsImNvbnN0cnVjdG9yRGVjbGFyYXRpb25Ub2tlbnMiLCJ0b2tlbnMiLCJ0b2tlbmlzZSJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7O0lBdUNnQkEsNERBQTREO2VBQTVEQTs7SUFyQkFDLHdDQUF3QztlQUF4Q0E7O0lBT0FDLHdDQUF3QztlQUF4Q0E7O0lBT0FDLHdEQUF3RDtlQUF4REE7O0lBckJBQyxnQ0FBZ0M7ZUFBaENBOzs7bUNBVGdCOzZCQUVpQjtBQUVqRCxJQUFNLEFBQUVDLHdDQUEwQ0Msb0NBQWUsQ0FBekREO0FBRVIsSUFBTUUsd0JBQXdCQyxJQUFBQSwrQ0FBZ0MsS0FDeERDLGVBQWVKLHNDQUFzQ0U7QUFFcEQsU0FBU0gsaUNBQWlDTSxjQUFjLEVBQUVDLEtBQUs7SUFDcEUsSUFBTUMsa0JBQWtCLEFBQUMsR0FBaUIsT0FBZkYsaUJBQ3JCRyxpQkFBaUJDLDBCQUEwQkYsaUJBQWlCRDtJQUVsRSxPQUFPRTtBQUNUO0FBRU8sU0FBU1oseUNBQXlDYyxrQkFBa0IsRUFBRUosS0FBSztJQUNoRixJQUFNSyxzQkFBc0IsQUFBQyxHQUFxQixPQUFuQkQscUJBQ3pCRSxxQkFBcUJILDBCQUEwQkUscUJBQXFCTDtJQUUxRSxPQUFPTTtBQUNUO0FBRU8sU0FBU2YseUNBQXlDZ0Isa0JBQWtCLEVBQUVQLEtBQUs7SUFDaEYsSUFBTVEsc0JBQXNCLEFBQUMsR0FBcUIsT0FBbkJELHFCQUN6QkUscUJBQXFCTiwwQkFBMEJLLHFCQUFxQlI7SUFFMUUsT0FBT1M7QUFDVDtBQUVPLFNBQVNqQix5REFBeURrQiwwQkFBMEIsRUFBRVYsS0FBSztJQUN4RyxJQUFNVyxVQUFVRCw0QkFDVkUsNkJBQTZCVCwwQkFBMEJRLFNBQVNYO0lBRXRFLE9BQU9ZO0FBQ1Q7QUFFTyxTQUFTdkIsNkRBQTZEd0IsNEJBQTRCLEVBQUViLEtBQUs7SUFDOUcsSUFBTVcsVUFBVUUsOEJBQ1ZDLCtCQUErQlgsMEJBQTBCUSxTQUFTWDtJQUV4RSxPQUFPYztBQUNUO0FBRUEsU0FBU1gsMEJBQTBCUSxPQUFPO1FBQUVYLFFBQUFBLGlFQUFRRjtJQUNsRCxJQUFNaUIsU0FBU2YsTUFBTWdCLFFBQVEsQ0FBQ0w7SUFFOUIsT0FBT0k7QUFDVCJ9
|
|
@@ -126,7 +126,7 @@ _define_property(IntrinsicLevelVerifier, "maps", [
|
|
|
126
126
|
{
|
|
127
127
|
nodeQuery: termNodeQuery,
|
|
128
128
|
verify: function(termNode, localContext) {
|
|
129
|
-
var
|
|
129
|
+
var Term = _shim.default.Term, term = Term.fromTermNode(termNode, localContext), termVerified = term.verify(localContext, function() {
|
|
130
130
|
var verifiedAhead = true;
|
|
131
131
|
return verifiedAhead;
|
|
132
132
|
});
|
|
@@ -137,4 +137,4 @@ _define_property(IntrinsicLevelVerifier, "maps", [
|
|
|
137
137
|
var intrinsicLevelVerifier = new IntrinsicLevelVerifier();
|
|
138
138
|
var _default = intrinsicLevelVerifier;
|
|
139
139
|
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9pbnRyaW5zaWNMZXZlbC5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHNoaW0gZnJvbSBcIi4uL3NoaW1cIjtcbmltcG9ydCBWZXJpZmllciBmcm9tIFwiLi4vdmVyaWZpZXJcIjtcblxuaW1wb3J0IHsgbm9kZVF1ZXJ5IH0gZnJvbSBcIi4uL3V0aWxpdGllcy9xdWVyeVwiO1xuXG5jb25zdCB0ZXJtTm9kZVF1ZXJ5ID0gbm9kZVF1ZXJ5KFwiL3Rlcm0hXCIpO1xuXG5jbGFzcyBJbnRyaW5zaWNMZXZlbFZlcmlmaWVyIGV4dGVuZHMgVmVyaWZpZXIge1xuICB2ZXJpZnkobm9kZSwgbG9jYWxDb250ZXh0KSB7XG4gICAgbGV0IHZlcmlmaWVkO1xuXG4gICAgY29uc3Qgbm9uVGVybWluYWxOb2RlID0gbm9kZSwgLy8vXG4gICAgICAgICAgbm9uVGVybWluYWxOb2RlVmVyaWZpZWQgPSB0aGlzLnZlcmlmeU5vblRlcm1pbmFsTm9kZShub25UZXJtaW5hbE5vZGUsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB2ZXJpZmllZCA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHRlcm1Ob2RlUXVlcnksXG4gICAgICB2ZXJpZnk6ICh0ZXJtTm9kZSwgbG9jYWxDb250ZXh0KSA9PiB7XG4gICAgICAgIGNvbnN0IHsgVGVybSB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgdGVybSA9IFRlcm0uZnJvbVRlcm1Ob2RlKHRlcm1Ob2RlLCBsb2NhbENvbnRleHQpLFxuICAgICAgICAgICAgICB0ZXJtVmVyaWZpZWQgPSB0ZXJtLnZlcmlmeShsb2NhbENvbnRleHQsICgpID0+IHtcbiAgICAgICAgICAgICAgICBjb25zdCB2ZXJpZmllZEFoZWFkID0gdHJ1ZTtcblxuICAgICAgICAgICAgICAgIHJldHVybiB2ZXJpZmllZEFoZWFkO1xuICAgICAgICAgICAgICB9KTtcblxuICAgICAgICByZXR1cm4gdGVybVZlcmlmaWVkO1xuICAgICAgfVxuICAgIH1cbiAgXTtcbn1cblxuY29uc3QgaW50cmluc2ljTGV2ZWxWZXJpZmllciA9IG5ldyBJbnRyaW5zaWNMZXZlbFZlcmlmaWVyKCk7XG5cbmV4cG9ydCBkZWZhdWx0IGludHJpbnNpY0xldmVsVmVyaWZpZXI7XG4iXSwibmFtZXMiOlsidGVybU5vZGVRdWVyeSIsIm5vZGVRdWVyeSIsIkludHJpbnNpY0xldmVsVmVyaWZpZXIiLCJ2ZXJpZnkiLCJub2RlIiwibG9jYWxDb250ZXh0IiwidmVyaWZpZWQiLCJub25UZXJtaW5hbE5vZGUiLCJub25UZXJtaW5hbE5vZGVWZXJpZmllZCIsInZlcmlmeU5vblRlcm1pbmFsTm9kZSIsIlZlcmlmaWVyIiwibWFwcyIsInRlcm1Ob2RlIiwiVGVybSIsInNoaW0iLCJ0ZXJtIiwiZnJvbVRlcm1Ob2RlIiwidGVybVZlcmlmaWVkIiwidmVyaWZpZWRBaGVhZCIsImludHJpbnNpY0xldmVsVmVyaWZpZXIiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXlDQTs7O2VBQUE7OzsyREF2Q2lCOytEQUNJO3FCQUVLOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUUxQixJQUFNQSxnQkFBZ0JDLElBQUFBLGdCQUFTLEVBQUM7QUFFaEMsSUFBQSxBQUFNQyx1Q0FBTjtjQUFNQTthQUFBQTtnQ0FBQUE7aUNBQUFBOztrQkFBQUE7O1lBQ0pDLEtBQUFBO21CQUFBQSxTQUFBQSxPQUFPQyxJQUFJLEVBQUVDLFlBQVk7Z0JBQ3ZCLElBQUlDO2dCQUVKLElBQU1DLGtCQUFrQkgsTUFDbEJJLDBCQUEwQixJQUFJLENBQUNDLHFCQUFxQixDQUFDRixpQkFBaUJGO2dCQUU1RUMsV0FBV0UseUJBQTBCLEdBQUc7Z0JBRXhDLE9BQU9GO1lBQ1Q7OztXQVZJSjtFQUErQlEsaUJBQVE7QUFZM0MsaUJBWklSLHdCQVlHUyxRQUFPO0lBQ1o7UUFDRVYsV0FBV0Q7UUFDWEcsUUFBUSxTQUFDUyxVQUFVUDtZQUNqQixJQUFNLEFBQUVRLE9BQVNDLGFBQUksQ0FBYkQsTUFDRkUsT0FBT0YsS0FBS0csWUFBWSxDQUFDSixVQUFVUCxlQUNuQ1ksZUFBZUYsS0FBS1osTUFBTSxDQUFDRSxjQUFjO2dCQUN2QyxJQUFNYSxnQkFBZ0I7Z0JBRXRCLE9BQU9BO1lBQ1Q7WUFFTixPQUFPRDtRQUNUO0lBQ0Y7Q0FDRDtBQUdILElBQU1FLHlCQUF5QixJQUFJakI7SUFFbkMsV0FBZWlCIn0=
|
|
@@ -133,7 +133,7 @@ _define_property(MetaLevelVerifier, "maps", [
|
|
|
133
133
|
{
|
|
134
134
|
nodeQuery: termNodeQuery,
|
|
135
135
|
verify: function(termNode, assignments, stated, localContext) {
|
|
136
|
-
var
|
|
136
|
+
var Term = _shim.default.Term, term = Term.fromTermNode(termNode, localContext), termVerified = term.verify(localContext, function() {
|
|
137
137
|
var verifiedAhead = true;
|
|
138
138
|
return verifiedAhead;
|
|
139
139
|
});
|
|
@@ -144,4 +144,4 @@ _define_property(MetaLevelVerifier, "maps", [
|
|
|
144
144
|
var metaLevelVerifier = new MetaLevelVerifier();
|
|
145
145
|
var _default = metaLevelVerifier;
|
|
146
146
|
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9tZXRhTGV2ZWwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVmVyaWZpZXIgZnJvbSBcIi4uL3ZlcmlmaWVyXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdGVybU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtIVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQhXCIpO1xuXG5jbGFzcyBNZXRhTGV2ZWxWZXJpZmllciBleHRlbmRzIFZlcmlmaWVyIHtcbiAgdmVyaWZ5KG5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCB2ZXJpZmllZDtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IG5vZGUsIC8vL1xuICAgICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gdGhpcy52ZXJpZnlDaGlsZE5vZGVzKGNoaWxkTm9kZXMsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB2ZXJpZmllZCA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHN0YXRlbWVudE5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCB7IFN0YXRlbWVudCB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgc3RhdGVtZW50ID0gU3RhdGVtZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkID0gc3RhdGVtZW50LnZlcmlmeShhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdGVybU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHRlcm1Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpID0+
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy92ZXJpZmllci9tZXRhTGV2ZWwuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBzaGltIGZyb20gXCIuLi9zaGltXCI7XG5pbXBvcnQgVmVyaWZpZXIgZnJvbSBcIi4uL3ZlcmlmaWVyXCI7XG5cbmltcG9ydCB7IG5vZGVRdWVyeSB9IGZyb20gXCIuLi91dGlsaXRpZXMvcXVlcnlcIjtcblxuY29uc3QgdGVybU5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi90ZXJtIVwiKSxcbiAgICAgIHN0YXRlbWVudE5vZGVRdWVyeSA9IG5vZGVRdWVyeShcIi9zdGF0ZW1lbnQhXCIpO1xuXG5jbGFzcyBNZXRhTGV2ZWxWZXJpZmllciBleHRlbmRzIFZlcmlmaWVyIHtcbiAgdmVyaWZ5KG5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkge1xuICAgIGxldCB2ZXJpZmllZDtcblxuICAgIGNvbnN0IG5vblRlcm1pbmFsTm9kZSA9IG5vZGUsIC8vL1xuICAgICAgICAgIGNoaWxkTm9kZXMgPSBub25UZXJtaW5hbE5vZGUuZ2V0Q2hpbGROb2RlcygpLFxuICAgICAgICAgIG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkID0gdGhpcy52ZXJpZnlDaGlsZE5vZGVzKGNoaWxkTm9kZXMsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCk7XG5cbiAgICB2ZXJpZmllZCA9IG5vblRlcm1pbmFsTm9kZVZlcmlmaWVkOyAgLy8vXG5cbiAgICByZXR1cm4gdmVyaWZpZWQ7XG4gIH1cblxuICBzdGF0aWMgbWFwcyA9IFtcbiAgICB7XG4gICAgICBub2RlUXVlcnk6IHN0YXRlbWVudE5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHN0YXRlbWVudE5vZGUsIGFzc2lnbm1lbnRzLCBzdGF0ZWQsIGxvY2FsQ29udGV4dCkgPT4ge1xuICAgICAgICBjb25zdCB7IFN0YXRlbWVudCB9ID0gc2hpbSxcbiAgICAgICAgICAgICAgc3RhdGVtZW50ID0gU3RhdGVtZW50LmZyb21TdGF0ZW1lbnROb2RlKHN0YXRlbWVudE5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHN0YXRlbWVudFZlcmlmaWVkID0gc3RhdGVtZW50LnZlcmlmeShhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpO1xuXG4gICAgICAgIHJldHVybiBzdGF0ZW1lbnRWZXJpZmllZDtcbiAgICAgIH1cbiAgICB9LFxuICAgIHtcbiAgICAgIG5vZGVRdWVyeTogdGVybU5vZGVRdWVyeSxcbiAgICAgIHZlcmlmeTogKHRlcm1Ob2RlLCBhc3NpZ25tZW50cywgc3RhdGVkLCBsb2NhbENvbnRleHQpID0+IHtcbiAgICAgICAgY29uc3QgeyBUZXJtIH0gPSBzaGltLFxuICAgICAgICAgICAgICB0ZXJtID0gVGVybS5mcm9tVGVybU5vZGUodGVybU5vZGUsIGxvY2FsQ29udGV4dCksXG4gICAgICAgICAgICAgIHRlcm1WZXJpZmllZCA9IHRlcm0udmVyaWZ5KGxvY2FsQ29udGV4dCwgKCkgPT4ge1xuICAgICAgICAgICAgICAgIGNvbnN0IHZlcmlmaWVkQWhlYWQgPSB0cnVlO1xuXG4gICAgICAgICAgICAgICAgcmV0dXJuIHZlcmlmaWVkQWhlYWQ7XG4gICAgICAgICAgICAgIH0pO1xuXG4gICAgICAgIHJldHVybiB0ZXJtVmVyaWZpZWQ7XG4gICAgICB9XG4gICAgfVxuICBdO1xufVxuXG5jb25zdCBtZXRhTGV2ZWxWZXJpZmllciA9IG5ldyBNZXRhTGV2ZWxWZXJpZmllcigpO1xuXG5leHBvcnQgZGVmYXVsdCBtZXRhTGV2ZWxWZXJpZmllcjtcbiJdLCJuYW1lcyI6WyJ0ZXJtTm9kZVF1ZXJ5Iiwibm9kZVF1ZXJ5Iiwic3RhdGVtZW50Tm9kZVF1ZXJ5IiwiTWV0YUxldmVsVmVyaWZpZXIiLCJ2ZXJpZnkiLCJub2RlIiwiYXNzaWdubWVudHMiLCJzdGF0ZWQiLCJsb2NhbENvbnRleHQiLCJ2ZXJpZmllZCIsIm5vblRlcm1pbmFsTm9kZSIsImNoaWxkTm9kZXMiLCJnZXRDaGlsZE5vZGVzIiwibm9uVGVybWluYWxOb2RlVmVyaWZpZWQiLCJ2ZXJpZnlDaGlsZE5vZGVzIiwiVmVyaWZpZXIiLCJtYXBzIiwic3RhdGVtZW50Tm9kZSIsIlN0YXRlbWVudCIsInNoaW0iLCJzdGF0ZW1lbnQiLCJmcm9tU3RhdGVtZW50Tm9kZSIsInN0YXRlbWVudFZlcmlmaWVkIiwidGVybU5vZGUiLCJUZXJtIiwidGVybSIsImZyb21UZXJtTm9kZSIsInRlcm1WZXJpZmllZCIsInZlcmlmaWVkQWhlYWQiLCJtZXRhTGV2ZWxWZXJpZmllciJdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7K0JBcURBOzs7ZUFBQTs7OzJEQW5EaUI7K0RBQ0k7cUJBRUs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRTFCLElBQU1BLGdCQUFnQkMsSUFBQUEsZ0JBQVMsRUFBQyxXQUMxQkMscUJBQXFCRCxJQUFBQSxnQkFBUyxFQUFDO0FBRXJDLElBQUEsQUFBTUUsa0NBQU47Y0FBTUE7YUFBQUE7Z0NBQUFBO2lDQUFBQTs7a0JBQUFBOztZQUNKQyxLQUFBQTttQkFBQUEsU0FBQUEsT0FBT0MsSUFBSSxFQUFFQyxXQUFXLEVBQUVDLE1BQU0sRUFBRUMsWUFBWTtnQkFDNUMsSUFBSUM7Z0JBRUosSUFBTUMsa0JBQWtCTCxNQUNsQk0sYUFBYUQsZ0JBQWdCRSxhQUFhLElBQzFDQywwQkFBMEIsSUFBSSxDQUFDQyxnQkFBZ0IsQ0FBQ0gsWUFBWUwsYUFBYUMsUUFBUUM7Z0JBRXZGQyxXQUFXSSx5QkFBMEIsR0FBRztnQkFFeEMsT0FBT0o7WUFDVDs7O1dBWElOO0VBQTBCWSxpQkFBUTtBQWF0QyxpQkFiSVosbUJBYUdhLFFBQU87SUFDWjtRQUNFZixXQUFXQztRQUNYRSxRQUFRLFNBQUNhLGVBQWVYLGFBQWFDLFFBQVFDO1lBQzNDLElBQU0sQUFBRVUsWUFBY0MsYUFBSSxDQUFsQkQsV0FDRkUsWUFBWUYsVUFBVUcsaUJBQWlCLENBQUNKLGVBQWVULGVBQ3ZEYyxvQkFBb0JGLFVBQVVoQixNQUFNLENBQUNFLGFBQWFDLFFBQVFDO1lBRWhFLE9BQU9jO1FBQ1Q7SUFDRjtJQUNBO1FBQ0VyQixXQUFXRDtRQUNYSSxRQUFRLFNBQUNtQixVQUFVakIsYUFBYUMsUUFBUUM7WUFDdEMsSUFBTSxBQUFFZ0IsT0FBU0wsYUFBSSxDQUFiSyxNQUNGQyxPQUFPRCxLQUFLRSxZQUFZLENBQUNILFVBQVVmLGVBQ25DbUIsZUFBZUYsS0FBS3JCLE1BQU0sQ0FBQ0ksY0FBYztnQkFDdkMsSUFBTW9CLGdCQUFnQjtnQkFFdEIsT0FBT0E7WUFDVDtZQUVOLE9BQU9EO1FBQ1Q7SUFDRjtDQUNEO0FBR0gsSUFBTUUsb0JBQW9CLElBQUkxQjtJQUU5QixXQUFlMEIifQ==
|
package/package.json
CHANGED
|
@@ -12,8 +12,9 @@ const statementNodesQuery = nodesQuery("/subproofAssertion/statement"),
|
|
|
12
12
|
subproofAssertionNodeQuery = nodeQuery("/statement/subproofAssertion");
|
|
13
13
|
|
|
14
14
|
export default class SubproofAssertion {
|
|
15
|
-
constructor(string, statements) {
|
|
15
|
+
constructor(string, node, statements) {
|
|
16
16
|
this.string = string;
|
|
17
|
+
this.node = node;
|
|
17
18
|
this.statements = statements;
|
|
18
19
|
}
|
|
19
20
|
|
|
@@ -21,6 +22,10 @@ export default class SubproofAssertion {
|
|
|
21
22
|
return this.string;
|
|
22
23
|
}
|
|
23
24
|
|
|
25
|
+
getNode() {
|
|
26
|
+
return this.node;
|
|
27
|
+
}
|
|
28
|
+
|
|
24
29
|
getStatements() {
|
|
25
30
|
return this.statements;
|
|
26
31
|
}
|
|
@@ -36,7 +41,7 @@ export default class SubproofAssertion {
|
|
|
36
41
|
verifiedWhenDerived = false;
|
|
37
42
|
|
|
38
43
|
if (stated) {
|
|
39
|
-
verifiedWhenStated = this.verifyWhenStated(
|
|
44
|
+
verifiedWhenStated = this.verifyWhenStated(localContext);
|
|
40
45
|
} else {
|
|
41
46
|
verifiedWhenDerived = this.verifyWhenDerived(localContext);
|
|
42
47
|
}
|
|
@@ -135,9 +140,10 @@ export default class SubproofAssertion {
|
|
|
135
140
|
|
|
136
141
|
return statement;
|
|
137
142
|
}),
|
|
143
|
+
node = subproofAssertionNode, ///
|
|
138
144
|
string = statementString; ///
|
|
139
145
|
|
|
140
|
-
subproofAssertion = new SubproofAssertion(string, statements);
|
|
146
|
+
subproofAssertion = new SubproofAssertion(string, node, statements);
|
|
141
147
|
}
|
|
142
148
|
|
|
143
149
|
return subproofAssertion;
|
|
@@ -151,8 +157,9 @@ export default class SubproofAssertion {
|
|
|
151
157
|
|
|
152
158
|
return statement;
|
|
153
159
|
}),
|
|
160
|
+
node = subproofAssertionNode, ///
|
|
154
161
|
string = stringFromStatements(statements),
|
|
155
|
-
subproofAssertion = new SubproofAssertion(string, statements);
|
|
162
|
+
subproofAssertion = new SubproofAssertion(string, node, statements);
|
|
156
163
|
|
|
157
164
|
return subproofAssertion;
|
|
158
165
|
}
|
package/src/metavariable.js
CHANGED
|
@@ -154,6 +154,52 @@ export default class Metavariable {
|
|
|
154
154
|
return statementUnified;
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
+
unifyStatementGivenSubstitution(statement, substitution, substitutions, localContext) {
|
|
158
|
+
let statementUnifiedGivenSubstitution = false;
|
|
159
|
+
|
|
160
|
+
const statementString = statement.getString(),
|
|
161
|
+
substitutionString = substitution.getString(),
|
|
162
|
+
metavariableString = this.string;
|
|
163
|
+
|
|
164
|
+
localContext.trace(`Unifying the '${statementString}' statement with the '${metavariableString}' metavariable givne the '${substitutionString}' substitution...`);
|
|
165
|
+
|
|
166
|
+
// let metavariableUnifiedWithStatementGivenSubstitution = false;
|
|
167
|
+
//
|
|
168
|
+
// const metavariableNode = metavariable.getNode(),
|
|
169
|
+
// substitutionNode = substitution.getNode(),
|
|
170
|
+
// complexSubstitution = substitutions.findComplexSubstitutionByMetavariableNodeAndSubstitutionNode(metavariableNode, substitutionNode);
|
|
171
|
+
//
|
|
172
|
+
// if (complexSubstitution !== null) {
|
|
173
|
+
// const statementNode = statement.getNode(),
|
|
174
|
+
// statementNodeMatches = complexSubstitution.matchStatementNode(statementNode);
|
|
175
|
+
//
|
|
176
|
+
// if (statementNodeMatches) {
|
|
177
|
+
// metavariableUnifiedWithStatementGivenSubstitution = true;
|
|
178
|
+
// }
|
|
179
|
+
// } else {
|
|
180
|
+
// const metavariableNameA = metavariableNameFromMetavariableNode(metavariableNode),
|
|
181
|
+
// metavariableA = localContextA.findMetavariableByMetavariableName(metavariableNameA),
|
|
182
|
+
// metavariableB = metavariableFromStatementNode(statement, localContextB);
|
|
183
|
+
//
|
|
184
|
+
// if (metavariableA === metavariableB) {
|
|
185
|
+
// metavariableUnifiedWithStatementGivenSubstitution = false; ///
|
|
186
|
+
// } else {
|
|
187
|
+
// const statementForMetavariableSubstitution = StatementForMetavariableSubstitution.fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, localContextA, localContextB),
|
|
188
|
+
// substitution = statementForMetavariableSubstitution; ///
|
|
189
|
+
//
|
|
190
|
+
// substitutions.addSubstitution(substitution, localContextA, localContextB);
|
|
191
|
+
//
|
|
192
|
+
// metavariableUnifiedWithStatementGivenSubstitution = true;
|
|
193
|
+
// }
|
|
194
|
+
// }
|
|
195
|
+
|
|
196
|
+
if (statementUnifiedGivenSubstitution) {
|
|
197
|
+
localContext.trace(`...unified the '${statementString}' statement with the '${metavariableString}' metavariable givne the '${substitutionString}' substitution.`);
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
return statementUnifiedGivenSubstitution;
|
|
201
|
+
}
|
|
202
|
+
|
|
157
203
|
toJSON() {
|
|
158
204
|
const metaTypeJSON = (this.metaType !== null) ?
|
|
159
205
|
this.metaType.toJSON() :
|
|
@@ -230,7 +276,7 @@ function statementMetavariableFromStatementNode(statementNode, localContext) {
|
|
|
230
276
|
const statementMetavariableNode = statementMetavariableNodeQuery(statementNode);
|
|
231
277
|
|
|
232
278
|
if (statementMetavariableNode !== null) {
|
|
233
|
-
const statementMetavariableName =
|
|
279
|
+
const statementMetavariableName = metavariableNameFromMetavariableNode(statementMetavariableNode);
|
|
234
280
|
|
|
235
281
|
statementMetavariable = localContext.findMetavariableByMetavariableName(statementMetavariableName);
|
|
236
282
|
}
|
package/src/premise.js
CHANGED
|
@@ -161,7 +161,7 @@ export default class Premise {
|
|
|
161
161
|
return premise;
|
|
162
162
|
}
|
|
163
163
|
|
|
164
|
-
static
|
|
164
|
+
static fromPremiseNode(suppositionNode, fileContext) {
|
|
165
165
|
const unqualifiedStatementNode = unqualifiedStatementNodeQuery(suppositionNode),
|
|
166
166
|
unqualifiedStatement = UnqualifiedStatement.fromUnqualifiedStatementNode(unqualifiedStatementNode, fileContext),
|
|
167
167
|
premise = new Premise(fileContext, unqualifiedStatement);
|
package/src/ruleNames.js
CHANGED
|
@@ -2,5 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
export const VARIABLE_RULE_NAME = "variable";
|
|
4
4
|
export const METAVARIABLE_RULE_NAME = "metavariable";
|
|
5
|
+
export const SUBSTITUTION_RULE_NAME = "substitution";
|
|
5
6
|
export const UNQUALIFIED_STATEMENT_RULE_NAME = "unqualifiedStatement";
|
|
6
7
|
export const CONSTRUCTOR_DECLARATION_RULE_NAME = "constructorDeclaration";
|
package/src/statement.js
CHANGED
|
@@ -3,15 +3,17 @@
|
|
|
3
3
|
import shim from "./shim";
|
|
4
4
|
import unifyMixins from "./mixins/statement/unify";
|
|
5
5
|
import verifyMixins from "./mixins/statement/verify";
|
|
6
|
+
import StatementSubstitution from "./substitution/statement";
|
|
6
7
|
import statementAsCombinatorVerifier from "./verifier/statementAsCombinator";
|
|
7
8
|
|
|
8
9
|
import { STATEMENT_META_TYPE_NAME } from "./metaTypeNames";
|
|
9
10
|
import { statementNodeFromStatementString } from "./utilities/node";
|
|
10
11
|
|
|
11
12
|
class Statement {
|
|
12
|
-
constructor(string, node) {
|
|
13
|
+
constructor(string, node, substitution) {
|
|
13
14
|
this.string = string;
|
|
14
15
|
this.node = node;
|
|
16
|
+
this.substitution = substitution;
|
|
15
17
|
}
|
|
16
18
|
|
|
17
19
|
getString() {
|
|
@@ -22,6 +24,10 @@ class Statement {
|
|
|
22
24
|
return this.node;
|
|
23
25
|
}
|
|
24
26
|
|
|
27
|
+
getSubstitution() {
|
|
28
|
+
return this.substitution;
|
|
29
|
+
}
|
|
30
|
+
|
|
25
31
|
isEqualTo(statement) {
|
|
26
32
|
const node = statement.getNode(),
|
|
27
33
|
matches = this.node.match(node),
|
|
@@ -108,8 +114,13 @@ class Statement {
|
|
|
108
114
|
}
|
|
109
115
|
|
|
110
116
|
toJSON() {
|
|
111
|
-
const
|
|
117
|
+
const substitutionJSON = (this.substitution !== null) ?
|
|
118
|
+
this.substitution.toJSON() :
|
|
119
|
+
null,
|
|
120
|
+
substitution = substitutionJSON, ///
|
|
121
|
+
string = this.string, ///
|
|
112
122
|
json = {
|
|
123
|
+
substitution,
|
|
113
124
|
string
|
|
114
125
|
};
|
|
115
126
|
|
|
@@ -122,8 +133,17 @@ class Statement {
|
|
|
122
133
|
lexer = fileContext.getLexer(),
|
|
123
134
|
parser = fileContext.getParser(),
|
|
124
135
|
statementNode = statementNodeFromStatementString(statementString, lexer, parser),
|
|
125
|
-
node = statementNode
|
|
126
|
-
|
|
136
|
+
node = statementNode; ///
|
|
137
|
+
|
|
138
|
+
let { substitution } = json;
|
|
139
|
+
|
|
140
|
+
json = substitution; ///
|
|
141
|
+
|
|
142
|
+
const statementSubstitution = StatementSubstitution.fromJSON(json, fileContext);
|
|
143
|
+
|
|
144
|
+
substitution = statementSubstitution; ///
|
|
145
|
+
|
|
146
|
+
const statement = new Statement(string, node, substitution);
|
|
127
147
|
|
|
128
148
|
return statement;
|
|
129
149
|
}
|
|
@@ -131,7 +151,9 @@ class Statement {
|
|
|
131
151
|
static fromStatementNode(statementNode, localContext) {
|
|
132
152
|
const node = statementNode, ///
|
|
133
153
|
string = localContext.nodeAsString(node),
|
|
134
|
-
|
|
154
|
+
statementSubstitution = StatementSubstitution.fromStatementNode(statementNode, localContext),
|
|
155
|
+
substitution = statementSubstitution, ///
|
|
156
|
+
statement = new Statement(string, node, substitution);
|
|
135
157
|
|
|
136
158
|
return statement;
|
|
137
159
|
}
|
|
@@ -69,10 +69,11 @@ export default class FrameForMetavariableSubstitution extends Substitution {
|
|
|
69
69
|
return metavariableNodeMatches;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
static
|
|
72
|
+
static fromSubstitution(substitution, localContextA, localContextB) {
|
|
73
73
|
let frameForMetavariableSubstitution = null;
|
|
74
74
|
|
|
75
|
-
const
|
|
75
|
+
const substitutionNode = substitution.getNode(),
|
|
76
|
+
substitutionFrameNode = substitutionFrameNodeQuery(substitutionNode);
|
|
76
77
|
|
|
77
78
|
if (substitutionFrameNode !== null) {
|
|
78
79
|
const substitutionMetavariableNode = substitutionMetavariableNodeQuery(substitutionNode),
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import Substitution from "../substitution";
|
|
4
|
+
|
|
5
|
+
import { nodeQuery } from "../utilities/query";
|
|
6
|
+
import { substitutionNodeFromSubstitutionString } from "../utilities/node";
|
|
7
|
+
|
|
8
|
+
const substitutionNodeQuery = nodeQuery("/statement/substitution");
|
|
9
|
+
|
|
10
|
+
export default class StatementSubstitution extends Substitution {
|
|
11
|
+
constructor(string, node) {
|
|
12
|
+
super(string);
|
|
13
|
+
|
|
14
|
+
this.node = node;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
getNode() {
|
|
18
|
+
return this.node;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
toJSON() {
|
|
22
|
+
const string = this.getString(),
|
|
23
|
+
json = {
|
|
24
|
+
string
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
return json;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
static fromJSON(json, fileContext) {
|
|
31
|
+
let statementSubstitution = null;
|
|
32
|
+
|
|
33
|
+
if (json !== null) {
|
|
34
|
+
const { string } = json,
|
|
35
|
+
lexer = fileContext.getLexer(),
|
|
36
|
+
parser = fileContext.getParser(),
|
|
37
|
+
substitutionString = string, ///
|
|
38
|
+
substitutionNode = substitutionNodeFromSubstitutionString(substitutionString, lexer, parser),
|
|
39
|
+
node = substitutionNode;
|
|
40
|
+
|
|
41
|
+
statementSubstitution = new Substitution(string, node);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
return statementSubstitution;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
static fromStatementNode(statementNode, fileContext) {
|
|
48
|
+
let statementSubstitution = null;
|
|
49
|
+
|
|
50
|
+
const substitutionNode = substitutionNodeQuery(statementNode);
|
|
51
|
+
|
|
52
|
+
if (substitutionNode) {
|
|
53
|
+
const node = substitutionNode,
|
|
54
|
+
string = fileContext.nodeAsString(substitutionNode);
|
|
55
|
+
|
|
56
|
+
statementSubstitution = new Substitution(string, node);
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
return statementSubstitution;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
@@ -71,12 +71,21 @@ export default class StatementForMetavariableSubstitution extends Substitution {
|
|
|
71
71
|
return statementForMetavariableSubstitution;
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
static
|
|
74
|
+
static fromStatementMetavariableAndSubstitution(statement, metavariable, substitution, localContext) {
|
|
75
|
+
let statementNode = statement.getNode();
|
|
76
|
+
|
|
75
77
|
statementNode = stripBracketsFromStatement(statementNode); ///
|
|
76
78
|
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
79
|
+
const { Statement } = shim;
|
|
80
|
+
|
|
81
|
+
statement = Statement.fromStatementNode(statementNode, localContext); ///
|
|
82
|
+
|
|
83
|
+
const metavariableNode = metavariable.getNode(),
|
|
84
|
+
string = stringFromStatementMetavariableAndSubstitution(statement, metavariable, substitution, localContext);
|
|
85
|
+
|
|
86
|
+
substitution = substitutionFromSubstitution(substitution, localContext);
|
|
87
|
+
|
|
88
|
+
const statementForMetavariableSubstitution = new StatementForMetavariableSubstitution(string, statementNode, metavariableNode, substitution);
|
|
80
89
|
|
|
81
90
|
return statementForMetavariableSubstitution;
|
|
82
91
|
}
|
|
@@ -91,29 +100,31 @@ function stringFromStatementAndMetavariable(statement, metavariable) {
|
|
|
91
100
|
}
|
|
92
101
|
|
|
93
102
|
|
|
94
|
-
function
|
|
95
|
-
let substitution = null;
|
|
96
|
-
|
|
97
|
-
if (substitution === null) {
|
|
98
|
-
const termForVariableSubstitution = TermForVariableSubstitution.fromSubstitutionNode(substitutionNode, localContextA, localContextB);
|
|
103
|
+
function substitutionFromSubstitution(substitution, localContextA, localContextB) {
|
|
104
|
+
// let substitution = null;
|
|
99
105
|
|
|
100
|
-
|
|
101
|
-
substitution = termForVariableSubstitution; ///
|
|
102
|
-
}
|
|
103
|
-
}
|
|
106
|
+
debugger
|
|
104
107
|
|
|
105
|
-
if (substitution === null) {
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
108
|
+
// if (substitution === null) {
|
|
109
|
+
// const termForVariableSubstitution = TermForVariableSubstitution.fromSubstitution(substitutionNode, localContextA, localContextB);
|
|
110
|
+
//
|
|
111
|
+
// if (termForVariableSubstitution !== null) {
|
|
112
|
+
// substitution = termForVariableSubstitution; ///
|
|
113
|
+
// }
|
|
114
|
+
// }
|
|
115
|
+
//
|
|
116
|
+
// if (substitution === null) {
|
|
117
|
+
// const frameForMetavariableSubstitution = FrameForMetavariableSubstitution.fromSubstitution(substitutionNode, localContextA, localContextB);
|
|
118
|
+
//
|
|
119
|
+
// if (frameForMetavariableSubstitution !== null) {
|
|
120
|
+
// substitution = frameForMetavariableSubstitution; ///
|
|
121
|
+
// }
|
|
122
|
+
// }
|
|
112
123
|
|
|
113
124
|
return substitution;
|
|
114
125
|
}
|
|
115
126
|
|
|
116
|
-
function
|
|
127
|
+
function stringFromStatementMetavariableAndSubstitution(statementNode, metavariableNode, substitution, localContextA, localContextB) {
|
|
117
128
|
let string;
|
|
118
129
|
|
|
119
130
|
const statementNodeB = statementNode, ///
|
|
@@ -7,7 +7,7 @@ import { nodeQuery } from "../utilities/query";
|
|
|
7
7
|
import { stripBracketsFromTerm } from "../utilities/brackets";
|
|
8
8
|
|
|
9
9
|
const termVariableNodeQuery = nodeQuery("/term/variable!"),
|
|
10
|
-
|
|
10
|
+
substitutionTermNodeQuery = nodeQuery("/substitution/term!"),
|
|
11
11
|
substitutionsVariableNodeQuery = nodeQuery("/substitution/variable!");
|
|
12
12
|
|
|
13
13
|
export default class TermForVariableSubstitution extends Substitution {
|
|
@@ -83,26 +83,12 @@ export default class TermForVariableSubstitution extends Substitution {
|
|
|
83
83
|
return unifiedWithEquivalence;
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
static
|
|
87
|
-
let termNode = term.getNode();
|
|
88
|
-
|
|
89
|
-
termNode = stripBracketsFromTerm(termNode); ///
|
|
90
|
-
|
|
91
|
-
const { Term } = shim;
|
|
92
|
-
|
|
93
|
-
term = Term.fromTermNode(termNode, localContext); ///
|
|
94
|
-
|
|
95
|
-
const string = stringFromTermAndVariable(term, variable),
|
|
96
|
-
variableNode = variable.getNode(),
|
|
97
|
-
termForVariableSubstitution = new TermForVariableSubstitution(string, termNode, variableNode);
|
|
98
|
-
|
|
99
|
-
return termForVariableSubstitution;
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
static fromSubstitutionNode(substitutionNode) {
|
|
86
|
+
static fromSubstitution(substitution) {
|
|
103
87
|
let termForVariableSubstitution = null;
|
|
104
88
|
|
|
105
|
-
|
|
89
|
+
const substitutionNode = substitution.getNode();
|
|
90
|
+
|
|
91
|
+
let substitutionTermNode = substitutionTermNodeQuery(substitutionNode);
|
|
106
92
|
|
|
107
93
|
if (substitutionTermNode !== null) {
|
|
108
94
|
let termNode = substitutionTermNode; ///
|
|
@@ -117,6 +103,22 @@ export default class TermForVariableSubstitution extends Substitution {
|
|
|
117
103
|
|
|
118
104
|
return termForVariableSubstitution;
|
|
119
105
|
}
|
|
106
|
+
|
|
107
|
+
static fromTernAndVariable(term, variable, localContext) {
|
|
108
|
+
let termNode = term.getNode();
|
|
109
|
+
|
|
110
|
+
termNode = stripBracketsFromTerm(termNode); ///
|
|
111
|
+
|
|
112
|
+
const { Term } = shim;
|
|
113
|
+
|
|
114
|
+
term = Term.fromTermNode(termNode, localContext); ///
|
|
115
|
+
|
|
116
|
+
const string = stringFromTermAndVariable(term, variable),
|
|
117
|
+
variableNode = variable.getNode(),
|
|
118
|
+
termForVariableSubstitution = new TermForVariableSubstitution(string, termNode, variableNode);
|
|
119
|
+
|
|
120
|
+
return termForVariableSubstitution;
|
|
121
|
+
}
|
|
120
122
|
}
|
|
121
123
|
|
|
122
124
|
function transformTermNode(termNode, substitutions) {
|