dcm 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b095ba79d4256d0e8ce543bca8b762c13ab739b68462983e2fdb64a088342ad4
-  data.tar.gz: 19ef351a9be8fdfb7332d46b9c93d127665a674bcfb911f633933ac0501a8a9c
+  metadata.gz: 3aaa1587b03304465c420597c49eb4e1f2da31b398179619a369a661e132f403
+  data.tar.gz: 7f50432f400c44d7df6811be4824074e5e3b4ddd6ba093bf56228d2844365719
 SHA512:
-  metadata.gz: 7c5df04fabe59a806c13c333efb781235fa3cc41e64858816df27052b7893e01a5210dc84286783e945cf22611f220e5939b5f8e903b0435acf74c07c4d1341c
-  data.tar.gz: 2aaa7e9092fe53cf8d8e249af2baf10bbb750e6ae277d841378e689c1a59adaa39870494ec708248c777e647e45590dbefd59fe4b5724550dd9141bbe2ae1675
+  metadata.gz: 4c30e958e78c5a792876bd5cd82efa5203e1aa68c743f7ea3c6cb5adda5df6de955d2b4005c4ebcf02fa5759c1383260118e64db93f38c6653cc046257e557bc
+  data.tar.gz: 8e6c1b9898ddfa1aeaee8ac0d714ef1a25667441f9b46870c41da349dbd58826c6afc28415cecbb16ebcf9b9b50d341e2b9c2c472d0c6904a1b1117583ab8062

data/lib/codinginfo.rb

@@ -10,16 +10,29 @@ class Codinginfo
     # the package and value can be merged
 
     attr_reader :name, :value, :package
+    attr_accessor :assignments
     def initialize(name:, package: nil, value: nil)
-      @name = name
-      @package = package
-      @value = value
+      @name        = name
+      @package     = package
+      @value       = value
+      @assignments = []
     end
 
-    def label_prefix
-      return /^#{name}_(\w+_)?#{value}\./ if package.nil?
+    def match?(assignments, label)
+      # assignments
+      #   .values
+      #   .select { _1.name == name }
+      #   .map { combine(_1) }
+      #   .any? { label.name.match?(_1.label_prefix) }
+      label.name.match?(label_prefix)
+    end
 
-      [name, package, value].join("_") + "."
+    def label_prefix
+      if package
+        [name, package, value].join("_") + "."
+      else
+        /^#{name}_([A-Za-z]+_)?#{value}\./
+      end
     end
 
     def to_s = "#{name}=#{value}"
@@ -90,7 +103,7 @@ class Codinginfo
 
   def variant
     fail "No variant matching #{@filter} found!" if @variants.empty?
-    fail "More than one variant matching #{id} found!" if @variants.size > 1
+    fail "More than one variant matching #{@filter} found!" if @variants.size > 1
 
     @variants.first
   end
@@ -133,7 +146,7 @@ class Codinginfo
   end
 
   def has_matching_cvar?(label)
-    variant.cvars.any? { label.name.match?(_1.label_prefix) }
+    variant.cvars.any? { _1.match?(@assignments, label) }
   end
 
   def add_cvar_prefix(name, variant)

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Dcm
-  VERSION = "0.0.16"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcm
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Jonas Mueller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automotive-ecu