brighterscript 0.67.8 → 0.68.0
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/CHANGELOG.md +7 -0
- package/dist/astUtils/creators.d.ts +35 -2
- package/dist/astUtils/creators.js +30 -1
- package/dist/astUtils/creators.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +3 -2
- package/dist/astUtils/visitors.js +37 -14
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +162 -4
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.d.ts +1 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js +139 -3
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js.map +1 -1
- package/dist/parser/Parser.js +7 -3
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Statement.d.ts +4 -2
- package/dist/parser/Statement.js +12 -8
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/TranspileState.d.ts +1 -1
- package/dist/parser/TranspileState.js +4 -1
- package/dist/parser/TranspileState.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +335 -74
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.BrsFilePreTranspileProcessor = void 0;
|
|
4
4
|
const creators_1 = require("../../astUtils/creators");
|
|
5
5
|
const reflection_1 = require("../../astUtils/reflection");
|
|
6
|
+
const visitors_1 = require("../../astUtils/visitors");
|
|
6
7
|
const TokenKind_1 = require("../../lexer/TokenKind");
|
|
7
8
|
const Expression_1 = require("../../parser/Expression");
|
|
8
9
|
const Parser_1 = require("../../parser/Parser");
|
|
@@ -18,6 +19,7 @@ class BrsFilePreTranspileProcessor {
|
|
|
18
19
|
}
|
|
19
20
|
iterateExpressions() {
|
|
20
21
|
const scope = this.event.program.getFirstScopeForFile(this.event.file);
|
|
22
|
+
//TODO move away from this loop and use a visitor instead
|
|
21
23
|
for (let expression of this.event.file.parser.references.expressions) {
|
|
22
24
|
if (expression) {
|
|
23
25
|
if ((0, reflection_1.isUnaryExpression)(expression)) {
|
|
@@ -28,6 +30,140 @@ class BrsFilePreTranspileProcessor {
|
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
32
|
}
|
|
33
|
+
const walkMode = visitors_1.WalkMode.visitExpressionsRecursive;
|
|
34
|
+
const visitor = (0, visitors_1.createVisitor)({
|
|
35
|
+
TernaryExpression: (ternaryExpression) => {
|
|
36
|
+
this.processTernaryExpression(ternaryExpression, visitor, walkMode);
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
this.event.file.ast.walk(visitor, { walkMode: walkMode });
|
|
40
|
+
}
|
|
41
|
+
processTernaryExpression(ternaryExpression, visitor, walkMode) {
|
|
42
|
+
var _a;
|
|
43
|
+
function getOwnerAndKey(statement) {
|
|
44
|
+
const parent = statement.parent;
|
|
45
|
+
if ((0, reflection_1.isBlock)(parent) || (0, reflection_1.isBody)(parent)) {
|
|
46
|
+
let idx = parent.statements.indexOf(statement);
|
|
47
|
+
if (idx > -1) {
|
|
48
|
+
return { owner: parent.statements, key: idx };
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
//if the ternary expression is part of a simple assignment, rewrite it as an `IfStatement`
|
|
53
|
+
let parent = ternaryExpression.findAncestor(x => !(0, reflection_1.isGroupingExpression)(x));
|
|
54
|
+
let operator;
|
|
55
|
+
//operators like `+=` will cause the RHS to be a BinaryExpression due to how the parser handles this. let's do a little magic to detect this situation
|
|
56
|
+
if (
|
|
57
|
+
//parent is a binary expression
|
|
58
|
+
(0, reflection_1.isBinaryExpression)(parent) &&
|
|
59
|
+
(((0, reflection_1.isAssignmentStatement)(parent.parent) && (0, reflection_1.isVariableExpression)(parent.left) && parent.left.name === parent.parent.name) ||
|
|
60
|
+
((0, reflection_1.isDottedSetStatement)(parent.parent) && (0, reflection_1.isDottedGetExpression)(parent.left) && parent.left.name === parent.parent.name) ||
|
|
61
|
+
((0, reflection_1.isIndexedSetStatement)(parent.parent) && (0, reflection_1.isIndexedGetExpression)(parent.left) && parent.left.index === parent.parent.index))) {
|
|
62
|
+
//keep the correct operator (i.e. `+=`)
|
|
63
|
+
operator = parent.operator;
|
|
64
|
+
//use the outer parent and skip this BinaryExpression
|
|
65
|
+
parent = parent.parent;
|
|
66
|
+
}
|
|
67
|
+
let ifStatement;
|
|
68
|
+
if ((0, reflection_1.isAssignmentStatement)(parent)) {
|
|
69
|
+
ifStatement = (0, creators_1.createIfStatement)({
|
|
70
|
+
if: (0, creators_1.createToken)(TokenKind_1.TokenKind.If, 'if', ternaryExpression.questionMarkToken.range),
|
|
71
|
+
condition: ternaryExpression.test,
|
|
72
|
+
then: (0, creators_1.createToken)(TokenKind_1.TokenKind.Then, 'then', ternaryExpression.questionMarkToken.range),
|
|
73
|
+
thenBranch: (0, creators_1.createBlock)({
|
|
74
|
+
statements: [
|
|
75
|
+
(0, creators_1.createAssignmentStatement)({
|
|
76
|
+
name: parent.name,
|
|
77
|
+
equals: operator !== null && operator !== void 0 ? operator : parent.equals,
|
|
78
|
+
value: ternaryExpression.consequent
|
|
79
|
+
})
|
|
80
|
+
]
|
|
81
|
+
}),
|
|
82
|
+
else: (0, creators_1.createToken)(TokenKind_1.TokenKind.Else, 'else', ternaryExpression.questionMarkToken.range),
|
|
83
|
+
elseBranch: (0, creators_1.createBlock)({
|
|
84
|
+
statements: [
|
|
85
|
+
(0, creators_1.createAssignmentStatement)({
|
|
86
|
+
name: parent.name,
|
|
87
|
+
equals: operator !== null && operator !== void 0 ? operator : parent.equals,
|
|
88
|
+
value: ternaryExpression.alternate
|
|
89
|
+
})
|
|
90
|
+
]
|
|
91
|
+
}),
|
|
92
|
+
endIf: (0, creators_1.createToken)(TokenKind_1.TokenKind.EndIf, 'end if', ternaryExpression.questionMarkToken.range)
|
|
93
|
+
});
|
|
94
|
+
}
|
|
95
|
+
else if ((0, reflection_1.isDottedSetStatement)(parent)) {
|
|
96
|
+
ifStatement = (0, creators_1.createIfStatement)({
|
|
97
|
+
if: (0, creators_1.createToken)(TokenKind_1.TokenKind.If, 'if', ternaryExpression.questionMarkToken.range),
|
|
98
|
+
condition: ternaryExpression.test,
|
|
99
|
+
then: (0, creators_1.createToken)(TokenKind_1.TokenKind.Then, 'then', ternaryExpression.questionMarkToken.range),
|
|
100
|
+
thenBranch: (0, creators_1.createBlock)({
|
|
101
|
+
statements: [
|
|
102
|
+
(0, creators_1.createDottedSetStatement)({
|
|
103
|
+
obj: parent.obj,
|
|
104
|
+
name: parent.name,
|
|
105
|
+
equals: operator !== null && operator !== void 0 ? operator : parent.equals,
|
|
106
|
+
value: ternaryExpression.consequent
|
|
107
|
+
})
|
|
108
|
+
]
|
|
109
|
+
}),
|
|
110
|
+
else: (0, creators_1.createToken)(TokenKind_1.TokenKind.Else, 'else', ternaryExpression.questionMarkToken.range),
|
|
111
|
+
elseBranch: (0, creators_1.createBlock)({
|
|
112
|
+
statements: [
|
|
113
|
+
(0, creators_1.createDottedSetStatement)({
|
|
114
|
+
obj: parent.obj,
|
|
115
|
+
name: parent.name,
|
|
116
|
+
equals: operator !== null && operator !== void 0 ? operator : parent.equals,
|
|
117
|
+
value: ternaryExpression.alternate
|
|
118
|
+
})
|
|
119
|
+
]
|
|
120
|
+
}),
|
|
121
|
+
endIf: (0, creators_1.createToken)(TokenKind_1.TokenKind.EndIf, 'end if', ternaryExpression.questionMarkToken.range)
|
|
122
|
+
});
|
|
123
|
+
}
|
|
124
|
+
else if ((0, reflection_1.isIndexedSetStatement)(parent)) {
|
|
125
|
+
ifStatement = (0, creators_1.createIfStatement)({
|
|
126
|
+
if: (0, creators_1.createToken)(TokenKind_1.TokenKind.If, 'if', ternaryExpression.questionMarkToken.range),
|
|
127
|
+
condition: ternaryExpression.test,
|
|
128
|
+
then: (0, creators_1.createToken)(TokenKind_1.TokenKind.Then, 'then', ternaryExpression.questionMarkToken.range),
|
|
129
|
+
thenBranch: (0, creators_1.createBlock)({
|
|
130
|
+
statements: [
|
|
131
|
+
(0, creators_1.createIndexedSetStatement)({
|
|
132
|
+
obj: parent.obj,
|
|
133
|
+
openingSquare: parent.openingSquare,
|
|
134
|
+
index: parent.index,
|
|
135
|
+
closingSquare: parent.closingSquare,
|
|
136
|
+
equals: operator !== null && operator !== void 0 ? operator : parent.equals,
|
|
137
|
+
value: ternaryExpression.consequent,
|
|
138
|
+
additionalIndexes: parent.additionalIndexes
|
|
139
|
+
})
|
|
140
|
+
]
|
|
141
|
+
}),
|
|
142
|
+
else: (0, creators_1.createToken)(TokenKind_1.TokenKind.Else, 'else', ternaryExpression.questionMarkToken.range),
|
|
143
|
+
elseBranch: (0, creators_1.createBlock)({
|
|
144
|
+
statements: [
|
|
145
|
+
(0, creators_1.createIndexedSetStatement)({
|
|
146
|
+
obj: parent.obj,
|
|
147
|
+
openingSquare: parent.openingSquare,
|
|
148
|
+
index: parent.index,
|
|
149
|
+
closingSquare: parent.closingSquare,
|
|
150
|
+
equals: operator !== null && operator !== void 0 ? operator : parent.equals,
|
|
151
|
+
value: ternaryExpression.alternate,
|
|
152
|
+
additionalIndexes: parent.additionalIndexes
|
|
153
|
+
})
|
|
154
|
+
]
|
|
155
|
+
}),
|
|
156
|
+
endIf: (0, creators_1.createToken)(TokenKind_1.TokenKind.EndIf, 'end if', ternaryExpression.questionMarkToken.range)
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
if (ifStatement) {
|
|
160
|
+
let { owner, key } = (_a = getOwnerAndKey(parent)) !== null && _a !== void 0 ? _a : {};
|
|
161
|
+
if (owner && key !== undefined) {
|
|
162
|
+
this.event.editor.setProperty(owner, key, ifStatement);
|
|
163
|
+
}
|
|
164
|
+
//we've injected an ifStatement, so now we need to trigger a walk to handle any nested ternary expressions
|
|
165
|
+
ifStatement.walk(visitor, { walkMode: walkMode });
|
|
166
|
+
}
|
|
31
167
|
}
|
|
32
168
|
/**
|
|
33
169
|
* Given a string optionally separated by dots, find an enum related to it.
|
|
@@ -53,10 +189,10 @@ class BrsFilePreTranspileProcessor {
|
|
|
53
189
|
};
|
|
54
190
|
}
|
|
55
191
|
}
|
|
56
|
-
processExpression(
|
|
192
|
+
processExpression(ternaryExpression, scope) {
|
|
57
193
|
var _a, _b, _c, _d;
|
|
58
|
-
let containingNamespace = (_a = this.event.file.getNamespaceStatementForPosition(
|
|
59
|
-
const parts = util_1.default.splitExpression(
|
|
194
|
+
let containingNamespace = (_a = this.event.file.getNamespaceStatementForPosition(ternaryExpression.range.start)) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript);
|
|
195
|
+
const parts = util_1.default.splitExpression(ternaryExpression);
|
|
60
196
|
const processedNames = [];
|
|
61
197
|
for (let part of parts) {
|
|
62
198
|
let entityName;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BrsFilePreTranspileProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"BrsFilePreTranspileProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts"],"names":[],"mappings":"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"}
|
package/dist/parser/Parser.js
CHANGED
|
@@ -696,7 +696,7 @@ class Parser {
|
|
|
696
696
|
}
|
|
697
697
|
else {
|
|
698
698
|
const nameExpression = new Expression_1.VariableExpression(name);
|
|
699
|
-
result = new Statement_1.AssignmentStatement(operator, name, new Expression_1.BinaryExpression(nameExpression, operator, value));
|
|
699
|
+
result = new Statement_1.AssignmentStatement({ kind: TokenKind_1.TokenKind.Equal, text: '=', range: operator.range }, name, new Expression_1.BinaryExpression(nameExpression, operator, value));
|
|
700
700
|
this.addExpressionsToReferences(nameExpression);
|
|
701
701
|
if ((0, reflection_1.isBinaryExpression)(value)) {
|
|
702
702
|
//remove the right-hand-side expression from this assignment operator, and replace with the full assignment expression
|
|
@@ -1475,12 +1475,16 @@ class Parser {
|
|
|
1475
1475
|
if ((0, reflection_1.isIndexedGetExpression)(left)) {
|
|
1476
1476
|
return new Statement_1.IndexedSetStatement(left.obj, left.index, operator.kind === TokenKind_1.TokenKind.Equal
|
|
1477
1477
|
? right
|
|
1478
|
-
: new Expression_1.BinaryExpression(left, operator, right), left.openingSquare, left.closingSquare, left.additionalIndexes
|
|
1478
|
+
: new Expression_1.BinaryExpression(left, operator, right), left.openingSquare, left.closingSquare, left.additionalIndexes, operator.kind === TokenKind_1.TokenKind.Equal
|
|
1479
|
+
? operator
|
|
1480
|
+
: { kind: TokenKind_1.TokenKind.Equal, text: '=', range: operator.range });
|
|
1479
1481
|
}
|
|
1480
1482
|
else if ((0, reflection_1.isDottedGetExpression)(left)) {
|
|
1481
1483
|
return new Statement_1.DottedSetStatement(left.obj, left.name, operator.kind === TokenKind_1.TokenKind.Equal
|
|
1482
1484
|
? right
|
|
1483
|
-
: new Expression_1.BinaryExpression(left, operator, right), left.dot
|
|
1485
|
+
: new Expression_1.BinaryExpression(left, operator, right), left.dot, operator.kind === TokenKind_1.TokenKind.Equal
|
|
1486
|
+
? operator
|
|
1487
|
+
: { kind: TokenKind_1.TokenKind.Equal, text: '=', range: operator.range });
|
|
1484
1488
|
}
|
|
1485
1489
|
}
|
|
1486
1490
|
return this.expressionStatement(expr);
|