mbt-gen 0.0.14.2 → 0.0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3176e95c2bc110640523d69ff0c4cfea0f8e9bb88b4548589c63538c880d6780
-  data.tar.gz: bc0ebcde2d51db9ab014af418f7d802fc0cba82b94a4bc8b4d416210f793fd43
+  metadata.gz: 13d918d0f3a00531a412669c0bcfb9cf0162c80c754b10c2eca6957d31c06c3e
+  data.tar.gz: 394f97de41ebf357f02568da55c38b69541d01f70358d6a10f12ef02458826b7
 SHA512:
-  metadata.gz: 27b59f856e37fcb50ceee1cf3c75868c15ca337325ce4900a078aa26bc06dac2376f0a683575bb86b5da21f6c57a2dbb59652c8967f664ea0d78a1bf215d69cc
-  data.tar.gz: 074aadce686f0d9af3fd6b6bf281e821dc3d8634f53d5ddba1545919453612440beb31e054f725c3562ce3cd46c70ed13e589aeb54d6bda64a6107f243f5c6a3
+  metadata.gz: bc652237dc0adb070594e90fc44cb5342fff9e1ab2fcbb14f4e07642d88622036b9e2f043b7f7e0582d2d667e04a47afc70e4af0c03ace5bd6ecc793c9798ddd
+  data.tar.gz: 82859f8923dfe404b79ed80eb36fe4a3011be424dd4086c6d0be369571cb64ca3a39d5caf67867e2a36f399456ba7f49ed5e95650a4db60768f000c2096ae056

data/lib/mbt-gen.rb

@@ -382,7 +382,7 @@ def translate_substructure_to_SMTLIB(progress, solver, struct, hash = {})
     if field == :additional_smtlib then
       solver.to_solver(progress, "; additional SMTLIB of structure #{prefix}")
       solver.to_solver(progress, translate_validation_rule_to_SMTLIB(definition, struct, prefix, config, options, "<additional SMTLIB of structure #{prefix}>"))
-    elsif field == :validation_rules || field == :predicates || field == :parent_link || field == :struct_xpath_prefix
+    elsif field == :validation_rules || field == :predicates || field == :parent_links || field == :struct_xpath_prefix
       next 
     else
       solver.to_solver(progress, "; #{field.to_s}")
@@ -539,15 +539,25 @@ def resolve_struct_path(path, relative_to_struct, prefix)
       raise RuntimeError.new("could not resolve field path: #{path.inspect} relative to struct #{relative_to_struct.inspect}")
     end
     if segment == "." then
-      result = current[:struct_xpath_prefix]
+      result = prefix
     elsif segment == ".." then
-      current = current[:parent_link]
       if prefix then
-        prefix_segs = prefix.split("/")
-        prefix = prefix_segs[0,prefix_segs.size()-1].join("/")
+        next_current = current[:parent_links].find{ |link| prefix.start_with?(link[:struct_xpath_prefix]) }
+        if next_current then
+          current = next_current
+          prefix = current[:struct_xpath_prefix]
+        else
+          raise RuntimeError.new("failure to resolve segment '..' of path #{path.inspect}: none of the parent-links (#{current[:parent_links].map{|p| p[:struct_xpath_prefix]}.join(', ')}) of struct #{current[:struct_xpath_prefix]} matched the prefix #{prefix.inspect}")
+        end
       else
-        prefix = current[:struct_xpath_prefix]
+        if current[:parent_links].size > 1 then
+          raise RuntimeError.new("could not resolve segment '..' in path #{path.inspect} as it is ambiguous: structure #{current[:struct_xpath_prefix]} has multiple parent-links (#{current[:parent_links].map{|p| p[:struct_xpath_prefix]}.join(', ')})")
+  	else
+  	  current = current[:parent_links].first
+          prefix = current[:struct_xpath_prefix]
+        end
       end
+      result = prefix
     else
       field_def = current[segment.to_sym]
       unless field_def then
@@ -564,6 +574,7 @@ def resolve_struct_path(path, relative_to_struct, prefix)
       end
     end
   end
+  puts "DEBUG: resolve_struct_path(#{path.inspect}, #{relative_to_struct[:struct_xpath_prefix].inspect}, #{prefix.inspect}) returned #{result.inspect}"
   return result
 end
 
@@ -577,7 +588,17 @@ def resolve_struct_def(path, relative_to_struct, prefix, context_desc = "")
     if segment == "." then
       result = current
     elsif segment == ".." then
-      current = current[:parent_link]
+      if prefix then
+        current = current[:parent_links].find{|link| prefix.start_with?(link[:struct_xpath_prefix]) }
+        prefix = current[:struct_xpath_prefix]
+      else
+        if current[:parent_links].size > 1 then
+          raise RuntimeError.new("could not resolve segment '..' in path #{path.inspect} as it is ambiguous: structure #{current[:struct_xpath_prefix]} has multiple parent-links (#{current[:parent_links].map{|p| p[:struct_xpath_prefix]}.join(', ')})")
+  	else
+  	  current = current[:parent_links].first
+          prefix = current[:struct_xpath_prefix]
+        end
+      end
       if prefix then
         prefix_segs = prefix.split("/")
         prefix = prefix_segs[0,prefix_segs.size()-1].join("/")
