1. 22 Oct, 2018 1 commit
    • Sylvain Dailler's avatar
      In ce collection pass, constants can now have several projections. · da3f5499
      Sylvain Dailler authored
      These projections are necessary because records have changed from
      old system to new system. Previously, a record was never abstract.
      Subsequently, we could always give value to its fields independently.
      Now, when a record (or algebraic type, not handled by this commit) is
      abstract, we use the function defined for its fields as projections.
      So, we need to have several projections per constant in order to represent
      those as values.
      
      This patch is also a first step to the necessary cleaning of ce treatment
      code.
      da3f5499
  2. 17 May, 2018 1 commit
  3. 03 May, 2018 1 commit
  4. 16 Mar, 2018 1 commit
  5. 12 Mar, 2018 1 commit
    • Sylvain Dailler's avatar
      Change the way counterexamples are parsed · 3ea32678
      Sylvain Dailler authored
      The way records are recognized during model parsing is changed:
      we previously recognized records during parsing by looking at the name of
      the variable returned by the prover (mk_r mk__rep etc).
      Now, we collect the names of constructor of records (recognized using
      their id_string beginning with "mk ") during the printing of the smt2
      files. So, after parsing of the model, we can match the name of an
      application with a previously collected constructor: we can recreate
      the record.
      
      The same can be done for all algebraic datatype.
      
      This change also solve the problem of parsing in ce-bench.
      3ea32678
  6. 19 Feb, 2018 1 commit
  7. 05 Feb, 2018 1 commit
  8. 11 Jan, 2018 1 commit
  9. 06 Jul, 2017 2 commits
  10. 26 Jun, 2017 1 commit
    • Sylvain Dailler's avatar
      Q424-012 Parse z3s boolean expression and floating point value · 3a94474f
      Sylvain Dailler authored
      This commit adds parsing for boolean expression and floating point value
      which are returned by z3 on the last version. This adds floating point
      values in the collected data and JSON printed data. This does not add
      boolean expressions because it does not add information.
      Also added transformation eliminate epsilon in driver for Z3 ce.
      
      * drivers/z3_gnatprove_ce.drv
      (eliminate_epsilon): Added transformation eliminate epsilon in driver for
      counterex for z3.
      
      * src/core/model_parser.ml
      (float_type): Added a float_type and functions to send it as JSON data.
      
      * src/driver/collect_data_model.ml
      (convert_array_value): Explicit matching for error handling when adding
      constructs.
      (convert_float): Dummy conversion of float_type to avoid circular
      dependency.
      
      * src/driver/parse_smtv2_model_lexer.mll
      (token): Adding z3 specific boolean expressions. Also adding a way to
      parse all floating point value including those we don't want to print
      because we need to parse them even if we don't want to print them.
      
      * src/driver/parse_smtv2_model_parser.mly
      (smt_term): Adding floating point value case which is handled in the lexer.
      Added boolean_expression case.
      
      * src/driver/smt2_model_defs.ml
      (float_type): Adding a duplicated float_type for dependencies reasons.
      (print_float): Debugging print of float_type.
      (): Adding cases for float in remaining functions.
      
      Change-Id: I5baee2880a9843f0fec61b1bf3edb2a2f3e54bd1
      3a94474f
  11. 12 Apr, 2017 2 commits
    • Sylvain Dailler's avatar
      Q217-025 minor typo · cffa3177
      Sylvain Dailler authored
      Change-Id: Id165717756375db150031589740470cc1e08b8ac
      cffa3177
    • Sylvain Dailler's avatar
      Q217-025 Use get-model instead of get-values for CE · 1f6da25d
      Sylvain Dailler authored
      This commit allows parsing of the result of get-model from smtsolvers.
      It changes the communication between why3 and Spark for CE to communicate
      records and array as JSON values.
      
       * src/core/model_parser.ml
      (model_value): Adding boolean and record type to model values.
      (print_*): Changed printing functions to print arrays and records as JSON
      values not as strings.
      
       * src/driver/collect_data_model.ml
      (get_variables_*): collect all internal variables of a term and put them
      into a map.
      (add_all_cvc): Add all cvc4 variables in the model to a global map.
      (add_vars_to_table): Add values of variables that can be deduced from ITE
       to the table.
      (corres_else_element): Take the definitions of functions to_rep/of_rep
      and extract the values of internal CVC variables from it.
      (refine_*): Recursively replace internal variables in a term with values
      taken from the table.
      (convert_*): Convert to type model_value from model_parser.ml.
      (create_list): Combine the following to get a list of model_value from
      the parsing of the model.
      
      * src/driver/parse_smtv2_model.ml
      (parse): Changed the detected end of model.
      
      * src/driver/parse_smtv2_model_lexer.mll
      (rule): Added tokens related to model definitions and SPARK definitions of
      records, discriminants and ref.
      
      * src/driver/parse_smtv2_model_parser.mly
      (output): Changed the parser so that it can parse a model as returned by
      Cvc4 or z3.
      
      * src/driver/smt2_model_defs.ml
      (print_*): Added printing functions for terms.
      (make_local*): Changes the AST of terms to differentiate smtsolver
      internal variables, user-defined variables and local variables.
      (subst*): Removes the local let bindings introduced by z3.
      (build_record_discr): Put definitions of discriminants inside the record
      definition.
      
       * src/printer/smtv2.ml
      (print_logic_decl): Removed get-values and added get-model.
      
      * src/transform/intro_projections_counterexmp.ml
      (intro_const_equal_to_term): Only allow projections for attributes first,
      last and field projections. Necessary when the field of a record is
      itself on array on which we want to get First and Last.
      
      * src/transform/intro_vc_vars_counterexmp.ml
      (do_intro): Some definitions moved to intro_projections_counterexmp.ml.
      
      Change-Id: Ib77fb66a2f7c53a9f54cfc300c8984e1fcec8087
      1f6da25d