template-ruby-parser 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1930e12f26e42bbe9273ce7f922adfff84931da89fa381cb9df9a9f2572da140
-  data.tar.gz: ccceda81f10d2d073ec1e1a8060f8b4ad8e59307802c42825fa13e25a760922e
+  metadata.gz: 124eb85f640967137c493954a5b4c90bd5d4fb559837ecdbfc10fb22e7cf5e24
+  data.tar.gz: 6ebc3cd2edd7fdad592b6a84a2fe67371b11b3832121daaf7a66efbe64f81c31
 SHA512:
-  metadata.gz: 29a6f68418e579de7fd8949be837e84c56f2364ab099943ea128b29c5ce69aa999b71479710d6cbb2d7f61d0be27017308c71bd0accb33cefae84a6471d956dc
-  data.tar.gz: 9e77b562a8908eaa4801aa27b3d98a43a54e09c1afc6784816a8d2d89157c5d5c16f716c21efad170f2310f65f1a5d5e0b780baa02bd8f2c14f9b08a675e8ff5
+  metadata.gz: dd3664a30abb295ca89a3dba32eb1305a2d863f28ff5b668b6ee02d579e4c99d308c6ae7e44f72777d79e44b0484e6d60543773981bf405dc6b13280f6bb139a
+  data.tar.gz: c85cb2d2e65bdedf1a79d0929593aaa45951df2708e517a8eb360ad9955c427b40bd7e094f46c8c2801da3f82e7871ffe1d5c1dfbe1d5c6462d7474e40b5dd32

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 0.1.8 - November 13, 2022
+
+- Allow numbers with exponents: `1e1`
+
+### 0.1.7 - November 13, 2022
+
+- Fix parsing of `nothing`
+
 ### 0.1.6 - November 13, 2022
 
 - Add missing operator from equal, e.g. a += 1, a = 2

data/lib/code/parser/not_keyword.rb

@@ -5,10 +5,12 @@ class Code
         previous_cursor = cursor
 
         if match(NOT_KEYWORD)
+          buffer!
+          consume while next?(WHITESPACE)
           comments = parse_comments
           right = parse_subclass(::Code::Parser::NotKeyword)
 
-          if right
+          if right && (comments || buffer?)
             { not: { right: right, comments: comments }.compact }
           else
             @cursor = previous_cursor

data/lib/code/parser/number.rb

@@ -10,18 +10,7 @@ class Code
           elsif match(B)
             parse_base(2)
           else
-            consume while (next?(DIGITS) || next?(UNDERSCORE)) && !end_of_input?
-
-            if next?(DOT) && next_next?(DIGITS)
-              consume
-              while (next?(DIGITS) || next?(UNDERSCORE)) && !end_of_input?
-                consume
-              end
-
-              { decimal: buffer.gsub(UNDERSCORE, EMPTY_STRING) }
-            else
-              { integer: buffer.gsub(UNDERSCORE, EMPTY_STRING).to_i }
-            end
+            parse_number
           end
         else
           parse_subclass(::Code::Parser::Boolean)
@@ -34,6 +23,35 @@ class Code
 
         { integer: buffer.gsub(UNDERSCORE, EMPTY_STRING).to_i(base) }
       end
+
+      def parse_number
+        consume while (next?(DIGITS) || next?(UNDERSCORE)) && !end_of_input?
+
+        if next?(DOT) && next_next?(DIGITS)
+          consume
+          consume while (next?(DIGITS) || next?(UNDERSCORE)) && !end_of_input?
+
+          decimal = buffer!.gsub(UNDERSCORE, EMPTY_STRING)
+
+          if match(E)
+            buffer!
+            exponent = parse_number
+            { decimal: { value: decimal, exponent: exponent } }
+          else
+            { decimal: decimal }
+          end
+        else
+          integer = buffer!.gsub(UNDERSCORE, EMPTY_STRING).to_i
+
+          if match(E)
+            buffer!
+            exponent = parse_number
+            { integer: { value: integer, exponent: exponent } }
+          else
+            { integer: integer }
+          end
+        end
+      end
     end
   end
 end

data/lib/code/parser.rb

@@ -10,6 +10,7 @@ class Code
     X = "x"
     O = "o"
     B = "b"
+    E = "e"
 
     SINGLE_QUOTE = "'"
     DOUBLE_QUOTE = '"'

data/lib/template/parser.rb

@@ -1,6 +1,6 @@
 class Template
   class Parser < ::Code::Parser
-    Version = Gem::Version.new("0.1.6")
+    Version = Gem::Version.new("0.1.8")
 
     def parse
       parts = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: template-ruby-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Dorian Marié