1. 08 Dec, 2016 1 commit
  2. 21 Oct, 2016 2 commits
    • Sylvain Dailler's avatar
      PA03-013 counterex: Projection function defined after being applied. · b00248b5
      Sylvain Dailler authored
      This patch solves a problem on the order of the generation of new
      declarations by intro_projections_counterexmp. The problem came from
      the combination of Trans.on_tagged_ls and Trans.decl. The former was used
      to know each projection function in advance and the latter would
      introduce new declarations directly at the definition of the decl being
      analysed sometimes using projections functions before they are defined.
      
      This patch makes intro_projections_counterexmp.ml adds declarations only
      at the end of the task. So we are sure that any meta is really defined
      before.
      
      * src/transform/intro_projections_counterexmp.ml
       (introduce_constant): Minor clarification.
       (projections_for_term): Replacing append with proper symbol. Also adding
        already computed list of declaration to the output.
       (introduce_projs): Removing already defined declarations from the set of
        declaration we will add.
       (build_projections_map): The order of elements is irrelevant so
        it is faster to use cons instead of append.
       (meta_transform2): Add declarations created by f at the end of the task.
       (encapsulate): Compose meta_transform2 and introduce_projs.
       (commented meta_transform2): Request for a fold able to do what is
        described.
      b00248b5
    • Sylvain Dailler's avatar
      P419-017 counterex- Missing one liner with multidim array · bc0b6ca9
      Sylvain Dailler authored
      The one liner is missing because we did not project value of array
      elements in intro_projections_counterexmp. I changed the whole algorithm
      of projections to allow projecting values of multidim array. Also,
      moved local functions outside the main function. Added some trivial
      helping functions.
      
      * intro_projections_counterexmp
       (detect_map_types): Takes a type and return the list of successive types
        in the map and the return type. On map int (map int int) returns
        ([int; int], int).
       (last_type): Takes a list of proj_functions and returns the return type
        of the last projections_function that will be applied.
       (recreate_types): Recreates the type of the map with projected return
        type.
       (create_index_list): Returns a list of new well typed symbol for
        application in the axiom.
       (recreate_term_applications): Apply array to indices.
       (list_projection_until_base_type): Returns the list of all possible
        list of proj_functions applied to it.
       (projections_for_term): Changed the map part almost completely. We do
        not call this function recursively but we used other functions to get
        the recursive behavior.
      bc0b6ca9
  3. 20 Oct, 2016 1 commit
  4. 11 Oct, 2016 2 commits
    • Johannes Kanig's avatar
      minor replace magic constant by named constant · 636e2c1f
      Johannes Kanig authored
      Change-Id: I296e85a9aa76594b51bf045f61df65f2e20e3a35
      636e2c1f
    • Johannes Kanig's avatar
      P909-002 allow for large exit codes · 883af7f6
      Johannes Kanig authored
      Sometimes the windows syscall GetExitCodeProcess returns a large result,
      larger than the ocaml [int] type. This is expected and not an error. For
      example the constant STATUS_QUOTA_EXCEEDED, which is 0xC0000044, may be
      a valid exit code. Such large values trip up the [int_of_string] parsing
      in the client.
      
      This patch implements the following solution to this problem:
      * the server doesn't care and sends the large value;
      * (the server now recognizes this value, though, to set the timeout flag
        more often)
      * the client uses an Int64 value to parse that big constant;
      * when converting to the internal Unix.process_status type, we simply
        convert to [int], because such large values don't have any special
        meaning for Why3 anyway.
      
      * call_provers.ml
      (parse_prover_run): now directly take the exit status as argument, and
      convert it to int;
      (handle_answer): don't wrap argument to parse_prover_run into unix type
      * prove_client.ml
      (read_answer): read Int64 type now
      * server-win.c
      (handle_child_event): set timeout boolean also when exitcode is equal to
         constant STATUS_QUOTA_EXCEEDED
      
      Change-Id: I1163a6f1adf1bdbfe1f53269ce0ae57dc8bd0287
      883af7f6
  5. 29 Sep, 2016 1 commit
  6. 26 Sep, 2016 4 commits
  7. 19 Sep, 2016 2 commits
  8. 09 Sep, 2016 2 commits
  9. 06 Sep, 2016 1 commit
    • Sylvain Dailler's avatar
      Why3 altergo counterex - Allowing values to be printed for Altergo · a5d0aa0b
      Sylvain Dailler authored
      We added the generation of identifiers for counterex values inside the
      printer of altergo.
      Also added a file to factorize counterex printing functions that are used
      for both altergo and smtv2.
      
      * Makefile.in
      (cntexmp_printer): Factorization file added to Makefile.
      
      * src/driver/parse_smtv2_model_lexer.mll
      (MODEL): Adding model keyword.
      
      * src/driver/parse_smtv2_model_parser.mly
      (output): Added parsing when keyword model is at beginning of the
       output of the prover.
      
      * src/printer/alt_ergo.ml
      Adding info mimicking smtv2.ml inside most printing functions for counterex
      generation.
      
      * src/printer/cntexmp_printer.ml
      Common functions to alt_ergo.ml and smtv2.ml
      
      * src/printer/smtv2.ml
      Removed functions that are factorized into cntexmp_printer.ml
      a5d0aa0b
  10. 02 Sep, 2016 1 commit
    • Sylvain Dailler's avatar
      Why3 counterex: Changing the way counterex value are get from prover. · 86ebcd21
      Sylvain Dailler authored
      This commit solve a problem raised by Mohamed Iguernlala. If provers give
      more values than asked, the results of counterex becomes inconsistent.
      
      We changed the way corresponding terms are associated to counterex value.
      Now we have a map containing the term corresponding to a counterex asked to
      a prover.
      
      * src/core/model_parser.ml
      (construct_name): Takes a string and create a model_name.
      (build_model_rec): Changed to use term_map which allow a name of asked
      counterex to correspond to the term asked.
      
      * src/core/printer.ml
      (printer_mapping): Changed type of queried_terms to store correspondance
      between names and terms.
      (printer_args): Changed initial value of queried_terms accordingly.
      
      * src/core/smtv2.ml
      (print_info_model): This function now returns the map of names to terms.
      (print_prop_decl): Changed variable model_list accordingly.
      86ebcd21
  11. 30 Aug, 2016 2 commits
    • Sylvain Dailler's avatar
      P530-020 counterex - Disallow printing of value not introduced · 76c67c9c
      Sylvain Dailler authored
      I introduced bug with last counterexample commit. This was due to
      querying counterexample value of variables that were not introduced. This
      commits introduce a container that save introduced variables and check if
      they should be taken as counterex.
      
      * src/transform/intro_vc_vars_counterexmp.ml
      (do_intro): Adding vc_var which contains all variables that we can safely
      print as counterexamples.
      (remove_positive_foralls): Adding vc_var and introduce variables in vc_var
      when quantified over.
      (intros): Adding vc_var.
      (do_intro_vc_vars_counterexmp): Adding vc_var.
      
      Change-Id: Ic6bf732f1e50241a42df8e097f52aa46dd473bd2
      76c67c9c
    • Sylvain Dailler's avatar
      P530-020 counterex - Printing quantified variables · 27b053f3
      Sylvain Dailler authored
      We changed the prepare_for_counterexamples transformation to allow
      printing of quantified expressions, remove duplications of printed
      examples and adding an incomplete function to print universally
      quantified variables that are positive but not at head of the term.
      
      * src/transform/intro_projections_counterexmp.ml
      (intro_const_equal_to_term): Generating of the preid for a counterex.
      
      * src/transform/intro_projections_counterexmp.mli
      (val_intro_const_equal_to_term): Changing signature.
      
      * src/transform/intro_vc_vars_counterexmp.ml
      (Hprid): Adding a container for preids.
      (do_intro): Adding cases for generation of counterexample in the Tvar
      case, factorising the construction of vc_constant in a function
      new_counter_example_variable. Adding argument vc_map to avoid
      duplication of vc_constants
      (new_counter_example_variable): Adding a check to avoid duplication of
      vc_constant.
      (remove_positive_foralls): New experimental incomplete function that aims
      at introducting foralls even when they are under a construct.
      "H /\ forall i. P(i)" becomes "i as premisse and H /\ P(i)".
      (intros): Added calls to do_intro and removed optimizations.
      (do_intro_vc_vars_counterexmp): Concatenate results of intros and
      do_intros and create the prop goal.
      
      * src/transform/introduction.ml
      (stop_intro): Removed stop_intro.
      
      * src/transform/prepare_for_counterexmp.ml
      (prepare_for_counterexmp2): Removed call to introduce_premisses.
      
      Change-Id: I836ae9e69b887247eb64196705cc7ad32ba36825
      27b053f3
  12. 26 Aug, 2016 5 commits
  13. 19 Aug, 2016 1 commit
  14. 17 Aug, 2016 1 commit
  15. 26 Jul, 2016 4 commits
  16. 25 Jul, 2016 3 commits
  17. 21 Jul, 2016 1 commit
  18. 19 Jul, 2016 1 commit
    • Johannes Kanig's avatar
      Allow to keep unmatched theories · 4c744eba
      Johannes Kanig authored
      When Why3 is run on a file where some theories have been suppressed, it
      will delete the corresponding theories from the session file.  We now
      add an option keep_unmatched_theories to Session.update_session, which
      keeps all theories. In this commit, this option is always disabled.
      
      This is useful for SPARK, which sometimes only generates part of the
      Why3 file for efficiency reasons, but doesn't want the session file to
      be damaged because of that.
      
      * session.ml
      (import_theory)
      (import_goal)
      (import_proof_attempt)
      (import_transf): new functions to copy a session tree from an old
        session file
      (merge_file): keep old theories when keep_unmatched_theories is true
      * session_scheduler.ml
      (update_session): pass keep_unmatched_theories
      * why3session_lib.ml
      (read_update_session): pass keep_unmatched_theories
      4c744eba
  19. 11 Jul, 2016 1 commit
  20. 05 Jul, 2016 3 commits
  21. 04 Jul, 2016 1 commit