occam-furtle 3.0.310 → 3.0.311
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/element/procedure.js
CHANGED
|
@@ -41,8 +41,9 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
|
|
|
41
41
|
getName() {
|
|
42
42
|
return this.label.getName();
|
|
43
43
|
}
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
isBoolean() {
|
|
45
|
+
const type = this.getType(), booleanType = type.isBooleanType(), boolean = booleanType; ///
|
|
46
|
+
return boolean;
|
|
46
47
|
}
|
|
47
48
|
getReturnStatement() {
|
|
48
49
|
return this.returnBlock.getReturnStatement();
|
|
@@ -75,4 +76,4 @@ const _default = (0, _elements.define)(class Procedure extends _occamlanguages.E
|
|
|
75
76
|
static name = "Procedure";
|
|
76
77
|
});
|
|
77
78
|
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3Byb2NlZHVyZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IEV4Y2VwdGlvbiBmcm9tIFwiLi4vZXhjZXB0aW9uXCI7XG5cbmltcG9ydCB7IGRlZmluZSB9IGZyb20gXCIuLi9lbGVtZW50c1wiO1xuaW1wb3J0IHsgdmFsdWVzRnJvbU5vbWluYWxWYWx1ZXMgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3ZhbHVlc1wiO1xuaW1wb3J0IHsgdmFyaWFibGVzRnJvbVZhbHVlc0FuZFBhcmFtZXRlcnMgfSBmcm9tIFwiLi4vdXRpbGl0aWVzL3BhcmFtZXRlcnNcIjtcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lKGNsYXNzIFByb2NlZHVyZSBleHRlbmRzIEVsZW1lbnQge1xuICBjb25zdHJ1Y3Rvcihjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIHR5cGUsIGxhYmVsLCBwYXJhbWV0ZXJzLCByZXR1cm5CbG9jaykge1xuICAgIHN1cGVyKGNvbnRleHQsIHN0cmluZywgbm9kZSwgYnJlYWtQb2ludCk7XG5cbiAgICB0aGlzLnR5cGUgPSB0eXBlO1xuICAgIHRoaXMubGFiZWwgPSBsYWJlbDtcbiAgICB0aGlzLnBhcmFtZXRlcnMgPSBwYXJhbWV0ZXJzO1xuICAgIHRoaXMucmV0dXJuQmxvY2sgPSByZXR1cm5CbG9jaztcbiAgfVxuXG4gIGdldFR5cGUoKSB7XG4gICAgcmV0dXJuIHRoaXMudHlwZTtcbiAgfVxuXG4gIGdldExhYmVsKCkge1xuICAgIHJldHVybiB0aGlzLmxhYmVsO1xuICB9XG5cbiAgZ2V0UGFyYW1ldGVycygpIHtcbiAgICByZXR1cm4gdGhpcy5wYXJhbWV0ZXJzO1xuICB9XG5cbiAgZ2V0UmV0dXJuQmxvY2soKSB7XG4gICAgcmV0dXJuIHRoaXMucmV0dXJuQmxvY2s7XG4gIH1cblxuICBnZXROYW1lKCkgeyByZXR1cm4gdGhpcy5sYWJlbC5nZXROYW1lKCk7IH1cblxuICBpc0Jvb2xlYW4oKSB7XG4gICAgY29uc3QgdHlwZSA9IHRoaXMuZ2V0VHlwZSgpLFxuICAgICAgICAgIGJvb2xlYW5UeXBlID0gdHlwZS5pc0Jvb2xlYW5UeXBlKCksXG4gICAgICAgICAgYm9vbGVhbiA9IGJvb2xlYW5UeXBlOyAgLy8vXG5cbiAgICByZXR1cm4gYm9vbGVhbjtcbiAgfVxuICBnZXRSZXR1cm5TdGF0ZW1lbnQoKSB7IHJldHVybiB0aGlzLnJldHVybkJsb2NrLmdldFJldHVyblN0YXRlbWVudCgpOyB9XG5cbiAgY29tcGFyZVByb2NlZHVyZU5hbWUocHJvY2VkdXJlTmFtZSkgeyByZXR1cm4gdGhpcy5sYWJlbC5jb21wYXJlUHJvY2VkdXJlTmFtZShwcm9jZWR1cmVOYW1lKTsgfVxuXG4gIGFzeW5jIGNhbGwodmFsdWVzLCBjb250ZXh0KSB7XG4gICAgYXdhaXQgdGhpcy5icmVhayhjb250ZXh0KTtcblxuICAgIGNvbnN0IHByb2NlZHVyZVN0cmluZyA9IHRoaXMuZ2V0U3RyaW5nKCk7ICAvLy9cblxuICAgIGNvbnRleHQudHJhY2UoYENhbGxpbmcgdGhlICcke3Byb2NlZHVyZVN0cmluZ30nIHByb2NlZHVyZS4uLmApO1xuXG4gICAgdGhpcy5wYXJhbWV0ZXJzLmNvbXBhcmVWYWx1ZXModmFsdWVzLCBjb250ZXh0KTtcblxuICAgIGNvbnN0IHZhcmlhYmxlcyA9IHZhcmlhYmxlc0Zyb21WYWx1ZXNBbmRQYXJhbWV0ZXJzKHZhbHVlcywgdGhpcy5wYXJhbWV0ZXJzLCBjb250ZXh0KSxcbiAgICAgICAgICB2YWx1ZSA9IGF3YWl0IHRoaXMucmV0dXJuQmxvY2suZXZhbHVhdGUodmFyaWFibGVzLCBjb250ZXh0KSxcbiAgICAgICAgICB2YWx1ZVR5cGUgPSB2YWx1ZS5nZXRUeXBlKCksXG4gICAgICAgICAgdHlwZUVxdWFsVG9WYWx1ZVR5cGUgPSB0aGlzLnR5cGUuaXNFcXVhbFRvKHZhbHVlVHlwZSk7XG5cbiAgICBpZiAoIXR5cGVFcXVhbFRvVmFsdWVUeXBlKSB7XG4gICAgICBjb25zdCB2YWx1ZVN0cmluZyA9IHZhbHVlLmdldFN0cmluZygpLFxuICAgICAgICAgICAgdHlwZVN0cmluZyA9IHRoaXMudHlwZS5nZXRTdHJpbmcoKSxcbiAgICAgICAgICAgIG1lc3NhZ2UgPSBgVGhlICcke3ZhbHVlU3RyaW5nfScgdmFsdWUncyAnJHt0eXBlU3RyaW5nfScgdHlwZSBpcyBub3QgZXF1YWwgdG8gdGhlICcke3Byb2NlZHVyZVN0cmluZ30nIHByb2NlZHVyZSdzICcke3R5cGVTdHJpbmd9JyB0eXBlLmAsXG4gICAgICAgICAgICBleGNlcHRpb24gPSBFeGNlcHRpb24uZnJvbU1lc3NhZ2UobWVzc2FnZSk7XG5cbiAgICAgIHRocm93IGV4Y2VwdGlvbjtcbiAgICB9XG5cbiAgICBjb250ZXh0LmRlYnVnKGAuLi5jYWxsZWQgdGhlICcke3Byb2NlZHVyZVN0cmluZ30nIHByb2NlZHVyZS5gKTtcblxuICAgIHJldHVybiB2YWx1ZTtcbiAgfVxuXG4gIGFzeW5jIGNhbGxOb21pbmFsbHkobm9taW5hbFZhbHVlcykge1xuICAgIGNvbnN0IGNvbnRleHQgPSB0aGlzLmdldENvbnRleHQoKTtcblxuICAgIGF3YWl0IHRoaXMuYnJlYWsoY29udGV4dCk7XG5cbiAgICBjb25zdCBwcm9jZWR1cmVTdHJpbmcgPSB0aGlzLmdldFN0cmluZygpOyAgLy8vXG5cbiAgICBjb250ZXh0LnRyYWNlKGBDYWxsaW5nIHRoZSAnJHtwcm9jZWR1cmVTdHJpbmd9JyBwcm9jZWR1cmUgbm9taW5hbGx5Li4uYCk7XG5cbiAgICBjb25zdCB2YWx1ZXMgPSB2YWx1ZXNGcm9tTm9taW5hbFZhbHVlcyhub21pbmFsVmFsdWVzLCBjb250ZXh0KSxcbiAgICAgICAgICB0ZXJtID0gYXdhaXQgdGhpcy5jYWxsKHZhbHVlcywgY29udGV4dCk7XG5cbiAgICBjb250ZXh0LmRlYnVnKGAuLi5jYWxsZWQgdGhlICcke3Byb2NlZHVyZVN0cmluZ30nIHByb2NlZHVyZSBub21pbmFsbHkuYCk7XG5cbiAgICByZXR1cm4gdGVybTtcbiAgfVxuXG4gIHN0YXRpYyBuYW1lID0gXCJQcm9jZWR1cmVcIjtcbn0pO1xuIl0sIm5hbWVzIjpbImRlZmluZSIsIlByb2NlZHVyZSIsIkVsZW1lbnQiLCJjb250ZXh0Iiwic3RyaW5nIiwibm9kZSIsImJyZWFrUG9pbnQiLCJ0eXBlIiwibGFiZWwiLCJwYXJhbWV0ZXJzIiwicmV0dXJuQmxvY2siLCJnZXRUeXBlIiwiZ2V0TGFiZWwiLCJnZXRQYXJhbWV0ZXJzIiwiZ2V0UmV0dXJuQmxvY2siLCJnZXROYW1lIiwiaXNCb29sZWFuIiwiYm9vbGVhblR5cGUiLCJpc0Jvb2xlYW5UeXBlIiwiYm9vbGVhbiIsImdldFJldHVyblN0YXRlbWVudCIsImNvbXBhcmVQcm9jZWR1cmVOYW1lIiwicHJvY2VkdXJlTmFtZSIsImNhbGwiLCJ2YWx1ZXMiLCJicmVhayIsInByb2NlZHVyZVN0cmluZyIsImdldFN0cmluZyIsInRyYWNlIiwiY29tcGFyZVZhbHVlcyIsInZhcmlhYmxlcyIsInZhcmlhYmxlc0Zyb21WYWx1ZXNBbmRQYXJhbWV0ZXJzIiwidmFsdWUiLCJldmFsdWF0ZSIsInZhbHVlVHlwZSIsInR5cGVFcXVhbFRvVmFsdWVUeXBlIiwiaXNFcXVhbFRvIiwidmFsdWVTdHJpbmciLCJ0eXBlU3RyaW5nIiwibWVzc2FnZSIsImV4Y2VwdGlvbiIsIkV4Y2VwdGlvbiIsImZyb21NZXNzYWdlIiwiZGVidWciLCJjYWxsTm9taW5hbGx5Iiwibm9taW5hbFZhbHVlcyIsImdldENvbnRleHQiLCJ2YWx1ZXNGcm9tTm9taW5hbFZhbHVlcyIsInRlcm0iLCJuYW1lIl0sIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFVQTs7O2VBQUE7OztnQ0FSd0I7a0VBRUY7MEJBRUM7d0JBQ2lCOzRCQUNTOzs7Ozs7TUFFakQsV0FBZUEsSUFBQUEsZ0JBQU0sRUFBQyxNQUFNQyxrQkFBa0JDLHVCQUFPO0lBQ25ELFlBQVlDLE9BQU8sRUFB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
|
package/lib/element/term.js
CHANGED
|
@@ -10,7 +10,6 @@ Object.defineProperty(exports, "default", {
|
|
|
10
10
|
});
|
|
11
11
|
const _occamlanguages = require("occam-languages");
|
|
12
12
|
const _elements = require("../elements");
|
|
13
|
-
const _typeNames = require("../typeNames");
|
|
14
13
|
const _default = (0, _elements.define)(class Term extends _occamlanguages.Element {
|
|
15
14
|
constructor(context, string, node, breakPoint, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm){
|
|
16
15
|
super(context, string, node, breakPoint);
|
|
@@ -111,4 +110,4 @@ const _default = (0, _elements.define)(class Term extends _occamlanguages.Elemen
|
|
|
111
110
|
}
|
|
112
111
|
});
|
|
113
112
|
|
|
114
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
113
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/term.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\n\nimport { define } from \"../elements\";\n\nexport default define(class Term extends Element {\n  constructor(context, string, node, breakPoint, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm) {\n    super(context, string, node, breakPoint);\n\n    this.variable = variable;\n    this.primitive = primitive;\n    this.negatedTerm = negatedTerm;\n    this.logicalTerm = logicalTerm;\n    this.bracketedTerm = bracketedTerm;\n    this.comparisonTerm = comparisonTerm;\n  }\n\n  getVariable() {\n    return this.variable;\n  }\n\n  getPrimitive() {\n    return this.primitive;\n  }\n\n  getNegatedTerm() {\n    return this.negatedTerm;\n  }\n\n  getLogicalTerm() {\n    return this.logicalTerm;\n  }\n\n  getBreedingTerm() {\n    return this.bracketedTerm;\n  }\n\n  getComparisonTerm() {\n    return this.comparisonTerm;\n  }\n\n  getPrimitiveValue() {\n    const primitiveValue = this.primitive.getValue();\n\n    return primitiveValue;\n  }\n\n  getType() {\n    let type;\n\n    if (false) {\n      ///\n    } else if (this.variable !== null) {\n      type = this.variable.getType();\n    } else if (this.primitive !== null) {\n      type = this.primitive.getType();\n    } else if (this.negatedTerm !== null) {\n      type = this.negatedTerm.getType();\n    } else if (this.logicalTerm !== null) {\n      type = this.logicalTerm.getType();\n    } else if (this.bracketedTerm !== null) {\n      type = this.bracketedTerm.getType();\n    } else if (this.comparisonTerm !== null) {\n      type = this.comparisonTerm.getType();\n    }\n\n    return type;\n  }\n\n  isBoolean() {\n    const type = this.getType(),\n          booleanType = type.isBooleanType(),\n          boolean = booleanType;  ///\n\n    return boolean;\n  }\n\n  evaluate(context) {\n    let value;\n\n    if (false) {\n      ///\n    } else if (this.variable !== null) {\n      value = this.variable.evaluate(context);\n    } else if (this.primitive !== null) {\n      value = this.primitive.evaluate(context);\n    } else if (this.negatedTerm !== null) {\n      value = this.negatedTerm.evaluate(context);\n    } else if (this.logicalTerm !== null) {\n      value = this.logicalTerm.evaluate(context);\n    } else if (this.bracketedTerm !== null) {\n      value = this.bracketedTerm.evaluate(context);\n    } else if (this.comparisonTerm !== null) {\n      value = this.comparisonTerm.evaluate(context);\n    }\n\n    return value;\n  }\n\n  isEqualTo(term) {\n    let equalTo = false;\n\n    if (false) {\n      ///\n    } else if (this.variable !== null) {\n      const variable = term.getVariable();\n\n      if (variable !== null) {\n        equalTo = this.variable.isEqualTo(variable);\n      }\n    } else if (this.primitive !== null) {\n      const primitive = term.getPrimitive();\n\n      if (primitive !== null) {\n        equalTo = this.primitive.isEqualTo(primitive);\n      }\n    }\n\n    return equalTo;\n  }\n\n  static name = \"Term\";\n\n  static fromPrimitive(primitive, context) {\n    const primitiveString = primitive.getString(),\n          string = primitiveString, ///\n          node = null,\n          breakPoint = null,\n          variable = null,\n          negatedTerm = null,\n          logicalTerm = null,\n          bracketedTerm = null,\n          comparisonTerm = null;\n\n    context = null;\n\n    const term = new Term(context, string, node, breakPoint, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm);\n\n    return term;\n  }\n});\n"],"names":["define","Term","Element","context","string","node","breakPoint","variable","primitive","negatedTerm","logicalTerm","bracketedTerm","comparisonTerm","getVariable","getPrimitive","getNegatedTerm","getLogicalTerm","getBreedingTerm","getComparisonTerm","getPrimitiveValue","primitiveValue","getValue","getType","type","isBoolean","booleanType","isBooleanType","boolean","evaluate","value","isEqualTo","term","equalTo","name","fromPrimitive","primitiveString","getString"],"mappings":"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"}
|
package/package.json
CHANGED
package/src/element/procedure.js
CHANGED
|
@@ -36,8 +36,13 @@ export default define(class Procedure extends Element {
|
|
|
36
36
|
|
|
37
37
|
getName() { return this.label.getName(); }
|
|
38
38
|
|
|
39
|
-
|
|
39
|
+
isBoolean() {
|
|
40
|
+
const type = this.getType(),
|
|
41
|
+
booleanType = type.isBooleanType(),
|
|
42
|
+
boolean = booleanType; ///
|
|
40
43
|
|
|
44
|
+
return boolean;
|
|
45
|
+
}
|
|
41
46
|
getReturnStatement() { return this.returnBlock.getReturnStatement(); }
|
|
42
47
|
|
|
43
48
|
compareProcedureName(procedureName) { return this.label.compareProcedureName(procedureName); }
|
package/src/element/term.js
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
import { Element } from "occam-languages";
|
|
4
4
|
|
|
5
5
|
import { define } from "../elements";
|
|
6
|
-
import { BOOLEAN_TYPE_NAME } from "../typeNames";
|
|
7
6
|
|
|
8
7
|
export default define(class Term extends Element {
|
|
9
8
|
constructor(context, string, node, breakPoint, variable, primitive, negatedTerm, logicalTerm, bracketedTerm, comparisonTerm) {
|