mbt-gen 0.0.13.1 → 0.0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a735505ef6ca3f6784860c7a01aa8abafdcfed996095718d94ed2caeee517c6a
-  data.tar.gz: 1822f83dfae7c22337e3754fe204955b02861a33f13558034a331092235d2c06
+  metadata.gz: b5c54288ab2aa997c537744ff1888959c3b7b44ef923d16af13c09cb96609434
+  data.tar.gz: f727661444b8763cbb7e60ba4c371af16af49cd64bb9e0f4e399e01d0c077cd3
 SHA512:
-  metadata.gz: 36a74c094e81a175ecc802dcd93f5da64660ff84712672752b95d139f17985945814b6ce84e7910f286c1b2f229cdb8a026b8c42049ef4779f5b36af9c47d465
-  data.tar.gz: 98307fab8e79ca0df312ff6a6375cc02c103c025e0bde84cc3fbf350e88b1062ffe93603bba0212344d51025ef839602d12e4389ea4f94f31a3c29208cc5f63b
+  metadata.gz: 5eb552c215e7e9b97db03dadb8964454c5720c41be7272da5ddb5a2409aeec593a84716581d27fbdda1921a6675935d5df1e8ee800532dfac290d22c945b9d68
+  data.tar.gz: 6b169b1aa47ca5ae869bb1985839e77545e50a1f087a78ef0dd00c58d688c324dae41645aca6d573a1b51949ebb6de8c3d076582240a18460955de42bf3eb6de

data/lib/mbt-gen.rb

@@ -182,6 +182,10 @@ def maxLength_contraint_for_expr(expr, maxLength)
   "(<= (str.len #{expr}) #{maxLength})"
 end
 
+def minLength_contraint_for_expr(expr, minLength)
+  "(>= (str.len #{expr}) #{minLength})"
+end
+
 def oneOf_contraint_for_expr(expr, values)
   list = values.map do |val|
     "(= #{expr} \"#{val}\")"
