cddl 0.12.10 → 0.12.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a1d0bc5804fcc0cc5d3a67b3b6754e917146021043b63fb53de148e568029b
-  data.tar.gz: ab3c7a943a3d8acf7f557f1f796ca30de5572417ea5bb7ad198edf6453ceed4c
+  metadata.gz: cfdab2f7b34bf400cc492abf8c301a90e01176423c6d1fb41ec45cc439a7757f
+  data.tar.gz: 06e53c2536c2a7aa1510f989b2cf8d01d0becbbc71a7264aa8355f29adddb0ad
 SHA512:
-  metadata.gz: e395661ff52a4dd30cfa8e22275c1a247f0ffbe24643a568c431372b7ed86a487ce6d2334cdbe07786e96e0931ed265c653e03c65917a3f82e5b5bdb1046e77b
-  data.tar.gz: b022f002061187c6d35312e4e9339dcc01b7b7da3a25f536e8789463f7dd0ec070df99e3ccba93e06e267a3ec938725c05301e3331f60cbb0d441f3be379fab3
+  metadata.gz: 170ddd4fa055f9efd24092af3147d4175fdb089e290eafcd418e6a16204250cfa6769f3d53124c5fc6161608301b21186e4d2348bae489175d8ab546230ff5b0
+  data.tar.gz: 17025b96351c9def9fe171cd74fc9398eeba3e927eb715b691880b2dd9812e1ea7268bbfc42dfe896d5be3cbf8ad0535cbb0a942cae80b04cdbc97a84e5eb293

data/cddl.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'cddl'
-  s.version = '0.12.10'
+  s.version = '0.12.11'
   s.summary = "CDDL generator and validator."
   s.description = %{A parser, generator, and validator for CDDL}
   s.add_dependency('cbor-diag')

data/lib/cddl.rb

@@ -119,6 +119,16 @@ module CDDL
       r.compact
     end
 
+    def longest_initial_match(old, now)
+      md = /\A(.*)(.*)\n\1(.*)\z/.match([old,now].join("\n"))
+      md[1..3]
+    end
+
+    def diff_message(old, now)
+      c, l, r = longest_initial_match(old, now)
+      "-- common: >#{c}< -- old: >#{l}< -- new: >#{r}<"
+    end
+
     def cname(s)
       s.to_s.gsub(/-/, "_")
     end
@@ -205,7 +215,7 @@ module CDDL
           ids = g.children(:id).map(&:to_s)
           # puts ["ids", ids].inspect
           if b = @generics[n]
-            fail "Duplicate generics definition #{n} as #{rule_ast} (was #{b})"
+            fail "Duplicate generics definition #{n} #{diff_message(strip_nodes(b[0]).inspect, strip_nodes(rule_ast).inspect)}"
           end
           @generics[n] = [rule_ast, ids]
         else
@@ -217,7 +227,7 @@ module CDDL
               if a == b
                 warn "*** Warning: Identical redefinition of #{n} as #{a}"
               else
-                fail "Duplicate rule definition #{n} as #{b} (was #{a})"
+                fail "Duplicate rule definition #{n} #{diff_message(b, a)}"
               end
             end
             @rules[n] = rule_ast

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cddl
 version: !ruby/object:Gem::Version
-  version: 0.12.10
+  version: 0.12.11
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cbor-diag
@@ -277,7 +276,6 @@ homepage: https://www.rfc-editor.org/rfc/rfc8610#appendix-F
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -292,8 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: CDDL generator and validator.
 test_files: []