Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance lexer to support long numeric literals with type designators #1351

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Enhance lexer to support long numeric literals with type designators #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/lexer/Lexer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,22 @@ describe('lexer', () => {
expect(f.text).to.eql('2.5e3');
});

it('supports very long numbers with !', () => {
function doTest(number: string) {
let f = Lexer.scan(number).tokens[0];
expect(f.kind).to.equal(TokenKind.FloatLiteral);
expect(f.text).to.eql(number);
}
doTest('0!');
doTest('0!');
doTest('147483648!');
doTest('2147483648!');
doTest('2147483648111!');
doTest('2.4e-38!');
doTest('2.4e-32342342342342342342342342348!');
doTest('2.4e+32342342342342342342342342348!');
});

it('supports larger-than-supported-precision floats to be defined with exponents', () => {
let f = Lexer.scan('2.3659475627512424e-38').tokens[0];
expect(f.kind).to.equal(TokenKind.FloatLiteral);
Expand Down
21 changes: 17 additions & 4 deletions src/lexer/Lexer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import type { Range, Diagnostic } from 'vscode-languageserver';
import { DiagnosticMessages } from '../DiagnosticMessages';
import util from '../util';

/**
* Numeric type designators can only be one of these characters
*/
const numericTypeDesignatorCharsRegexp = /[#d!e&%]/;

export class Lexer {
/**
* The zero-indexed position at which the token under consideration begins.
Expand Down Expand Up @@ -675,8 +680,12 @@ export class Lexer {
let asString = this.source.slice(this.start, this.current);
let numberOfDigits = containsDecimal ? asString.length - 1 : asString.length;
let designator = this.peek().toLowerCase();
//set to undefined if it's not one of the supported designator chars
if (!numericTypeDesignatorCharsRegexp.test(designator)) {
designator = undefined;
}

if (numberOfDigits >= 10 && designator !== '&' && designator !== 'e') {
if (numberOfDigits >= 10 && !designator) {
// numeric literals over 10 digits with no type designator are implicitly Doubles
this.addToken(TokenKind.DoubleLiteral);
} else if (designator === '#') {
Expand Down Expand Up @@ -707,9 +716,9 @@ export class Lexer {
this.advance();
this.addToken(TokenKind.FloatLiteral);
} else if (designator === 'e') {
// literals that use "E" as the exponent are also automatic Floats
// literals that use "e" as the exponent are also automatic Floats

// consume the "E"
// consume the "e"
this.advance();

// exponents are optionally signed
Expand All @@ -722,6 +731,11 @@ export class Lexer {
this.advance();
}

//optionally consume a trailing type designator
if (numericTypeDesignatorCharsRegexp.test(this.peek())) {
this.advance();
}

this.addToken(TokenKind.FloatLiteral);
} else if (containsDecimal) {
// anything with a decimal but without matching Double rules is a Float
Expand All @@ -737,7 +751,6 @@ export class Lexer {
} else {
// otherwise, it's a regular integer
this.addToken(TokenKind.IntegerLiteral);

}
}

Expand Down