Skip to content

Commit b3f0ac9

Browse files
committed
update .combineTwo to fix ReferenceErrors
1 parent f80f25d commit b3f0ac9

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

src/ast.ts

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ export namespace syxparser {
8585

8686
/**
8787
* Combines the start of first range with the end of second range to create a range.
88-
* @param {Range} starterRange
89-
* @param {Range} enderRange
88+
* @param starterRange Start range.
89+
* @param enderRange End range.
9090
* @author efekos
9191
* @since 0.0.1-alpha
92-
* @version 1.0.0
92+
* @version 1.0.1
9393
*/
9494
export function combineTwo(starter: Token | Range, ender: Token | Range): Range {
95-
return { start: (starter instanceof Range ? starter as Range : (starter as Token).range).start, end: (ender instanceof Range ? ender as Range : (ender as Token).range).end };
95+
return { start: ('range' in starter ? starter.range : starter).start, end: ('range' in ender ? ender.range : ender).end };
9696
}
9797

9898
/**
@@ -395,16 +395,17 @@ export namespace sysparser {
395395

396396
let program: ProgramStatement;
397397

398+
398399
/**
399-
* Combines the start of first range with the end of second range to create a range.
400-
* @param {Range} starterRange
401-
* @param {Range} enderRange
402-
* @author efekos
403-
* @since 0.0.1-alpha
404-
* @version 1.0.0
405-
*/
400+
* Combines the start of first range with the end of second range to create a range.
401+
* @param starterRange Start range.
402+
* @param enderRange End range.
403+
* @author efekos
404+
* @since 0.0.1-alpha
405+
* @version 1.0.1
406+
*/
406407
export function combineTwo(starter: Token | Range, ender: Token | Range): Range {
407-
return { start: (starter instanceof Range ? starter as Range : (starter as Token).range).start, end: (ender instanceof Range ? ender as Range : (ender as Token).range).end };
408+
return { start: ('range' in starter ? starter.range : starter).start, end: ('range' in ender ? ender.range : ender).end };
408409
}
409410

410411
/**
@@ -419,7 +420,7 @@ export namespace sysparser {
419420
tokens = t;
420421

421422
const eof = t.find(r => r.type === TokenType.EndOfFile);
422-
program = { body: [], type: NodeType.Program, range: {start:{character:0,line:0},end:eof.range.end}};
423+
program = { body: [], type: NodeType.Program, range: { start: { character: 0, line: 0 }, end: eof.range.end } };
423424

424425
while (canGo()) {
425426
parseStatement();

0 commit comments

Comments
 (0)