occam-furtle 3.0.519 → 3.0.521
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/block.js +9 -1
- package/lib/context/file/furtle.js +60 -10
- package/lib/element/importBinding.js +58 -8
- package/lib/element/importStatement.js +5 -4
- package/lib/element/label.js +5 -4
- package/lib/element/parameters.js +5 -4
- package/lib/element/procedureCall.js +10 -4
- package/lib/element/reference.js +5 -4
- package/lib/element/type.js +5 -4
- package/lib/example/furtle/bnf.js +45 -31
- package/lib/example/furtle/entries.js +2 -2
- package/package.json +5 -5
- package/src/context/block.js +14 -0
- package/src/context/file/furtle.js +92 -14
- package/src/element/importBinding.js +98 -14
- package/src/element/importStatement.js +6 -4
- package/src/element/label.js +6 -4
- package/src/element/parameters.js +6 -4
- package/src/element/procedureCall.js +12 -3
- package/src/element/reference.js +6 -4
- package/src/element/type.js +6 -4
- package/src/example/furtle/bnf.js +44 -30
- package/src/example/furtle/entries.js +1 -1
package/lib/element/reference.js
CHANGED
|
@@ -35,13 +35,14 @@ const _default = (0, _elements.define)(class Reference extends _occamlanguages.E
|
|
|
35
35
|
}
|
|
36
36
|
static name = "Reference";
|
|
37
37
|
static fromJSON(json, context) {
|
|
38
|
-
|
|
38
|
+
let reference;
|
|
39
|
+
(0, _context.instantiate)((context)=>{
|
|
39
40
|
const { string } = json, referencelNode = (0, _instantiate.instantiateReference)(string, context), node = referencelNode, breakPoint = null, name = (0, _element.nameFromReferenceNode)(referencelNode, context);
|
|
40
41
|
context = null;
|
|
41
|
-
|
|
42
|
-
return referencel;
|
|
42
|
+
reference = new Reference(context, string, node, breakPoint, name);
|
|
43
43
|
}, context);
|
|
44
|
+
return reference;
|
|
44
45
|
}
|
|
45
46
|
});
|
|
46
47
|
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbGVtZW50L3JlZmVyZW5jZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgRWxlbWVudCB9IGZyb20gXCJvY2NhbS1sYW5ndWFnZXNcIjtcblxuaW1wb3J0IHsgZGVmaW5lIH0gZnJvbSBcIi4uL2VsZW1lbnRzXCI7XG5pbXBvcnQgeyBpbnN0YW50aWF0ZSB9IGZyb20gXCIuLi91dGlsaXRpZXMvY29udGV4dFwiO1xuaW1wb3J0IHsgaW5zdGFudGlhdGVSZWZlcmVuY2UgfSBmcm9tIFwiLi4vcHJvY2Vzcy9pbnN0YW50aWF0ZVwiO1xuaW1wb3J0IHsgbmFtZUZyb21SZWZlcmVuY2VOb2RlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9lbGVtZW50XCI7XG5cbmV4cG9ydCBkZWZhdWx0IGRlZmluZShjbGFzcyBSZWZlcmVuY2UgZXh0ZW5kcyBFbGVtZW50IHtcbiAgY29uc3RydWN0b3IoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50LCBuYW1lKSB7XG4gICAgc3VwZXIoY29udGV4dCwgc3RyaW5nLCBub2RlLCBicmVha1BvaW50KTtcblxuICAgIHRoaXMubmFtZSA9IG5hbWU7XG4gIH1cblxuICBnZXROYW1lKCkge1xuICAgIHJldHVybiB0aGlzLm5hbWU7XG4gIH1cblxuICBnZXRQcm9jZWR1cmVOYW1lKCkge1xuICAgIGNvbnN0IHByb2NlZHVyZU5hbWUgPSB0aGlzLm5hbWU7ICAvLy9cblxuICAgIHJldHVybiBwcm9jZWR1cmVOYW1lO1xuICB9XG5cbiAgdG9KU09OKCkge1xuICAgIGxldCBqc29uO1xuXG4gICAgY29uc3Qgc3RyaW5nID0gdGhpcy5nZXRTdHJpbmcoKTtcblxuICAgIGpzb24gPSB7XG4gICAgICBzdHJpbmdcbiAgICB9O1xuXG4gICAgcmV0dXJuIGpzb247XG4gIH1cblxuICBzdGF0aWMgbmFtZSA9IFwiUmVmZXJlbmNlXCI7XG5cbiAgc3RhdGljIGZyb21KU09OKGpzb24sIGNvbnRleHQpIHtcbiAgICBsZXQgcmVmZXJlbmNlO1xuXG4gICAgaW5zdGFudGlhdGUoKGNvbnRleHQpID0+IHtcbiAgICAgIGNvbnN0IHsgc3RyaW5nIH0gPSBqc29uLFxuICAgICAgICAgICAgcmVmZXJlbmNlbE5vZGUgPSBpbnN0YW50aWF0ZVJlZmVyZW5jZShzdHJpbmcsIGNvbnRleHQpLFxuICAgICAgICAgICAgbm9kZSA9IHJlZmVyZW5jZWxOb2RlLCAgLy8vXG4gICAgICAgICAgICBicmVha1BvaW50ID0gbnVsbCxcbiAgICAgICAgICAgIG5hbWUgPSBuYW1lRnJvbVJlZmVyZW5jZU5vZGUocmVmZXJlbmNlbE5vZGUsIGNvbnRleHQpO1xuXG4gICAgICBjb250ZXh0ID0gbnVsbDtcblxuICAgICAgcmVmZXJlbmNlID0gbmV3IFJlZmVyZW5jZShjb250ZXh0LCBzdHJpbmcsIG5vZGUsIGJyZWFrUG9pbnQsIG5hbWUpO1xuICAgIH0sIGNvbnRleHQpO1xuXG4gICAgcmV0dXJuIHJlZmVyZW5jZTtcbiAgfVxufSk7XG4iXSwibmFtZXMiOlsiZGVmaW5lIiwiUmVmZXJlbmNlIiwiRWxlbWVudCIsImNvbnRleHQiLCJzdHJpbmciLCJub2RlIiwiYnJlYWtQb2ludCIsIm5hbWUiLCJnZXROYW1lIiwiZ2V0UHJvY2VkdXJlTmFtZSIsInByb2NlZHVyZU5hbWUiLCJ0b0pTT04iLCJqc29uIiwiZ2V0U3RyaW5nIiwiZnJvbUpTT04iLCJyZWZlcmVuY2UiLCJpbnN0YW50aWF0ZSIsInJlZmVyZW5jZWxOb2RlIiwiaW5zdGFudGlhdGVSZWZlcmVuY2UiLCJuYW1lRnJvbVJlZmVyZW5jZU5vZGUiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQVNBOzs7ZUFBQTs7O2dDQVB3QjswQkFFRDt5QkFDSzs2QkFDUzt5QkFDQztNQUV0QyxXQUFlQSxJQUFBQSxnQkFBTSxFQUFDLE1BQU1DLGtCQUFrQkMsdUJBQU87SUFDbkQsWUFBWUMsT0FBTyxFQUFFQyxNQUFNLEVBQUVDLElBQUksRUFBRUMsVUFBVSxFQUFFQyxJQUFJLENBQUU7UUFDbkQsS0FBSyxDQUFDSixTQUFTQyxRQUFRQyxNQUFNQztRQUU3QixJQUFJLENBQUNDLElBQUksR0FBR0E7SUFDZDtJQUVBQyxVQUFVO1FBQ1IsT0FBTyxJQUFJLENBQUNELElBQUk7SUFDbEI7SUFFQUUsbUJBQW1CO1FBQ2pCLE1BQU1DLGdCQUFnQixJQUFJLENBQUNILElBQUksRUFBRyxHQUFHO1FBRXJDLE9BQU9HO0lBQ1Q7SUFFQUMsU0FBUztRQUNQLElBQUlDO1FBRUosTUFBTVIsU0FBUyxJQUFJLENBQUNTLFNBQVM7UUFFN0JELE9BQU87WUFDTFI7UUFDRjtRQUVBLE9BQU9RO0lBQ1Q7SUFFQSxPQUFPTCxPQUFPLFlBQVk7SUFFMUIsT0FBT08sU0FBU0YsSUFBSSxFQUFFVCxPQUFPLEVBQUU7UUFDN0IsSUFBSVk7UUFFSkMsSUFBQUEsb0JBQVcsRUFBQyxDQUFDYjtZQUNYLE1BQU0sRUFBRUMsTUFBTSxFQUFFLEdBQUdRLE1BQ2JLLGlCQUFpQkMsSUFBQUEsaUNBQW9CLEVBQUNkLFFBQVFELFVBQzlDRSxPQUFPWSxnQkFDUFgsYUFBYSxNQUNiQyxPQUFPWSxJQUFBQSw4QkFBcUIsRUFBQ0YsZ0JBQWdCZDtZQUVuREEsVUFBVTtZQUVWWSxZQUFZLElBQUlkLFVBQVVFLFNBQVNDLFFBQVFDLE1BQU1DLFlBQVlDO1FBQy9ELEdBQUdKO1FBRUgsT0FBT1k7SUFDVDtBQUNGIn0=
|
package/lib/element/type.js
CHANGED
|
@@ -89,12 +89,13 @@ const _default = (0, _elements.define)(class Type extends _occamlanguages.Elemen
|
|
|
89
89
|
}
|
|
90
90
|
static name = "Type";
|
|
91
91
|
static fromJSON(json, context) {
|
|
92
|
-
|
|
92
|
+
let type;
|
|
93
|
+
(0, _context.instantiate)((context)=>{
|
|
93
94
|
const { string } = json, typeNode = (0, _instantiate.instantiateType)(string, context), node = typeNode, breakPoint = null, name = (0, _element.nameFromTypeNode)(typeNode, context), argumentType = (0, _element.argumentTypeFromTypeNode)(typeNode, context);
|
|
94
95
|
context = null;
|
|
95
|
-
|
|
96
|
-
return type;
|
|
96
|
+
type = new Type(context, string, node, breakPoint, name, argumentType);
|
|
97
97
|
}, context);
|
|
98
|
+
return type;
|
|
98
99
|
}
|
|
99
100
|
static fromTypeName(typeName, context) {
|
|
100
101
|
let type = null;
|
|
@@ -113,4 +114,4 @@ const _default = (0, _elements.define)(class Type extends _occamlanguages.Elemen
|
|
|
113
114
|
}
|
|
114
115
|
});
|
|
115
116
|
|
|
116
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/element/type.js"],"sourcesContent":["\"use strict\";\n\nimport { Element } from \"occam-languages\";\n\nimport { define } from \"../elements\";\n\nimport { instantiate } from \"../utilities/context\";\nimport { instantiateType } from \"../process/instantiate\";\nimport { typeStringFromTypeNameAndArgumentTypeName } from \"../utilities/string\";\nimport { nameFromTypeNode, argumentTypeFromTypeNode } from \"../utilities/element\";\nimport { LIST_TYPE_NAME, STRING_TYPE_NAME, BOOLEAN_TYPE_NAME, INTEGER_TYPE_NAME, NOMINAL_VALUE_TYPE_NAME } from \"../typeNames\";\n\nexport default define(class Type extends Element {\n  constructor(context, string, node, breakPoint, name, argumentType) {\n    super(context, string, node, breakPoint);\n\n    this.name = name;\n    this.argumentType = argumentType;\n  }\n\n  getName() {\n    return this.name;\n  }\n\n  getArgumentType() {\n    return this.argumentType;\n  }\n\n  isListType() {\n    const listType = (this.name === LIST_TYPE_NAME);\n\n    return listType;\n  }\n\n  isStringType() {\n    const booleanType = (this.name === STRING_TYPE_NAME);\n\n    return booleanType;\n  }\n\n  isBooleanType() {\n    const booleanType = (this.name === BOOLEAN_TYPE_NAME);\n\n    return booleanType;\n  }\n\n  isIntegerType() {\n    const integerType = (this.name === INTEGER_TYPE_NAME);\n\n    return integerType;\n  }\n\n  isNominalValueType() {\n    const listType = (this.name === NOMINAL_VALUE_TYPE_NAME);\n\n    return listType;\n  }\n\n  isEqualTo(type) {\n    let equalTo = false;\n\n    const typeName = type.getName();\n\n    if (this.name === typeName) {\n      switch (this.name) {\n        case LIST_TYPE_NAME: {\n          const typeArgumentType = type.getArgumentType();\n\n          if ((this.argumentType === null) || (typeArgumentType === null)) {\n            if (this.argumentType === typeArgumentType) {\n              equalTo = true;\n            }\n          } else {\n            const arguemntTypeEqualToTypeArgumentType = this.argumentType.isEqualTo(typeArgumentType);\n\n            if (arguemntTypeEqualToTypeArgumentType) {\n              equalTo = true;\n            }\n          }\n\n          break;\n        }\n\n        case STRING_TYPE_NAME:\n        case BOOLEAN_TYPE_NAME:\n        case INTEGER_TYPE_NAME:\n        case NOMINAL_VALUE_TYPE_NAME: {\n          equalTo = true;\n\n          break;\n        }\n      }\n    }\n\n    return equalTo;\n  }\n\n  toJSON() {\n    let json;\n\n    const string = this.getString();\n\n    json = {\n      string\n    };\n\n    return json;\n  }\n\n  static name = \"Type\";\n\n  static fromJSON(json, context) {\n    let type;\n\n    instantiate((context) => {\n      const { string } = json,\n            typeNode = instantiateType(string, context),\n            node = typeNode,  ///\n            breakPoint = null,\n            name = nameFromTypeNode(typeNode, context),\n            argumentType = argumentTypeFromTypeNode(typeNode, context);\n\n      context = null;\n\n      type = new Type(context, string, node, breakPoint, name, argumentType);\n    }, context);\n\n    return type;\n  }\n\n  static fromTypeName(typeName, context) {\n    let type = null;\n\n    if (typeName !== null) {\n      const node = null,  ///\n            name = typeName,  ///\n            argumentType = null,\n            typeString = typeName,  ///\n            string = typeString,  ///\n            breakPoint = null;\n\n      context = null;\n\n      type = new Type(context, string, node, breakPoint, name, argumentType);\n    }\n\n    return type;\n  }\n\n  static fromTypeNameAndArgumentTypeName(typeName, argumentTypeName, context) {\n    const node = null,  ///\n          name = typeName,  ///\n          argumentType = Type.fromTypeName(argumentTypeName, context),\n          typeString = typeStringFromTypeNameAndArgumentTypeName(typeName, argumentTypeName),\n          string = typeString,  ///\n          breakPoint = null;\n\n    context = null;\n\n    const type = new Type(context, string, node, breakPoint, name, argumentType);\n\n    return type;\n  }\n\n});\n"],"names":["define","Type","Element","context","string","node","breakPoint","name","argumentType","getName","getArgumentType","isListType","listType","LIST_TYPE_NAME","isStringType","booleanType","STRING_TYPE_NAME","isBooleanType","BOOLEAN_TYPE_NAME","isIntegerType","integerType","INTEGER_TYPE_NAME","isNominalValueType","NOMINAL_VALUE_TYPE_NAME","isEqualTo","type","equalTo","typeName","typeArgumentType","arguemntTypeEqualToTypeArgumentType","toJSON","json","getString","fromJSON","instantiate","typeNode","instantiateType","nameFromTypeNode","argumentTypeFromTypeNode","fromTypeName","typeString","fromTypeNameAndArgumentTypeName","argumentTypeName","typeStringFromTypeNameAndArgumentTypeName"],"mappings":"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"}
|
|
@@ -40,34 +40,6 @@ const bnf = `
|
|
|
40
40
|
|
|
41
41
|
|
|
42
42
|
|
|
43
|
-
importBindings ::= importBinding ( "," importBinding )* ;
|
|
44
|
-
|
|
45
|
-
namedBindings ::= namedBinding ( "," namedBinding )* ;
|
|
46
|
-
|
|
47
|
-
parameters ::= parameter ( "," parameter )* ;
|
|
48
|
-
|
|
49
|
-
bindings ::= binding ( "," binding )* ;
|
|
50
|
-
|
|
51
|
-
values ::= value ( "," value )* ;
|
|
52
|
-
|
|
53
|
-
terms ::= term ( "," term )* ;
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
importBinding ::= reference ( "as" label )? ;
|
|
58
|
-
|
|
59
|
-
namedBinding ::= type [name] ( "as" [name] )? ;
|
|
60
|
-
|
|
61
|
-
parameter ::= type [name] ;
|
|
62
|
-
|
|
63
|
-
binding ::= type [name]
|
|
64
|
-
|
|
65
|
-
| ε
|
|
66
|
-
|
|
67
|
-
;
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
43
|
procedureCall ::= reference<NO_WHITESPACE>"(" values? ")" ;
|
|
72
44
|
|
|
73
45
|
returnBlock.. ::= "{" ( statement | nonsense )* returnStatement "}" ;
|
|
@@ -79,6 +51,10 @@ const bnf = `
|
|
|
79
51
|
every ::= "every"<NO_WHITESPACE>"(" variable "," anonymousProcedure ")" ;
|
|
80
52
|
|
|
81
53
|
some ::= "some"<NO_WHITESPACE>"(" variable "," anonymousProcedure ")" ;
|
|
54
|
+
|
|
55
|
+
all ::= "all"<NO_WHITESPACE>"(" variable "," referencesListLiteral ( "," values )? ")" ;
|
|
56
|
+
|
|
57
|
+
exists ::= "exists"<NO_WHITESPACE>"(" variable "," referencesListLiteral ( "," values )? ")" ;
|
|
82
58
|
|
|
83
59
|
|
|
84
60
|
|
|
@@ -104,6 +80,40 @@ const bnf = `
|
|
|
104
80
|
|
|
105
81
|
|
|
106
82
|
|
|
83
|
+
referencesListLiteral ::= "[" references? "]" ;
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
|
|
87
|
+
importBindings ::= importBinding ( "," importBinding )* ;
|
|
88
|
+
|
|
89
|
+
namedBindings ::= namedBinding ( "," namedBinding )* ;
|
|
90
|
+
|
|
91
|
+
parameters ::= parameter ( "," parameter )* ;
|
|
92
|
+
|
|
93
|
+
references ::= reference ( "," reference )* ;
|
|
94
|
+
|
|
95
|
+
bindings ::= binding ( "," binding )* ;
|
|
96
|
+
|
|
97
|
+
values ::= value ( "," value )* ;
|
|
98
|
+
|
|
99
|
+
terms ::= term ( "," term )* ;
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
|
|
103
|
+
importBinding ::= reference ( "as" label )? ;
|
|
104
|
+
|
|
105
|
+
namedBinding ::= type [name] ( "as" [name] )? ;
|
|
106
|
+
|
|
107
|
+
parameter ::= type [name] ;
|
|
108
|
+
|
|
109
|
+
binding ::= type [name]
|
|
110
|
+
|
|
111
|
+
| ε
|
|
112
|
+
|
|
113
|
+
;
|
|
114
|
+
|
|
115
|
+
|
|
116
|
+
|
|
107
117
|
comparisonTerm ::= term ( "==" | "!=" ) term ;
|
|
108
118
|
|
|
109
119
|
bracketedTerm ::= "(" term ")" ;
|
|
@@ -126,6 +136,10 @@ const bnf = `
|
|
|
126
136
|
|
|
127
137
|
| some
|
|
128
138
|
|
|
139
|
+
| all
|
|
140
|
+
|
|
141
|
+
| exists
|
|
142
|
+
|
|
129
143
|
| nodesQuery
|
|
130
144
|
|
|
131
145
|
| nodeQuery
|
|
@@ -164,7 +178,7 @@ const bnf = `
|
|
|
164
178
|
|
|
165
179
|
|
|
166
180
|
|
|
167
|
-
|
|
181
|
+
type ::= "List"<NO_WHITESPACE>"<" ( "Node" | "String" | "Boolean" | "Integer" ) ">"
|
|
168
182
|
|
|
169
183
|
| "Node"
|
|
170
184
|
|
|
@@ -200,7 +214,7 @@ const bnf = `
|
|
|
200
214
|
|
|
201
215
|
reference. ::= [name] ;
|
|
202
216
|
|
|
203
|
-
variable
|
|
217
|
+
variable. ::= [name] ;
|
|
204
218
|
|
|
205
219
|
label. ::= [name] ;
|
|
206
220
|
|
|
@@ -215,4 +229,4 @@ const bnf = `
|
|
|
215
229
|
`;
|
|
216
230
|
const _default = bnf;
|
|
217
231
|
|
|
218
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9leGFtcGxlL2Z1cnRsZS9ibmYuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmNvbnN0IGJuZiA9IGBcblxuICAgIGRvY3VtZW50ICAgICAgICAgICAgICAgIDo6PSAgKCBpbXBvcnRTdGF0ZW1lbnQgfCBwcm9jZWR1cmUgfCBlcnJvciApKyA7XG4gICAgXG4gICAgXG4gICAgXG4gICAgcHJvY2VkdXJlICAgICAgICAgICAgICAgOjo9ICBcImV4cG9ydFwiPyB0eXBlIGxhYmVsPE5PX1dISVRFU1BBQ0U+
|
|
232
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../../src/example/furtle/bnf.js"],"sourcesContent":["\"use strict\";\n\nconst bnf = `\n\n    document                ::=  ( importStatement | procedure | error )+ ;\n    \n    \n    \n    procedure               ::=  \"export\"? type label<NO_WHITESPACE>\"(\" parameters? \")\" returnBlock ;\n    \n    importStatement         ::=  \"import\" importBindings \"from\" [string-literal] \";\" ;\n    \n    anonymousProcedure      ::=  type \"(\" parameters? \")\" returnBlock ;\n    \n    statement               ::=  variableAssignments\n                              \n                              |  objectAssignment\n     \n                              |  listAssignment\n                              \n                              ;  \n      \n      \n    \n    variableAssignments     ::=  type variableAssignment ( \",\" variableAssignment )* \";\" ;\n    \n    variableAssignment      ::=  variable \"=\" expression ;\n    \n    objectAssignment        ::=  \"{\" namedBindings \"}\" \"=\" variable \";\" ;\n    \n    listAssignment         ::=  \"[\" bindings \"]\" \"=\" variable \";\" ;\n    \n\n\n    procedureCall           ::=  reference<NO_WHITESPACE>\"(\" values? \")\" ;\n    \n    returnBlock..           ::=  \"{\" ( statement | nonsense )* returnStatement \"}\" ;\n                                     \n    ternary                 ::=  \"if\" \"(\" term \")\" expression \"else\" expression ;\n    \n    reduce                  ::=  \"reduce\"<NO_WHITESPACE>\"(\" variable \",\" anonymousProcedure \",\" value \")\" ;\n    \n    every                   ::=  \"every\"<NO_WHITESPACE>\"(\" variable \",\" anonymousProcedure \")\" ;\n    \n    some                    ::=  \"some\"<NO_WHITESPACE>\"(\" variable \",\" anonymousProcedure \")\" ;\n\n    all                     ::=  \"all\"<NO_WHITESPACE>\"(\" variable \",\" referencesListLiteral ( \",\" values )? \")\" ;\n    \n    exists                  ::=  \"exists\"<NO_WHITESPACE>\"(\" variable \",\" referencesListLiteral ( \",\" values )? \")\" ;    \n    \n    \n    \n    nodesQuery              ::=  \"nodesQuery\"<NO_WHITESPACE>\"(\" variable \",\" [string-literal] \")\" ;\n    \n    nodeQuery               ::=  \"nodeQuery\"<NO_WHITESPACE>\"(\" variable \",\" [string-literal] \")\" ;\n    \n    lengthOf                ::=  \"lengthOf\"<NO_WHITESPACE>\"(\" variable \")\" ;\n    \n    toInteger               ::=  \"toInteger\"<NO_WHITESPACE>\"(\" variable \")\" ;\n    \n    tryInteger              ::=  \"tryInteger\"<NO_WHITESPACE>\"(\" variable \")\" ;\n    \n    startsWith              ::=  \"startsWith\"<NO_WHITESPACE>\"(\" variable \",\" [string-literal] \")\" ;\n    \n    endsWith                ::=  \"endsWith\"<NO_WHITESPACE>\"(\" variable \",\" [string-literal] \")\" ;\n    \n    contains                ::=  \"contains\"<NO_WHITESPACE>\"(\" variable \",\" [string-literal] \")\" ;\n    \n    \n    \n    returnStatement         ::=  \"return\" value \";\" ; \n    \n    \n    \n    referencesListLiteral   ::=  \"[\" references? \"]\" ;\n     \n     \n     \n    importBindings          ::=  importBinding ( \",\" importBinding )* ;\n    \n    namedBindings           ::=  namedBinding ( \",\" namedBinding )* ;\n    \n    parameters              ::=  parameter ( \",\" parameter )* ;\n    \n    references              ::=  reference ( \",\" reference )* ;\n    \n    bindings                ::=  binding ( \",\" binding )* ;\n    \n    values                  ::=  value ( \",\" value )* ;\n    \n    terms                   ::=  term ( \",\" term )* ;\n    \n\n\n    importBinding           ::=  reference ( \"as\" label )? ;   \n    \n    namedBinding            ::=  type [name] ( \"as\" [name] )? ;   \n    \n    parameter               ::=  type [name] ;\n\n    binding                 ::=  type [name]\n    \n                              |  ε \n                                  \n                              ;\n\n\n    \n    comparisonTerm          ::=  term ( \"==\" | \"!=\" ) term ; \n    \n    bracketedTerm           ::=  \"(\" term \")\" ; \n    \n    negatedTerm             ::=  \"!\"<NO_WHITESPACE>term ; \n    \n    logicalTerm             ::=  term ( \"||\" | \"&&\" ) term ; \n\n\n    \n    expression              ::=  procedureCall\n     \n                              |  returnBlock\n    \n                              |  ternary\n                              \n                              |  reduce\n    \n                              |  every\n    \n                              |  some\n                              \n                              |  all\n                              \n                              |  exists\n                              \n                              |  nodesQuery\n                              \n                              |  nodeQuery\n                              \n                              |  lengthOf\n                             \n                              |  toInteger\n                             \n                              |  tryInteger\n                             \n                              |  startsWith\n                              \n                              |  endsWith\n                              \n                              |  contains\n                              \n                              |  term\n                              \n                              ;\n    \n    \n    \n    term                    ::=  comparisonTerm \n    \n                              |  bracketedTerm \n    \n                              |  logicalTerm \n    \n                              |  negatedTerm \n    \n                              |  primitive \n    \n                              |  variable \n                              \n                              ;\n\n\n    \n    type                    ::=  \"List\"<NO_WHITESPACE>\"<\" ( \"Node\" | \"String\" | \"Boolean\" | \"Integer\" ) \">\"\n     \n                              |  \"Node\"  \n     \n                              |  \"String\" \n     \n                              |  \"Boolean\"   \n\n                              |  \"Integer\"   \n\n                              ;\n\n\n    \n    value                   ::=  primitive \n    \n                              |  variable \n\n                              ;\n\n\n    \n    primitive               ::=  [string-literal]\n                              \n                              |  [boolean]\n                              \n                              |  [integer]\n                              \n                              |  [null]\n                             \n                              ;\n\n\n\n    reference.              ::=  [name] ;\n    \n    variable.               ::=  [name] ;\n    \n    label.                  ::=  [name] ;\n    \n    \n    \n    nonsense.               ::=  [string-literal] | [secondary-keyword] | [function-name] | [type] | [boolean] | [integer] | [null] | [name] | [special] | [unassigned] ;\n\n\n    \n    error.                  ::=  . ;\n    \n`;\n\nexport default bnf;\n"],"names":["bnf"],"mappings":"AAAA;;;;+BA8NA;;;eAAA;;;AA5NA,MAAMA,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0Nb,CAAC;MAED,WAAeA"}
|
|
@@ -20,7 +20,7 @@ const entries = [
|
|
|
20
20
|
"secondary-keyword": "^(?:as|if|else)"
|
|
21
21
|
},
|
|
22
22
|
{
|
|
23
|
-
"function-name": "^(?:nodeQuery|nodesQuery|reduce|every|some|lengthOf|toInteger|tryInteger|startsWith|endsWith|contains)"
|
|
23
|
+
"function-name": "^(?:nodeQuery|nodesQuery|reduce|every|some|lengthOf|toInteger|tryInteger|startsWith|endsWith|contains|all|exists)"
|
|
24
24
|
},
|
|
25
25
|
{
|
|
26
26
|
"type": "^(?:List|Node|String|Boolean|Integer)"
|
|
@@ -46,4 +46,4 @@ const entries = [
|
|
|
46
46
|
];
|
|
47
47
|
const _default = entries;
|
|
48
48
|
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9leGFtcGxlL2Z1cnRsZS9lbnRyaWVzLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xyXG5cclxuY29uc3QgTEFUSU4gPSBcIltcXFxccHtTY3JpcHQ9TGF0aW59XVwiLFxyXG4gICAgICBERUNJTUFMID0gXCJbMC05XVwiO1xyXG5cclxuY29uc3QgZW50cmllcyA9IFtcclxuICB7XHJcbiAgICBcImJyYWNrZXRcIjogXCJeKD86XFxcXHt8XFxcXH0pXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwicHJpbWFyeS1rZXl3b3JkXCI6IFwiXig/OmV4cG9ydHxpbXBvcnR8ZnJvbXxyZXR1cm4pXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwic2Vjb25kYXJ5LWtleXdvcmRcIjogXCJeKD86YXN8aWZ8ZWxzZSlcIlxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJmdW5jdGlvbi1uYW1lXCI6IFwiXig/
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9leGFtcGxlL2Z1cnRsZS9lbnRyaWVzLmpzIl0sInNvdXJjZXNDb250ZW50IjpbIlwidXNlIHN0cmljdFwiO1xyXG5cclxuY29uc3QgTEFUSU4gPSBcIltcXFxccHtTY3JpcHQ9TGF0aW59XVwiLFxyXG4gICAgICBERUNJTUFMID0gXCJbMC05XVwiO1xyXG5cclxuY29uc3QgZW50cmllcyA9IFtcclxuICB7XHJcbiAgICBcImJyYWNrZXRcIjogXCJeKD86XFxcXHt8XFxcXH0pXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwicHJpbWFyeS1rZXl3b3JkXCI6IFwiXig/OmV4cG9ydHxpbXBvcnR8ZnJvbXxyZXR1cm4pXCJcclxuICB9LFxyXG4gIHtcclxuICAgIFwic2Vjb25kYXJ5LWtleXdvcmRcIjogXCJeKD86YXN8aWZ8ZWxzZSlcIlxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJmdW5jdGlvbi1uYW1lXCI6IFwiXig/Om5vZGVRdWVyeXxub2Rlc1F1ZXJ5fHJlZHVjZXxldmVyeXxzb21lfGxlbmd0aE9mfHRvSW50ZWdlcnx0cnlJbnRlZ2VyfHN0YXJ0c1dpdGh8ZW5kc1dpdGh8Y29udGFpbnN8YWxsfGV4aXN0cylcIlxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJ0eXBlXCI6IFwiXig/Okxpc3R8Tm9kZXxTdHJpbmd8Qm9vbGVhbnxJbnRlZ2VyKVwiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcImJvb2xlYW5cIjogXCJeKD86dHJ1ZXxmYWxzZSlcIlxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJpbnRlZ2VyXCI6IFwiXlsrXFxcXC1dP1xcXFxkK1wiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcIm51bGxcIjogXCJebnVsbFwiXHJcbiAgfSxcclxuICB7XHJcbiAgICBcIm5hbWVcIjogYF4ke0xBVElOfSske0RFQ0lNQUx9KmAsXHJcbiAgfSxcclxuICB7XHJcbiAgICBcInNwZWNpYWxcIjogXCJeKD86PHw+fCE9fD09fCF8PXwsfDt8JiZ8XFxcXHxcXFxcfHxcXFxcKHxcXFxcKXxcXFxcW3xcXFxcXSlcIlxyXG4gIH0sXHJcbiAge1xyXG4gICAgXCJ1bmFzc2lnbmVkXCI6IFwiXlteXFxcXHNdK1wiXHJcbiAgfVxyXG5dO1xyXG5cclxuZXhwb3J0IGRlZmF1bHQgZW50cmllcztcclxuIl0sIm5hbWVzIjpbIkxBVElOIiwiREVDSU1BTCIsImVudHJpZXMiXSwibWFwcGluZ3MiOiJBQUFBOzs7OytCQXlDQTs7O2VBQUE7OztBQXZDQSxNQUFNQSxRQUFRLHVCQUNSQyxVQUFVO0FBRWhCLE1BQU1DLFVBQVU7SUFDZDtRQUNFLFdBQVc7SUFDYjtJQUNBO1FBQ0UsbUJBQW1CO0lBQ3JCO0lBQ0E7UUFDRSxxQkFBcUI7SUFDdkI7SUFDQTtRQUNFLGlCQUFpQjtJQUNuQjtJQUNBO1FBQ0UsUUFBUTtJQUNWO0lBQ0E7UUFDRSxXQUFXO0lBQ2I7SUFDQTtRQUNFLFdBQVc7SUFDYjtJQUNBO1FBQ0UsUUFBUTtJQUNWO0lBQ0E7UUFDRSxRQUFRLENBQUMsQ0FBQyxFQUFFRixNQUFNLENBQUMsRUFBRUMsUUFBUSxDQUFDLENBQUM7SUFDakM7SUFDQTtRQUNFLFdBQVc7SUFDYjtJQUNBO1FBQ0UsY0FBYztJQUNoQjtDQUNEO01BRUQsV0FBZUMifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "occam-furtle",
|
|
3
3
|
"author": "James Smith",
|
|
4
|
-
"version": "3.0.
|
|
4
|
+
"version": "3.0.521",
|
|
5
5
|
"license": "MIT, Anti-996",
|
|
6
6
|
"homepage": "https://github.com/djalbat/occam-furtle",
|
|
7
7
|
"description": "Occam's Furtle language.",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"necessary": "^17.7.2",
|
|
14
|
-
"occam-grammars": "^1.3.
|
|
15
|
-
"occam-languages": "^3.0.
|
|
14
|
+
"occam-grammars": "^1.3.690",
|
|
15
|
+
"occam-languages": "^3.0.82",
|
|
16
16
|
"occam-lexers": "^23.2.12",
|
|
17
17
|
"occam-parsers": "^23.2.17",
|
|
18
18
|
"occam-query": "^4.1.210"
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"juxtapose": "^4.0.143",
|
|
29
29
|
"lively-cli": "^3.0.3",
|
|
30
30
|
"occam-grammar-utilities": "^8.1.27",
|
|
31
|
-
"occam-model": "^1.0.
|
|
32
|
-
"occam-server": "^7.0.
|
|
31
|
+
"occam-model": "^1.0.594",
|
|
32
|
+
"occam-server": "^7.0.93",
|
|
33
33
|
"watchful-cli": "^1.7.102"
|
|
34
34
|
},
|
|
35
35
|
"scripts": {
|
package/src/context/block.js
CHANGED
|
@@ -78,6 +78,13 @@ export default class BlockContext extends Context {
|
|
|
78
78
|
return variable;
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
+
findImportedProcedureByProcedureName(procedureName) {
|
|
82
|
+
const context = this.getContext(),
|
|
83
|
+
importedProcedure = context.findImportedProcedureByProcedureName(procedureName);
|
|
84
|
+
|
|
85
|
+
return importedProcedure;
|
|
86
|
+
}
|
|
87
|
+
|
|
81
88
|
isVariablePresentByVariableName(variableName, nested = true) {
|
|
82
89
|
const variable = this.findVariableByVariableName(variableName, nested),
|
|
83
90
|
variablePresent = (variable !== null);
|
|
@@ -85,6 +92,13 @@ export default class BlockContext extends Context {
|
|
|
85
92
|
return variablePresent;
|
|
86
93
|
}
|
|
87
94
|
|
|
95
|
+
isImportedProcedurePresentByProcedureName(procedureName) {
|
|
96
|
+
const context = this.getContext(),
|
|
97
|
+
importedProcedurePresent = context.isImportedProcedurePresentByProcedureName(procedureName);
|
|
98
|
+
|
|
99
|
+
return importedProcedurePresent;
|
|
100
|
+
}
|
|
101
|
+
|
|
88
102
|
static fromVariables(variables, context) {
|
|
89
103
|
const blockContext = Context.fromNothing(BlockContext, variables, context)
|
|
90
104
|
|
|
@@ -6,19 +6,26 @@ import { queryUtilities } from "occam-query";
|
|
|
6
6
|
import { isolate } from "../../utilities/context";
|
|
7
7
|
import { verifyFile } from "../../process/verify";
|
|
8
8
|
import { furtleLexer, furtleParser } from "../../utilities/furtle";
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
proceduresFromJSON,
|
|
11
|
+
importBindingsFromJSON,
|
|
12
|
+
proceduresToProceduresJSON,
|
|
13
|
+
importBindingsToImportBindingsJSON
|
|
14
|
+
} from "../../utilities/json";
|
|
15
|
+
import procedure from "../../element/procedure";
|
|
10
16
|
|
|
11
17
|
const { nodesQuery } = queryUtilities;
|
|
12
18
|
|
|
13
19
|
const procedureNodesQuery = nodesQuery("/document/procedure");
|
|
14
20
|
|
|
15
21
|
export default class FurtleFileContext extends FileContext {
|
|
16
|
-
constructor(context, fileContent, filePath, tokens, node, json, lexer, parser, procedures) {
|
|
22
|
+
constructor(context, fileContent, filePath, tokens, node, json, lexer, parser, procedures, importBindings) {
|
|
17
23
|
super(context, fileContent, filePath, tokens, node, json);
|
|
18
24
|
|
|
19
25
|
this.lexer = lexer;
|
|
20
26
|
this.parser = parser;
|
|
21
27
|
this.procedures = procedures;
|
|
28
|
+
this.importBindings = importBindings;
|
|
22
29
|
}
|
|
23
30
|
|
|
24
31
|
getLexer() {
|
|
@@ -29,6 +36,18 @@ export default class FurtleFileContext extends FileContext {
|
|
|
29
36
|
return this.parser;
|
|
30
37
|
}
|
|
31
38
|
|
|
39
|
+
getProcedures(includeRelease = true) {
|
|
40
|
+
const procedures = includeRelease ?
|
|
41
|
+
this.context.getProcedures() :
|
|
42
|
+
this.procedures;
|
|
43
|
+
|
|
44
|
+
return procedures;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
getImportBindings() {
|
|
48
|
+
return this.importBindings;
|
|
49
|
+
}
|
|
50
|
+
|
|
32
51
|
getLabels(includeRelease = true) {
|
|
33
52
|
const labels = [];
|
|
34
53
|
|
|
@@ -113,14 +132,6 @@ export default class FurtleFileContext extends FileContext {
|
|
|
113
132
|
return metavariables;
|
|
114
133
|
}
|
|
115
134
|
|
|
116
|
-
getProcedures(includeRelease = true) {
|
|
117
|
-
const procedures = includeRelease ?
|
|
118
|
-
this.context.getProcedures() :
|
|
119
|
-
this.procedures;
|
|
120
|
-
|
|
121
|
-
return procedures;
|
|
122
|
-
}
|
|
123
|
-
|
|
124
135
|
getVariables(nested = true) {
|
|
125
136
|
const variables = [];
|
|
126
137
|
|
|
@@ -137,6 +148,16 @@ export default class FurtleFileContext extends FileContext {
|
|
|
137
148
|
this.debug(`Added the '${procedureString}' function to the '${filePath}' file context.`);
|
|
138
149
|
}
|
|
139
150
|
|
|
151
|
+
addImportBinding(importBinding) {
|
|
152
|
+
const importBindingString = importBinding.getString();
|
|
153
|
+
|
|
154
|
+
this.importBindings.push(importBinding);
|
|
155
|
+
|
|
156
|
+
const filePath = this.getFilePath();
|
|
157
|
+
|
|
158
|
+
this.debug(`Added the '${importBindingString}' import binding to the '${filePath}' file context.`);
|
|
159
|
+
}
|
|
160
|
+
|
|
140
161
|
findProcedureNode(label) {
|
|
141
162
|
const node = this.getNode(),
|
|
142
163
|
labelNode = label.getNode(),
|
|
@@ -166,6 +187,42 @@ export default class FurtleFileContext extends FileContext {
|
|
|
166
187
|
return procedure;
|
|
167
188
|
}
|
|
168
189
|
|
|
190
|
+
findImportedProcedureByProcedureName(procedureName) {
|
|
191
|
+
let importedProcedure = null;
|
|
192
|
+
|
|
193
|
+
this.importBindings.some((importBinding) => {
|
|
194
|
+
const lablledProcedureName = procedureName; ///
|
|
195
|
+
|
|
196
|
+
const labelledProcedureNameClmpares = importBinding.compareLablledProcedureName(lablledProcedureName);
|
|
197
|
+
|
|
198
|
+
if (labelledProcedureNameClmpares) {
|
|
199
|
+
const referencedProcedureName = importBinding.getReferencedProcedureName();
|
|
200
|
+
|
|
201
|
+
procedureName = referencedProcedureName; ///
|
|
202
|
+
|
|
203
|
+
const procedure = this.findProcedureByProcedureName(procedureName);
|
|
204
|
+
|
|
205
|
+
importedProcedure = procedure; ///
|
|
206
|
+
|
|
207
|
+
return true;
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
return importedProcedure;
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
findImportBindingByLabelledProcedureName(labelledProcedureName) {
|
|
215
|
+
const importBinding = this.importBindings.find((importBinding) => {
|
|
216
|
+
const labelledProcedureNameCompares = importBinding.compareLablledProcedureName(labelledProcedureName);
|
|
217
|
+
|
|
218
|
+
if (labelledProcedureNameCompares) {
|
|
219
|
+
return true;
|
|
220
|
+
}
|
|
221
|
+
}) || null;
|
|
222
|
+
|
|
223
|
+
return importBinding;
|
|
224
|
+
}
|
|
225
|
+
|
|
169
226
|
isProcedurePresentByProcedureName(procedureName) {
|
|
170
227
|
const procedure = this.findProcedureByProcedureName(procedureName),
|
|
171
228
|
procedurePresent = (procedure !== null);
|
|
@@ -173,6 +230,20 @@ export default class FurtleFileContext extends FileContext {
|
|
|
173
230
|
return procedurePresent;
|
|
174
231
|
}
|
|
175
232
|
|
|
233
|
+
isImportedProcedurePresentByProcedureName(procedureName) {
|
|
234
|
+
const importedProceudre = this.findImportedProcedureByProcedureName(procedureName),
|
|
235
|
+
importedProceudrePresent = (importedProceudre !== null);
|
|
236
|
+
|
|
237
|
+
return importedProceudrePresent;
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
isImportBindingPresentByLabelledProcedureName(labelledProcedureName) {
|
|
241
|
+
const importBinding = this.findImportBindingByLabelledProcedureName(labelledProcedureName),
|
|
242
|
+
importBindingPresent = (importBinding !== null);
|
|
243
|
+
|
|
244
|
+
return importBindingPresent;
|
|
245
|
+
}
|
|
246
|
+
|
|
176
247
|
compareReleaseName(releaseName) { return this.context.compareReleaseName(releaseName); }
|
|
177
248
|
|
|
178
249
|
clear() {
|
|
@@ -192,6 +263,8 @@ export default class FurtleFileContext extends FileContext {
|
|
|
192
263
|
const fileContext = this; ///
|
|
193
264
|
|
|
194
265
|
this.procedures = proceduresFromJSON(json, fileContext);
|
|
266
|
+
|
|
267
|
+
this.importBindings = importBindingsFromJSON(json, fileContext);
|
|
195
268
|
}
|
|
196
269
|
}
|
|
197
270
|
|
|
@@ -211,12 +284,15 @@ export default class FurtleFileContext extends FileContext {
|
|
|
211
284
|
const filePath = this.getFilePath(),
|
|
212
285
|
fileContent = this.getFileContent(),
|
|
213
286
|
proceduresJSON = proceduresToProceduresJSON(this.procedures),
|
|
214
|
-
|
|
287
|
+
importBindingsJSON = importBindingsToImportBindingsJSON(this.importBindings),
|
|
288
|
+
procedures = proceduresJSON, ///
|
|
289
|
+
importBindings = importBindingsJSON;
|
|
215
290
|
|
|
216
291
|
json = {
|
|
217
292
|
filePath,
|
|
218
293
|
fileContent,
|
|
219
|
-
procedures
|
|
294
|
+
procedures,
|
|
295
|
+
importBindings
|
|
220
296
|
};
|
|
221
297
|
|
|
222
298
|
return json;
|
|
@@ -226,7 +302,8 @@ export default class FurtleFileContext extends FileContext {
|
|
|
226
302
|
const lexer = furtleLexer, ///
|
|
227
303
|
parser = furtleParser, ///
|
|
228
304
|
procedures = [],
|
|
229
|
-
|
|
305
|
+
importBindings = [],
|
|
306
|
+
furtleFileContext = FileContext.fromFile(FurtleFileContext, file, lexer, parser, procedures, importBindings, context);
|
|
230
307
|
|
|
231
308
|
return furtleFileContext;
|
|
232
309
|
}
|
|
@@ -235,7 +312,8 @@ export default class FurtleFileContext extends FileContext {
|
|
|
235
312
|
const lexer = furtleLexer, ///
|
|
236
313
|
parser = furtleParser, ///
|
|
237
314
|
procedures = null,
|
|
238
|
-
|
|
315
|
+
importBindings = null,
|
|
316
|
+
furtleFileContext = FileContext.fromJSON(FurtleFileContext, json, lexer, parser, procedures, importBindings, context);
|
|
239
317
|
|
|
240
318
|
return furtleFileContext;
|
|
241
319
|
}
|