Skip to content

Commit 7c7f000

Browse files
committed
chore: add options parameter to end of Parser constructor
1 parent 1ca3ad7 commit 7c7f000

2 files changed

Lines changed: 10 additions & 11 deletions

File tree

src/parser.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,17 @@ export class Parser extends DiagnosticEmitter {
121121
sources: Source[];
122122
/** Current overridden module name. */
123123
currentModuleName: string | null = null;
124-
/** Temporary variable so I can disable parsing tuples if multi-variable is disabled */
125-
options: Options | null = null;
124+
/** Compiler options. */
125+
options: Options;
126126
/** Constructs a new parser. */
127127
constructor(
128128
diagnostics: DiagnosticMessage[] | null = null,
129-
sources: Source[] = []
129+
sources: Source[] = [],
130+
options: Options
130131
) {
131132
super(diagnostics);
132133
this.sources = sources;
134+
this.options = options;
133135
}
134136

135137
/** Parses a file and adds its definitions to the program. */
@@ -579,7 +581,7 @@ export class Parser extends DiagnosticEmitter {
579581
}
580582

581583
// '[' ((Identifier ':')? Type (',' (Identifier ':')? Type)*)? ']'
582-
} else if (token == Token.OpenBracket && this.options && this.options!.hasFeature(Feature.MultiValue)) {
584+
} else if (token == Token.OpenBracket && this.options.hasFeature(Feature.MultiValue)) {
583585
let elements: TypeNode[] = [];
584586
let elementNames: (IdentifierExpression | null)[] = [];
585587
let hasElementNames = false;

src/program.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,9 @@ export namespace OperatorKind {
390390
case Token.GreaterThan_GreaterThan_Equals: return OperatorKind.BitwiseShr;
391391
case Token.GreaterThan_GreaterThan_GreaterThan:
392392
case Token.GreaterThan_GreaterThan_GreaterThan_Equals: return OperatorKind.BitwiseShrU;
393-
case Token.Equals_Equals:
393+
case Token.Equals_Equals:
394394
case Token.Equals_Equals_Equals: return OperatorKind.Eq;
395-
case Token.Exclamation_Equals:
395+
case Token.Exclamation_Equals:
396396
case Token.Exclamation_Equals_Equals: return OperatorKind.Ne;
397397
case Token.GreaterThan: return OperatorKind.Gt;
398398
case Token.GreaterThan_Equals: return OperatorKind.Ge;
@@ -436,15 +436,12 @@ export class Program extends DiagnosticEmitter {
436436
diagnostics: DiagnosticMessage[] | null = null
437437
) {
438438
super(diagnostics);
439-
this.module = Module.create(options.stackSize > 0, options.sizeTypeRef);
440-
this.parser = new Parser(this.diagnostics, this.sources);
439+
this.module = Module.create(options.stackSize > 0, options.sizeTypeRef);
440+
this.parser = new Parser(this.diagnostics, this.sources, this.options);
441441
this.resolver = new Resolver(this);
442442
let nativeFile = new File(this, Source.native);
443443
this.nativeFile = nativeFile;
444444
this.filesByName.set(nativeFile.internalName, nativeFile);
445-
446-
// temporary fix
447-
this.parser.options = this.options;
448445
}
449446

450447
/** Module instance. */

0 commit comments

Comments
 (0)