brighterscript 1.0.0-alpha.11 → 1.0.0-alpha.15
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 +253 -268
- package/README.md +2 -2
- package/dist/Cache.d.ts +3 -8
- package/dist/Cache.js +9 -14
- package/dist/Cache.js.map +1 -1
- package/dist/CommentFlagProcessor.js +5 -3
- package/dist/CommentFlagProcessor.js.map +1 -1
- package/dist/DiagnosticMessages.d.ts +21 -1
- package/dist/DiagnosticMessages.js +21 -1
- package/dist/DiagnosticMessages.js.map +1 -1
- package/dist/LanguageServer.d.ts +1 -6
- package/dist/LanguageServer.js +0 -9
- package/dist/LanguageServer.js.map +1 -1
- package/dist/PluginInterface.d.ts +3 -3
- package/dist/PluginInterface.js +3 -0
- package/dist/PluginInterface.js.map +1 -1
- package/dist/Program.d.ts +30 -16
- package/dist/Program.js +110 -45
- package/dist/Program.js.map +1 -1
- package/dist/ProgramBuilder.js +3 -3
- package/dist/ProgramBuilder.js.map +1 -1
- package/dist/Scope.d.ts +31 -17
- package/dist/Scope.js +86 -48
- package/dist/Scope.js.map +1 -1
- package/dist/SymbolTable.d.ts +1 -1
- package/dist/XmlScope.d.ts +3 -3
- package/dist/astUtils/AstEditor.d.ts +33 -0
- package/dist/astUtils/AstEditor.js +107 -0
- package/dist/astUtils/AstEditor.js.map +1 -0
- package/dist/{bscPlugin/semanticTokens/SemanticTokensProcessor.spec.d.ts → astUtils/AstEditor.spec.d.ts} +0 -0
- package/dist/astUtils/AstEditor.spec.js +170 -0
- package/dist/astUtils/AstEditor.spec.js.map +1 -0
- package/dist/astUtils/reflection.d.ts +3 -1
- package/dist/astUtils/reflection.js +10 -2
- package/dist/astUtils/reflection.js.map +1 -1
- package/dist/astUtils/reflection.spec.js +6 -6
- package/dist/astUtils/reflection.spec.js.map +1 -1
- package/dist/astUtils/visitors.d.ts +3 -1
- package/dist/astUtils/visitors.js.map +1 -1
- package/dist/astUtils/visitors.spec.js +8 -8
- package/dist/astUtils/visitors.spec.js.map +1 -1
- package/dist/astUtils/xml.d.ts +1 -0
- package/dist/astUtils/xml.js +6 -1
- package/dist/astUtils/xml.js.map +1 -1
- package/dist/bscPlugin/BscPlugin.d.ts +4 -1
- package/dist/bscPlugin/BscPlugin.js +21 -2
- package/dist/bscPlugin/BscPlugin.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js +3 -3
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map +1 -1
- package/dist/bscPlugin/codeActions/CodeActionsProcessor.spec.js.map +1 -1
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.d.ts +9 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js +97 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.js.map +1 -0
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.d.ts +1 -0
- package/dist/bscPlugin/semanticTokens/{SemanticTokensProcessor.spec.js → BrsFileSemanticTokensProcessor.spec.js} +30 -2
- package/dist/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.js.map +1 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.d.ts +8 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js +36 -0
- package/dist/bscPlugin/transpile/BrsFilePreTranspileProcessor.js.map +1 -0
- package/dist/bscPlugin/validation/BrsFileValidator.d.ts +9 -0
- package/dist/bscPlugin/validation/BrsFileValidator.js +66 -0
- package/dist/bscPlugin/validation/BrsFileValidator.js.map +1 -0
- package/dist/bscPlugin/validation/ScopeValidator.d.ts +11 -0
- package/dist/bscPlugin/validation/ScopeValidator.js +94 -0
- package/dist/bscPlugin/validation/ScopeValidator.js.map +1 -0
- package/dist/files/BrsFile.Class.spec.js +404 -230
- package/dist/files/BrsFile.Class.spec.js.map +1 -1
- package/dist/files/BrsFile.d.ts +26 -12
- package/dist/files/BrsFile.js +265 -127
- package/dist/files/BrsFile.js.map +1 -1
- package/dist/files/BrsFile.spec.js +586 -169
- package/dist/files/BrsFile.spec.js.map +1 -1
- package/dist/files/XmlFile.d.ts +11 -10
- package/dist/files/XmlFile.js +13 -8
- package/dist/files/XmlFile.js.map +1 -1
- package/dist/files/XmlFile.spec.js +106 -59
- package/dist/files/XmlFile.spec.js.map +1 -1
- package/dist/files/tests/imports.spec.js +8 -6
- package/dist/files/tests/imports.spec.js.map +1 -1
- package/dist/globalCallables.d.ts +3 -1
- package/dist/globalCallables.js +198 -99
- package/dist/globalCallables.js.map +1 -1
- package/dist/index.d.ts +12 -3
- package/dist/index.js +21 -4
- package/dist/index.js.map +1 -1
- package/dist/interfaces.d.ts +68 -15
- package/dist/lexer/Lexer.js +1 -2
- package/dist/lexer/Lexer.js.map +1 -1
- package/dist/lexer/Lexer.spec.js +470 -462
- package/dist/lexer/Lexer.spec.js.map +1 -1
- package/dist/lexer/TokenKind.d.ts +2 -0
- package/dist/lexer/TokenKind.js +5 -0
- package/dist/lexer/TokenKind.js.map +1 -1
- package/dist/parser/Expression.d.ts +1 -1
- package/dist/parser/Expression.js +10 -10
- package/dist/parser/Expression.js.map +1 -1
- package/dist/parser/Parser.Class.spec.js +33 -32
- package/dist/parser/Parser.Class.spec.js.map +1 -1
- package/dist/parser/Parser.d.ts +28 -7
- package/dist/parser/Parser.js +494 -290
- package/dist/parser/Parser.js.map +1 -1
- package/dist/parser/Parser.spec.js +157 -35
- package/dist/parser/Parser.spec.js.map +1 -1
- package/dist/parser/SGParser.js +1 -1
- package/dist/parser/SGParser.js.map +1 -1
- package/dist/parser/SGTypes.d.ts +3 -0
- package/dist/parser/SGTypes.js +8 -3
- package/dist/parser/SGTypes.js.map +1 -1
- package/dist/parser/SGTypes.spec.js +9 -9
- package/dist/parser/SGTypes.spec.js.map +1 -1
- package/dist/parser/Statement.d.ts +55 -3
- package/dist/parser/Statement.js +162 -9
- package/dist/parser/Statement.js.map +1 -1
- package/dist/parser/tests/Parser.spec.d.ts +3 -3
- package/dist/parser/tests/Parser.spec.js +4 -4
- package/dist/parser/tests/Parser.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/For.spec.js +40 -40
- package/dist/parser/tests/controlFlow/For.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/ForEach.spec.js +22 -21
- package/dist/parser/tests/controlFlow/ForEach.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/If.spec.js +100 -99
- package/dist/parser/tests/controlFlow/If.spec.js.map +1 -1
- package/dist/parser/tests/controlFlow/While.spec.js +25 -25
- package/dist/parser/tests/controlFlow/While.spec.js.map +1 -1
- package/dist/parser/tests/expression/Additive.spec.js +21 -21
- package/dist/parser/tests/expression/Additive.spec.js.map +1 -1
- package/dist/parser/tests/expression/ArrayLiterals.spec.js +91 -91
- package/dist/parser/tests/expression/ArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js +102 -102
- package/dist/parser/tests/expression/AssociativeArrayLiterals.spec.js.map +1 -1
- package/dist/parser/tests/expression/Boolean.spec.js +15 -15
- package/dist/parser/tests/expression/Boolean.spec.js.map +1 -1
- package/dist/parser/tests/expression/Call.spec.js +22 -21
- package/dist/parser/tests/expression/Call.spec.js.map +1 -1
- package/dist/parser/tests/expression/Exponential.spec.js +11 -11
- package/dist/parser/tests/expression/Exponential.spec.js.map +1 -1
- package/dist/parser/tests/expression/Function.spec.js +171 -171
- package/dist/parser/tests/expression/Function.spec.js.map +1 -1
- package/dist/parser/tests/expression/Indexing.spec.js +50 -50
- package/dist/parser/tests/expression/Indexing.spec.js.map +1 -1
- package/dist/parser/tests/expression/Multiplicative.spec.js +25 -25
- package/dist/parser/tests/expression/Multiplicative.spec.js.map +1 -1
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js +30 -18
- package/dist/parser/tests/expression/NullCoalescenceExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/PrefixUnary.spec.js +26 -26
- package/dist/parser/tests/expression/PrefixUnary.spec.js.map +1 -1
- package/dist/parser/tests/expression/Primary.spec.js +27 -27
- package/dist/parser/tests/expression/Primary.spec.js.map +1 -1
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js +3 -2
- package/dist/parser/tests/expression/RegexLiteralExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/Relational.spec.js +25 -25
- package/dist/parser/tests/expression/Relational.spec.js.map +1 -1
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js +7 -7
- package/dist/parser/tests/expression/TemplateStringExpression.spec.js.map +1 -1
- package/dist/parser/tests/expression/TernaryExpression.spec.js +6 -6
- package/dist/parser/tests/expression/TernaryExpression.spec.js.map +1 -1
- package/dist/parser/tests/statement/AssignmentOperators.spec.js +15 -15
- package/dist/parser/tests/statement/AssignmentOperators.spec.js.map +1 -1
- package/dist/parser/tests/statement/Declaration.spec.js +20 -20
- package/dist/parser/tests/statement/Declaration.spec.js.map +1 -1
- package/dist/parser/tests/statement/Enum.spec.d.ts +1 -0
- package/dist/parser/tests/statement/Enum.spec.js +774 -0
- package/dist/parser/tests/statement/Enum.spec.js.map +1 -0
- package/dist/parser/tests/statement/Function.spec.js +121 -120
- package/dist/parser/tests/statement/Function.spec.js.map +1 -1
- package/dist/parser/tests/statement/Goto.spec.js +9 -8
- package/dist/parser/tests/statement/Goto.spec.js.map +1 -1
- package/dist/parser/tests/statement/Increment.spec.js +22 -22
- package/dist/parser/tests/statement/Increment.spec.js.map +1 -1
- package/dist/parser/tests/statement/InterfaceStatement.spec.js +12 -0
- package/dist/parser/tests/statement/InterfaceStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/LibraryStatement.spec.js +7 -7
- package/dist/parser/tests/statement/LibraryStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Misc.spec.js +71 -70
- package/dist/parser/tests/statement/Misc.spec.js.map +1 -1
- package/dist/parser/tests/statement/PrintStatement.spec.js +17 -17
- package/dist/parser/tests/statement/PrintStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/ReturnStatement.spec.js +33 -33
- package/dist/parser/tests/statement/ReturnStatement.spec.js.map +1 -1
- package/dist/parser/tests/statement/Set.spec.js +53 -53
- package/dist/parser/tests/statement/Set.spec.js.map +1 -1
- package/dist/parser/tests/statement/Stop.spec.js +7 -6
- package/dist/parser/tests/statement/Stop.spec.js.map +1 -1
- package/dist/preprocessor/Chunk.d.ts +1 -1
- package/dist/preprocessor/Preprocessor.d.ts +1 -1
- package/dist/preprocessor/Preprocessor.js +7 -7
- package/dist/preprocessor/Preprocessor.js.map +1 -1
- package/dist/types/ArrayType.d.ts +8 -5
- package/dist/types/ArrayType.js +45 -9
- package/dist/types/ArrayType.js.map +1 -1
- package/dist/types/ArrayType.spec.js +62 -3
- package/dist/types/ArrayType.spec.js.map +1 -1
- package/dist/types/BscType.d.ts +1 -1
- package/dist/types/CustomType.d.ts +1 -1
- package/dist/types/CustomType.js +4 -2
- package/dist/types/CustomType.js.map +1 -1
- package/dist/types/FunctionType.d.ts +5 -5
- package/dist/types/FunctionType.js +11 -11
- package/dist/types/FunctionType.js.map +1 -1
- package/dist/types/FunctionType.spec.js +1 -1
- package/dist/types/FunctionType.spec.js.map +1 -1
- package/dist/types/LazyType.d.ts +1 -2
- package/dist/types/LazyType.js +1 -5
- package/dist/types/LazyType.js.map +1 -1
- package/dist/types/helpers.js +1 -1
- package/dist/types/helpers.js.map +1 -1
- package/dist/util.d.ts +25 -9
- package/dist/util.js +139 -55
- package/dist/util.js.map +1 -1
- package/dist/validators/ClassValidator.js +27 -27
- package/dist/validators/ClassValidator.js.map +1 -1
- package/package.json +4 -3
- package/dist/astUtils/index.d.ts +0 -7
- package/dist/astUtils/index.js +0 -26
- package/dist/astUtils/index.js.map +0 -1
- package/dist/bscPlugin/semanticTokens/SemanticTokensProcessor.d.ts +0 -7
- package/dist/bscPlugin/semanticTokens/SemanticTokensProcessor.js +0 -63
- package/dist/bscPlugin/semanticTokens/SemanticTokensProcessor.js.map +0 -1
- package/dist/bscPlugin/semanticTokens/SemanticTokensProcessor.spec.js.map +0 -1
- package/dist/lexer/index.d.ts +0 -3
- package/dist/lexer/index.js +0 -18
- package/dist/lexer/index.js.map +0 -1
- package/dist/parser/index.d.ts +0 -3
- package/dist/parser/index.js +0 -16
- package/dist/parser/index.js.map +0 -1
- package/dist/preprocessor/index.d.ts +0 -3
- package/dist/preprocessor/index.js +0 -16
- package/dist/preprocessor/index.js.map +0 -1
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const chai_1 = require("chai");
|
|
4
4
|
const Parser_1 = require("../../Parser");
|
|
5
|
-
const
|
|
5
|
+
const TokenKind_1 = require("../../../lexer/TokenKind");
|
|
6
6
|
const Parser_spec_1 = require("../Parser.spec");
|
|
7
7
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
8
8
|
const DiagnosticMessages_1 = require("../../../DiagnosticMessages");
|
|
@@ -10,7 +10,7 @@ describe('parser postfix unary expressions', () => {
|
|
|
10
10
|
it('parses postfix \'++\' for variables', () => {
|
|
11
11
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
12
12
|
(0, Parser_spec_1.identifier)('foo'),
|
|
13
|
-
(0, Parser_spec_1.token)(
|
|
13
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.PlusPlus, '++'),
|
|
14
14
|
Parser_spec_1.EOF
|
|
15
15
|
]);
|
|
16
16
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
@@ -20,9 +20,9 @@ describe('parser postfix unary expressions', () => {
|
|
|
20
20
|
it('parses postfix \'--\' for dotted get expressions', () => {
|
|
21
21
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
22
22
|
(0, Parser_spec_1.identifier)('obj'),
|
|
23
|
-
(0, Parser_spec_1.token)(
|
|
23
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Dot, '.'),
|
|
24
24
|
(0, Parser_spec_1.identifier)('property'),
|
|
25
|
-
(0, Parser_spec_1.token)(
|
|
25
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.MinusMinus, '--'),
|
|
26
26
|
Parser_spec_1.EOF
|
|
27
27
|
]);
|
|
28
28
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
@@ -32,10 +32,10 @@ describe('parser postfix unary expressions', () => {
|
|
|
32
32
|
it('parses postfix \'++\' for indexed get expressions', () => {
|
|
33
33
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
34
34
|
(0, Parser_spec_1.identifier)('obj'),
|
|
35
|
-
(0, Parser_spec_1.token)(
|
|
35
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.LeftSquareBracket, '['),
|
|
36
36
|
(0, Parser_spec_1.identifier)('property'),
|
|
37
|
-
(0, Parser_spec_1.token)(
|
|
38
|
-
(0, Parser_spec_1.token)(
|
|
37
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.RightSquareBracket, ']'),
|
|
38
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.PlusPlus, '++'),
|
|
39
39
|
Parser_spec_1.EOF
|
|
40
40
|
]);
|
|
41
41
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
@@ -45,8 +45,8 @@ describe('parser postfix unary expressions', () => {
|
|
|
45
45
|
it('disallows consecutive postfix operators', () => {
|
|
46
46
|
let { diagnostics } = Parser_1.Parser.parse([
|
|
47
47
|
(0, Parser_spec_1.identifier)('foo'),
|
|
48
|
-
(0, Parser_spec_1.token)(
|
|
49
|
-
(0, Parser_spec_1.token)(
|
|
48
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.PlusPlus, '++'),
|
|
49
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.PlusPlus, '++'),
|
|
50
50
|
Parser_spec_1.EOF
|
|
51
51
|
]);
|
|
52
52
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(1);
|
|
@@ -57,9 +57,9 @@ describe('parser postfix unary expressions', () => {
|
|
|
57
57
|
it('disallows postfix \'--\' for function call results', () => {
|
|
58
58
|
let { diagnostics } = Parser_1.Parser.parse([
|
|
59
59
|
(0, Parser_spec_1.identifier)('func'),
|
|
60
|
-
(0, Parser_spec_1.token)(
|
|
61
|
-
(0, Parser_spec_1.token)(
|
|
62
|
-
(0, Parser_spec_1.token)(
|
|
60
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.LeftParen, '('),
|
|
61
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.RightParen, ')'),
|
|
62
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.MinusMinus, '--'),
|
|
63
63
|
Parser_spec_1.EOF
|
|
64
64
|
]);
|
|
65
65
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(1);
|
|
@@ -67,15 +67,15 @@ describe('parser postfix unary expressions', () => {
|
|
|
67
67
|
});
|
|
68
68
|
it('allows \'++\' at the end of a function', () => {
|
|
69
69
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
70
|
-
(0, Parser_spec_1.token)(
|
|
70
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Sub, 'sub'),
|
|
71
71
|
(0, Parser_spec_1.identifier)('foo'),
|
|
72
|
-
(0, Parser_spec_1.token)(
|
|
73
|
-
(0, Parser_spec_1.token)(
|
|
74
|
-
(0, Parser_spec_1.token)(
|
|
72
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.LeftParen, '('),
|
|
73
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.RightParen, ')'),
|
|
74
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
|
|
75
75
|
(0, Parser_spec_1.identifier)('someValue'),
|
|
76
|
-
(0, Parser_spec_1.token)(
|
|
77
|
-
(0, Parser_spec_1.token)(
|
|
78
|
-
(0, Parser_spec_1.token)(
|
|
76
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.PlusPlus, '++'),
|
|
77
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Newline, '\n'),
|
|
78
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.EndSub, 'end sub'),
|
|
79
79
|
Parser_spec_1.EOF
|
|
80
80
|
]);
|
|
81
81
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
@@ -91,19 +91,19 @@ describe('parser postfix unary expressions', () => {
|
|
|
91
91
|
*/
|
|
92
92
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
93
93
|
{
|
|
94
|
-
kind:
|
|
94
|
+
kind: TokenKind_1.TokenKind.Identifier,
|
|
95
95
|
text: 'someNumber',
|
|
96
96
|
isReserved: false,
|
|
97
97
|
range: vscode_languageserver_1.Range.create(0, 0, 0, 10)
|
|
98
98
|
},
|
|
99
99
|
{
|
|
100
|
-
kind:
|
|
100
|
+
kind: TokenKind_1.TokenKind.PlusPlus,
|
|
101
101
|
text: '++',
|
|
102
102
|
isReserved: false,
|
|
103
103
|
range: vscode_languageserver_1.Range.create(0, 10, 0, 12)
|
|
104
104
|
},
|
|
105
105
|
{
|
|
106
|
-
kind:
|
|
106
|
+
kind: TokenKind_1.TokenKind.Eof,
|
|
107
107
|
text: '\0',
|
|
108
108
|
isReserved: false,
|
|
109
109
|
range: vscode_languageserver_1.Range.create(0, 12, 0, 13)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Increment.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/Increment.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,yCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"Increment.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/Increment.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,5 +57,17 @@ describe('InterfaceStatement', () => {
|
|
|
57
57
|
end interface
|
|
58
58
|
`, undefined, undefined, undefined, true);
|
|
59
59
|
});
|
|
60
|
+
it('allows declaring multiple interfaces in a file', () => {
|
|
61
|
+
program.setFile('source/interfaces.bs', `
|
|
62
|
+
interface Iface1
|
|
63
|
+
name as dynamic
|
|
64
|
+
end interface
|
|
65
|
+
interface IFace2
|
|
66
|
+
prop as dynamic
|
|
67
|
+
end interface
|
|
68
|
+
`);
|
|
69
|
+
program.validate();
|
|
70
|
+
(0, testHelpers_spec_1.expectZeroDiagnostics)(program);
|
|
71
|
+
});
|
|
60
72
|
});
|
|
61
73
|
//# sourceMappingURL=InterfaceStatement.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InterfaceStatement.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/InterfaceStatement.spec.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"InterfaceStatement.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/InterfaceStatement.spec.ts"],"names":[],"mappings":";;AAAA,gEAAqF;AACrF,wCAAqD;AACrD,8CAA2C;AAE3C,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAChC,MAAM,OAAO,GAAG,IAAA,sBAAC,EAAA,GAAG,OAAO,CAAC,GAAG,EAAE,eAAe,CAAC;IACjD,IAAI,OAAgB,CAAC;IACrB,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,GAAG,IAAI,iBAAO,CAAC;YAClB,OAAO,EAAE,OAAO;SACnB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAA,oCAAiB,EAAC,GAAG,EAAE,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAEnE,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;QACjD,cAAc,CAAC;;;;;;;;;;SAUd,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;QAC/C,cAAc,CAAC;;;;;;;;;;SAUd,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACzB,cAAc,CAAC;;;;;SAKd,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;QAC5B,cAAc,CAAC;;;;;;;;SAQd,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACtD,OAAO,CAAC,OAAO,CAAC,sBAAsB,EAAE;;;;;;;SAOvC,CAAC,CAAC;QACH,OAAO,CAAC,QAAQ,EAAE,CAAC;QACnB,IAAA,wCAAqB,EAAC,OAAO,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const chai_1 = require("chai");
|
|
4
4
|
const Parser_1 = require("../../Parser");
|
|
5
|
-
const
|
|
5
|
+
const Lexer_1 = require("../../../lexer/Lexer");
|
|
6
6
|
const Statement_1 = require("../../Statement");
|
|
7
7
|
describe('parser library statements', () => {
|
|
8
8
|
it('supports library statements at top of file', () => {
|
|
9
|
-
const { tokens } =
|
|
9
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
10
10
|
Library "v30/bslCore.brs"
|
|
11
11
|
sub main()
|
|
12
12
|
end sub
|
|
@@ -15,7 +15,7 @@ describe('parser library statements', () => {
|
|
|
15
15
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
16
16
|
});
|
|
17
17
|
it('supports multiple library statements separated by colon', () => {
|
|
18
|
-
const { tokens } =
|
|
18
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
19
19
|
Library "v30/bslCore.brs" : Library "v30/bslCore.brs"
|
|
20
20
|
sub main()
|
|
21
21
|
end sub
|
|
@@ -24,7 +24,7 @@ describe('parser library statements', () => {
|
|
|
24
24
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
25
25
|
});
|
|
26
26
|
it('still parses entire file after invalid library statement', () => {
|
|
27
|
-
const { tokens } =
|
|
27
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
28
28
|
library cat dog mouse
|
|
29
29
|
sub main()
|
|
30
30
|
end sub
|
|
@@ -33,7 +33,7 @@ describe('parser library statements', () => {
|
|
|
33
33
|
(0, chai_1.expect)(diagnostics.length).to.be.greaterThan(0);
|
|
34
34
|
});
|
|
35
35
|
it('does not prevent usage of `library` as varible name', () => {
|
|
36
|
-
const { tokens } =
|
|
36
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
37
37
|
sub main()
|
|
38
38
|
library = "Gotham City Library"
|
|
39
39
|
end sub
|
|
@@ -46,7 +46,7 @@ describe('parser library statements', () => {
|
|
|
46
46
|
(0, chai_1.expect)(assignment.name.text).to.equal('library');
|
|
47
47
|
});
|
|
48
48
|
it('does not prevent usage of `library` as object property name', () => {
|
|
49
|
-
const { tokens } =
|
|
49
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
50
50
|
sub main()
|
|
51
51
|
buildings = {
|
|
52
52
|
library: "Gotham City Library"
|
|
@@ -59,7 +59,7 @@ describe('parser library statements', () => {
|
|
|
59
59
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
60
60
|
});
|
|
61
61
|
it('parses rest of file with ONLY the library keyword present at root level', () => {
|
|
62
|
-
const { tokens } =
|
|
62
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
63
63
|
library
|
|
64
64
|
sub main()
|
|
65
65
|
library = "Your Library"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LibraryStatement.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/LibraryStatement.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,yCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"LibraryStatement.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/LibraryStatement.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAE9B,yCAAsC;AACtC,gDAA6C;AAC7C,+CAAwF;AAExF,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QAClD,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;SAI7B,CAAC,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;SAI7B,CAAC,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAChE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;SAI7B,CAAC,CAAC;QACH,MAAM,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAA,aAAM,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;SAI7B,CAAC,CAAC;QACH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAQ,CAAC;QAChE,0DAA0D;QAC1D,IAAI,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvD,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtC,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,+BAAmB,CAAC,CAAC;QACzD,IAAA,aAAM,EAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACnE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;SAM7B,CAAC,CAAC;QACH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAQ,CAAC;QAChE,0DAA0D;QAC1D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAClG,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,GAAG,EAAE;QAC/E,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;SAK7B,CAAC,CAAC;QACH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACzD,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtC,uCAAuC;QACvC,IAAA,aAAM,EAAC,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,6BAAW,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -2,14 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const chai_1 = require("chai");
|
|
4
4
|
const Parser_1 = require("../../Parser");
|
|
5
|
-
const
|
|
5
|
+
const Lexer_1 = require("../../../lexer/Lexer");
|
|
6
|
+
const TokenKind_1 = require("../../../lexer/TokenKind");
|
|
6
7
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
7
8
|
const testHelpers_spec_1 = require("../../../testHelpers.spec");
|
|
8
9
|
describe('parser', () => {
|
|
9
10
|
describe('`end` keyword', () => {
|
|
10
11
|
it('does not produce diagnostics', () => {
|
|
11
12
|
var _a;
|
|
12
|
-
let { tokens } =
|
|
13
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
13
14
|
sub Main()
|
|
14
15
|
end
|
|
15
16
|
end sub
|
|
@@ -18,7 +19,7 @@ describe('parser', () => {
|
|
|
18
19
|
(0, chai_1.expect)((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.not.exist;
|
|
19
20
|
});
|
|
20
21
|
it('can be used as a property name on objects', () => {
|
|
21
|
-
let { tokens } =
|
|
22
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
22
23
|
sub Main()
|
|
23
24
|
person = {
|
|
24
25
|
end: true
|
|
@@ -30,7 +31,7 @@ describe('parser', () => {
|
|
|
30
31
|
});
|
|
31
32
|
it('is not allowed as a standalone variable', () => {
|
|
32
33
|
//this test depends on token locations, so use the lexer to generate those locations.
|
|
33
|
-
let { tokens } =
|
|
34
|
+
let { tokens } = Lexer_1.Lexer.scan(`sub Main()\n else = true\nend sub`);
|
|
34
35
|
let { diagnostics } = Parser_1.Parser.parse(tokens);
|
|
35
36
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(1);
|
|
36
37
|
//specifically check for the error location, because the identifier location was wrong in the past
|
|
@@ -38,7 +39,7 @@ describe('parser', () => {
|
|
|
38
39
|
});
|
|
39
40
|
});
|
|
40
41
|
it('certain reserved words are allowed as local var identifiers', () => {
|
|
41
|
-
let { tokens } =
|
|
42
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
42
43
|
sub Main()
|
|
43
44
|
endfor = true
|
|
44
45
|
double = true
|
|
@@ -55,16 +56,16 @@ describe('parser', () => {
|
|
|
55
56
|
});
|
|
56
57
|
it('most reserved words are not allowed as local var identifiers', () => {
|
|
57
58
|
let statementList = [];
|
|
58
|
-
[...
|
|
59
|
+
[...TokenKind_1.DisallowedLocalIdentifiersText].filter(x => x === 'if').forEach((disallowedIdentifier) => {
|
|
59
60
|
//use the lexer to generate tokens because there are many different TokenKind types represented in this list
|
|
60
|
-
let { tokens } =
|
|
61
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
61
62
|
sub main()
|
|
62
63
|
${disallowedIdentifier} = true
|
|
63
64
|
end sub
|
|
64
65
|
`);
|
|
65
66
|
let { statements, diagnostics } = Parser_1.Parser.parse(tokens);
|
|
66
67
|
if (diagnostics.length === 0) {
|
|
67
|
-
console.log(
|
|
68
|
+
console.log(TokenKind_1.DisallowedLocalIdentifiersText);
|
|
68
69
|
throw new Error(`'${disallowedIdentifier}' cannot be used as an identifier, but was not detected as an error`);
|
|
69
70
|
}
|
|
70
71
|
statementList.push(statements);
|
|
@@ -92,65 +93,65 @@ describe('parser', () => {
|
|
|
92
93
|
});
|
|
93
94
|
it('allows certain TokenKinds as object properties', () => {
|
|
94
95
|
let kinds = [
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
96
|
+
TokenKind_1.TokenKind.As,
|
|
97
|
+
TokenKind_1.TokenKind.And,
|
|
98
|
+
TokenKind_1.TokenKind.Box,
|
|
99
|
+
TokenKind_1.TokenKind.CreateObject,
|
|
100
|
+
TokenKind_1.TokenKind.Dim,
|
|
101
|
+
TokenKind_1.TokenKind.Then,
|
|
102
|
+
TokenKind_1.TokenKind.Else,
|
|
103
|
+
TokenKind_1.TokenKind.End,
|
|
104
|
+
TokenKind_1.TokenKind.EndFunction,
|
|
105
|
+
TokenKind_1.TokenKind.EndFor,
|
|
106
|
+
TokenKind_1.TokenKind.EndIf,
|
|
107
|
+
TokenKind_1.TokenKind.EndSub,
|
|
108
|
+
TokenKind_1.TokenKind.EndWhile,
|
|
109
|
+
TokenKind_1.TokenKind.Eval,
|
|
110
|
+
TokenKind_1.TokenKind.Exit,
|
|
111
|
+
TokenKind_1.TokenKind.ExitFor,
|
|
112
|
+
TokenKind_1.TokenKind.ExitWhile,
|
|
113
|
+
TokenKind_1.TokenKind.False,
|
|
114
|
+
TokenKind_1.TokenKind.For,
|
|
115
|
+
TokenKind_1.TokenKind.ForEach,
|
|
116
|
+
TokenKind_1.TokenKind.Function,
|
|
117
|
+
TokenKind_1.TokenKind.GetGlobalAA,
|
|
118
|
+
TokenKind_1.TokenKind.GetLastRunCompileError,
|
|
119
|
+
TokenKind_1.TokenKind.GetLastRunRunTimeError,
|
|
120
|
+
TokenKind_1.TokenKind.Goto,
|
|
121
|
+
TokenKind_1.TokenKind.If,
|
|
122
|
+
TokenKind_1.TokenKind.Invalid,
|
|
123
|
+
TokenKind_1.TokenKind.Let,
|
|
124
|
+
TokenKind_1.TokenKind.Next,
|
|
125
|
+
TokenKind_1.TokenKind.Not,
|
|
126
|
+
TokenKind_1.TokenKind.ObjFun,
|
|
127
|
+
TokenKind_1.TokenKind.Or,
|
|
128
|
+
TokenKind_1.TokenKind.Pos,
|
|
129
|
+
TokenKind_1.TokenKind.Print,
|
|
130
|
+
TokenKind_1.TokenKind.Rem,
|
|
131
|
+
TokenKind_1.TokenKind.Return,
|
|
132
|
+
TokenKind_1.TokenKind.Step,
|
|
133
|
+
TokenKind_1.TokenKind.Stop,
|
|
134
|
+
TokenKind_1.TokenKind.Sub,
|
|
135
|
+
TokenKind_1.TokenKind.Tab,
|
|
136
|
+
TokenKind_1.TokenKind.To,
|
|
137
|
+
TokenKind_1.TokenKind.True,
|
|
138
|
+
TokenKind_1.TokenKind.Type,
|
|
139
|
+
TokenKind_1.TokenKind.While,
|
|
140
|
+
TokenKind_1.TokenKind.Void,
|
|
141
|
+
TokenKind_1.TokenKind.Boolean,
|
|
142
|
+
TokenKind_1.TokenKind.Integer,
|
|
143
|
+
TokenKind_1.TokenKind.LongInteger,
|
|
144
|
+
TokenKind_1.TokenKind.Float,
|
|
145
|
+
TokenKind_1.TokenKind.Double,
|
|
146
|
+
TokenKind_1.TokenKind.String,
|
|
147
|
+
TokenKind_1.TokenKind.Object,
|
|
148
|
+
TokenKind_1.TokenKind.Interface,
|
|
149
|
+
TokenKind_1.TokenKind.Dynamic,
|
|
150
|
+
TokenKind_1.TokenKind.Void,
|
|
151
|
+
TokenKind_1.TokenKind.As
|
|
151
152
|
].map(x => x.toLowerCase());
|
|
152
153
|
for (let kind of kinds) {
|
|
153
|
-
let { tokens } =
|
|
154
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
154
155
|
obj = {
|
|
155
156
|
${kind}: true
|
|
156
157
|
}
|
|
@@ -166,7 +167,7 @@ describe('parser', () => {
|
|
|
166
167
|
});
|
|
167
168
|
it('allows whitelisted reserved words as object properties', () => {
|
|
168
169
|
//use the lexer to generate token list because...this list is huge.
|
|
169
|
-
let { tokens } =
|
|
170
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
170
171
|
sub Main()
|
|
171
172
|
person = {}
|
|
172
173
|
person.and = true
|
|
@@ -229,7 +230,7 @@ describe('parser', () => {
|
|
|
229
230
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
230
231
|
});
|
|
231
232
|
it('allows rem as a property name only in certain situations', () => {
|
|
232
|
-
let { tokens } =
|
|
233
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
233
234
|
function main ()
|
|
234
235
|
person = {
|
|
235
236
|
rem: 1
|
|
@@ -252,7 +253,7 @@ describe('parser', () => {
|
|
|
252
253
|
});
|
|
253
254
|
it('handles quoted AA keys', () => {
|
|
254
255
|
var _a;
|
|
255
|
-
let { tokens } =
|
|
256
|
+
let { tokens } = Lexer_1.Lexer.scan(`
|
|
256
257
|
function main(arg as string)
|
|
257
258
|
twoDimensional = {
|
|
258
259
|
"has-second-layer": true,
|
|
@@ -269,7 +270,7 @@ describe('parser', () => {
|
|
|
269
270
|
(0, chai_1.expect)(element.keyToken.text).to.equal('"has-second-layer"');
|
|
270
271
|
});
|
|
271
272
|
it('extracts property names for completion', () => {
|
|
272
|
-
const { tokens } =
|
|
273
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
273
274
|
function main(arg as string)
|
|
274
275
|
aa1 = {
|
|
275
276
|
"sprop1": 0,
|
|
@@ -307,7 +308,7 @@ describe('parser', () => {
|
|
|
307
308
|
(0, chai_1.expect)(Object.keys(refreshedHints).sort()).to.deep.equal(expected, 'Refreshed hints');
|
|
308
309
|
});
|
|
309
310
|
it('extracts property names matching JavaScript reserved names', () => {
|
|
310
|
-
const { tokens } =
|
|
311
|
+
const { tokens } = Lexer_1.Lexer.scan(`
|
|
311
312
|
function main(arg as string)
|
|
312
313
|
aa1 = {
|
|
313
314
|
"constructor": 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Misc.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/Misc.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,yCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"Misc.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/Misc.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,yCAAsC;AACtC,gDAA6C;AAC7C,wDAAqF;AACrF,iEAA8C;AAE9C,gEAAkE;AAElE,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IACpB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;;YACpC,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;aAI3B,CAAC,CAAC;YACH,IAAI,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAA,aAAM,EAAC,MAAA,WAAW,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC;QACjD,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACjD,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;aAM3B,CAAC,CAAC;YACH,IAAI,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YAC/C,qFAAqF;YACrF,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpE,IAAI,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtC,kGAAkG;YAClG,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CACxC,6BAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAC3B,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6DAA6D,EAAE,GAAG,EAAE;QACnE,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;;;;;;SAW3B,CAAC,CAAC;QACH,IAAI,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACpE,IAAI,aAAa,GAAG,EAAE,CAAC;QACvB,CAAC,GAAG,0CAA8B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,oBAAoB,EAAE,EAAE;YACzF,4GAA4G;YAC5G,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;sBAElB,oBAAoB;;aAE7B,CAAC,CAAC;YACH,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACvD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,OAAO,CAAC,GAAG,CAAC,0CAA8B,CAAC,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,IAAI,oBAAoB,qEAAqE,CAAC,CAAC;aAClH;YACD,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QAClE,6DAA6D;QAC7D,IAAA,wCAAqB,EACjB,eAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;;;;aAgBZ,CAAC,CACL,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACtD,IAAI,KAAK,GAAG;YACR,qBAAS,CAAC,EAAE;YACZ,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,YAAY;YACtB,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,WAAW;YACrB,qBAAS,CAAC,MAAM;YAChB,qBAAS,CAAC,KAAK;YACf,qBAAS,CAAC,MAAM;YAChB,qBAAS,CAAC,QAAQ;YAClB,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,OAAO;YACjB,qBAAS,CAAC,SAAS;YACnB,qBAAS,CAAC,KAAK;YACf,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,OAAO;YACjB,qBAAS,CAAC,QAAQ;YAClB,qBAAS,CAAC,WAAW;YACrB,qBAAS,CAAC,sBAAsB;YAChC,qBAAS,CAAC,sBAAsB;YAChC,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,EAAE;YACZ,qBAAS,CAAC,OAAO;YACjB,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,MAAM;YAChB,qBAAS,CAAC,EAAE;YACZ,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,KAAK;YACf,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,MAAM;YAChB,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,GAAG;YACb,qBAAS,CAAC,EAAE;YACZ,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,KAAK;YACf,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,OAAO;YACjB,qBAAS,CAAC,OAAO;YACjB,qBAAS,CAAC,WAAW;YACrB,qBAAS,CAAC,KAAK;YACf,qBAAS,CAAC,MAAM;YAChB,qBAAS,CAAC,MAAM;YAChB,qBAAS,CAAC,MAAM;YAChB,qBAAS,CAAC,SAAS;YACnB,qBAAS,CAAC,OAAO;YACjB,qBAAS,CAAC,IAAI;YACd,qBAAS,CAAC,EAAE;SACf,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE5B,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE;YACpB,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;sBAElB,IAAI;;sBAEJ,IAAI;iCACO,IAAI;aACxB,CAAC,CAAC;YACH,IAAI,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3C,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,MAAM,IAAI,KAAK,CACX,UAAU,IAAI,gEAAgE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;aACpH;YACD,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SACzC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wDAAwD,EAAE,GAAG,EAAE;QAC9D,mEAAmE;QACnE,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAyD3B,CAAC,CAAC;QACH,IAAI,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAA,aAAM,EAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC;QACpD,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,GAAG,EAAE;QAChE,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;;;;;;;;aAavB,CACJ,CAAC;QACF,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAQ,CAAC;QAC9D,IAAA,aAAM,EAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,yBAAyB,CAAC,CAAC;QAC3E,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxF,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxF,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACrG,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;;QAC9B,IAAI,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;;;;;SAU3B,CAAC,CAAC;QACH,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,OAAO,GAAK,UAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAwB,CAAC;QACvG,IAAA,aAAM,EAAC,MAAA,WAAW,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC;QAC7C,IAAA,aAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;SAyB7B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG;YACb,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ;YAC1D,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;SAClF,CAAC;QAEF,MAAM,MAAM,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;QAC1D,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QAElF,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC9B,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;QAC5D,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAK,CAAC,IAAI,CAAC;;;;;;;;;;;;SAY7B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG;YACb,aAAa,EAAE,UAAU,EAAE,SAAS;SACvC,CAAC;QAEF,MAAM,MAAM,GAAG,eAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;QAC1D,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QAElF,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAC9B,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;QAC5D,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const chai_1 = require("chai");
|
|
4
4
|
const Parser_1 = require("../../Parser");
|
|
5
|
-
const
|
|
5
|
+
const TokenKind_1 = require("../../../lexer/TokenKind");
|
|
6
6
|
const Parser_spec_1 = require("../Parser.spec");
|
|
7
7
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
8
8
|
const Program_1 = require("../../../Program");
|
|
@@ -19,8 +19,8 @@ describe('parser print statements', () => {
|
|
|
19
19
|
});
|
|
20
20
|
it('parses singular print statements', () => {
|
|
21
21
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
22
|
-
(0, Parser_spec_1.token)(
|
|
23
|
-
(0, Parser_spec_1.token)(
|
|
22
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Print),
|
|
23
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.StringLiteral, 'Hello, world'),
|
|
24
24
|
Parser_spec_1.EOF
|
|
25
25
|
]);
|
|
26
26
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
@@ -28,17 +28,17 @@ describe('parser print statements', () => {
|
|
|
28
28
|
(0, chai_1.expect)(statements).not.to.be.null;
|
|
29
29
|
});
|
|
30
30
|
it('supports empty print', () => {
|
|
31
|
-
let { statements, diagnostics } = Parser_1.Parser.parse([(0, Parser_spec_1.token)(
|
|
31
|
+
let { statements, diagnostics } = Parser_1.Parser.parse([(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Print), Parser_spec_1.EOF]);
|
|
32
32
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
33
33
|
(0, chai_1.expect)(statements).to.exist;
|
|
34
34
|
(0, chai_1.expect)(statements).not.to.be.null;
|
|
35
35
|
});
|
|
36
36
|
it('parses print lists with no separator', () => {
|
|
37
37
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
38
|
-
(0, Parser_spec_1.token)(
|
|
39
|
-
(0, Parser_spec_1.token)(
|
|
40
|
-
(0, Parser_spec_1.token)(
|
|
41
|
-
(0, Parser_spec_1.token)(
|
|
38
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Print),
|
|
39
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.StringLiteral, 'Foo'),
|
|
40
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.StringLiteral, 'bar'),
|
|
41
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.StringLiteral, 'baz'),
|
|
42
42
|
Parser_spec_1.EOF
|
|
43
43
|
]);
|
|
44
44
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
@@ -47,12 +47,12 @@ describe('parser print statements', () => {
|
|
|
47
47
|
});
|
|
48
48
|
it('parses print lists with separators', () => {
|
|
49
49
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
50
|
-
(0, Parser_spec_1.token)(
|
|
51
|
-
(0, Parser_spec_1.token)(
|
|
52
|
-
(0, Parser_spec_1.token)(
|
|
53
|
-
(0, Parser_spec_1.token)(
|
|
54
|
-
(0, Parser_spec_1.token)(
|
|
55
|
-
(0, Parser_spec_1.token)(
|
|
50
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Print),
|
|
51
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.StringLiteral, 'Foo'),
|
|
52
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Semicolon),
|
|
53
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.StringLiteral, 'bar'),
|
|
54
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.Semicolon),
|
|
55
|
+
(0, Parser_spec_1.token)(TokenKind_1.TokenKind.StringLiteral, 'baz'),
|
|
56
56
|
Parser_spec_1.EOF
|
|
57
57
|
]);
|
|
58
58
|
(0, chai_1.expect)(diagnostics).to.be.lengthOf(0);
|
|
@@ -68,21 +68,21 @@ describe('parser print statements', () => {
|
|
|
68
68
|
*/
|
|
69
69
|
let { statements, diagnostics } = Parser_1.Parser.parse([
|
|
70
70
|
{
|
|
71
|
-
kind:
|
|
71
|
+
kind: TokenKind_1.TokenKind.Print,
|
|
72
72
|
text: 'print',
|
|
73
73
|
isReserved: true,
|
|
74
74
|
range: vscode_languageserver_1.Range.create(0, 0, 1, 5),
|
|
75
75
|
leadingWhitespace: ''
|
|
76
76
|
},
|
|
77
77
|
{
|
|
78
|
-
kind:
|
|
78
|
+
kind: TokenKind_1.TokenKind.StringLiteral,
|
|
79
79
|
text: `"foo"`,
|
|
80
80
|
isReserved: false,
|
|
81
81
|
range: vscode_languageserver_1.Range.create(0, 6, 0, 11),
|
|
82
82
|
leadingWhitespace: ''
|
|
83
83
|
},
|
|
84
84
|
{
|
|
85
|
-
kind:
|
|
85
|
+
kind: TokenKind_1.TokenKind.Eof,
|
|
86
86
|
text: '\0',
|
|
87
87
|
isReserved: false,
|
|
88
88
|
range: vscode_languageserver_1.Range.create(0, 11, 0, 12),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrintStatement.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/PrintStatement.spec.ts"],"names":[],"mappings":";;AAAA,+BAA8B;AAC9B,yCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"PrintStatement.spec.js","sourceRoot":"","sources":["../../../../src/parser/tests/statement/PrintStatement.spec.ts"],"names":[],"mappings":"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"}
|