cddl 0.12.11 → 0.12.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfdab2f7b34bf400cc492abf8c301a90e01176423c6d1fb41ec45cc439a7757f
-  data.tar.gz: 06e53c2536c2a7aa1510f989b2cf8d01d0becbbc71a7264aa8355f29adddb0ad
+  metadata.gz: 14b45fb81b49e2fb1f85498e33ceb17ce3cc41ef784b829b9f4c76fa322eaaf5
+  data.tar.gz: cfdf92a193c09448a03eacf73525b5ea6294a6d80e1dfbcff3771a5346979aff
 SHA512:
-  metadata.gz: 170ddd4fa055f9efd24092af3147d4175fdb089e290eafcd418e6a16204250cfa6769f3d53124c5fc6161608301b21186e4d2348bae489175d8ab546230ff5b0
-  data.tar.gz: 17025b96351c9def9fe171cd74fc9398eeba3e927eb715b691880b2dd9812e1ea7268bbfc42dfe896d5be3cbf8ad0535cbb0a942cae80b04cdbc97a84e5eb293
+  metadata.gz: 88002266c186c57d8aece3dffd9cc4cc85d62a3c9b9591dceaa02bd8463857569868cf74a5f716b50755f94fba500a276617017a7448158a809743ce2aac5d00
+  data.tar.gz: d5e0bee838808e9cfdbbb0627ec37226406262bde1d1956e42e33079a4de8514ff9399b224dd9264179aead25dfd67ab03a925438756984794fef0252121a467

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.12.11'
+  s.version = '0.12.13'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')
@@ -16,7 +16,6 @@ spec = Gem::Specification.new do |s|
   s.files = Dir['lib/**/*.rb'] + %w(cddl.gemspec) + Dir['data/**/*.abnf'] + Dir['data/**/*.cddl'] + Dir['test-data/**/*.cddl'] + Dir['test/**/*.rb']
   s.require_path = 'lib'
   s.executables = ['cddl']
-  s.default_executable = 'cddl'
   s.required_ruby_version = '>= 2.3'
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"

data/data/cddl.abnf

@@ -65,9 +65,10 @@ value = number
 int = ["-"] uint
 
 ; This is a float if it has fraction or exponent; int otherwise
-number = int ["." fraction] ["e" exponent ]
+number = hexfloat / (int ["." fraction] ["e" exponent ])
+hexfloat = ["-"] "0x" 1*HEXDIG ["." 1*HEXDIG] "p" exponent
 fraction = 1*DIGIT
-exponent = int
+exponent = ["+"/"-"] 1*DIGIT
 
 text = %x22 *SCHAR %x22
 SCHAR = %x20-21 / %x23-5B / %x5D-7E / NONASCII / SESC

data/lib/cddl.rb

@@ -215,7 +215,8 @@ module CDDL
           ids = g.children(:id).map(&:to_s)
           # puts ["ids", ids].inspect
           if b = @generics[n]
-            fail "Duplicate generics definition #{n} #{diff_message(strip_nodes(b[0]).inspect, strip_nodes(rule_ast).inspect)}"
+            fail "Duplicate generics definition #{n} #{
+              diff_message(strip_nodes(b[0]).inspect, strip_nodes(rule_ast).inspect)}"
           end
           @generics[n] = [rule_ast, ids]
         else
@@ -709,6 +710,7 @@ module CDDL
           fail "Not smart enough to generate #{where}#{@last_message}"
         when :within, :and
           try_generate(target) do |content|
+            $features ||= Hash.new {|h, k| h[k] = {}}
             if validate1(content, control)
               return content
             elsif conop == :within
@@ -1571,7 +1573,11 @@ module CDDL
             end
           }
         end
-        val = eval(s)
+        if s =~ /p.*\d\z/       # hexfloat
+          val = s.scanf("%a").first
+        else
+          val = eval(s)
+        end
         # warn val
         case val
          when Integer; [:int, val]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.12.11
+  version: 0.12.13
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-05-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.2
 specification_version: 4
 summary: CDDL generator and validator.
 test_files: []