Skip to content

Improve Python's tokenizer for numeric literals #5084

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

Open
lucach wants to merge 1 commit into
base: main
Choose a base branch
from
+98 −8
Open

Improve Python's tokenizer for numeric literals #5084

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
90 changes: 85 additions & 5 deletions src/basic-languages/python/python.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ testTokenization('python', [
line: "'''Lots '''0.3e-5",
tokens: [
{ startIndex: 0, type: 'string.python' },
{ startIndex: 11, type: 'number.python' }
{ startIndex: 11, type: 'number.float.python' }
]
}
],
Expand Down Expand Up @@ -171,10 +171,11 @@ testTokenization('python', [
{
line: '0xAcBFd',
tokens: [{ startIndex: 0, type: 'number.hex.python' }]
}
],

[
},
{
line: '0X_1234_ABCD',
tokens: [{ startIndex: 0, type: 'number.hex.python' }]
},
{
line: '0x0cH',
tokens: [
Expand All @@ -184,9 +185,88 @@ testTokenization('python', [
}
],

[
{
line: '0o7501',
tokens: [{ startIndex: 0, type: 'number.octal.python' }]
},
{
line: '0O_1_2_3_4_5_6_7',
tokens: [{ startIndex: 0, type: 'number.octal.python' }]
}
],

[
{
line: '0b0',
tokens: [{ startIndex: 0, type: 'number.binary.python' }]
},
{
line: '0B_1010_0101',
tokens: [{ startIndex: 0, type: 'number.binary.python' }]
}
],

[
{
line: '3.14',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '456.7j',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '0.34J',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '.999_999',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '1.',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
}
],

[
{
line: '456.7e-7j',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '0.1234e+1J',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '.12e-0j',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '0E0',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
},
{
line: '1e1_0',
tokens: [{ startIndex: 0, type: 'number.float.python' }]
}
],

[
{
line: '123456',
tokens: [{ startIndex: 0, type: 'number.python' }]
},
{
line: '-1L',
tokens: [
{ startIndex: 0, type: '' },
{ startIndex: 1, type: 'number.python' }
]
},
{
line: '1_000_000_000',
tokens: [{ startIndex: 0, type: 'number.python' }]
}
],
Expand Down
16 changes: 13 additions & 3 deletions src/basic-languages/python/python.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ export const language = <languages.IMonarchLanguage>{
{ open: '(', close: ')', token: 'delimiter.parenthesis' }
],

// we include these common regular expressions
digits: /\d+(_+\d+)*/,
octaldigits: /[0-7]+(_+[0-7]+)*/,
binarydigits: /[0-1]+(_+[0-1]+)*/,
hexdigits: /[[0-9a-fA-F]+(_+[0-9a-fA-F]+)*/,

tokenizer: {
root: [
{ include: '@whitespace' },
Expand Down Expand Up @@ -241,10 +247,14 @@ export const language = <languages.IMonarchLanguage>{
[/"/, 'string']
],

// Recognize hex, negatives, decimals, imaginaries, longs, and scientific notation
// Recognize hex, octal, binary, floating-point (including scientific notation), decimals, plus variants (imaginaries, Python 2 longs)
numbers: [
[/-?0x([abcdef]|[ABCDEF]|\d)+[lL]?/, 'number.hex'],
[/-?(\d*\.)?\d+([eE][+\-]?\d+)?[jJ]?[lL]?/, 'number']
[/0[xX]_?(@hexdigits)[lL]?/, 'number.hex'],
[/0[oO]_?(@octaldigits)[lL]?/, 'number.octal'],
[/0[bB]_?(@binarydigits)[lL]?/, 'number.binary'],
[/(((@digits)\.(@digits)?)|(\.(@digits)))([eE][+-]?(@digits))?[jJ]?/, 'number.float'],
[/(@digits)[eE][+-]?(@digits)[jJ]?/, 'number.float'],
[/(@digits)[lLjJ]?/, 'number']
],

// Recognize strings, including those broken across lines with \ (but not without)
Expand Down