broomhlda 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5841f61e93c8c3411d7941da19ccf65387695007
-  data.tar.gz: ecc7612997c65556d44c23a7b8b581e6a5c7ffa9
+  metadata.gz: 8e4e015b3a863bdd7bb60b140a07cdfe99bb0c3f
+  data.tar.gz: 00e951c27d40c290ee1d939691cd8cb84b1fb8b2
 SHA512:
-  metadata.gz: 3dc935718a23fe89c7c9e1ce166d70679098836c14afd10d86a90d16fed739dd67f2e949af795900503521ca5eadbd2881db32b98297b6af719e932f2fefcb52
-  data.tar.gz: 2a8f6a62d8005ba9404b69983c4cd8e1aca320056d2d60ce298fce3a8a8474de2f2283081d36ab5976646a03a2f7462bb73ca6da4dde425c21007179d18d3a9c
+  metadata.gz: 168266efc868ba4abb4f9eb77b225490187811eedfd1b18855bd15cf9071da8cc0b90186837ac9cf85fb4e11c5a3f4821b45d60d66c11d6232307db108f716b9
+  data.tar.gz: 732bc42d202a80811e42d9458d7d6244dcefc93d8b048a42f10fbc981f2765ec4379aed279354e1c10f6fad4ca10ee817e748451d7015477ec7912901b999ffa

data/lib/hl/lexers/yaml.ay

@@ -131,7 +131,7 @@ lexer = lexer:
     -- whitespaces separating tokens
     r"[ ]+" is(text)
 
-    -- tags, anchors and aliases,
+    -- tags, anchors and aliases
     any-of(descriptors)
 
     -- block collections and scalars
@@ -140,6 +140,9 @@ lexer = lexer:
     -- flow collections and quoted scalars
     any-of(flow-nodes)
 
+    -- constant literals (null, bool, numeric)
+    any-of(constants)
+
     -- a plain scalar
     r"(?=[^\s?:,\[\]{}#&*!|>'\"%@`-]|[?:-]\S)" is(name.variable) => plain-scalar-in-block-context
 
@@ -225,6 +228,9 @@ lexer = lexer:
     -- nested collections and quoted scalars
     any-of(flow-nodes)
 
+    -- constant literals (null, bool, numeric)
+    any-of(constants)
+
     -- a plain scalar
     r"(?=[^\s?:,\[\]{}#&*!|>'\"%@`])" is(name.variable) => plain-scalar-in-flow-context
 
@@ -321,8 +327,6 @@ lexer = lexer:
     -- other whitespaces are a part of the value
     r"[ ]+" is(literal.scalar.plain)
 
-    any-of(constants)
-
     -- regular non-whitespace characters acting as a key
     r"(?::(?!\s)|[^\s:])+(?=:( |$))" is(name.property)
 
@@ -347,8 +351,6 @@ lexer = lexer:
     -- other whitespaces are a part of the value
     r"[ ]+" is(name.variable)
 
-    any-of(constants)
-
     -- regular non-whitespace characters acting as a key
     r"[^\s,:?\[\]{}]+(?=:( |$))" is(name.property)
 
@@ -357,8 +359,38 @@ lexer = lexer:
 
 
   lex(constants):
+    -- null
     r"\b(~|null|Null|NULL)\b" is(keyword.constant)
-    r"\b(y|Y|yes|Yes|YES|n|N|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\b" is(keyword.constant)
+
+    -- true/false
+    r"\b(yes|Yes|YES|no|No|NO|true|True|TRUE|false|False|FALSE|on|On|ON|off|Off|OFF)\b" is(keyword.constant)
+
+    -- base 60 floats (yes really)
+    r"[\-+]?[0-9][0-9_]*(:[0-5]?[0-9])+\.[0-9_]*(?![.0-9_])" is(literal.number.float)
+
+    -- base 10 floats
+    r"[\-+]?([0-9][0-9_]*)?\.[0-9]+([eE][-+][0-9]+)?(?![.0-9_])" is(literal.number.float)
+
+    -- infinity
+    r"[\-+]?\.(inf|Inf|INF)\b" is(literal.number.float)
+
+    -- not a number
+    r"\.(nan|NaN|NAN)\b" is(literal.number.float)
+
+    -- base 2 integers
+    r"[\-+]?0b[0-1_]+(?![.0-9_])" is(literal.number.integer)
+
+    -- base 60 integers (yes really)
+    r"[\-+]?[1-9][0-9_]*(:[0-5]?[0-9])+(?![.0-9_])" is(literal.number.integer)
+
+    -- base 16 integers
+    r"[\-+]?0x[0-9a-fA-F_]+(?![.0-9_])" is(literal.number.hex)
+
+    -- base 8 integers
+    r"[\-+]?0[0-7_]+(?![.0-9_])" is(literal.number.oct)
+
+    -- base 10 integers
+    r"[\-+]?(0|[1-9][0-9_]*)(?![.0-9_])" is(literal.number.integer)
 
 
 const-set(.Lexer, lexer)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: broomhlda
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alex Suraci