Skip to content

Commit 59282ab

Browse files
author
Keith Smiley
committed
Merge pull request #91 from raimon49/support-underscore-in-integer-literals
Add match pattern underscore to hex, binary, octal literals
2 parents b0aac5c + 0801671 commit 59282ab

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

example/example.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,17 @@ if foo {
5858

5959
0xa2ef // hex
6060
0x123P432
61+
0xa_2ef // hex with underscore
6162
0x13p-43
6263
0x13r-43
6364
0x213zdf // broken hex
6465

6566
0b10101 // binary
67+
0b1010_1 // binary with underscore
6668
0b1234 // broken binary
6769

6870
0o567 // octal
71+
0o56_7 // octal with underscore
6972
0o5689 // broken octal
7073

7174
1_000_000 // underscore separated million

syntax/swift.vim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ syntax match swiftNumber "\v<\d+>"
6262
syntax match swiftNumber "\v<(\d+_+)+\d+(\.\d+(_+\d+)*)?>"
6363
syntax match swiftNumber "\v<\d+\.\d+>"
6464
syntax match swiftNumber "\v<\d*\.?\d+([Ee]-?)?\d+>"
65-
syntax match swiftNumber "\v<0x\x+([Pp]-?)?\x+>"
66-
syntax match swiftNumber "\v<0b[01]+>"
67-
syntax match swiftNumber "\v<0o\o+>"
65+
syntax match swiftNumber "\v<0x[[:xdigit:]_]+([Pp]-?)?\x+>"
66+
syntax match swiftNumber "\v<0b[01_]+>"
67+
syntax match swiftNumber "\v<0o[0-7_]+>"
6868

6969
" BOOLs
7070
syntax keyword swiftBoolean

0 commit comments

Comments
 (0)