@@ -246,7 +250,6 @@ def translate_field_def_to_SMTLIB_constraints(progress, solver, fielddef, xpath,
         solver.associateAssertionIDWith(assertionID, info)
         solver.to_solver(progress, "(assert (! (=> #{varname}-filled #{regex_constraint_for_expr("#{varname}-value", fielddef[:regex])}) :named #{assertionID}))") 
     end 
-    # TODO: minLength?
     if fielddef[:maxLength] then
       assertionID = "maxLength-#{varname}"
         info = {
@@ -259,6 +262,18 @@ def translate_field_def_to_SMTLIB_constraints(progress, solver, fielddef, xpath,
       solver.associateAssertionIDWith(assertionID, info)
       solver.to_solver(progress, "(assert (! (=> #{varname}-filled #{maxLength_contraint_for_expr("#{varname}-value", fielddef[:maxLength])}) :named #{assertionID}))") 
     end
+    if fielddef[:minLength] then
+      assertionID = "minLength-#{varname}"
+        info = {
+          :assertion_type => :constraint,
+          :xpath => xpath,
+          :datatype => :string,
+          :value => fielddef[:minLength],
+          :constraint_type => :minLength
+        }
+      solver.associateAssertionIDWith(assertionID, info)
+      solver.to_solver(progress, "(assert (! (=> #{varname}-filled #{minLength_contraint_for_expr("#{varname}-value", fielddef[:minLength])}) :named #{assertionID}))") 
+    end
     if fielddef[:from_list] then
       assertionID = "oneOf-#{varname}"
       list_filename = "#{LISTS_DIR}/#{fielddef[:from_list]}"
@@ -310,12 +325,16 @@ def translate_list_def_to_SMTLIB_constraints(progress, solver, fielddef, varname
           solver.to_solver(progress, "(assert (! (=> (< #{i} #{varname}-size) #{regex_constraint_for_expr("#{varname}-index-#{i}-value", fielddef[:regex])}) :named list-regex-#{varname}-index-#{i}))") 
         end
     end 
-    # TODO: minLength?
     if fielddef[:maxLength] then
         fielddef[:model_maxLength].times do |i|
           solver.to_solver(progress, "(assert (! (=> (< #{i} #{varname}-size) #{maxLength_contraint_for_expr("#{varname}-index-#{i}-value", fielddef[:maxLength])}) :named list-maxLength-#{varname}-index-#{i}))") 
         end
     end 
+    if fielddef[:minLength] then
+        fielddef[:model_maxLength].times do |i|
+          solver.to_solver(progress, "(assert (! (=> (< #{i} #{varname}-size) #{minLength_contraint_for_expr("#{varname}-index-#{i}-value", fielddef[:minLength])}) :named list-minLength-#{varname}-index-#{i}))") 
+        end
+    end 
   when :enum
     fielddef[:model_maxLength].times do |i|
       solver.to_solver(progress, "(assert (! (=> (< #{i} #{varname}-size) #{enum_constraint_for_expr("#{varname}-index-#{i}-value", fielddef[:values])}) :named list-enum-#{varname}-index-#{i}))") 
@@ -412,7 +431,7 @@ def translate_substructure_to_SMTLIB(progress, solver, struct, hash = {})
         solver.to_solver(progress, "(assert (! (=> (not #{filled_var_for_field(xpath)}) (= #{size_var_for_list(xpath)} 0)) :named empty-objlist-has-zero-size-#{raw_field(xpath)}))")
         solver.to_solver(progress, "(assert (! (=> (= #{size_var_for_list(xpath)} 0) (not #{filled_var_for_field(xpath)})) :named objlist-has-zero-size-implies-empty-objlist-#{raw_field(xpath)}))")
         minSize = 0
-        solver.to_solver(progress, "(assert (! (=> #{filled_var_for_field(xpath)} (and (> #{size_var_for_list(xpath)} #{minSize}) (< #{size_var_for_list(xpath)} #{definition[:model_maxLength]}))) :named filled-objlist-has-positive-size-#{raw_field(xpath)}))")
+        solver.to_solver(progress, "(assert (! (=> #{filled_var_for_field(xpath)} (and (> #{size_var_for_list(xpath)} #{minSize}) (<= #{size_var_for_list(xpath)} #{definition[:model_maxLength]}))) :named filled-objlist-has-positive-size-#{raw_field(xpath)}))")
         solver.to_solver(progress, "(assert (! (=> (> #{size_var_for_list(xpath)} 0) #{filled_var_for_field(xpath)}) :named objlist-has-positive-size-implies-filled-objlist-#{raw_field(xpath)}))")
         definition[:model_maxLength].times do |i|
           ext_xpath = "#{xpath}/#{i}"
@@ -847,7 +866,11 @@ def pick_solver_value_for_field(field_desc)
     if field_desc[:maxLength] then
       "a" * field_desc[:maxLength]
     else
-      "default"
+      if field_desc[:minLength] then
+        "a" * field_desc[:minLength]
+      else
+        "default"
+      end
     end
   elsif field_desc[:datatype] == :enum then
     field_desc[:values].first.to_s
@@ -918,6 +941,16 @@ def build_document_from_model(progress, struct, model)
   return doc
 end
 
+def model_value_to_int(model_value)
+  if model_value.is_a?(Integer) then
+    model_value
+  else if model_value.is_a?(String) then
+    Integer(model_value, 10)
+  else
+    raise RuntimeError.new("Don't know how to cast this model value into an int: #{model_value.inspect}")
+  end
+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
@@ -941,7 +974,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], 10) > 0 then
+      if model_value_to_int(model_value[:size]) > 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
@@ -952,8 +985,9 @@ 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], 10) > 0 then
-        model_value[:size].times do |index|
+      size = model_value_to_int(model_value[:size])
+      if size > 0 then
+        size.times do |index|
           cnode = node.add_child("<#{xpath_element}></#{xpath_element}>")
           if cnode.is_a?(Nokogiri::XML::NodeSet) then
             cnode = cnode.first 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbt-gen
 version: !ruby/object:Gem::Version
-  version: 0.0.13.1
+  version: 0.0.14.1
 platform: ruby
 authors:
 - FM-enthusiast