mbt-gen 0.0.12 → 0.0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20bf8b787d83e3b2b6944c56c94054da7f42bd5c587bd4dd78486a2aec1acf12
-  data.tar.gz: 055a0a05ac4556b952c6746f2bf987b440b80f111f0714883958193be4254966
+  metadata.gz: a735505ef6ca3f6784860c7a01aa8abafdcfed996095718d94ed2caeee517c6a
+  data.tar.gz: 1822f83dfae7c22337e3754fe204955b02861a33f13558034a331092235d2c06
 SHA512:
-  metadata.gz: c58c06320fda5aa5944b17ac9e1507f1d65ffe93810bb7c0fcb158e6e1ddb273b98ab3a47afbdbf41b9230fdf0bc2deb8a2b6b04e78bdd413e9a9876e82b40fc
-  data.tar.gz: 884f6ef5c8f134cfe401a5a46e28b92599ee86ae46adfc7ad8d30bdc1c5e1d47299ffc177774b03b230c29a63ae605196a0e551c0ad4bcebc9aae4ecee5990dd
+  metadata.gz: 36a74c094e81a175ecc802dcd93f5da64660ff84712672752b95d139f17985945814b6ce84e7910f286c1b2f229cdb8a026b8c42049ef4779f5b36af9c47d465
+  data.tar.gz: 98307fab8e79ca0df312ff6a6375cc02c103c025e0bde84cc3fbf350e88b1062ffe93603bba0212344d51025ef839602d12e4389ea4f94f31a3c29208cc5f63b

data/lib/mbt-gen.rb

