From c98640ca0d39ed2934dbf6d2bb2d5b9987441395 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 3 Jul 2018 22:59:30 -0400
Subject: - Improved syntax for numeric literals by allowing arbitrary zeroes
 (0) at the front of numbers.

---
 lux-mode/lux-mode.el   | 12 +++++-------
 luxc/src/lux/lexer.clj |  8 ++++----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el
index 5beb7f91c..45db10635 100644
--- a/lux-mode/lux-mode.el
+++ b/lux-mode/lux-mode.el
@@ -254,14 +254,14 @@ Called by `imenu--generic-function'."
          "\\>")
        0 font-lock-constant-face)
                                         ; Nat literals
-      ("\\<\\+\\(0\\|[1-9][0-9_]*\\)\\>" 0 font-lock-constant-face)
+      ("\\<\\+\\(0\\|[0-9][0-9_]*\\)\\>" 0 font-lock-constant-face)
                                         ; Int|Frac literals
-      ("\\<-?\\(0\\|[1-9][0-9_]*\\)\\(\\.[0-9_]+\\)?\\>" 0 font-lock-constant-face)
-      ("\\<-?\\(0\\|[1-9][0-9_]*\\)\\(\\.[0-9_]+\\(\\(e\\|E\\)\\(-\\|\\+\\)?[1-9][0-9_]*\\)?\\)?\\>" 0 font-lock-constant-face)
+      ("\\<-?\\(0\\|[0-9][0-9_]*\\)\\(\\.[0-9_]+\\)?\\>" 0 font-lock-constant-face)
+      ("\\<-?\\(0\\|[--9][0-9_]*\\)\\(\\.[0-9_]+\\(\\(e\\|E\\)\\(-\\|\\+\\)?[0-9][0-9_]*\\)?\\)?\\>" 0 font-lock-constant-face)
                                         ; Frac "ratio" literals
-      ("\\<-?\\(0\\|[1-9][0-9_]*\\)/[1-9][0-9_]*\\>" 0 font-lock-constant-face)
+      ("\\<-?\\(0\\|[0-9][0-9_]*\\)/[0-9][0-9_]*\\>" 0 font-lock-constant-face)
                                         ; Deg literals
-      ("\\<\\(\\.[0-9_]+\\)\\>" 0 font-lock-constant-face)
+      ("\\<\\(\\.[0-9][0-9_]*\\)\\>" 0 font-lock-constant-face)
                                         ; Tags
       ("#\\.[a-zA-Z0-9-\\+_=!@\\$%\\^&\\*<>\.,/\\\\\\|':~\\?]+" 0 font-lock-type-face)
       ("#\\.\\.[a-zA-Z0-9-\\+_=!@\\$%\\^&\\*<>\.,/\\\\\\|':~\\?]+" 0 font-lock-type-face)
@@ -396,6 +396,4 @@ This function also returns nil meaning don't specify the indentation."
   )
 
 ;;;###autoload
-
-
 (provide 'lux-mode)
diff --git a/luxc/src/lux/lexer.clj b/luxc/src/lux/lexer.clj
index 7bd329766..84c925cbc 100644
--- a/luxc/src/lux/lexer.clj
+++ b/luxc/src/lux/lexer.clj
@@ -138,10 +138,10 @@
     (|do [[meta _ token] (&reader/read-regex <regex>)]
       (return (&/T [meta (<tag> (string/replace token #"_" ""))]))))
 
-  lex-nat  $Nat  #"^\+(0|[1-9][0-9_]*)"
-  lex-int  $Int  #"^-?(0|[1-9][0-9_]*)"
-  lex-deg  $Deg  #"^(\.[0-9_]+)"
-  lex-frac $Frac #"^-?(0\.[0-9_]+|[1-9][0-9_]*\.[0-9_]+)(e-?[1-9][0-9_]*)?"
+  lex-nat  $Nat  #"^\+[0-9][0-9_]*"
+  lex-int  $Int  #"^-?[0-9][0-9_]*"
+  lex-deg  $Deg  #"^\.[0-9][0-9_]+"
+  lex-frac $Frac #"^-?[0-9][0-9_]*\.[0-9_]+((e|E)(-|\+)?[0-9][0-9_]*)?"
   )
 
 (def +same-module-mark+ (str &/+name-separator+ &/+name-separator+))
-- 
cgit v1.2.3