Fixed incorrect parsing of binary and octal literals (an incorrect li…

…terals where considered fine so user experience where bad when serde refused to parse a file)
madwareru · Aug 10, 2021 · cc52b27 · cc52b27
1 parent 12864e7
commit cc52b27
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 95 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 # RON Extended Support Changelog
 
 ## [Unreleased]
+### Fixed
+- Fixed incorrect parsing of binary and octal literals (an incorrect literals where considered fine 
+so user experience where bad when serde refused to parse a file)
 
 ## [0.2.4] 2021-07-30
 ### Fixed

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 
 pluginGroup = com.github.madwareru.intellijronremix
 pluginName = RON Extended Support
-pluginVersion = 0.2.4
+pluginVersion = 0.2.5
 
 pluginSinceBuild = 203
 pluginUntilBuild = 212.*

diff --git a/src/main/gen/com/github/madwareru/intellijronremix/language/__RONLexer.java b/src/main/gen/com/github/madwareru/intellijronremix/language/__RONLexer.java
diff --git a/src/main/kotlin/com/github/madwareru/intellijronremix/language/__RONLexer.flex b/src/main/kotlin/com/github/madwareru/intellijronremix/language/__RONLexer.flex
@@ -61,7 +61,7 @@ WHITE_SPACE=\s+
 COMMENT="//".*
 BOOLEAN=true|false
 IDENT=[A-Za-z_][A-Za-z0-9_]*
-INTEGER=[+-]?((0x[0-9A-Fa-f][0-9A-Fa-f_]*)|((0[bo]?)?[0-9][0-9_]*))
+INTEGER=[+-]?((0x[0-9A-Fa-f][0-9A-Fa-f_]*)|(0b[0-1][0-1_]*)|(0o[0-7][0-7_]*)|([0-9][0-9_]*))
 FLOAT=([+-]?[0-9]+\.[0-9]*([Ee][0-9]+)?)|(\.[0-9]+([Ee][0-9]+)?)
 CHAR='([ -&(-\[\]-~])|(\')|(\\\\)'
 STRING=\"([^\r\n\"]|(\\[\S]))*\"