@@ -596,6 +596,19 @@ def translate_validation_rules_to_SMTLIB(progress, solver, struct, prefix, confi
         new_prefix = key.to_s
       end
       translate_validation_rules_to_SMTLIB(progress, solver, value[:ref], new_prefix, config, options)
+    elsif value[:type] == :objlist then
+      maxLength = value[:model_maxLength]
+      unless maxLength then
+        raise RuntimeError.new("encountered objList without :model_maxLength property!")
+      end
+      maxLength.times do |i|
+        if prefix then
+          new_prefix = "#{prefix.to_s}/#{key}/#{i}"
+        else
+          new_prefix = "#{key.to_s}/#{i}"
+        end
+        translate_validation_rules_to_SMTLIB(progress, solver, value[:ref], new_prefix, config, options)
+      end
     end
   end
 end
@@ -615,7 +628,7 @@ def translate_validation_rule_to_SMTLIB(rule, context_struct, prefix, config, op
                       raise RuntimeError.new("could not parse LIST_VALUE_FIRST_ELEMENT[...]: #{m.inspect} in validation rule #{rule_name}")
                     end
                     xpath = $1
-                    index = Integer($2)
+                    index = Integer($2, 10)
                     l = resolve_field_path(xpath, context_struct, prefix)
                     value_var_for_list(l, index)
                   end
@@ -711,7 +724,7 @@ def translate_validation_rule_to_SMTLIB(rule, context_struct, prefix, config, op
                       end
                     elsif fdef[:datatype] == :int then
                       terms = values.filter{|l| !l.start_with?("#")}.map do |val|
-                        "(= #{value_var_for_field(fpath)} #{Integer(val)})"
+                        "(= #{value_var_for_field(fpath)} #{Integer(val, 10)})"
                       end
                     else
                       raise RuntimeError.new("FIELD_IN_QUERY[] was applied to a field of datatype #{fdef[:datatype].inspect}. However, it can only be applied to fields of datatype string or int.")
@@ -780,7 +793,7 @@ def parse_field_value(fielddef, value)
   datatype = fielddef[:datatype]
   case datatype
   when :int
-    return Integer(value)
+    return Integer(value, 10)
   when :string
     return solver_value_to_string(value)
   when :enum
@@ -865,8 +878,8 @@ def add_max_struct_to_doc(progress, struct, doc, prefix = nil)
         node = node.first 
       end
       xpath_element = value[:xpath_element]
-      if Integer(value[:model_maxLength]) > 0 then
-        Integer(value[:model_maxLength]).times do |i|
+      if Integer(value[:model_maxLength], 10) > 0 then
+        Integer(value[:model_maxLength], 10).times do |i|
           node.add_child("<#{xpath_element}>#{format_solver_value(value, pick_solver_value_for_field(value))}</#{xpath_element}>")
         end
       end
@@ -928,8 +941,8 @@ def add_model_struct_to_doc(progress, struct, doc, model, prefix = nil)
         node = node.first 
       end
       xpath_element = value[:xpath_element]
-      if Integer(model_value[:size]) > 0 then
-        model_value[:value].slice(0, Integer(model_value[:size])).each do |mvalue|
+      if Integer(model_value[:size], 10) > 0 then
+        model_value[:value].slice(0, Integer(model_value[:size], 10)).each do |mvalue|
           node.add_child("<#{xpath_element}>#{solver_value_to_string(mvalue)}</#{xpath_element}>")
         end
       end
@@ -939,7 +952,7 @@ def add_model_struct_to_doc(progress, struct, doc, model, prefix = nil)
         node = node.first 
       end
       xpath_element = value[:xpath_element]
-      if Integer(model_value[:size]) > 0 then
+      if Integer(model_value[:size], 10) > 0 then
         model_value[:size].times do |index|
           cnode = node.add_child("<#{xpath_element}></#{xpath_element}>")
           if cnode.is_a?(Nokogiri::XML::NodeSet) then
@@ -1315,7 +1328,7 @@ def z3ValueToRubyValue(value)
   if value =~ /\"(.*)\"/ then # string
     return $1
   elsif value =~ /\d+/ then # int
-    return Integer(value)
+    return Integer(value, 10)
   elsif value == "true"
     return true
   elsif value == "false" then
@@ -1583,7 +1596,7 @@ def default_parser_for_type(value_str, datatype)
   if datatype == :string or datatype == :enum then
     value_str
   elsif datatype == :int then
-    Integer(value_str)
+    Integer(value_str, 10)
   elsif datatype == :date then
     Date.parse(value_str)
   elsif datatype == :timestamp then
@@ -1806,12 +1819,12 @@ class CoreEnumerationAlgo
 
   def self.parse_continuation_point(line)
     split = line.split(";")
-    doc_number = Integer(split[0])
-    num_docs = Integer(split[1])
+    doc_number = Integer(split[0], 10)
+    num_docs = Integer(split[1], 10)
     state = CoreEnumerationAlgo.parse_state(split[2])
     assignment = CoreEnumerationAlgo.parse_assignment(split[3])
     new_assignment = CoreEnumerationAlgo.parse_assignment(split[4])
-    processessing_time = Integer(split[5])
+    processessing_time = Integer(split[5], 10)
     return [doc_number, num_docs, state, assignment, new_assignment, processessing_time]
   end
 
@@ -2510,7 +2523,7 @@ def generate(message, argv, message_config_filename = nil)
     elsif opt == "-generate-docs-from" then
       options[:combination_source] = argv.shift
     elsif opt == "-skip" then
-      options[:skip] = Integer(argv.shift)
+      options[:skip] = Integer(argv.shift, 10)
     elsif opt == "-generate-docs-for-key" then
       options[:docs_for_key] = argv.shift
     elsif opt == "-count-docs-for-key" then
@@ -2518,7 +2531,7 @@ def generate(message, argv, message_config_filename = nil)
     elsif opt == "-continue" then
       options[:continue] = true
     elsif opt == "-max-num-docs" then
-      options[:max_num_docs] = Integer(argv.shift)
+      options[:max_num_docs] = Integer(argv.shift, 10)
       puts "flag -max-num-docs used. Will stop after generating #{options[:max_num_docs]} documents."
     elsif opt == "-validate" then
       if options.has_key?(:validate_files) then

data/lib/regexp-to-smtlib.rb

@@ -84,8 +84,8 @@ class Regexp_to_SMTLIB
             return "(re.opt #{expr})"
         elsif multiplicator =~ /\{(\d+),(\d+)\}/ then
         begin
-            lower = Integer($1)
-            upper = Integer($2)
+            lower = Integer($1, 10)
+            upper = Integer($2, 10)
         rescue TypeError => e
             raise RuntimeError.new("cannot parse regexp (#{$1} or #{$2} is no Integer)")
         end
@@ -117,4 +117,4 @@ class Regexp_to_SMTLIB
     end
 
 
-end
+end

data/lib/solver-lib.rb

@@ -337,7 +337,7 @@ class SolverFactory
                 unless varname =~ /-index-(\d+)-value$/
                   raise RuntimeError.new("inconsistent model: xpath #{xpath} is a list value and hence its varname should end like -index-X-value, not #{varname.inspect}.")
                 end
-                index = Integer($1)
+                index = Integer($1, 10)
                 model[xpath][:xpath_element] = info[:xpath_element]
                 if model[xpath].has_key?(:value) then
                   val = convert_solver_value(info[:type], info[:datatype], value, xpath)
@@ -354,7 +354,7 @@ class SolverFactory
               if model[xpath][:type] == :field then
                 model[xpath][:type] = :list
               end
-              model[xpath][:size] = Integer(value)
+              model[xpath][:size] = Integer(value, 10)
             elsif varname.start_with?("struct-") && varname.end_with?("-exists") then
               unless model[xpath][:type] == :struct then
                 raise RuntimeError.new("inconsistent model: xpath #{xpath} should be a struct, not a #{model[xpath][:type]}.")
@@ -403,9 +403,9 @@ class SolverFactory
   def convert_solver_value(type, datatype, value, xpath)
     check_type(type, value, xpath)
     if datatype == :date then
-      return (Time.at(0).to_date + Integer(value)).to_s
+      return (Time.at(0).to_date + Integer(value, 10)).to_s
     elsif datatype == :timestamp then
-      return Time.at(Integer(value)).to_s
+      return Time.at(Integer(value, 10)).to_s
     else
       return value
     end

metadata

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