Improve numbers parsing in Kotlin

alecthomas · Feb 8, 2019 · b5ccb8d · b5ccb8d
1 parent f4dea84
commit b5ccb8d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/lexers/k/kotlin.go b/lexers/k/kotlin.go
@@ -30,7 +30,7 @@ var Kotlin = internal.Register(MustNewLexer(
 			{`"""[^"]*"""`, LiteralString, nil},
 			{`"(\\\\|\\"|[^"\n])*["\n]`, LiteralString, nil},
 			{`'\\.'|'[^\\]'`, LiteralStringChar, nil},
-			{`[0-9](\.[0-9]*)?([eE][+-][0-9]+)?[flFL]?|0[xX][0-9a-fA-F]+[Ll]?`, LiteralNumber, nil},
+			{`0[xX][0-9a-fA-F]+[Uu]?[Ll]?|[0-9]+(\.[0-9]*)?([eE][+-][0-9]+)?[fF]?[Uu]?[Ll]?`, LiteralNumber, nil},
 			{`(companion)(\s+)(object)`, ByGroups(Keyword, Text, Keyword), nil},
 			{`(class|interface|object)(\s+)`, ByGroups(Keyword, Text), Push("class")},
 			{`(package|import)(\s+)`, ByGroups(Keyword, Text), Push("package")},

diff --git a/lexers/testdata/kotlin.actual b/lexers/testdata/kotlin.actual
@@ -10,6 +10,7 @@ fun main(args: Array<String>) {
   StringBuilder().apply {
     append(multiline)
   }
+  val unsigned = 0x00UL + 123u + 76.54
 }
 /*
 */

diff --git a/lexers/testdata/kotlin.expected b/lexers/testdata/kotlin.expected
@@ -53,6 +53,22 @@
   {"type":"Punctuation","value":")"},
   {"type":"Text","value":"\n  "},
   {"type":"Punctuation","value":"}"},
+  {"type":"Text","value":"\n  "},
+  {"type":"Keyword","value":"val"},
+  {"type":"Text","value":" "},
+  {"type":"NameProperty","value":"unsigned"},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"="},
+  {"type":"Text","value":" "},
+  {"type":"LiteralNumber","value":"0x00UL"},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"+"},
+  {"type":"Text","value":" "},
+  {"type":"LiteralNumber","value":"123u"},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"+"},
+  {"type":"Text","value":" "},
+  {"type":"LiteralNumber","value":"76.54"},
   {"type":"Text","value":"\n"},
   {"type":"Punctuation","value":"}"},
   {"type":"Text","value":"\n"},
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ fun main(args: Array<String>) { @@
       StringBuilder().apply {
         append(multiline)
       }
+      val unsigned = 0x00UL + 123u + 76.54
     }
     /*
     */
@@ Expand Down @@