@@ -606,8 +627,8 @@ end
 def translate_validation_rules_to_SMTLIB(progress, solver, struct, prefix, config, options)
   solver.to_solver(progress, "; --- Validation Rules ---")
   translate_validation_rules_for_structure_to_SMTLIB(progress, solver, struct, prefix, config, options)
-  struct.each_pair do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+  struct.each_pair do |key, value| 
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if value[:type] == :structure then
       if prefix then
         new_prefix = "#{prefix.to_s}/#{key}"
@@ -885,7 +906,7 @@ end
 
 def add_max_struct_to_doc(progress, struct, doc, prefix = nil)
   struct.each do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if prefix then
       xpath = "#{prefix}/#{key}"
     else
@@ -953,7 +974,7 @@ end
 
 def add_model_struct_to_doc(progress, struct, doc, model, prefix = nil)
   struct.each do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if prefix then
       xpath = "#{prefix}/#{key}"
     else
@@ -1016,7 +1037,7 @@ end
 def collect_validation_rule_names(struct)
   result = []
   struct.each do |key, value|
-    next if key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if key == :validation_rules
       value.each do |key, value|
         result << key
@@ -1038,7 +1059,7 @@ end
 
 def each_structure_and_field_in(struct, prefix = nil, &block)
   struct.each do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
 
     if prefix then
       xpath = "#{prefix}/#{key}"
@@ -1519,7 +1540,7 @@ end
 def collect_key_fields(fkey, struct, prefix = nil)
   result = {}
   struct.each do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if value[:type] == :structure
       if value.has_key?(:keys) and value[:keys].include?(fkey) then
         xpath = key.to_s
@@ -1545,7 +1566,7 @@ def collect_key_fields_and_strctures(fkey, struct, prefix = nil)
   fields = []
   structures = []
   struct.each do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if value[:type] == :structure
       if value.has_key?(:keys) and value[:keys].include?(fkey) then
         xpath = key.to_s
@@ -1572,7 +1593,7 @@ end
 def collect_keys(struct)
   result = []
   struct.each do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if value[:type] == :structure
       if value.has_key?(:keys) then
         result += value[:keys]
@@ -1592,7 +1613,7 @@ end
 def collect_validation_rules(struct)
   result = []
   struct.each do |key, value|
-    next if key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if key == :validation_rules then
       result += value.keys
     else
@@ -2141,13 +2162,17 @@ end
 
 def introduce_parent_links(message, parent = nil, prefix = nil)
   if parent != nil then
-    message[:parent_link] = parent
+    if message.has_key?(:parent_links) then
+      message[:parent_links] << parent
+    else
+      message[:parent_links] = [parent]
+    end
   end
   if prefix != nil then
     message[:struct_xpath_prefix] = prefix
   end
   message.each_pair do |key, value|
-    next if key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    next if key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
     if value[:type] == :structure then
       if prefix then
         new_prefix = "#{prefix}/#{key}"
@@ -2181,7 +2206,7 @@ def validate_model(message, prefix=nil)
             puts "WARN: Model Problem: structure #{prefix}'s predicate #{mkey} does not have an SMTLIB representation. It will be regarded as always true."
         end
       end
-    elsif key == :parent_link || key == :struct_xpath_prefix || key == :additional_smtlib
+    elsif key == :parent_links || key == :struct_xpath_prefix || key == :additional_smtlib
       next
     else
       if value[:type] == :structure then
@@ -2294,7 +2319,7 @@ end
 
 def validate_schema_against_doc_struct(struct, doc, prefix = nil)
   struct.each do |key, value|
-    next if key == :additional_smtlib || key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix
+    next if key == :additional_smtlib || key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix
     if prefix then
       xpath = "#{prefix}/#{key}"
     else
@@ -2369,7 +2394,7 @@ def translate_struct_in_doc_to_SMTLIB(progress, solver, struct, doc, prefix, var
   config = hash[:config]
 
   struct.each do |key, value|
-    next if key == :additional_smtlib || key == :validation_rules || key == :predicates || key == :parent_link || key == :struct_xpath_prefix
+    next if key == :additional_smtlib || key == :validation_rules || key == :predicates || key == :parent_links || key == :struct_xpath_prefix
     if prefix then
       xpath = "#{prefix}/#{key.to_s}"
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mbt-gen
 version: !ruby/object:Gem::Version
-  version: 0.0.14.2
+  version: 0.0.14.3
 platform: ruby
 authors:
 - FM-enthusiast
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-11-05 00:00:00.000000000 Z
+date: 2026-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri