diff --git a/.Makefile.lint b/.Makefile.lint
index 61f5274d3a2ed6cdbdca5c321d880466d842a100..f213229e55714480b8766486a7538600f510672a 100644
--- a/.Makefile.lint
+++ b/.Makefile.lint
@@ -215,7 +215,6 @@ ML_LINT_KO+=src/libraries/utils/hptset.ml
ML_LINT_KO+=src/libraries/utils/hptset.mli
ML_LINT_KO+=src/libraries/utils/indexer.ml
ML_LINT_KO+=src/libraries/utils/indexer.mli
-ML_LINT_KO+=src/libraries/utils/json.mli
ML_LINT_KO+=src/libraries/utils/leftistheap.mli
ML_LINT_KO+=src/libraries/utils/pretty_utils.ml
ML_LINT_KO+=src/libraries/utils/pretty_utils.mli
diff --git a/.gitignore b/.gitignore
index 583b96d24e7700d71389dd6fa5ddfa759504e0b5..633a7d72b4f6a96980eec0d1d508467a17ddfa92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -197,3 +197,11 @@ hello-*.tar.gz
#######################
# should remain empty #
#######################
+/src/plugins/gui/GSourceView2.mli
+/src/plugins/gui/GSourceView2.ml
+/src/plugins/gui/dgraph.ml
+/src/plugins/gui/dgraph.mli
+/src/plugins/gui/gtk_compat.ml
+/src/plugins/gui/GSourceView.ml
+/src/plugins/gui/GSourceView.mli
+/tests/crowbar/integer_bb_pretty
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96c52af374c82f1c0bc8524cda90c91437398ab7..0f54bad033530b3a48bbc86e9e541750c5ac9676 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,225 +1,248 @@
stages:
- - update_docker
- - lint
- - frama_c_and_plugins
+ - git-update
+ - build
+ - tests
- distrib_and_compatibility
-variables:
- OPAM_PACKAGES: ocamlfind zarith ocamlgraph ocp-indent
-
-# update the cache
-update_docker:
- stage: update_docker
- image: ocaml/opam:debian
- variables:
- GIT_STRATEGY: none
- before_script:
- - sudo apt-get install -y -qq rsync
- - mkdir -p .gitlab_oci_cache/.opam/
- - rsync -a .gitlab_oci_cache/.opam/ /home/opam/.opam/
- - opam list
- - opam depext -i $OPAM_PACKAGES
- after_script:
- - rsync -a --delete /home/opam/.opam/ .gitlab_oci_cache/.opam/
- cache:
- key: "frama-c"
- paths:
- - .gitlab_oci_cache/
- script:
- - exit 0
- tags:
- - docker
-
-#lint uses the cache but doesn't modify it
-lint:
- stage: lint
- image: ocaml/opam:debian
- before_script:
- - sudo apt-get install -y -qq rsync autoconf build-essential bc
- - mkdir -p .gitlab_oci_cache/.opam/
- - rsync -a .gitlab_oci_cache/.opam/ /home/opam/.opam/
- - opam list
- - opam depext -i $OPAM_PACKAGES
- cache:
- key: "frama-c"
- paths:
- - .gitlab_oci_cache/
- script:
- - autoconf
- - ./configure
- - make lint
- - make stats-lint
-# - make check-headers OPEN_SOURCE=yes STRICT_HEADERS=yes
- coverage: '/lint coverage: \d+\.\d+/'
- tags:
- - docker
-
-
-frama-c-external:
- stage: frama_c_and_plugins
+#avoid a nix error https://github.com/NixOS/nix/issues/2087
+git-update:
+ stage: git-update
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME frama-c-external --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh instantiate --eval -A frama-c.src.outPath
tags:
- except:
- - tags
- retry: 2
+ - nix
frama-c:
- stage: frama_c_and_plugins
+ stage: build
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME frama-c --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A frama-c.installed
tags:
- except:
- - tags
- retry: 2
+ - nix
-frama-c-ocaml-4.03:
- stage: distrib_and_compatibility
+lint:
+ stage: build
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --ocaml 4.03 --camlp4 4.03 --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME frama-c --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A frama-c.lint
+ coverage: '/lint coverage: \d+\.\d+/'
tags:
- except:
- - tags
- retry: 2
+ - nix
-frama-c-ocaml-4.04:
- stage: distrib_and_compatibility
+tests:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --ocaml 4.04 --camlp4 4.04 --lablgtk 4bbd5cf1990aa8b775cf247fbfe5be321e13cc61 --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME frama-c --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A frama-c.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-frama-c-ocaml-4.05:
- stage: distrib_and_compatibility
+wp-qualif:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --ocaml 4.05 --camlp4 4.05 --lablgtk 4bbd5cf1990aa8b775cf247fbfe5be321e13cc61 --camomile 3f4d657d50c17213f3338ca75efb30d728704df3 --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME frama-c --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A frama-c.wp-qualif
tags:
- except:
- - tags
- retry: 2
+ - nix
allow_failure: true
-frama-c-internal:
- stage: distrib_and_compatibility
- script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME frama-c-internal --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
- tags:
- only:
- - master
- - stable/silicium
- except:
- - tags
- retry: 2
-
-frama-c-distrib:
- stage: distrib_and_compatibility
+genassigns:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME frama-c-distrib --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A genassigns.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-
-Genassigns:
- stage: frama_c_and_plugins
+counter-examples:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME Genassigns --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A counter-examples.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-Mthread:
- stage: frama_c_and_plugins
+acsl-importer:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME Mthread --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A acsl-importer.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-a3export:
- stage: frama_c_and_plugins
+volatile:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME a3export --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A volatile.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-PathCrawler:
- stage: frama_c_and_plugins
+E-ACSL:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME PathCrawler --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A e-acsl.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
Security:
- stage: frama_c_and_plugins
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME Security --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A security.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-E-ACSL:
- stage: frama_c_and_plugins
+CFP:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME E-ACSL --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A context-from-precondition.tests
tags:
- except:
- - tags
- allow_failure: true
- retry: 2
+ - nix
-context-from-precondition:
- stage: frama_c_and_plugins
+internal:
+ stage: distrib_and_compatibility
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME context-from-precondition --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A frama-c.internal
tags:
- except:
- - tags
- retry: 2
+ - nix
-open-source-case-studies:
- stage: frama_c_and_plugins
+.build_template: &frama-c-ocaml
+ stage: distrib_and_compatibility
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --url open-source-case-studies,git@git.frama-c.com:frama-c/open-source-case-studies.git --commit open-source-case-studies,master open-source-case-studies --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A frama-c.installed
tags:
- except:
- - tags
- when: manual
- retry: 2
+ - nix
+
+
+frama-c-ocaml-4.02:
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_02"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
+ <<: *frama-c-ocaml
-ACSL-importer:
- stage: frama_c_and_plugins
+frama-c-ocaml-4.03:
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_03"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
+ <<: *frama-c-ocaml
+
+frama-c-ocaml-4.04:
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_04"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
+ <<: *frama-c-ocaml
+
+frama-c-ocaml-4.06:
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_06"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
+ <<: *frama-c-ocaml
+
+frama-c-ocaml-4.07:
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_07"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
+ <<: *frama-c-ocaml
+
+caveat-importer:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME ACSL-importer --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A caveat-importer.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-Caveat-importer:
- stage: frama_c_and_plugins
+mthread:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME Caveat-importer --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A mthread.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
-Volatile:
- stage: frama_c_and_plugins
+pathcrawler:
+ stage: tests
+ variables:
+ CURRENT: $CI_COMMIT_REF_NAME
+ DEFAULT: "master"
+ OCAML: "4_05"
+ FRAMA_CI_OPT: "--override frama-c:$CI_COMMIT_REF_NAME,$CI_COMMIT_SHA"
script:
- - ~oci/oci/bin/bf_client.native run --socket ~oci/data/oci-data/oci.socket --frama-c $CI_BUILD_REF --branch $CI_BUILD_REF_NAME Volatile --cppo 07d2bcee50670aecae7e094d92f68fd18314073a --ocamlgraph 9286b375c005d1d504a1def0c5986f54c7f12251 --url ocamlfind,git@git.frama-c.com:bobot/ocamlfind.git
+ - nix/frama-ci.sh build -A pathcrawler.tests
tags:
- except:
- - tags
- retry: 2
+ - nix
diff --git a/Makefile b/Makefile
index 1782574f1fe884910665a8b5e8d03fe92e0b6e0d..3239f007f7bbef6fa24e65d82a222fd5f26a8817 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -254,6 +254,7 @@ DISTRIB_FILES:=\
share/analysis-scripts/cmd-dep.sh \
share/analysis-scripts/concat-csv.sh \
$(wildcard share/analysis-scripts/examples/*) \
+ share/analysis-scripts/find_fun.py \
share/analysis-scripts/flamegraph.pl \
share/analysis-scripts/frama-c.mk \
share/analysis-scripts/list_files.py \
@@ -373,7 +374,7 @@ ifeq ("$(DEVELOPMENT)","yes")
all:: share/.gitignore
endif
-clean::
+clean_share_link:
if test -f share/.gitignore; then \
for link in $$(cat share/.gitignore); do \
if test -L share$$link; then \
@@ -385,6 +386,8 @@ clean::
rm share/.gitignore; \
fi
+clean:: clean_share_link
+
##############
# Ocamlgraph #
##############
@@ -680,8 +683,59 @@ STARTUP_CMX=$(STARTUP_CMO:.cmo=.cmx)
WTOOLKIT= \
wutil widget wbox wfile wpane wpalette wtext wtable
+ifeq ($(strip $(GTKSOURCEVIEW)),lablgtk3.sourceview3)
+
+src/plugins/gui/GSourceView.ml: src/plugins/gui/GSourceView3.ml.in
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+
+src/plugins/gui/GSourceView.mli: src/plugins/gui/GSourceView3.mli.in
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+
+else
+src/plugins/gui/GSourceView.ml: src/plugins/gui/GSourceView2.ml.in
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+
+src/plugins/gui/GSourceView.mli: src/plugins/gui/GSourceView2.mli.in
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+
+endif
+
+SOURCEVIEWCOMPAT:=GSourceView
+GENERATED+=src/plugins/gui/GSourceView.ml src/plugins/gui/GSourceView.mli
+
+DGRAPHCOMPAT:=
+ifeq ($(HAS_GNOMECANVAS),no)
+DGRAPHCOMPAT:=dgraph
+src/plugins/gui/dgraph.ml: src/plugins/gui/dgraph.ml.in
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+src/plugins/gui/dgraph.mli: src/plugins/gui/dgraph.mli.in
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+
+GENERATED+=src/plugins/gui/dgraph.ml src/plugins/gui/dgraph.mli
+endif
+
+ifeq ($(LABLGTK),lablgtk3)
+src/plugins/gui/gtk_compat.ml: src/plugins/gui/gtk_compat.3.ml
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+else
+src/plugins/gui/gtk_compat.ml: src/plugins/gui/gtk_compat.2.ml
+ $(CP) $< $@
+ $(CHMOD_RO) $@
+endif
+GENERATED+=src/plugins/gui/gtk_compat.ml
+
SINGLE_GUI_CMO:= \
+ gtk_compat \
$(WTOOLKIT) \
+ $(SOURCEVIEWCOMPAT) \
+ $(DGRAPHCOMPAT) \
gui_parameters \
gtk_helper gtk_form \
source_viewer pretty_source source_manager book_manager \
@@ -734,7 +788,12 @@ PLUGIN_NAME:=Callgraph
PLUGIN_DISTRIBUTED:=yes
PLUGIN_DIR:=src/plugins/callgraph
PLUGIN_CMO:= options journalize subgraph cg services uses register
+#GTK3: no DGraph available.
+ifeq ($(HAS_GNOMECANVAS),yes)
PLUGIN_GUI_CMO:=cg_viewer
+else
+PLUGIN_GUI_CMO:=
+endif
PLUGIN_CMI:= callgraph_api
PLUGIN_INTERNAL_TEST:=yes
PLUGIN_TESTS_DIRS:=callgraph
@@ -865,6 +924,7 @@ PLUGIN_GUI_CMO:=$(VALUE_GUI_AUX) gui_files/gui_callstacks_manager \
gui_files/gui_red gui_files/register_gui
PLUGIN_INTERNAL_TEST:= yes
+PLUGIN_TESTS_LIB=tests/float/fval_test.ml
PLUGIN_DISTRIBUTED:=yes
VALUE_TYPES:=$(addprefix src/plugins/value_types/,\
cilE cvalue precise_locs value_types widen_type)
@@ -899,6 +959,11 @@ PLUGIN_CMO:= options generator rte visit register
PLUGIN_DISTRIBUTED:=yes
PLUGIN_INTERNAL_TEST:=yes
PLUGIN_TESTS_DIRS:=rte rte_manual
+PLUGIN_TESTS_LIB:=\
+ tests/rte/my_annotation/my_annotation.ml \
+ tests/rte/rte_api/rte_get_annot.ml \
+ tests/rte/compute_annot/compute_annot.ml \
+ tests/rte/my_annot_proxy/my_annot_proxy.ml
$(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
#################
@@ -943,6 +1008,7 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
PLUGIN_ENABLE:=$(ENABLE_CONSTANT_PROPAGATION)
PLUGIN_NAME:=Constant_Propagation
PLUGIN_DIR:=src/plugins/constant_propagation
+PLUGIN_TESTS_LIB:=tests/constant_propagation/introduction_of_non_explicit_cast.ml
PLUGIN_CMO:= propagationParameters \
api
PLUGIN_DISTRIBUTED:=yes
@@ -1006,6 +1072,8 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
PLUGIN_ENABLE:=$(ENABLE_PDG)
PLUGIN_NAME:=Pdg
PLUGIN_DIR:=src/plugins/pdg
+PLUGIN_TESTS_LIB:=tests/pdg/dyn_dpds.ml \
+ tests/pdg/sets.ml
PLUGIN_CMO:= pdg_parameters \
ctrlDpds \
pdg_state \
@@ -1034,6 +1102,8 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
PLUGIN_ENABLE:=$(ENABLE_SCOPE)
PLUGIN_NAME:=Scope
PLUGIN_DIR:=src/plugins/scope
+PLUGIN_TESTS_LIB:=tests/scope/bts971.ml \
+ tests/scope/zones.ml
PLUGIN_CMO:= datascope zones defs
PLUGIN_GUI_CMO:=dpds_gui
PLUGIN_DEPENDENCIES:=Eva Inout
@@ -1165,6 +1235,16 @@ bin/toplevel.opt$(EXE): $(ALL_BATCH_CMX) $(GEN_OPT_LIBS) \
$(PRINT_LINKING) $@
$(OCAMLOPT) $(OLINKFLAGS) -o $@ $(OPT_LIBS) $(ALL_BATCH_CMX)
+LIB_KERNEL_CMO= $(filter-out src/kernel_internals/runtime/gui_init.cmo, $(CMO))
+LIB_KERNEL_CMX= $(filter-out src/kernel_internals/runtime/gui_init.cmx, $(CMX))
+
+lib/fc/frama-c.cma: $(LIB_KERNEL_CMO) $(GEN_OPT_LIBS) $(LIB_KERNEL_CMX) lib/fc/META.frama-c
+ $(PRINT_LINKING) $@ and lib/fc/frama-c.cmxa
+ $(MKDIR) $(FRAMAC_LIB)
+ $(OCAMLMKLIB) -o lib/fc/frama-c $(OPT_LIBS) $(LIB_KERNEL_CMO) $(LIB_KERNEL_CMX)
+
+lib/fc/frama-c.cmxa: lib/fc/frama-c.cma
+
####################
# (Ocaml) Toplevel #
####################
@@ -1332,17 +1412,18 @@ acsl_tests: byte
$(PRINT_EXEC) acsl_tests
find doc/speclang -name \*.c -exec ./bin/toplevel.byte$(EXE) {} \; > /dev/null
-LONELY_TESTS_ML_FILES=$(wildcard $(TEST_DIRS_AS_PLUGIN:%=tests/%/*.ml))
-LONELY_TESTS_BYTE_FILES=$(LONELY_TESTS_ML_FILES:%.ml=%.cmo)
-LONELY_TESTS_OPT_FILES=$(LONELY_TESTS_ML_FILES:%.ml=%.cmx)
-LONELY_TESTS_DYN_FILES=$(LONELY_TESTS_ML_FILES:%.ml=%.cmxs)
-$(LONELY_TESTS_BYTE_FILES): BFLAGS+=$(TEST_DIRS_AS_PLUGIN:%=-I tests/%)
-$(LONELY_TESTS_OPT_FILES): OFLAGS+=$(TEST_DIRS_AS_PLUGIN:%=-I tests/%)
-$(LONELY_TESTS_DYN_FILES): OFLAGS+=$(TEST_DIRS_AS_PLUGIN:%=-I tests/%)
-.PRECIOUS: $(LONELY_TESTS_OPT_FILES) \
- $(LONELY_TESTS_DYN_FILES) \
- $(LONELY_TESTS_BYTE_FILES) \
- $(LONELY_TESTS_BYTE_FILES:%.cmo=%.cmi)
+LONELY_TESTS_ML_FILES:=\
+ $(shell find $(TEST_DIRS_AS_PLUGIN:%=tests/%) -name '*.ml')
+$(foreach file,$(LONELY_TESTS_ML_FILES),\
+ $(eval $(file:%.ml=%.cmo): BFLAGS+=-I $(dir $(file))))
+$(foreach file,$(LONELY_TESTS_ML_FILES),\
+ $(eval $(file:%.ml=%.cmx): OFLAGS+=-I $(dir $(file))))
+$(foreach file,$(LONELY_TESTS_ML_FILES),\
+ $(eval $(file:%.ml=%.cmxs): OFLAGS+=-I $(dir $(file))))
+.PRECIOUS: $(LONELY_TESTS_ML_FILES:%.ml=%.cmx) \
+ $(LONELY_TESTS_DYN_FILES:%.ml=%.cmxs) \
+ $(LONELY_TESTS_BYTE_FILES:%.ml=%.cmo) \
+ $(LONELY_TESTS_BYTE_FILES:%.ml=%.cmi)
bin/ocamldep_transitive_closure: devel_tools/ocamldep_transitive_closure.ml
$(OCAMLOPT) -package ocamlgraph -package str -linkpkg -o $@ $<
@@ -1770,6 +1851,7 @@ install-lib: clean-install
$(PRINT_INSTALL) kernel API
$(MKDIR) $(FRAMAC_LIBDIR)
$(CP) $(LIB_BYTE_TO_INSTALL) $(LIB_OPT_TO_INSTALL) $(FRAMAC_LIBDIR)
+ $(CP) $(addprefix lib/fc/,dllframa-c.so libframa-c.a frama-c.cma frama-c.a frama-c.cmxa META.frama-c) $(FRAMAC_LIBDIR)
install-doc-code:
$(PRINT_INSTALL) API documentation
@@ -1805,6 +1887,7 @@ install:: install-lib
$(MKDIR) $(FRAMAC_DATADIR)/analysis-scripts
$(CP) share/analysis-scripts/cmd-dep.sh \
share/analysis-scripts/concat-csv.sh \
+ share/analysis-scripts/find_fun.py \
share/analysis-scripts/flamegraph.pl \
share/analysis-scripts/frama-c.mk \
share/analysis-scripts/parse-coverage.sh \
@@ -2341,15 +2424,15 @@ clean-distrib: dist-clean
create_lib_to_install_list = $(addprefix $(FRAMAC_LIB)/,$(call map,notdir,$(1)))
-byte:: bin/toplevel.byte$(EXE) share/Makefile.dynamic_config \
+byte:: bin/toplevel.byte$(EXE) lib/fc/frama-c.cma share/Makefile.dynamic_config \
$(call create_lib_to_install_list,$(LIB_BYTE_TO_INSTALL)) \
- $(PLUGIN_META_LIST)
+ $(PLUGIN_META_LIST) lib/fc/META.frama-c
-opt:: bin/toplevel.opt$(EXE) share/Makefile.dynamic_config \
+opt:: bin/toplevel.opt$(EXE) lib/fc/frama-c.cmxa share/Makefile.dynamic_config \
$(call create_lib_to_install_list,$(LIB_OPT_TO_INSTALL)) \
$(filter %.o %.cmi,\
$(call create_lib_to_install_list,$(LIB_BYTE_TO_INSTALL))) \
- $(PLUGIN_META_LIST)
+ $(PLUGIN_META_LIST) lib/fc/META.frama-c
top: bin/toplevel.top$(EXE) \
$(call create_lib_to_install_list,$(LIB_BYTE_TO_INSTALL)) \
diff --git a/Makefile.generating b/Makefile.generating
index eece5c22c89475fbafcc4e7e782bbcb995f11924..174a2b7bd4944525c884101148b7d1bf947bdb41 100644
--- a/Makefile.generating
+++ b/Makefile.generating
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -209,6 +209,12 @@ ifeq ("$(DEVELOPMENT)","yes")
all:: .merlin
endif
+lib/fc/META.frama-c: share/META.frama-c share/Makefile.config Makefile.generating
+ $(MKDIR) lib/fc/
+ $(SED) $< -e "s/@REQUIRES/$(LIBRARY_NAMES)/" > $@
+
+GENERATED += lib/fc/META.frama-c
+
# Local Variables:
# mode: makefile
diff --git a/bin/developers-by-files.sh b/bin/developers-by-files.sh
index 93f959d3b062080132e74522b633e935101de6e0..243e44b9ca5358fbb3a97c83593e1bef57c9745c 100755
--- a/bin/developers-by-files.sh
+++ b/bin/developers-by-files.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/frama-c b/bin/frama-c
index 6b918fd2926d34832952dcbc0c9dacf387ad90df..bbd1ca4a92948637a73e4e064a4e0344f53f0134 100755
--- a/bin/frama-c
+++ b/bin/frama-c
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/frama-c-config b/bin/frama-c-config
index 9cd14c400d06bc466bc33c3766721af26a985dc4..9b70a6730f73da85d4c0ef85d9d1b2c67bf5971d 100755
--- a/bin/frama-c-config
+++ b/bin/frama-c-config
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/frama-c-gui b/bin/frama-c-gui
index e60f5c809e8dce4711b0703a15ef21545cd4151a..b70c1b8f54a5b6caa12b3c86c82fc6543cc50f6b 100755
--- a/bin/frama-c-gui
+++ b/bin/frama-c-gui
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/frama-c-gui.byte b/bin/frama-c-gui.byte
index 4ccc5fc3c0b61c77de7aca76fedfabec5fc7f92f..16a65b41eeb2dd6b82bbe0428585979e45c26468 100755
--- a/bin/frama-c-gui.byte
+++ b/bin/frama-c-gui.byte
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/frama-c-script b/bin/frama-c-script
index 707e9fd932f3208791ecbc8d851f1d5ce1804ce9..b46c6944edca65174b822f16b565189f6cc64d9f 100755
--- a/bin/frama-c-script
+++ b/bin/frama-c-script
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -49,6 +49,11 @@ if [ $# -lt 1 ]; then
echo " Generates flamegraph.svg and flamegraph.html in [dir]"
echo " (or in the FRAMAC_SESSION directory by default)."
echo " Also opens it in a browser, unless variable NOGUI is set."
+ echo ""
+ echo " - find-fun <function-name> [dirs]"
+ echo " Lists files in [dirs] declaring or defining <function-name>"
+ echo " (defaults to PWD + /usr/include)."
+ echo " Heuristics-based: neither correct nor complete."
exit
fi
@@ -188,6 +193,10 @@ case "$command" in
shift;
${FRAMAC_SHARE}/analysis-scripts/list_files.py "$@";
;;
+ "find-fun")
+ shift;
+ ${FRAMAC_SHARE}/analysis-scripts/find_fun.py "$@";
+ ;;
"flamegraph")
shift;
flamegraph "$@";
diff --git a/bin/frama-c.byte b/bin/frama-c.byte
index 758f9da90fcb0eb738895c4781df0a50a8fe61c3..43e10b23f57f800a60962ed92946786bb38c1a73 100755
--- a/bin/frama-c.byte
+++ b/bin/frama-c.byte
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/frama-c.top b/bin/frama-c.top
index 88158372025e40d2211f379c86976232556cdac2..7a149f2a74456a69741e219d055acafcd57d933a 100755
--- a/bin/frama-c.top
+++ b/bin/frama-c.top
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/local_export.sh b/bin/local_export.sh
index cdac4fe533772ac1d2243b61ab0474980e4058b9..4f1e10eb7bfba0ad706c731bb2aa0863f93ffaaf 100644
--- a/bin/local_export.sh
+++ b/bin/local_export.sh
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/aluminium2silicon.sh b/bin/migration_scripts/aluminium2silicon.sh
index 72647a40813cc7046244113cd2a5ca3b406ca91f..7f7a4eb7cfbedf136fdc395a0e6ae445d59d40f0 100755
--- a/bin/migration_scripts/aluminium2silicon.sh
+++ b/bin/migration_scripts/aluminium2silicon.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/boron2carbon.sh b/bin/migration_scripts/boron2carbon.sh
index 831a11f3da47bf9018053126042c06f957c4e8da..8b8b3ceec2953633d9468fc01011d768ab4e95a6 100755
--- a/bin/migration_scripts/boron2carbon.sh
+++ b/bin/migration_scripts/boron2carbon.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/carbon2nitrogen.sh b/bin/migration_scripts/carbon2nitrogen.sh
index be6fb21b7920c04558dcb1ff06bf3b0c753140cd..42daa82f5dc12f58b6c8c10bbef61b4ade0c4905 100755
--- a/bin/migration_scripts/carbon2nitrogen.sh
+++ b/bin/migration_scripts/carbon2nitrogen.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/chlorine2argon.sh b/bin/migration_scripts/chlorine2argon.sh
index 0c2d2a58fd439182bbe6fbfcc3d23f04b2137d1a..a010796bfd360277e043ea4c1362696090f974a9 100755
--- a/bin/migration_scripts/chlorine2argon.sh
+++ b/bin/migration_scripts/chlorine2argon.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/fluorine2neon.sh b/bin/migration_scripts/fluorine2neon.sh
index c2791849cc2342ae72e5fd438c287277a6677c79..a13be5ef38fbad05c8e39bc21f001c1dcad3bafb 100755
--- a/bin/migration_scripts/fluorine2neon.sh
+++ b/bin/migration_scripts/fluorine2neon.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/lithium2beryllium.sh b/bin/migration_scripts/lithium2beryllium.sh
index 7b03839b8aee5e4c6621fda83b332e5ae9154676..81da725617c6eb3270d20fe045dab83e0f6ebdf0 100755
--- a/bin/migration_scripts/lithium2beryllium.sh
+++ b/bin/migration_scripts/lithium2beryllium.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/magnesium2aluminium.sh b/bin/migration_scripts/magnesium2aluminium.sh
index 2db830cf8c11855141db3797c5e0eddf0b11d601..b222dcc2f9365223b0785d370882fd2450a2a1b6 100755
--- a/bin/migration_scripts/magnesium2aluminium.sh
+++ b/bin/migration_scripts/magnesium2aluminium.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/neon2sodium.sh b/bin/migration_scripts/neon2sodium.sh
index d8ffbdc05cc4b8a21422b3242d35368475b825d7..46d0904351693427578da8e7752aeaabcab1a610 100755
--- a/bin/migration_scripts/neon2sodium.sh
+++ b/bin/migration_scripts/neon2sodium.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/nitrogen2oxygen.sh b/bin/migration_scripts/nitrogen2oxygen.sh
index 5f52bda0bd65a6e48abaf28d9662e5e423c28275..0808bb7dbb93ce290b938ef1c9ef229928de88da 100755
--- a/bin/migration_scripts/nitrogen2oxygen.sh
+++ b/bin/migration_scripts/nitrogen2oxygen.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/oxygen2fluorine.sh b/bin/migration_scripts/oxygen2fluorine.sh
index 3d5bd058018bb375c337b95abb90e3a901453453..63e4bba7d2913157954c57c5dc04b783cc04767a 100755
--- a/bin/migration_scripts/oxygen2fluorine.sh
+++ b/bin/migration_scripts/oxygen2fluorine.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/phosphorus2sulfur.sh b/bin/migration_scripts/phosphorus2sulfur.sh
index 400b953c2a19f52584a477657a4654e4fc23827b..6e0ae27792b1bf898698b72d82f87dffdf3db112 100755
--- a/bin/migration_scripts/phosphorus2sulfur.sh
+++ b/bin/migration_scripts/phosphorus2sulfur.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/silicon2phosphorus.sh b/bin/migration_scripts/silicon2phosphorus.sh
index b72495c8a4e0d4655a4bb7ae074e78d8ea6d0750..a5ffae5bba6d87ee62833232dc466848beb5ef5c 100755
--- a/bin/migration_scripts/silicon2phosphorus.sh
+++ b/bin/migration_scripts/silicon2phosphorus.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/sodium2magnesium.sh b/bin/migration_scripts/sodium2magnesium.sh
index ee4bf5a672a082c84de8d348bc947e0df9766384..a2f121c8cf7064aabf205e0b8b970fae6f0d645f 100755
--- a/bin/migration_scripts/sodium2magnesium.sh
+++ b/bin/migration_scripts/sodium2magnesium.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/migration_scripts/sulfur2chlorine.sh b/bin/migration_scripts/sulfur2chlorine.sh
index d2ee9da682bc4d45af4e9190c363ce9caa519417..f9710169d5a1549e116d99a6987f4d2c2b048f1d 100755
--- a/bin/migration_scripts/sulfur2chlorine.sh
+++ b/bin/migration_scripts/sulfur2chlorine.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/bin/test_all_plugins.sh b/bin/test_all_plugins.sh
index 108cb1c37bf8c4e924329a00ebe2d7b5cb3da112..f1fe1811c914c25eda5a43dd952c67f186493b5c 100755
--- a/bin/test_all_plugins.sh
+++ b/bin/test_all_plugins.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/config.h.in b/config.h.in
index 573fd99563a3230367c17ff646c8266f95752ec6..68114ae885e9005ad963539b511230bebafead47 100644
--- a/config.h.in
+++ b/config.h.in
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/configure.in b/configure.in
index bd9c9a010d412cff46fd8e5b9e979005f59cc462..988da1a7b0cada6cc5de981f4e790bc82aafdcb4 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# INRIA (Institut National de Recherche en Informatique et en #
@@ -741,7 +741,7 @@ plugin_require(from_analysis,callgraph)
check_plugin(gui,src/plugins/gui,[support for gui],yes)
plugin_require_external(gui,lablgtk)
-plugin_require_external(gui,gnomecanvas)
+plugin_use_external(gui,gnomecanvas)
plugin_require_external(gui,gtksourceview)
plugin_use_external(gui,dot)
@@ -921,22 +921,46 @@ new_section "configure tools and libraries used by some plug-ins"
# lablgtk2
##########
+define([ENABLE_LABLGTK3_HELP],
+ AC_HELP_STRING([--disable-lablgtk3],
+ [in case lablgtk2 and lablgtk3 are available, the default is to compile
+ against lablgtk3. Use this option to force compiling against lablgtk2]))
+
+AC_ARG_ENABLE(
+ lablgtk3,[ENABLE_LABLGTK3_HELP],
+ [ENABLE_LABLGTK3=$enableval],[ENABLE_LABLGTK3=yes])
+
REQUIRE_LABLGTK="$REQUIRE_LABLGTK$REQUIRE_GNOMECANVAS"
USE_LABLGTK="$USE_LABLGTK$USE_GNOMECANVAS"
+LABLGTK_PATH=""
+
+if test "$ENABLE_LABLGTK3" = "yes"; then
+ LABLGTK_PATH=`ocamlfind query lablgtk3 | tr -d '\\r\\n'`;
+fi
+
+if test "$LABLGTK_PATH" = ""; then
+ LABLGTK_VERSION=2
LABLGTK_PATH=`ocamlfind query lablgtk2 | tr -d '\\r\\n'`
- if test "$LABLGTK_PATH" = "" -o "$LABLGTK_PATH" -ef "$OCAMLLIB/lablgtk2" ; then
- echo "Ocamlfind -> using +lablgtk2.($LABLGTK_PATH,$OCAMLLIB/lablgtk2)"
- LABLGTK_PATH=+lablgtk2
- LABLGTKPATH_FOR_CONFIGURE=$OCAMLLIB/lablgtk2
+ if test "$LABLGTK_PATH" = "" -o \
+ "$LABLGTK_PATH" -ef "$OCAMLLIB/lablgtk2" ; then
+ echo "Ocamlfind -> using +lablgtk2.($LABLGTK_PATH,$OCAMLLIB/lablgtk2)"
+ LABLGTK_PATH=+lablgtk2
+ LABLGTKPATH_FOR_CONFIGURE=$OCAMLLIB/lablgtk2
else
- echo "Ocamlfind -> using $LABLGTK_PATH"
- LABLGTKPATH_FOR_CONFIGURE=$LABLGTK_PATH
- fi
+ echo "Ocamlfind -> using $LABLGTK_PATH"
+ LABLGTKPATH_FOR_CONFIGURE=$LABLGTK_PATH
+ fi;
+else
+ LABLGTK_VERSION=3
+ echo "ocamlfind -> using $LABLGTK_PATH"
+ LABLGTKPATH_FOR_CONFIGURE=$LABLGTK_PATH;
+fi
configure_library([GTKSOURCEVIEW],
- [$LABLGTKPATH_FOR_CONFIGURE/lablgtksourceview2.$LIB_SUFFIX],
- [lablgtksourceview2.$LIB_SUFFIX not found],
+ [$LABLGTKPATH_FOR_CONFIGURE/lablgtksourceview2.$LIB_SUFFIX,
+ $LABLGTKPATH_FOR_CONFIGURE/lablgtksourceview3.$LIB_SUFFIX],
+ [lablgtksourceview not found],
no)
configure_library([GNOMECANVAS],
@@ -991,6 +1015,7 @@ AC_SUBST(HAS_YOJSON)
AC_SUBST(HAS_APRON)
AC_SUBST(HAS_MPFR)
AC_SUBST(HAS_LANDMARKS)
+AC_SUBST(LABLGTK_VERSION)
AC_SUBST(OCAMLBEST)
AC_SUBST(OCAMLVERSION)
AC_SUBST(OCAMLLIB)
diff --git a/default.nix b/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e64150378a86d1a128776f31ba1f5912ea77af15
--- /dev/null
+++ b/default.nix
@@ -0,0 +1,15 @@
+# standalone derivation, for nix-build, nix-shell, etc
+{ pkgs ? import <nixpkgs> {} }:
+let
+ src = builtins.fetchGit {
+ "url" = ./.git;
+ "name" = "frama-c";
+ "rev" = "ffa925f404779a3a0c4aacff5bd78b1c502def11";
+ "ref" = "test-nix-fetchGit";
+ };
+ in
+
+pkgs.callPackage ./nix/default.nix {
+ opam2nix = pkgs.callPackage ../Frama-CI/opam2nix-packages.nix {};
+ src = src;
+}
diff --git a/doc/Makefile b/doc/Makefile
index e45e252c0f47f8df338ed88a1f0431ad2a4b9f5c..9c59a4b6775dcf5996dfcb0658b53f27cebb11f9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/doc/code/docgen.ml b/doc/code/docgen.ml
index eb9be2be87495617d4ed7006bc0f3b3e86cd130e..31fa061f8b6f83ae9f745c3f6af26605ddb6bb4a 100644
--- a/doc/code/docgen.ml
+++ b/doc/code/docgen.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/doc/code/intro_kernel_plugin.txt b/doc/code/intro_kernel_plugin.txt
index 577af241540f45ee7662277e4c655d1417da13f7..ff0fe91bf6331afd9280b50b71ad931c3e7ee27c 100644
--- a/doc/code/intro_kernel_plugin.txt
+++ b/doc/code/intro_kernel_plugin.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_occurrence.txt b/doc/code/intro_occurrence.txt
index 23d2b25b672f763d0f436f4ceda21b6c511364b9..9c1ed182b9204ef7942ecf4b430ca1f9a6780c6a 100644
--- a/doc/code/intro_occurrence.txt
+++ b/doc/code/intro_occurrence.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_pdg.txt b/doc/code/intro_pdg.txt
index 0fc3b3e8a6275ba5679a61b77f3dcfd8eec0fecb..aa55601f1992cdda3ab8ca533133d667db81729c 100644
--- a/doc/code/intro_pdg.txt
+++ b/doc/code/intro_pdg.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_plugin.txt b/doc/code/intro_plugin.txt
index 160d2b3be6e478b7b024f58d04971eb00f02bbb2..2d6889a51af0e250e70a2c976a75100e022e1241 100644
--- a/doc/code/intro_plugin.txt
+++ b/doc/code/intro_plugin.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_plugin_D_and_S.txt b/doc/code/intro_plugin_D_and_S.txt
index e0fec19ddbfcf8945b8b98d7a5177f75a0af94b3..670f184b8793afe09a8dce2b5cc4227bdc9e4e9f 100644
--- a/doc/code/intro_plugin_D_and_S.txt
+++ b/doc/code/intro_plugin_D_and_S.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_plugin_default.txt b/doc/code/intro_plugin_default.txt
index 9b2190a4a2117e29018711ddfa25d5e3488e6824..17c8d92915305a5622a187d1e5087fc0a5c15a61 100644
--- a/doc/code/intro_plugin_default.txt
+++ b/doc/code/intro_plugin_default.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_scope.txt b/doc/code/intro_scope.txt
index 7ebffff7012059e60881cf4ec3f88262a182aa5b..a6efd13396fb61efb8b4a84a8fcafd8349b95a04 100644
--- a/doc/code/intro_scope.txt
+++ b/doc/code/intro_scope.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_slicing.txt b/doc/code/intro_slicing.txt
index 99bfb9b66bfe6572ef5c5451df2dd8d476ac91fe..707f0988c8f85483899fac5d5f321339717b3c6c 100644
--- a/doc/code/intro_slicing.txt
+++ b/doc/code/intro_slicing.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/intro_sparecode.txt b/doc/code/intro_sparecode.txt
index 7eb41c1788e9c37c702d99e2f81299181c7b76a6..683cafefc103f3dd9d56a6aede60bba28e0f2fb1 100644
--- a/doc/code/intro_sparecode.txt
+++ b/doc/code/intro_sparecode.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat à l'énergie atomique et aux énergies #
#* alternatives) #
#* #
diff --git a/doc/code/style.css b/doc/code/style.css
index ee67a9792ae07d1147882a0fa41a121e6fcbb762..2e1c896b1a29bbd2757eb11a545185858600fc42 100644
--- a/doc/code/style.css
+++ b/doc/code/style.css
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/doc/code/toc_head.htm b/doc/code/toc_head.htm
index 6bc6f6cdc507f532e3488d58558e759b125e84b2..d7aafb105b7dbabb1c601e2932a3e0403bda9a2b 100644
--- a/doc/code/toc_head.htm
+++ b/doc/code/toc_head.htm
@@ -2,7 +2,7 @@
<!-- -->
<!-- This file is part of Frama-C. -->
<!-- -->
-<!-- Copyright (C) 2007-2018 -->
+<!-- Copyright (C) 2007-2019 -->
<!-- CEA (Commissariat à l'énergie atomique et aux énergies -->
<!-- alternatives) -->
<!-- -->
diff --git a/doc/code/toc_tail.htm b/doc/code/toc_tail.htm
index a6f39e6fc6a69d5790b8428ed0072debbc12bcfe..87ef71351dee6426b95db1d20943cab093f7e69b 100644
--- a/doc/code/toc_tail.htm
+++ b/doc/code/toc_tail.htm
@@ -2,7 +2,7 @@
<!-- -->
<!-- This file is part of Frama-C. -->
<!-- -->
-<!-- Copyright (C) 2007-2018 -->
+<!-- Copyright (C) 2007-2019 -->
<!-- CEA (Commissariat à l'énergie atomique et aux énergies -->
<!-- alternatives) -->
<!-- -->
diff --git a/doc/value/main.tex b/doc/value/main.tex
index 2d5124ad23a4639fa25509a1de053eaf6842253f..15d5553fb0a48ebc63c5c0bc8f0ab51525505895 100644
--- a/doc/value/main.tex
+++ b/doc/value/main.tex
@@ -3289,7 +3289,7 @@ remaining \lstinline|-eva-slevel| may be used to unroll more iterations.
While it is sometimes useful to unroll only the first iterations, the usual
objective is full unrolling; the user can enable option
-\lstinline|-value-msg-key=loop-unrolling| to be informed whenever the specified
+\lstinline|-value-msg-key=loop-unroll| to be informed whenever the specified
unrolling value is insufficient to unroll the loop entirely:
\begin{lstlisting}
@@ -3301,7 +3301,7 @@ void main() {
\end{lstlisting}
\begin{lstlisting}
-[eva:loop-unrolling] insuf-loop.c:3: loop not completely unrolled
+[eva:loop-unroll] insuf-loop.c:3: loop not completely unrolled
\end{lstlisting}
Note that using an unrolling parameter which is higher than the actual number
diff --git a/headers/check-headers.sh b/headers/check-headers.sh
index b88fa6305f5dd6a475b76a867a31a62f25a77b65..0a1a95e0b3512aa4609c4a20423f6e146db93bca 100755
--- a/headers/check-headers.sh
+++ b/headers/check-headers.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/headers/close-source/ACSL_EL b/headers/close-source/ACSL_EL
index 9984ea26eef801b99be0c4f6907226321bb018aa..99fcded1099e2e97889204aeb4ba741d6e2be775 100644
--- a/headers/close-source/ACSL_EL
+++ b/headers/close-source/ACSL_EL
@@ -4,7 +4,7 @@ This file is part of Frama-C.
Copyright (C) 2008-2011
Pierre Roux
-Copyright (C) 2009-2018
+Copyright (C) 2009-2019
CEA LIST
you can redistribute it and/or modify it under the terms of the GNU
diff --git a/headers/close-source/AORAI_LGPL b/headers/close-source/AORAI_LGPL
index ddcbbf500594d273881958a13ffee1e56bd1302f..a37f43ed4dbcdcde1649a901b47d1448db0434a8 100644
--- a/headers/close-source/AORAI_LGPL
+++ b/headers/close-source/AORAI_LGPL
@@ -1,7 +1,7 @@
This file is part of Aorai plug-in of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
INRIA (Institut National de Recherche en Informatique et en
diff --git a/headers/close-source/CEA_INRIA_LGPL b/headers/close-source/CEA_INRIA_LGPL
index f71388de28872349b680152efd0418b1a7e49aa1..62bce5275ee7ad73c9f8b8b1ff70d75fd581e612 100644
--- a/headers/close-source/CEA_INRIA_LGPL
+++ b/headers/close-source/CEA_INRIA_LGPL
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
INRIA (Institut National de Recherche en Informatique et en
diff --git a/headers/close-source/CEA_LGPL b/headers/close-source/CEA_LGPL
index 236c12248780eadc45026e657f79dde38615ca27..87798be30e7cf28ebbd3b7c2365e95b7d2fad5a8 100644
--- a/headers/close-source/CEA_LGPL
+++ b/headers/close-source/CEA_LGPL
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
diff --git a/headers/close-source/CEA_LGPL_OR_PROPRIETARY b/headers/close-source/CEA_LGPL_OR_PROPRIETARY
index 39bb899ccc59fce71bc7639790fd77a509eb5ad3..d592caa19b9f4fcfa3ecf8db45b1b68e8affe87b 100644
--- a/headers/close-source/CEA_LGPL_OR_PROPRIETARY
+++ b/headers/close-source/CEA_LGPL_OR_PROPRIETARY
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
diff --git a/headers/close-source/CEA_PROPRIETARY b/headers/close-source/CEA_PROPRIETARY
index 39bb899ccc59fce71bc7639790fd77a509eb5ad3..d592caa19b9f4fcfa3ecf8db45b1b68e8affe87b 100644
--- a/headers/close-source/CEA_PROPRIETARY
+++ b/headers/close-source/CEA_PROPRIETARY
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
diff --git a/headers/close-source/CEA_WP b/headers/close-source/CEA_WP
index 83802f3b8f0cbcbdff584ff08ba0177c7e766e67..079a10bf96bc6d3deaf3f65262a37ed59d8fe287 100644
--- a/headers/close-source/CEA_WP
+++ b/headers/close-source/CEA_WP
@@ -1,9 +1,10 @@
This file is part of WP plug-in of Frama-C.
-Copyright (C) 2007-2018
- CEA (Commissariat a l'energie atomique et aux energies
+Copyright (C) 2007-2019
+ CEA (Commissariat a l'energie atomique et aux energies
alternatives)
All rights reserved.
Contact CEA LIST for licensing.
+
diff --git a/headers/headache.sh b/headers/headache.sh
index 4da5fb8b04fd05d32c10ca44bbe4cf3cc9213887..6231da5ef50c928990d2eceb54039d05879814db 100755
--- a/headers/headache.sh
+++ b/headers/headache.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/headers/header_spec.txt b/headers/header_spec.txt
index c2c4cf6bb470db1a420b4a3a2f7b6868dfc39c5a..45b46064305c574920d79983bd030dd041c8fcea 100644
--- a/headers/header_spec.txt
+++ b/headers/header_spec.txt
@@ -122,6 +122,7 @@ share/analysis-scripts/examples/example.mk: .ignore
share/analysis-scripts/examples/example-multi.mk: .ignore
share/analysis-scripts/examples/example-slevel.mk: .ignore
share/analysis-scripts/examples/Makefile: .ignore
+share/analysis-scripts/find_fun.py: .ignore
share/analysis-scripts/flamegraph.pl: CDDL
share/analysis-scripts/list_files.py: .ignore
share/analysis-scripts/parse-coverage.sh: .ignore
@@ -756,6 +757,10 @@ src/plugins/from/from_register_gui.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/from/from_register_gui.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/from/functionwise.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/from/functionwise.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/GSourceView2.ml.in: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/GSourceView2.mli.in: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/GSourceView3.ml.in: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/GSourceView3.mli.in: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/analyses_manager.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/analyses_manager.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/book_manager.ml: CEA_LGPL_OR_PROPRIETARY
@@ -764,10 +769,15 @@ src/plugins/gui/debug_manager.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/debug_manager.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/design.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/design.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/dgraph.ml.in: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/dgraph.mli.in: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/file_manager.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/file_manager.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/filetree.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/filetree.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/gtk_compat.mli: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/gtk_compat.2.ml: CEA_LGPL_OR_PROPRIETARY
+src/plugins/gui/gtk_compat.3.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/gtk_form.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/gtk_form.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/gui/gtk_helper.ml: CEA_LGPL_OR_PROPRIETARY
diff --git a/headers/open-source/ACSL_EL b/headers/open-source/ACSL_EL
index 9984ea26eef801b99be0c4f6907226321bb018aa..99fcded1099e2e97889204aeb4ba741d6e2be775 100644
--- a/headers/open-source/ACSL_EL
+++ b/headers/open-source/ACSL_EL
@@ -4,7 +4,7 @@ This file is part of Frama-C.
Copyright (C) 2008-2011
Pierre Roux
-Copyright (C) 2009-2018
+Copyright (C) 2009-2019
CEA LIST
you can redistribute it and/or modify it under the terms of the GNU
diff --git a/headers/open-source/AORAI_LGPL b/headers/open-source/AORAI_LGPL
index ddcbbf500594d273881958a13ffee1e56bd1302f..a37f43ed4dbcdcde1649a901b47d1448db0434a8 100644
--- a/headers/open-source/AORAI_LGPL
+++ b/headers/open-source/AORAI_LGPL
@@ -1,7 +1,7 @@
This file is part of Aorai plug-in of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
INRIA (Institut National de Recherche en Informatique et en
diff --git a/headers/open-source/CEA_INRIA_LGPL b/headers/open-source/CEA_INRIA_LGPL
index f71388de28872349b680152efd0418b1a7e49aa1..62bce5275ee7ad73c9f8b8b1ff70d75fd581e612 100644
--- a/headers/open-source/CEA_INRIA_LGPL
+++ b/headers/open-source/CEA_INRIA_LGPL
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
INRIA (Institut National de Recherche en Informatique et en
diff --git a/headers/open-source/CEA_LGPL b/headers/open-source/CEA_LGPL
index 236c12248780eadc45026e657f79dde38615ca27..87798be30e7cf28ebbd3b7c2365e95b7d2fad5a8 100644
--- a/headers/open-source/CEA_LGPL
+++ b/headers/open-source/CEA_LGPL
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
diff --git a/headers/open-source/CEA_LGPL_OR_PROPRIETARY b/headers/open-source/CEA_LGPL_OR_PROPRIETARY
index 236c12248780eadc45026e657f79dde38615ca27..87798be30e7cf28ebbd3b7c2365e95b7d2fad5a8 100644
--- a/headers/open-source/CEA_LGPL_OR_PROPRIETARY
+++ b/headers/open-source/CEA_LGPL_OR_PROPRIETARY
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
diff --git a/headers/open-source/CEA_PROPRIETARY b/headers/open-source/CEA_PROPRIETARY
index 39bb899ccc59fce71bc7639790fd77a509eb5ad3..d592caa19b9f4fcfa3ecf8db45b1b68e8affe87b 100644
--- a/headers/open-source/CEA_PROPRIETARY
+++ b/headers/open-source/CEA_PROPRIETARY
@@ -1,7 +1,7 @@
This file is part of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat à l'énergie atomique et aux énergies
alternatives)
diff --git a/headers/open-source/CEA_WP b/headers/open-source/CEA_WP
index d123eedfb80180cfe70da25005e9d7354f3add47..19e59e23132d118cb7decbf6b6db039011fee1fc 100644
--- a/headers/open-source/CEA_WP
+++ b/headers/open-source/CEA_WP
@@ -1,7 +1,7 @@
This file is part of WP plug-in of Frama-C.
-Copyright (C) 2007-2018
+Copyright (C) 2007-2019
CEA (Commissariat a l'energie atomique et aux energies
alternatives)
diff --git a/headers/updates-headers.sh b/headers/updates-headers.sh
index 24e1946995422ccdf6d83b41509e37e3ebdcb818..c026810335e87bb18ad896f4befb6de1af44eaad 100755
--- a/headers/updates-headers.sh
+++ b/headers/updates-headers.sh
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/man/frama-c.1 b/man/frama-c.1
index a6d2358f564f9634aba54f17efebc84c8bbb0015..8195efa760fefebbb1878eb745e3d32d4edca2a7 100644
--- a/man/frama-c.1
+++ b/man/frama-c.1
@@ -2,7 +2,7 @@
.\"
.\" This file is part of Frama-C.
.\"
-.\" Copyright (C) 2007-2018
+.\" Copyright (C) 2007-2019
.\" CEA (Commissariat à l'énergie atomique et aux énergies
.\" alternatives)
.\"
diff --git a/nix/default.nix b/nix/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3bc25269109649cda4fcd4975e348e46a170e8e7
--- /dev/null
+++ b/nix/default.nix
@@ -0,0 +1,238 @@
+# paramaterised derivation with dependencies injected (callPackage style)
+{ pkgs, stdenv, src ? ../., opam2nix, ocaml_version ? "ocaml-ng.ocamlPackages_4_05.ocaml", plugins ? { } }:
+
+let mk_buildInputs = { opamPackages ? [] } :
+ [ pkgs.gnugrep pkgs.gnused pkgs.autoconf pkgs.gnumake pkgs.gcc pkgs.ncurses pkgs.time pkgs.python3 pkgs.perl] ++ opam2nix.build {
+ specs = opam2nix.toSpecs ([ "ocamlfind" "zarith" "ocamlgraph"
+ { name = "coq"; constraint = "=8.7.2"; }
+ ] ++ opamPackages ++
+ (if ocaml_version == "pkgs.ocaml-ng.ocamlPackages_4_02.ocaml"
+ then [ { name = "ocamlbuild" ; constraint = "=0"; } ] else [])
+ );
+ ocamlAttr = ocaml_version;
+ };
+
+in
+
+rec {
+ inherit src;
+ buildInputs = mk_buildInputs {};
+ installed = main.out;
+ main = stdenv.mkDerivation {
+ name = "frama-c";
+ inherit src buildInputs;
+ outputs = [ "out" "build_dir" ];
+ postPatch = ''
+ patchShebangs .
+ '';
+ configurePhase = ''
+ unset CC
+ autoconf
+ ./configure --prefix=$out
+ '';
+ buildPhase = ''
+ make -j 4
+ '';
+ installPhase = ''
+ make install
+ mkdir -p $build_dir
+ tar -cf $build_dir/dir.tar .
+ pwd > $build_dir/old_pwd
+ '';
+ setupHook = pkgs.writeText "setupHook.sh" ''
+ addFramaCPath () {
+ if test -d "''$1/lib/frama-c/plugins"; then
+ export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
+ export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
+ fi
+
+ if test -d "''$1/lib/frama-c"; then
+ export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/frama-c"
+ fi
+
+ if test -d "''$1/share/frama-c/"; then
+ export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
+ fi
+
+ }
+
+ addEnvHooks "$targetOffset" addFramaCPath
+ '';
+ };
+
+ lint = stdenv.mkDerivation {
+ name = "frama-c-lint";
+ inherit src;
+ buildInputs = (mk_buildInputs {opamPackages = [ "ocp-indent" ];} ) ++ [ pkgs.bc plugins.headache.installed pkgs.file ];
+ outputs = [ "out" ];
+ postPatch = ''
+ patchShebangs .
+ '';
+ configurePhase = ''
+ unset CC
+ autoconf
+ ./configure --prefix=$out
+ '';
+ buildPhase = ''
+ make lint
+ make stats-lint
+ make check-headers
+ '';
+ installPhase = ''
+ true
+ '';
+ };
+
+ tests = stdenv.mkDerivation {
+ name = "frama-c-test";
+ inherit buildInputs;
+ build_dir = main.build_dir;
+ src = main.build_dir + "/dir.tar";
+ sourceRoot = ".";
+ postUnpack = ''
+ find . \( -name "Makefile*" -or -name ".depend" -o -name "ptests_config" -o -name "config.status" \) -exec bash -c "t=\$(stat -c %y \"\$0\"); sed -i -e \"s&$(cat $build_dir/old_pwd)&$(pwd)&g\" \"\$0\"; touch -d \"\$t\" \"\$0\"" {} \;
+ '';
+ configurePhase = ''
+ true
+ '';
+ buildPhase = ''
+ make clean_share_link
+ make create_share_link
+ make tests -j4 PTESTS_OPTS="-error-code -j 4"
+ '';
+ installPhase = ''
+ true
+ '';
+ };
+
+ distrib = stdenv.mkDerivation {
+ name = "frama-c-distrib";
+ inherit src;
+ buildInputs = buildInputs ++ [ plugins.headache.installed ];
+ postPatch = ''
+ patchShebangs .
+ '';
+ configurePhase = ''
+ unset CC
+ autoconf
+ ./configure --prefix=$out
+ '';
+ buildPhase = ''
+ make DISTRIB="frama-c-archive" src-distrib
+ '';
+ installPhase = ''
+ tar -C $out --strip-components=1 -xf frama-c-archive.tar.gz
+ '';
+ };
+
+ tests-distrib = stdenv.mkDerivation {
+ name = "frama-c-tests-distrib";
+ inherit distrib buildInputs;
+ outputs = [ "out" "build_dir" ];
+ configurePhase = ''
+ unset CC
+ autoconf
+ ./configure --prefix=$out
+ '';
+ buildPhase = ''
+ make -j 4
+ make tests -j4 PTESTS_OPTS="-error-code -j 4"
+ '';
+ installPhase = ''
+ make install
+ '';
+ };
+
+ wp-qualif = stdenv.mkDerivation {
+ name = "frama-c-wp-qualif";
+ buildInputs = mk_buildInputs { opamPackages = [
+ { name = "alt-ergo"; constraint = "=2.0.0"; }
+ { name = "why3" ; constraint = "=0.88.3"; }
+ ]; };
+ build_dir = main.build_dir;
+ src = main.build_dir + "/dir.tar";
+ sourceRoot = ".";
+ postUnpack = ''
+ find . \( -name "Makefile*" -or -name ".depend" -o -name "ptests_config" -o -name "config.status" \) -exec bash -c "t=\$(stat -c %y \"\$0\"); sed -i -e \"s&$(cat $build_dir/old_pwd)&$(pwd)&g\" \"\$0\"; touch -d \"\$t\" \"\$0\"" {} \;
+ '';
+ configurePhase = ''
+ true
+ '';
+ buildPhase = ''
+ make clean_share_link
+ make create_share_link
+ mkdir home
+ HOME=$(pwd)/home
+ why3 config
+ bin/ptests.opt -error-code -config qualif src/plugins/wp/tests
+ '';
+ installPhase = ''
+ true
+ '';
+ };
+
+ internal = stdenv.mkDerivation {
+ name = "frama-c-internal";
+ inherit src;
+ buildInputs = (mk_buildInputs { opamPackages = [ "xml-light" ];} ) ++
+ [ pkgs.getopt pkgs.which
+ pkgs.libxslt pkgs.libxml2 pkgs.file pkgs.autoPatchelfHook stdenv.cc.cc.lib
+ ];
+ counter_examples_src = plugins.counter-examples.src;
+ genassigns_src = plugins.genassigns.src;
+ pathcrawler_src = plugins.pathcrawler.src;
+ mthread_src = plugins.mthread.src;
+ caveat_importer_src = plugins.caveat-importer.src;
+ acsl_importer_src = plugins.acsl-importer.src;
+ volatile_src = plugins.volatile.src;
+ e_acsl_src = plugins.e-acsl.src;
+ security_src = plugins.security.src;
+ context_from_precondition_src = plugins.context-from-precondition.src;
+ postPatch = ''
+ patchShebangs .
+ '';
+ postUnpack = ''
+ cp -r --preserve=mode "$counter_examples_src" "$sourceRoot/src/plugins/counter-examples"
+ chmod -R u+w -- "$sourceRoot/src/plugins/counter-examples"
+ cp -r --preserve=mode "$genassigns_src" "$sourceRoot/src/plugins/genassigns"
+ chmod -R u+w -- "$sourceRoot/src/plugins/genassigns"
+ cp -r --preserve=mode "$pathcrawler_src" "$sourceRoot/src/plugins/pathcrawler"
+ chmod -R u+w -- "$sourceRoot/src/plugins/pathcrawler"
+ cp -r --preserve=mode "$mthread_src" "$sourceRoot/src/plugins/mthread"
+ chmod -R u+w -- "$sourceRoot/src/plugins/mthread"
+ cp -r --preserve=mode "$caveat_importer_src" "$sourceRoot/src/plugins/caveat-importer"
+ chmod -R u+w -- "$sourceRoot/src/plugins/caveat-importer"
+ cp -r --preserve=mode "$volatile_src" "$sourceRoot/src/plugins/volatile"
+ chmod -R u+w -- "$sourceRoot/src/plugins/volatile"
+ cp -r --preserve=mode "$acsl_importer_src" "$sourceRoot/src/plugins/acsl-importer"
+ chmod -R u+w -- "$sourceRoot/src/plugins/acsl-importer"
+ cp -r --preserve=mode "$e_acsl_src" "$sourceRoot/src/plugins/e-acsl"
+ chmod -R u+w -- "$sourceRoot/src/plugins/e-acsl"
+ echo IN_FRAMA_CI=yes > "$sourceRoot/in_frama_ci"
+ cp -r --preserve=mode "$context_from_precondition_src" "$sourceRoot/src/plugins/context-from-precondition"
+ chmod -R u+w -- "$sourceRoot/src/plugins/context-from-precondition"
+ cp -r --preserve=mode "$security_src" "$sourceRoot/src/plugins/security"
+ chmod -R u+w -- "$sourceRoot/src/plugins/security"
+ '';
+
+ configurePhase = ''
+ unset CC
+ autoconf
+ ./configure --prefix=$out
+ '';
+ buildPhase = ''
+ make unpack-eclipse
+ sed -i src/plugins/pathcrawler/extern/eclipseCLP/RUNME -e "s/chmod 2755/chmod 755/g"
+ rm src/plugins/pathcrawler/extern/eclipseCLP/lib/x86_64_linux/dbi_mysql.so
+ rm src/plugins/pathcrawler/extern/eclipseCLP/lib/x86_64_linux/ic.so
+ prefix="src/plugins/pathcrawler" autoPatchelf
+ make -j 4
+ ln -sr src/plugins/pathcrawler/share share/pc
+ make tests -j4 PTESTS_OPTS="-error-code -j 4"
+ '';
+ installPhase = ''
+ make install
+ '';
+ };
+
+}
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/bitwise2.err.oracle b/nix/empty
similarity index 100%
rename from src/plugins/wp/tests/wp_acsl/oracle/bitwise2.err.oracle
rename to nix/empty
diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e26a55d0f058b25b43d59ddd40a3656c951ef440
--- /dev/null
+++ b/nix/frama-ci.nix
@@ -0,0 +1,15 @@
+#To copy in other repository
+{ pkgs ? import <nixpkgs> {}, password}:
+
+let
+ src = builtins.fetchGit {
+ "url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
+ "name" = "Frama-CI";
+ "rev" = "70045f4252e668e0facad12d7db2c6ab83fc813b";
+ "ref" = "master";
+ };
+ in
+ {
+ src = src;
+ compiled = pkgs.callPackage "${src}/compile.nix" { inherit pkgs; };
+ }
diff --git a/nix/frama-ci.sh b/nix/frama-ci.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b4a69f90154968218273a70d50be6173a2909841
--- /dev/null
+++ b/nix/frama-ci.sh
@@ -0,0 +1,12 @@
+#!/bin/sh -eu
+
+DIR=$(dirname $0)
+
+export FRAMA_CI_NIX=$DIR/frama-ci.nix
+
+export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixpkgs> {}).callPackage $FRAMA_CI_NIX { password = \"$TOKEN_FOR_API\";}).src.outPath")
+
+FRAMA_CI=${FRAMA_CI#\"}
+FRAMA_CI=${FRAMA_CI%\"}
+
+$FRAMA_CI/compile.sh $@
diff --git a/ptests/ptests.ml b/ptests/ptests.ml
index 05cb9f5a57aecfc8eeaa3d4d2c3bc4ffb8a6338e..ef9497abebbceba829913c2c4cf56847fd4b08ca 100644
--- a/ptests/ptests.ml
+++ b/ptests/ptests.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/share/META.frama-c b/share/META.frama-c
new file mode 100644
index 0000000000000000000000000000000000000000..be05739fdfee70b426d186932e71a06352db62e4
--- /dev/null
+++ b/share/META.frama-c
@@ -0,0 +1,16 @@
+description="frama-c"
+version=""
+requires=""
+
+package "kernel" (
+ description="The kernel library of frama-c"
+ version=""
+ requires="@REQUIRES"
+ archive(byte) = "frama-c.cma"
+ plugin(byte) = "frama-c.cma"
+ archive(native) = "frama-c.cmxa"
+ plugin(native) = "frama-c.cmxs"
+ directory=""
+)
+
+directory=""
diff --git a/share/Makefile.clean b/share/Makefile.clean
index 753e556ed8abc977081fd4d0df9745f16dcfa422..be4c0133cbdf239af6c1c3f19a59814226ebd651 100644
--- a/share/Makefile.clean
+++ b/share/Makefile.clean
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/Makefile.common b/share/Makefile.common
index d5061d699d1e11bbf51cdf910d717accfd93eccd..d89db19e691bc8da319a60cca8a8cab6e476ad3a 100644
--- a/share/Makefile.common
+++ b/share/Makefile.common
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/Makefile.config.in b/share/Makefile.config.in
index 993b677842a1f90c021bf18d911c88be1b97448a..9d321679ed94e0bd3c09e788c50172408cd44421 100644
--- a/share/Makefile.config.in
+++ b/share/Makefile.config.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -38,10 +38,10 @@ prefix ?=@prefix@
exec_prefix ?=@exec_prefix@
datarootdir ?=@datarootdir@
datadir ?=@datadir@
-BINDIR ?="$(DESTDIR)@bindir@"
-LIBDIR ?="$(DESTDIR)@libdir@"
-DATADIR ?="$(DESTDIR)@datarootdir@"
-MANDIR ?="$(DESTDIR)@mandir@"
+BINDIR ?=$(DESTDIR)@bindir@
+LIBDIR ?=$(DESTDIR)@libdir@
+DATADIR ?=$(DESTDIR)@datarootdir@
+MANDIR ?=$(DESTDIR)@mandir@
FRAMAC_LIBDIR ?=$(LIBDIR)/frama-c
FRAMAC_PLUGINDIR ?=$(FRAMAC_LIBDIR)/plugins
@@ -65,6 +65,8 @@ OCAMLDEP ?=@OCAMLDEP@ -slash
OCAMLLEX ?=@OCAMLLEX@
OCAMLYACC ?=@OCAMLYACC@
OCAMLMKTOP ?=@OCAMLMKTOP@
+OCAMLMKLIB ?=@OCAMLFIND@ ocamlmklib
+OCAMLFIND ?=@OCAMLFIND@
OCAMLDOC ?=@OCAMLDOC@
OCAMLCP ?=@OCAMLCP@
@@ -102,10 +104,13 @@ DEVELOPMENT ?=@DEVELOPMENT@
HAS_LABLGTK ?=@HAS_LABLGTK@
HAS_LABLGTK_CUSTOM_MODEL ?=@HAS_LABLGTK@
LABLGTK_PATH ?=@LABLGTK_PATH@
-
+LABLGTK ?= lablgtk@LABLGTK_VERSION@
# lablgtksourceview
HAS_GTKSOURCEVIEW ?=@HAS_GTKSOURCEVIEW@
+GTKSOURCEVIEW:=\
+ $(patsubst lablgtk%,$(LABLGTK).%,$(basename $(notdir @GTKSOURCEVIEW@)))
+
# lablgnomecanvas
HAS_GNOMECANVAS ?=@HAS_GNOMECANVAS@
@@ -190,7 +195,10 @@ LIBRARY_NAMES += yojson
endif
ifneq ($(ENABLE_GUI),no)
-LIBRARY_NAMES_GUI = lablgtk2 lablgtk2.gnomecanvas lablgtk2.sourceview2
+ LIBRARY_NAMES_GUI = $(LABLGTK) $(GTKSOURCEVIEW)
+ ifeq ($(HAS_GNOMECANVAS),yes)
+ LIBRARY_NAMES_GUI+=lablgtk2.gnomecanvas
+ endif
else
LIBRARY_NAMES_GUI =
endif
diff --git a/share/Makefile.dynamic b/share/Makefile.dynamic
index ab4f3647d3332669b6ba0eb414654b49d27ef231..4ebe6147bc6d2b7b10b77c5c0c9e035d93765a01 100644
--- a/share/Makefile.dynamic
+++ b/share/Makefile.dynamic
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -46,6 +46,7 @@ ifeq ($(FRAMAC_INTERNAL),yes)
PLUGIN_RESET :=yes
else
+
# The plugin is compiled from an installed frama-c
PLUGIN_RESET :=no
include $(MAKECONFIG_DIR)/Makefile.common
@@ -186,11 +187,11 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
TARGETS := $(TARGET_META) $(TARGET_CMI)
TARGETS_TOP := $(TARGET_TOP_CMO) $(TARGET_TOP_CMX) \
- $(TARGET_TOP_CMA) $(TARGET_TOP_CMXS)
+ $(TARGET_TOP_CMA) $(TARGET_TOP_CMXS) $(TARGET_TOP_O)
TARGETS_GUI_BYTE := $(TARGET_GUI_CMI) $(TARGET_GUI_CMO)
-TARGETS_GUI := $(TARGETS_GUI_BYTE) $(TARGET_GUI_CMX) $(TARGET_GUI_CMXS)
+TARGETS_GUI := $(TARGETS_GUI_BYTE) $(TARGET_GUI_CMX) $(TARGET_GUI_CMXS) $(TARGET_GUI_O)
TARGETS_BYTE:= $(TARGET_META) $(TARGET_CMI) $(TARGET_TOP_CMO) $(TARGET_TOP_CMA)
-TARGETS_OPT:= $(TARGET_META) $(TARGET_CMI) $(TARGET_TOP_CMX) $(TARGET_TOP_CMXS)
+TARGETS_OPT:= $(TARGET_META) $(TARGET_CMI) $(TARGET_TOP_CMX) $(TARGET_TOP_CMXS) $(TARGET_TOP_O)
byte:: $(TARGETS_BYTE)
opt:: $(TARGETS_OPT)
@@ -247,14 +248,24 @@ endif # PLUGIN_ENABLE <> no
# Merlin #
##########
-.PHONY: merlin_plugin
-merlin_plugin::
- echo "B $(FRAMAC_LIBDIR)" > .merlin
+.PHONY: create_merlin
+create_merlin:
+#create Merlin file for external plug-in
+ $(PRINT_MAKING) .merlin
+ echo "FLG -c $(FLAGS) $(FRAMAC_USER_MERLIN_FLAGS)" > .merlin
+ echo "B $(FRAMAC_LIBDIR)" >> .merlin
echo "B $(FRAMAC_LIBDIR)/plugins" >> .merlin
echo "B $(FRAMAC_LIBDIR)/plugins/gui" >> .merlin
- echo "PKG ocamlgraph" >> .merlin
- echo "PKG zarith" >> .merlin
- echo "PKG lablgtk2" >> .merlin
+ for PKG in $(LIBRARY_NAMES); do echo PKG $$PKG >> .merlin; done
+ for PKG in $(LIBRARY_NAMES_GUI); do echo PKG $$PKG >> .merlin; done
+ for PKG in $(MERLIN_PACKAGES); do echo PKG $$PKG >> .merlin; done
+ for DIR in $(patsubst %/,%,$(sort $(dir $(PLUGIN_ML_SRC) $(PLUGIN_TESTS_LIB)))); do echo S $$DIR>> .merlin; echo B $$DIR >> .merlin; done
+
+# To allow completion of .merlin file
+.PHONY: merlin
+merlin:: create_merlin
+
+.merlin: merlin
############
# Cleaning #
diff --git a/share/Makefile.dynamic_config.external b/share/Makefile.dynamic_config.external
index 30f7f68761412daa0e71c005e97d382021a496bc..e76a1aa89899864ff5f1c29830e04a997b0f855c 100644
--- a/share/Makefile.dynamic_config.external
+++ b/share/Makefile.dynamic_config.external
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -29,13 +29,16 @@ export FRAMAC_INCLUDES=-I "$(FRAMAC_LIBDIR)"
export PTESTS=$(BINDIR)/ptests.$(PTESTSBEST)$(EXE)
-export FRAMAC_LIB="$(FRAMAC_LIBDIR)"
+export FRAMAC_LIB=$(FRAMAC_LIBDIR)
export DOC_DIR=$(FRAMAC_SHARE)/doc/code
export PLUGIN_LIB_DIR=$(PLUGIN_DIR)
export FRAMAC_COMPILED_PLUGINDIR=$(FRAMAC_LIBDIR)/plugins
+export OCAMLPATH:=$(FRAMAC_LIB):$(FRAMAC_PLUGINDIR)$(if $(OCAMLPATH),:,)$(OCAMLPATH)
+export OCAMLFIND_IGNORE_DUPS_IN:=$(FRAMAC_LIB):$(FRAMAC_PLUGINDIR)$(if $(OCAMLFIND_IGNORE_DUPS_IN),:,)$(OCAMLFIND_IGNORE_DUPS_IN)
+
# fake target corresponding to the clean-install of Frama-C's Makefile
.PHONY: clean-install
clean-install: ;
diff --git a/share/Makefile.dynamic_config.internal b/share/Makefile.dynamic_config.internal
index a836f0ab98c5db3ca1986dad79435c3f076fb26c..6c50e7bba80c9ccea20a91c6c08111c773703ba3 100644
--- a/share/Makefile.dynamic_config.internal
+++ b/share/Makefile.dynamic_config.internal
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -36,6 +36,9 @@ export PLUGIN_LIB_DIR=$(FRAMAC_ROOT_SRCDIR)/lib/plugins
export FRAMAC_COMPILED_PLUGINDIR=$(FRAMAC_ROOT_SRCDIR)/lib/plugins
+export OCAMLPATH:=$(FRAMAC_LIB):$(PLUGIN_LIB_DIR)$(if $(OCAMLPATH),:,)$(OCAMLPATH)
+export OCAMLFIND_IGNORE_DUPS_IN:=$(FRAMAC_LIB):$(PLUGIN_LIB_DIR)$(if $(OCAMLFIND_IGNORE_DUPS_IN),:,)$(OCAMLFIND_IGNORE_DUPS_IN)
+
##########################################################################
# Local Variables:
# mode: makefile
diff --git a/share/Makefile.generic b/share/Makefile.generic
index e201cab8cdc66454a8afaf51ba15c0825ce4f6a6..77074035606542c0cbb8638f9660d4ccc8c46b3f 100644
--- a/share/Makefile.generic
+++ b/share/Makefile.generic
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/Makefile.plugin.template b/share/Makefile.plugin.template
index c8ef9b1bacc6ab6cea339f96e2c9e6fa24f8d5ee..df7931022fe0916c4305b2b531a9c302032d2a14 100644
--- a/share/Makefile.plugin.template
+++ b/share/Makefile.plugin.template
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -183,18 +183,26 @@ PLUGIN_RESET?=yes # Set it to no in order to NOT reset plug-in variable.
#
###############################################################################
+
+DEPEND_PKG := $(addprefix frama-c-, $(shell echo $(PLUGIN_DEPENDENCIES) | tr '[:upper:]' '[:lower:]'))
+
# Where the other plug-ins to load are already installed
ifeq ($(FRAMAC_INTERNAL),yes)
INSTALLED_PLUGIN_DIR:=$(FRAMAC_ROOT_SRCDIR)/lib/plugins
# Also inform the main Makefile that there's another plug-in to be
# considered
PLUGIN_LIST+=$(PLUGIN_DIR)/@PLUGIN_NAME@
+PLUGIN_PACKAGES:=$(PLUGIN_REQUIRES)
+
else
INSTALLED_PLUGIN_DIR:=$(PLUGIN_INSTALL_DIR)
+PLUGIN_PACKAGES:=$(PLUGIN_REQUIRES) $(DEPEND_PKG)
endif
+PLUGIN_REQUIRES += $(DEPEND_PKG)
+
# The plugin types .cm* files
PLUGIN_TYPES_CMO:=$(addsuffix .cmo,$(PLUGIN_TYPES_CMO))
PLUGIN_TYPES_CMX:=$(PLUGIN_TYPES_CMO:.cmo=.cmx)
@@ -213,6 +221,8 @@ $(notdir $(patsubst %/,%,$(PLUGIN_DIR)))))
PLUGIN_DEPENDS:=$(PLUGIN_DEPENDS) $(PLUGIN_DEPENDENCIES)
+
+
################
# ml sources #
################
@@ -389,6 +399,8 @@ endif
# Some meta-variables for compilation flags
NAME_BFLAGS :=@PLUGIN_NAME@_BFLAGS
NAME_OFLAGS :=@PLUGIN_NAME@_OFLAGS
+NAME_TEST_BFLAGS :=@PLUGIN_NAME@_TEST_BFLAGS
+NAME_TEST_OFLAGS :=@PLUGIN_NAME@_TEST_OFLAGS
TARGET_OFLAGS :=@PLUGIN_NAME@_TARGET_OFLAGS
TARGET_BFLAGS :=@PLUGIN_NAME@_TARGET_BFLAGS
ifeq ($(HAS_GUI),yes)
@@ -424,12 +436,16 @@ endif
PLUGIN_EXTRA_DIRS_INC:=$(patsubst %,-I $(PLUGIN_DIR)/% ,$(PLUGIN_EXTRA_DIRS))
# Set the compilation flags for the plugin
-INCLUDE_FLAGS:=-I $(PLUGIN_DIR) -I $(INSTALLED_PLUGIN_DIR) \
- $(PLUGIN_EXTRA_DIRS_INC) \
- $(addprefix -package ,$(PLUGIN_REQUIRES) $(LIBRARY_NAMES))
-
+INCLUDE_EXT_FLAGS:=-I $(INSTALLED_PLUGIN_DIR) \
+ $(addprefix -package ,$(PLUGIN_PACKAGES) $(LIBRARY_NAMES))
+INCLUDE_FLAGS:=-I $(PLUGIN_DIR) $(PLUGIN_EXTRA_DIRS_INC) $(INCLUDE_EXT_FLAGS)
$(NAME_BFLAGS):=$(BFLAGS) $(INCLUDE_FLAGS) $(PLUGIN_BFLAGS)
$(NAME_OFLAGS):=$(OFLAGS) $(INCLUDE_FLAGS) $(PLUGIN_OFLAGS)
+# DO NOT include the plugin's own directory as search path for compiling
+# ml test scripts: they will be loaded in a separate phase, and will only see
+# the plugin through its static API
+$(NAME_TEST_BFLAGS):= $(BFLAGS) $(INCLUDE_EXT_FLAGS) $(PLUGIN_BFLAGS)
+$(NAME_TEST_OFLAGS):= $(OFLAGS) $(INCLUDE_EXT_FLAGS) $(PLUGIN_OFLAGS)
$(TARGET_BFLAGS):= $(PLUGIN_LINK_BFLAGS)
$(TARGET_OFLAGS):= $(PLUGIN_LINK_OFLAGS)
@@ -459,9 +475,8 @@ endif
# META file
PLUGIN_PKG :=$(shell echo frama-c-@PLUGIN_NAME@ | tr '[:upper:]' '[:lower:]')
-DEPEND_PKG :=$(shell echo $(PLUGIN_DEPENDENCIES) | tr '[:upper:]' '[:lower:]')
-PLUGIN_REQUIRES += $(addprefix frama-c-,$(DEPEND_PKG))
TARGET_META :=$(PLUGIN_LIB_DIR)/META.$(PLUGIN_PKG)
+PLUGIN_GENERATED+= $(TARGET_META)
ifneq ($(PLUGIN_HAS_META),yes)
# generated META
@@ -510,7 +525,7 @@ $(TARGET_META):
$(RM) $@
$(ECHO) "description = \"$($(notdir $@).DESCRIPTION)\"" >> $@
$(ECHO) "version = \"$($(notdir $@).VERSION)\"" >> $@
- $(ECHO) "requires = \"$($(notdir $@).REQUIRES)\"" >> $@
+ $(ECHO) "requires = \"frama-c.kernel $($(notdir $@).REQUIRES)\"" >> $@
$(ECHO) "archive(byte) = \"top/$($(notdir $@).BYTE)\"" >> $@
$(ECHO) "archive(native) = \"top/$($(notdir $@).NATIVE)\"" >> $@
$(ECHO) "plugin(native) = \"top/$($(notdir $@).PLUGIN)\"" >> $@
@@ -854,9 +869,9 @@ endif
@PLUGIN_NAME@_TESTS_LIB_OPT_DYN:=$(PLUGIN_TESTS_LIB:%.ml=%.cmxs)
@PLUGIN_NAME@_TESTS_LIB_BYTE:=$(PLUGIN_TESTS_LIB:%.ml=%.cmo)
-$(@PLUGIN_NAME@_TESTS_LIB_OPT): OFLAGS:=$($(NAME_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
-$(@PLUGIN_NAME@_TESTS_LIB_OPT_DYN): OFLAGS:=$($(NAME_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
-$(@PLUGIN_NAME@_TESTS_LIB_BYTE): BFLAGS:=$($(NAME_BFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
+$(@PLUGIN_NAME@_TESTS_LIB_OPT): OFLAGS:=$($(NAME_TEST_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
+$(@PLUGIN_NAME@_TESTS_LIB_OPT_DYN): OFLAGS:=$($(NAME_TEST_OFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
+$(@PLUGIN_NAME@_TESTS_LIB_BYTE): BFLAGS:=$($(NAME_TEST_BFLAGS)) $(@PLUGIN_NAME@_TESTS_LIB_DIR_INCLUDE)
# [JS 2009/03/18] both .PRECIOUS are required in order to prevent 'make'
# deletion of intermediate generated files. Such a deletion forces 'make' to
@@ -981,7 +996,7 @@ endif #EXTRA_BYTE
endif #HAS_GUI
PLUGIN_DYN_DEP_GUI_CMX_LIST += $(PLUGIN_GUI_CMX)
-PLUGIN_DYN_CMX_LIST += $(TARGET_TOP_CMXS) $(TARGET_TOP_CMX)
+PLUGIN_DYN_CMX_LIST += $(TARGET_TOP_CMXS) $(TARGET_TOP_CMX) $(TARGET_TOP_O)
# If P1 depends on P2, then dynamically link P1.cmxs requires to have
# compiled P1's sources wrt the P2's .cmx.
ifeq ($(HAS_GUI),yes)
diff --git a/share/_frama-c b/share/_frama-c
index 174f99374715734bc27c9a91349c84e4ea637928..f4250a0323691b1e0d11d0c84aabc0b543f581b8 100644
--- a/share/_frama-c
+++ b/share/_frama-c
@@ -3,7 +3,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/analysis-scripts/find_fun.py b/share/analysis-scripts/find_fun.py
new file mode 100755
index 0000000000000000000000000000000000000000..8451cdf13022196d665f0b3a24cc120f6524debe
--- /dev/null
+++ b/share/analysis-scripts/find_fun.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+#-*- coding: utf-8 -*-
+##########################################################################
+# #
+# This file is part of Frama-C. #
+# #
+# Copyright (C) 2007-2018 #
+# CEA (Commissariat à l'énergie atomique et aux énergies #
+# alternatives) #
+# #
+# you can redistribute it and/or modify it under the terms of the GNU #
+# Lesser General Public License as published by the Free Software #
+# Foundation, version 2.1. #
+# #
+# It is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU Lesser General Public License for more details. #
+# #
+# See the GNU Lesser General Public License version 2.1 #
+# for more details (enclosed in the file licenses/LGPLv2.1). #
+# #
+##########################################################################
+
+# This script finds files containing likely declarations and definitions
+# for a given function name, via heuristic syntactic matching.
+
+import sys
+import os
+import re
+import glob
+
+debug = False
+
+arg = ""
+if len(sys.argv) < 2:
+ print("usage: %s fname [dir1 dir2 ...]" % sys.argv[0])
+ print(" looks for likely declarations/definitions of function fname")
+ print(" in files with extensions '.c', '.h' and '.i';")
+ print(" if dir1, dir2, etc, are specified, looks inside them,")
+ print(" otherwise looks inside PWD and /usr/include.")
+ print(" Subdirectories are always considered recursively.")
+ sys.exit(1)
+else:
+ fname = sys.argv[1]
+ if re.match('[a-zA-Z_][a-zA-Z0-9_]*$', fname) == None:
+ print("error: function name contains invalid characters: %s" % fname)
+ print(" (only letters/digits/underscore allowed)")
+ sys.exit(1)
+
+dirs = set()
+if len(sys.argv) < 3:
+ pwd = os.getcwd()
+ dirs = [pwd, "/usr/include"]
+else:
+ dirs = set(sys.argv[2:])
+
+if debug:
+ print("Looking for files in dirs (and their subdirs): %s" % dirs)
+
+files = []
+for d in dirs:
+ files += glob.glob(d + "/**/*.[ich]", recursive=True)
+
+print("Looking for '%s' inside %d file(s)..." % (fname, len(files)))
+#print("\n".join(files))
+
+# To minimize the amount of false positives, we try to match the following:
+# - the line must begin with a C identifier (declarations and definitions in C
+# rarely start with spaces in the line), or with the function name itself
+# (supposing the return type is in the previous line)
+# - any number of identifiers are allowed (to allow for 'struct', 'volatile',
+# 'extern', etc)
+# - asterisks are allowed both before and after identifiers, except for the
+# first one (to allow for 'char *', 'struct **ptr', etc)
+# - identifiers are allowed after the parentheses, to allow for some macros/
+# modifiers
+
+possible_declarators = []
+possible_definers = []
+c_identifier = "[a-zA-Z_][a-zA-Z0-9_]*"
+c_id_maybe_pointer = c_identifier + "\**"
+type_prefix = c_id_maybe_pointer + "(?:\s+\**" + c_id_maybe_pointer + ")*\s+\**"
+parentheses_suffix = "\s*\([^)]*\)"
+re_fun = re.compile("^(?:" + type_prefix + "\s*)?" + fname + parentheses_suffix
+ + "\s*(?:" + c_identifier + ")?\s*(;|{)", flags=re.MULTILINE)
+for f in files:
+ with open(f, encoding="ascii", errors='ignore') as content_file:
+ content = content_file.read()
+ has_decl_or_def = re_fun.search(content)
+ if has_decl_or_def is not None:
+ is_decl = has_decl_or_def.group(1) == ";"
+ if is_decl:
+ possible_declarators.append(f)
+ else:
+ possible_definers.append(f)
+
+if possible_declarators == [] and possible_definers == []:
+ print("No declaration/definition found for function '%s'" % fname)
+else:
+ if possible_declarators != []:
+ print("Possible declarations for function '%s' in the following file(s):"
+ % fname)
+ print(" " + "\n ".join(possible_declarators))
+ if possible_definers != []:
+ print("Possible definitions for function '%s' in the following file(s):"
+ % fname)
+ print(" " + "\n ".join(possible_definers))
diff --git a/share/analysis-scripts/frama-c.mk b/share/analysis-scripts/frama-c.mk
index cd3ae313ebb1a181c8e13e5d38be02cfeec0bdb4..6f0ec68c482eabf8234d60eefabfeecb41fae351 100644
--- a/share/analysis-scripts/frama-c.mk
+++ b/share/analysis-scripts/frama-c.mk
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
@@ -205,7 +205,8 @@ SHELL := /bin/bash
printf 'timestamp=%q\n' "$(HR_TIMESTAMP)";
printf 'warnings=%s\n' "`cat $@/warnings.log | grep ':\[\(eva\|kernel\|from\)\]' | wc -l`";
printf 'alarms=%s\n' "`expr $$(cat $@/alarms.csv | wc -l) - 1`";
- printf 'cmd_args=%q\n' "$(subst ",\",$(wordlist 2,999,$(EVA)))"
+ printf 'cmd_args=%q\n' "$(subst ",\",$(wordlist 2,999,$(EVA)))";
+ printf 'benchmark_tag=%s' "$(BENCHMARK)"
} >> $@/stats.txt
if [ ! -z $${FLAMEGRAPH+x} ]; then
NOGUI=1 $(FRAMAC_SCRIPT) flamegraph $@/flamegraph.txt $@/
diff --git a/share/autocomplete_frama-c b/share/autocomplete_frama-c
index 48c443678930fe24f94202eba7f89cf4ef66bb9c..5cbbb141a6459cc27bfd78000361c1a38696dfc9 100644
--- a/share/autocomplete_frama-c
+++ b/share/autocomplete_frama-c
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/builtin.h b/share/builtin.h
index c9bf927fc124e0b35560cf2375c2dfc50f7189c9..ce5a87c749ac48d97c08d08e670a65d6fc8cd228 100644
--- a/share/builtin.h
+++ b/share/builtin.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/configure.ac b/share/configure.ac
index 31403990467e09d84b60cfe4668b79f5b84cf7fe..1ea8d54d0ee906608bb404a4eaa5e4d11a9210e9 100644
--- a/share/configure.ac
+++ b/share/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/emacs/acsl.el b/share/emacs/acsl.el
index 97650d0a5aec38e40676fe7cd41767cb29b9f68e..34f21d2ffed344fc2cbdb0013db2460c2ce22518 100644
--- a/share/emacs/acsl.el
+++ b/share/emacs/acsl.el
@@ -5,7 +5,7 @@
; Copyright (C) 2008-2011 ;
; Pierre Roux ;
; ;
-; Copyright (C) 2009-2018 ;
+; Copyright (C) 2009-2019 ;
; CEA LIST ;
; ;
; you can redistribute it and/or modify it under the terms of the GNU ;
diff --git a/share/emacs/frama-c-dev.el b/share/emacs/frama-c-dev.el
index dcd7722f9fd5e6ee057d15d9d9b09d73de54411c..87fca32f0e6a89f9176beb2895ffaf071006ee80 100644
--- a/share/emacs/frama-c-dev.el
+++ b/share/emacs/frama-c-dev.el
@@ -2,7 +2,7 @@
; ;
; This file is part of Frama-C. ;
; ;
-; Copyright (C) 2007-2018 ;
+; Copyright (C) 2007-2019 ;
; CEA (Commissariat à l'énergie atomique et aux énergies ;
; alternatives) ;
; ;
diff --git a/share/emacs/frama-c-init.el b/share/emacs/frama-c-init.el
index 64a90eb2c1bf5272273136ce5e368023b7aff3c8..b6f7e5989a7528061eb4055e60c5f28b13759aab 100644
--- a/share/emacs/frama-c-init.el
+++ b/share/emacs/frama-c-init.el
@@ -2,7 +2,7 @@
; ;
; This file is part of Frama-C. ;
; ;
-; Copyright (C) 2007-2018 ;
+; Copyright (C) 2007-2019 ;
; CEA (Commissariat à l'énergie atomique et aux énergies ;
; alternatives) ;
; ;
diff --git a/share/emacs/frama-c-recommended.el b/share/emacs/frama-c-recommended.el
index 383fe533edf51e6f4cd0777224c0368265526bc3..88426743b6308b0d55a5f7d39a06cbe60caa671f 100644
--- a/share/emacs/frama-c-recommended.el
+++ b/share/emacs/frama-c-recommended.el
@@ -2,7 +2,7 @@
; ;
; This file is part of Frama-C. ;
; ;
-; Copyright (C) 2007-2018 ;
+; Copyright (C) 2007-2019 ;
; CEA (Commissariat à l'énergie atomique et aux énergies ;
; alternatives) ;
; ;
diff --git a/share/frama-c.Unix.rc b/share/frama-c.Unix.rc
index 898c5069268b2f264b1da3568f05e9d3ecc6c404..81c21f20dc4f7aebc5eac04f316dfbaef7fd4f22 100644
--- a/share/frama-c.Unix.rc
+++ b/share/frama-c.Unix.rc
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/frama-c.WIN32.rc b/share/frama-c.WIN32.rc
index febc1cf361124942fedd926965a508521ff68a44..574ebc5b509fb542f80790ac98d2a78e48e6ae84 100644
--- a/share/frama-c.WIN32.rc
+++ b/share/frama-c.WIN32.rc
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/share/libc.c b/share/libc.c
index 8c8d3f58a31c2a8f2fc7eb9177926329f3731906..bd14e7820b752c14887790e628692ff83d7d4a87 100644
--- a/share/libc.c
+++ b/share/libc.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_alloc_axiomatic.h b/share/libc/__fc_alloc_axiomatic.h
index 2b8f8800cf411b65d803181c10ad635d65a24a74..43bb7cb6534657bade7ba53268df1905295c9ee3 100644
--- a/share/libc/__fc_alloc_axiomatic.h
+++ b/share/libc/__fc_alloc_axiomatic.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_builtin.c b/share/libc/__fc_builtin.c
index ed89586c4d38587228fc7b20528277d198d133fa..0c099981f983a5d8ac718694a3f3427aa99120a8 100644
--- a/share/libc/__fc_builtin.c
+++ b/share/libc/__fc_builtin.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_builtin.h b/share/libc/__fc_builtin.h
index 19f80b43a557a50942de5783cc499544600442fb..a201ec354be35f992af10fe24017a9ba23b4c482 100644
--- a/share/libc/__fc_builtin.h
+++ b/share/libc/__fc_builtin.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_blkcnt_t.h b/share/libc/__fc_define_blkcnt_t.h
index 244a15928abff1c8c008512652fe74c7e9ce57b5..72d131dae155cd2e212339aaeb731c73f940b5a6 100644
--- a/share/libc/__fc_define_blkcnt_t.h
+++ b/share/libc/__fc_define_blkcnt_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_blksize_t.h b/share/libc/__fc_define_blksize_t.h
index 17a8ec909a3babfcc0ba4b520dfe488def54deb7..dae9c9dca6c60ce06852451b3524a0ed65142682 100644
--- a/share/libc/__fc_define_blksize_t.h
+++ b/share/libc/__fc_define_blksize_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_clockid_t.h b/share/libc/__fc_define_clockid_t.h
index ef43abaf6657cc8c68fdb0fb2e3b35a389222db2..08dc3994a6e769c7b81a9716b9f3da843d9510f7 100644
--- a/share/libc/__fc_define_clockid_t.h
+++ b/share/libc/__fc_define_clockid_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_dev_t.h b/share/libc/__fc_define_dev_t.h
index 29c7d4d0159c3a77037c0771cc476d4b7f50fc0c..dbddbdfe4c1110a66fb16801705c0d11215f2ea4 100644
--- a/share/libc/__fc_define_dev_t.h
+++ b/share/libc/__fc_define_dev_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_eof.h b/share/libc/__fc_define_eof.h
index 15f7a468af99c389d3bfd33aebfa9eae0d98cea6..843518c27f7d656e29262428fb90e026880b7827 100644
--- a/share/libc/__fc_define_eof.h
+++ b/share/libc/__fc_define_eof.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_fd_set_t.h b/share/libc/__fc_define_fd_set_t.h
index 55d2d2155d78bf2d108547901093273c473cbffc..9a33dcec7e78b5abeb7c54179c2b3764ce8fb84e 100644
--- a/share/libc/__fc_define_fd_set_t.h
+++ b/share/libc/__fc_define_fd_set_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_file.h b/share/libc/__fc_define_file.h
index 6b9ec24f3e3e53d8c05eddfc9115761bcc522f96..d1c0687b59da58d7f964aaa329e158c23d34247b 100644
--- a/share/libc/__fc_define_file.h
+++ b/share/libc/__fc_define_file.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_fpos_t.h b/share/libc/__fc_define_fpos_t.h
index 03ba44085b8a3841ccfc2fc44e33bfac6d8032fb..8a04d0e9083515291445537353045cb6434f5e85 100644
--- a/share/libc/__fc_define_fpos_t.h
+++ b/share/libc/__fc_define_fpos_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_id_t.h b/share/libc/__fc_define_id_t.h
index e03e235f5aaae5c28438d66335211b0ed08f2e85..a22a686e0ec81f8a605ad68375e064911bdbc4e9 100644
--- a/share/libc/__fc_define_id_t.h
+++ b/share/libc/__fc_define_id_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_ino_t.h b/share/libc/__fc_define_ino_t.h
index 1f78dfdceebb24a340fe45ac88267d14e03d4ac0..0cb76d79bfab35481dd6fa442e89faf7a49faf55 100644
--- a/share/libc/__fc_define_ino_t.h
+++ b/share/libc/__fc_define_ino_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_intptr_t.h b/share/libc/__fc_define_intptr_t.h
index 18783c107e0db37902d12639913a68e88b5003d6..8095d6e7937ee90c214e580d294654b3f4fe1c8c 100644
--- a/share/libc/__fc_define_intptr_t.h
+++ b/share/libc/__fc_define_intptr_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_iovec.h b/share/libc/__fc_define_iovec.h
index 69d6656160062781539967ba53ea9bd021d69f47..16c331b09ce5283832d37984f6482d46ae61aecf 100644
--- a/share/libc/__fc_define_iovec.h
+++ b/share/libc/__fc_define_iovec.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_key_t.h b/share/libc/__fc_define_key_t.h
index bf12080587c104884df86d5d82dd15f13c114f8b..be49ff2d8df4627800fd82149cf2663ef656c223 100644
--- a/share/libc/__fc_define_key_t.h
+++ b/share/libc/__fc_define_key_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_mode_t.h b/share/libc/__fc_define_mode_t.h
index 2b2022af6cfc22d3ac4a4b8d5b0cda72c624a275..7f0aee4e12ed763f988f2655e7310b8fb81d95b0 100644
--- a/share/libc/__fc_define_mode_t.h
+++ b/share/libc/__fc_define_mode_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_nlink_t.h b/share/libc/__fc_define_nlink_t.h
index d16ad9f033862d0e504abbd7882eb33d1a47fd65..409d62a67b0af4e84f6cb79a7e60ebfdb81420c8 100644
--- a/share/libc/__fc_define_nlink_t.h
+++ b/share/libc/__fc_define_nlink_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_null.h b/share/libc/__fc_define_null.h
index 983fac7d4162dcdf22558c86f782e8678ac7dafe..1b7cec39268dfedcfdd6151a77e415e5fa0883c1 100644
--- a/share/libc/__fc_define_null.h
+++ b/share/libc/__fc_define_null.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_off_t.h b/share/libc/__fc_define_off_t.h
index 2b15928b8d194aed66b6c89d72d0b01c70c97bc4..3c00c5e7da7204df7e2c269af7b35750e4e4a6c2 100644
--- a/share/libc/__fc_define_off_t.h
+++ b/share/libc/__fc_define_off_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_pid_t.h b/share/libc/__fc_define_pid_t.h
index 1b9585b5563e4450a1eb27b91090d67e0d2fae87..1226707869ee73ed0aa84973c63a688eb38a5016 100644
--- a/share/libc/__fc_define_pid_t.h
+++ b/share/libc/__fc_define_pid_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_pthread_types.h b/share/libc/__fc_define_pthread_types.h
index 1ccd78200e29298c45db366aa8f9776c0f1a62e5..bd9a591bc55c194098716a5e5df96e8762982a6d 100644
--- a/share/libc/__fc_define_pthread_types.h
+++ b/share/libc/__fc_define_pthread_types.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_sa_family_t.h b/share/libc/__fc_define_sa_family_t.h
index 3502b258885423256cf9b5cbd6dea00e1cbe19fc..49e5de72c9a9a1251dbd6696fc41b1976817fb2a 100644
--- a/share/libc/__fc_define_sa_family_t.h
+++ b/share/libc/__fc_define_sa_family_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_seek_macros.h b/share/libc/__fc_define_seek_macros.h
index 51a98efe03acfb9abb808c4dda3dc8acd4042d0d..026fc4be4979eb7ae504c8bb9424ac3b183158a1 100644
--- a/share/libc/__fc_define_seek_macros.h
+++ b/share/libc/__fc_define_seek_macros.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_sigset_t.h b/share/libc/__fc_define_sigset_t.h
index 5e20b6a494e6501ff2f7a7a1f28e64df37f8b307..299908fbb0c4bafe489cf61865c67a806846ec64 100644
--- a/share/libc/__fc_define_sigset_t.h
+++ b/share/libc/__fc_define_sigset_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_size_t.h b/share/libc/__fc_define_size_t.h
index 8b60233e1cb49d889ba5d28a3b74edf87d5a1e23..6e70cbd98b2a2af08a8e6ccfa762157f36003360 100644
--- a/share/libc/__fc_define_size_t.h
+++ b/share/libc/__fc_define_size_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_sockaddr.h b/share/libc/__fc_define_sockaddr.h
index 705201d37729ea364e365e070e09cc6715ca1645..6c524e7dba6493c466749da80cd8260e6469bf7b 100644
--- a/share/libc/__fc_define_sockaddr.h
+++ b/share/libc/__fc_define_sockaddr.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_ssize_t.h b/share/libc/__fc_define_ssize_t.h
index 4303426d2c5da7b58c95f12404e1e24b8816944d..3bb0ce562c5d2fc62a139a1ee3b0ced7a6a1d495 100644
--- a/share/libc/__fc_define_ssize_t.h
+++ b/share/libc/__fc_define_ssize_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_stat.h b/share/libc/__fc_define_stat.h
index 5c6559a50fcea335830134d6687e04d8eb018240..c9ec17a474efb9d3015216924bedd943f2c16655 100644
--- a/share/libc/__fc_define_stat.h
+++ b/share/libc/__fc_define_stat.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_suseconds_t.h b/share/libc/__fc_define_suseconds_t.h
index 4cd0fa8601526b700c37cfc994d5cca6b06e027e..e14c14b5180f0f85f7ca40939a124a9aa7141a10 100644
--- a/share/libc/__fc_define_suseconds_t.h
+++ b/share/libc/__fc_define_suseconds_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_time_t.h b/share/libc/__fc_define_time_t.h
index 2e31a7968a09dd4f4136cf6f536ca1396d77d4d4..b1779dd0a24a655a64a878473c9976acdfd130bd 100644
--- a/share/libc/__fc_define_time_t.h
+++ b/share/libc/__fc_define_time_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_timer_t.h b/share/libc/__fc_define_timer_t.h
index 95bcb72ddd9290cb839c09e771d62b1da7b8a7b6..0677a9b2a4f67f89d6a7f90c09c7f352251eceba 100644
--- a/share/libc/__fc_define_timer_t.h
+++ b/share/libc/__fc_define_timer_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_timespec.h b/share/libc/__fc_define_timespec.h
index 6752a93639138a65778bfcb813db283e394373b1..b6bcae76d66cca29775777a626b1e1228d38f4d3 100644
--- a/share/libc/__fc_define_timespec.h
+++ b/share/libc/__fc_define_timespec.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_uid_and_gid.h b/share/libc/__fc_define_uid_and_gid.h
index 2624e5fcc14f45cb8d00e2ed1ec2aceccba088c5..7bff3f2c64c87e39ecd1b3879ccda90200279ffc 100644
--- a/share/libc/__fc_define_uid_and_gid.h
+++ b/share/libc/__fc_define_uid_and_gid.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_useconds_t.h b/share/libc/__fc_define_useconds_t.h
index cc2d77764310671734af07a3a0d9157cbd5d0830..bf7915a8b01e9970f7023ddeaf256dcc27b93f1f 100644
--- a/share/libc/__fc_define_useconds_t.h
+++ b/share/libc/__fc_define_useconds_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_wchar_t.h b/share/libc/__fc_define_wchar_t.h
index c6a8d68efd3c5a655eecc34cfb2e0feaed20a116..6e66e39399d26c6bc28f78b7c9fbe9ad577f08b7 100644
--- a/share/libc/__fc_define_wchar_t.h
+++ b/share/libc/__fc_define_wchar_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_define_wint_t.h b/share/libc/__fc_define_wint_t.h
index bd24aa79f30ea4cd8b399281506e9f1cfd34915b..caeef9031e827dd50ef4779bbbb1b5b497ac80e9 100644
--- a/share/libc/__fc_define_wint_t.h
+++ b/share/libc/__fc_define_wint_t.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_gcc_builtins.h b/share/libc/__fc_gcc_builtins.h
index 5b9a7b71e3e425a8dc52961c941a8f273b115490..7db2e0fed113092cd4a734652d53bb7cad4c793d 100644
--- a/share/libc/__fc_gcc_builtins.h
+++ b/share/libc/__fc_gcc_builtins.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_inet.h b/share/libc/__fc_inet.h
index 1ac5d20ebab4a146a6179d5253ae777b3855beab..07fe52fccc6a481e7c45fb47d0beec7133313464 100644
--- a/share/libc/__fc_inet.h
+++ b/share/libc/__fc_inet.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_machdep.h b/share/libc/__fc_machdep.h
index e58da007bf8a6a028c5d7568d8e87652598606d0..34752edcb40c7f10b325068e1670f17831ed9f50 100644
--- a/share/libc/__fc_machdep.h
+++ b/share/libc/__fc_machdep.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_machdep_linux_shared.h b/share/libc/__fc_machdep_linux_shared.h
index 68c14b46fe8e51974e7e3cb9ecc8dc33297822e8..0b0760b19e339a05a22e0b114fa8ea815b93216d 100644
--- a/share/libc/__fc_machdep_linux_shared.h
+++ b/share/libc/__fc_machdep_linux_shared.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_select.h b/share/libc/__fc_select.h
index e32831dd22e2683ea2962414d8962f4092a09d4c..82a079e98bd4fab78b03020d910170aaa3b64b1e 100644
--- a/share/libc/__fc_select.h
+++ b/share/libc/__fc_select.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/__fc_string_axiomatic.h b/share/libc/__fc_string_axiomatic.h
index 52de34035580066a124eb67a8681cd38abd07829..a89a527466eacc4412932d441b23dbfbb3817c69 100644
--- a/share/libc/__fc_string_axiomatic.h
+++ b/share/libc/__fc_string_axiomatic.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/alloca.h b/share/libc/alloca.h
index 7ebd85e0a0976da831bc4bf5da414c9adb17520c..1403454fdcc4037cc3c3991b92c63e7eb287472e 100644
--- a/share/libc/alloca.h
+++ b/share/libc/alloca.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/arpa/inet.h b/share/libc/arpa/inet.h
index d56c83df68d64b552c8bdb0dc7078461c684c3ae..8e9cf21bdc537ec1fb4e4f53f1f946fd149858e8 100644
--- a/share/libc/arpa/inet.h
+++ b/share/libc/arpa/inet.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/assert.c b/share/libc/assert.c
index bf185913c5f41d1291330b03e299ffe3d153cef6..cfbf8e50d00e44e765d42afb4648582082e65f7f 100644
--- a/share/libc/assert.c
+++ b/share/libc/assert.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/assert.h b/share/libc/assert.h
index 0ad8904b81731aa6b28023b98d89f61d111e8418..0313b44aeafa371e9a365f58451243b944600f56 100644
--- a/share/libc/assert.h
+++ b/share/libc/assert.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/byteswap.h b/share/libc/byteswap.h
index 8fd1b74619a721bfbc494f5b8d951d677925f3f4..f3ca11ff17c469366fa7ef95ee99d9c21d921efd 100644
--- a/share/libc/byteswap.h
+++ b/share/libc/byteswap.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/complex.h b/share/libc/complex.h
index a9cb4ec97dc64e64485542631ceb71143ca7371e..da8e129559c25b87d4c6057fe1c618513a1a5569 100644
--- a/share/libc/complex.h
+++ b/share/libc/complex.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/ctype.c b/share/libc/ctype.c
index d345850a8bcade8d215b43bc4bbf7611495745c8..8954e5b109fdf44269be1e436b8fa761d7d22949 100644
--- a/share/libc/ctype.c
+++ b/share/libc/ctype.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/ctype.h b/share/libc/ctype.h
index 7072e58a267b94c55fe30c56ff0d75bcc484ae14..e946e5eef0c4debc56c25dae463573bcc7a9f450 100644
--- a/share/libc/ctype.h
+++ b/share/libc/ctype.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/dirent.h b/share/libc/dirent.h
index bde4da9523bac911be2f3f34befcd258edb8a600..6d75102f9e1bb1e51ca609e8d532fdfdda787cd0 100644
--- a/share/libc/dirent.h
+++ b/share/libc/dirent.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/dlfcn.h b/share/libc/dlfcn.h
index bc65b736a834f5ce8999605bacfef73f918659a4..b612cf638eee62850c6376161ef77b94d9bda72c 100644
--- a/share/libc/dlfcn.h
+++ b/share/libc/dlfcn.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/endian.h b/share/libc/endian.h
index 63cb4d2f7c106b2da0ef51340d49118329142a0d..85a893a37a891043513d6feb8661d34c8c472a69 100644
--- a/share/libc/endian.h
+++ b/share/libc/endian.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/errno.c b/share/libc/errno.c
index b43be400737d723f13890d6034867fe3d9a115df..53501bb02a54b636cccfbd0d09d0dc897297a5cf 100644
--- a/share/libc/errno.c
+++ b/share/libc/errno.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/errno.h b/share/libc/errno.h
index 757a7e4bcea63016be68197782a8c5db8c132926..254ed1af53f1024a369c585062e194571c2ae946 100644
--- a/share/libc/errno.h
+++ b/share/libc/errno.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/fc_runtime.c b/share/libc/fc_runtime.c
index 9db5598839bb35cd65f7ad6e30ef4a268b42534b..8890a09a7516cfb88c464a992ea4df1caaa8e2f0 100644
--- a/share/libc/fc_runtime.c
+++ b/share/libc/fc_runtime.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/fcntl.h b/share/libc/fcntl.h
index 432ff7b16c3f43eac2d2e67a2242bf45cf4e96f3..d5e21e8726ad9c1e74b929ed166209d5f498892c 100644
--- a/share/libc/fcntl.h
+++ b/share/libc/fcntl.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/features.h b/share/libc/features.h
index 4eca85c0a6f95bc04070be7e0c8ea6f5ba8f3965..08d5c8de3db90bb829c33a440b5ba89dc29dc8be 100644
--- a/share/libc/features.h
+++ b/share/libc/features.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/fenv.c b/share/libc/fenv.c
index 27a21d32577ad990c1d530fb608221bfd3a50b53..9f34644e7d4580b57837e26ab3e064ea2895341c 100644
--- a/share/libc/fenv.c
+++ b/share/libc/fenv.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/fenv.h b/share/libc/fenv.h
index 1ebae3fab3e9aa657a56c05e364cf96a0172c5a0..4fb6dacdd2967c3ef7b9fccd6b7f438bf8742c1e 100644
--- a/share/libc/fenv.h
+++ b/share/libc/fenv.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/float.h b/share/libc/float.h
index 745ff77c8283e3c253fb5c131641bc3abe3f3cc6..bc3c4b1de0ae811cbcce53c70416f027c258c320 100644
--- a/share/libc/float.h
+++ b/share/libc/float.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/fnmatch.h b/share/libc/fnmatch.h
index 69a57e376de120b79756a4a6ea59ca0343434875..86c1fd1425cc192bbfd8a6ea8119d393d3cfd02c 100644
--- a/share/libc/fnmatch.h
+++ b/share/libc/fnmatch.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/getopt.c b/share/libc/getopt.c
index 0b554dbf501a86c196e6b25f2017ba3c3a2e21d5..9bb2c44da563cd433e39de0c0943c9c40058c655 100644
--- a/share/libc/getopt.c
+++ b/share/libc/getopt.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/getopt.h b/share/libc/getopt.h
index 90a62b249b33b4ecf77e7f141d41d96968ddfd2e..6788b728779835daa8f5d3e12b7e9d08a85d47d0 100644
--- a/share/libc/getopt.h
+++ b/share/libc/getopt.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/glob.c b/share/libc/glob.c
index 0811a6b4853616226cf6805c8b51cc34c0840701..05377dfe093fc51e631ca28032e44e21fb8beb80 100644
--- a/share/libc/glob.c
+++ b/share/libc/glob.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/glob.h b/share/libc/glob.h
index 220ce88e94a748a2372de9e24712398b0326569e..cafe8f453c4ac9ccda0b2c42609189c45e3608e6 100644
--- a/share/libc/glob.h
+++ b/share/libc/glob.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/grp.h b/share/libc/grp.h
index a0ea701feb24b7360dd26c884a02b6a4046d3cb1..a4e4450d77f20a7b282bc9462c3c1012849fbb1d 100644
--- a/share/libc/grp.h
+++ b/share/libc/grp.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/iconv.h b/share/libc/iconv.h
index b8a23c12dea9b62e91a1ecdc17c29b8d6b4e45a1..92fae1bace58ef09cba99560df764b7cd9a88833 100644
--- a/share/libc/iconv.h
+++ b/share/libc/iconv.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/ifaddrs.h b/share/libc/ifaddrs.h
index e34fbba6564e23a25c90471e6cc6f37a9d0a6710..9c1cadd191bf1f357ca9e077694639d9cdd03ef7 100644
--- a/share/libc/ifaddrs.h
+++ b/share/libc/ifaddrs.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/inttypes.c b/share/libc/inttypes.c
index c30a96d9f066ab7a2acf0a47aee3f2ad99ece6b0..a12156da2f0bed308499fc7e679a49766b99f4f2 100644
--- a/share/libc/inttypes.c
+++ b/share/libc/inttypes.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/inttypes.h b/share/libc/inttypes.h
index 060bc8c6dfc0ffa6f6bdb3e3b40ad055ec344177..7a5a4f1396bf9c74803a3b48e2883e1166e17d98 100644
--- a/share/libc/inttypes.h
+++ b/share/libc/inttypes.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/iso646.h b/share/libc/iso646.h
index 492b2ff524542693fac3cc986bbf5832a271edd6..89e3c4759675f55bb947e61c608b5bb96b6e2a05 100644
--- a/share/libc/iso646.h
+++ b/share/libc/iso646.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/libgen.h b/share/libc/libgen.h
index c21a57da9faee597ad9d01ea593bed9afeaccb3c..1abe66dd28cc3ebb3d7847b1ba63074c4296f798 100644
--- a/share/libc/libgen.h
+++ b/share/libc/libgen.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/libintl.h b/share/libc/libintl.h
index 8682b18228560c32329d790f5f49dec8c1916a5e..f79f14d0fcfdb0482bfa524301ebc55a9f38eb53 100644
--- a/share/libc/libintl.h
+++ b/share/libc/libintl.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/limits.h b/share/libc/limits.h
index fffc496c32eb4a319ad61b9f83600892a319d1cc..703571925dcddcba60c9ec3df8feee73d755276f 100644
--- a/share/libc/limits.h
+++ b/share/libc/limits.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/linux/fs.h b/share/libc/linux/fs.h
index cd93d6762a671d6be5b5ca4f2b871807841dff21..c0b6d361f2d781309374dd3c9efcc86cd1d8196c 100644
--- a/share/libc/linux/fs.h
+++ b/share/libc/linux/fs.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/linux/if_addr.h b/share/libc/linux/if_addr.h
index d5d1ecd616f8bd72717e2c9df9b4ebc3844ff2a4..51efee090ac1788a4db5851a27a04303a0efb0d5 100644
--- a/share/libc/linux/if_addr.h
+++ b/share/libc/linux/if_addr.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/linux/if_netlink.h b/share/libc/linux/if_netlink.h
index 630c4566125e9efa83cd91a22b87ff8f343fcd6a..276d067832a672962cb593531e6b95205c857db2 100644
--- a/share/libc/linux/if_netlink.h
+++ b/share/libc/linux/if_netlink.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/linux/netlink.h b/share/libc/linux/netlink.h
index d993849f8e78bf13d4e95396c2a3778282c869eb..1ddd191ab29e8419a1ef0dedfbcdbc6ac73c56ce 100644
--- a/share/libc/linux/netlink.h
+++ b/share/libc/linux/netlink.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/linux/rtnetlink.h b/share/libc/linux/rtnetlink.h
index f1d2af1c6e6c51fc526110e63cc6ce68ecfaa72a..7ea2a119e9f92904ec8d82044c36b2eb89273995 100644
--- a/share/libc/linux/rtnetlink.h
+++ b/share/libc/linux/rtnetlink.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/locale.c b/share/libc/locale.c
index b725753ec3b7ecf0a24d3d328f3fb271bb8f4488..96aaec7b2f3e397a2912939166999daaddc05c21 100644
--- a/share/libc/locale.c
+++ b/share/libc/locale.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/locale.h b/share/libc/locale.h
index 7a489f5a54a5aa5451df5f243011aa2c86bd6d69..11f0244bcb3cf4b8f4df547113ba2de04669bf37 100644
--- a/share/libc/locale.h
+++ b/share/libc/locale.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/malloc.h b/share/libc/malloc.h
index 4b00c058c829abd93198d87bc09312c51ee1af48..3508e681088d7156a2c1ef1463ec483a387ca669 100644
--- a/share/libc/malloc.h
+++ b/share/libc/malloc.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/math.c b/share/libc/math.c
index d24525f7c4a4be560cb77a7b74f7f8c79be34ee0..dbe443de13f2e5d6973e77226aa14c34f80cd18e 100644
--- a/share/libc/math.c
+++ b/share/libc/math.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/math.h b/share/libc/math.h
index da98d886eeb603667561f7de0c13e04d1e934a47..a7a0ef9dbf6040e15ff30925742c05f9d1678ed0 100644
--- a/share/libc/math.h
+++ b/share/libc/math.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/memory.h b/share/libc/memory.h
index 60924c439eed162026b141d011c48ac45408cc36..4c1227c6134fc888153acd73db5fca43ba6b1bdd 100644
--- a/share/libc/memory.h
+++ b/share/libc/memory.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/net/if.h b/share/libc/net/if.h
index 82dc07e9c92f00d68c49a520d43dc9a6c3ae5c78..0b92ebd79829f463d0370a2b5ef0056eeb660e0b 100644
--- a/share/libc/net/if.h
+++ b/share/libc/net/if.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/netdb.c b/share/libc/netdb.c
index 12af93afa0dd750e3812d7606cbbd4bab131e741..cfdea15cc7fb7a6bf9c09f96fd8ab6c851b0bb1c 100644
--- a/share/libc/netdb.c
+++ b/share/libc/netdb.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/netdb.h b/share/libc/netdb.h
index 2611c02af22059a6133b928452c4d19cac0b1923..860c95c85025032ffebbf883061760c2a756169c 100644
--- a/share/libc/netdb.h
+++ b/share/libc/netdb.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/netinet/in.h b/share/libc/netinet/in.h
index d56c83df68d64b552c8bdb0dc7078461c684c3ae..8e9cf21bdc537ec1fb4e4f53f1f946fd149858e8 100644
--- a/share/libc/netinet/in.h
+++ b/share/libc/netinet/in.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/netinet/in_systm.h b/share/libc/netinet/in_systm.h
index 5db1fed93ae1bea1400e554e400da5d7eba7a206..1beabb1cae1d68c9448bc06e4f4d61a4f0a9eb99 100644
--- a/share/libc/netinet/in_systm.h
+++ b/share/libc/netinet/in_systm.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/netinet/ip.h b/share/libc/netinet/ip.h
index 10f651143b643c8e60dee1c7c2333969c21aec96..0c469cede7533dbba94f67cb2e601c6d585a8539 100644
--- a/share/libc/netinet/ip.h
+++ b/share/libc/netinet/ip.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/netinet/ip_icmp.h b/share/libc/netinet/ip_icmp.h
index 8f31eef9c7049af4bb8c1e1cb2a5b0a52351b1cf..78e895961d9fba583731860cac67c0cee72f8e9e 100644
--- a/share/libc/netinet/ip_icmp.h
+++ b/share/libc/netinet/ip_icmp.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/netinet/tcp.h b/share/libc/netinet/tcp.h
index 66735e9c1367e1a78d29b633863b10fdaf7d7700..fb7abe05a65782a53e85991a95ebfab6b4c479ee 100644
--- a/share/libc/netinet/tcp.h
+++ b/share/libc/netinet/tcp.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/nl_types.h b/share/libc/nl_types.h
index 9855266a5083f206cfe44c8261d2fca082099e24..390d581811b5b20ff8259d22126e14ca369d1498 100644
--- a/share/libc/nl_types.h
+++ b/share/libc/nl_types.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/poll.h b/share/libc/poll.h
index beb5082b34fc0b575889bd91ea868714da5d10dc..4995c69d888b50fec29beabeed3e53c7804590b2 100644
--- a/share/libc/poll.h
+++ b/share/libc/poll.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/pthread.h b/share/libc/pthread.h
index b11ef330c31c4a03f11ac36bd1a72c2886c135be..d55ece32dee5c2f5a6c474d7495635726e9a7d5e 100644
--- a/share/libc/pthread.h
+++ b/share/libc/pthread.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/pwd.h b/share/libc/pwd.h
index 6396526cf22d815e841f679804a8e4480b2c0e6e..17cca2f73e46b400a9f5656a76902982db557ed3 100644
--- a/share/libc/pwd.h
+++ b/share/libc/pwd.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/regex.h b/share/libc/regex.h
index 64ca98378176e0acc88de7baaaff0644116f4456..97277d5564e19613ff3867a2556331879e0e37ee 100644
--- a/share/libc/regex.h
+++ b/share/libc/regex.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/resolv.h b/share/libc/resolv.h
index 65c89b0656f45fb73a9ece9355fbde6a62c32f29..beaf508bea85f13d13fa10e75d21cbf5ee32cbf5 100644
--- a/share/libc/resolv.h
+++ b/share/libc/resolv.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sched.h b/share/libc/sched.h
index eed88716eef7023f203f998a8c136caa7bf14e11..50f8ba16e77b0a9fdf5b783942c269a5c6d930a3 100644
--- a/share/libc/sched.h
+++ b/share/libc/sched.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/semaphore.h b/share/libc/semaphore.h
index f032e82ee62d963c4936b6443c8469d0c50ffc48..264a85bfeda14cc93d550b93bdae55e390fc78b6 100644
--- a/share/libc/semaphore.h
+++ b/share/libc/semaphore.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/setjmp.h b/share/libc/setjmp.h
index a3b60f82a2f35bc57432c684a36232ba65b750d0..ecca7307fda4be495b6b765343d6fa178b14e4c0 100644
--- a/share/libc/setjmp.h
+++ b/share/libc/setjmp.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/signal.h b/share/libc/signal.h
index fd2ae1b22e0b50f619d9fffd1343c8884a411944..f1eb5d6cc1b20256a72059b97021f8219c07661d 100644
--- a/share/libc/signal.h
+++ b/share/libc/signal.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stdarg.h b/share/libc/stdarg.h
index 83a23331657626b0041bdc0b755bc8a66efa8515..e0f7efbd2774284cbcf878bff0d5864194717dfb 100644
--- a/share/libc/stdarg.h
+++ b/share/libc/stdarg.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stdbool.h b/share/libc/stdbool.h
index e7092fc5b57bf84a907c399aa29c9352a104529c..7c5f1e35b7c108b88fcef36413757de6ca4ddf30 100644
--- a/share/libc/stdbool.h
+++ b/share/libc/stdbool.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stddef.h b/share/libc/stddef.h
index c82123e9329dc154aae9460d359f67aa309c1aeb..e32d8548e869d1d2bee02714348b5b151cf7d2c1 100644
--- a/share/libc/stddef.h
+++ b/share/libc/stddef.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stdint.h b/share/libc/stdint.h
index f7cc8358ac3e13ee86a02dfbe6c4e303fe3a0df4..f73a75048ed34117c9dad58276602e77e0a11a9c 100644
--- a/share/libc/stdint.h
+++ b/share/libc/stdint.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stdio.c b/share/libc/stdio.c
index 48c6419e9c800f4d75611508ca109d7e395e27d2..c4bf2ae37bb2a33045805cf96c4a0e0d418979d1 100644
--- a/share/libc/stdio.c
+++ b/share/libc/stdio.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stdio.h b/share/libc/stdio.h
index d3d147f5c8154aacff0f6048d34384a98813f3e7..9c27119c016ce7fced52dde77b279b8f1db2630b 100644
--- a/share/libc/stdio.h
+++ b/share/libc/stdio.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stdlib.c b/share/libc/stdlib.c
index e08714f86e364711c1aa0adde2c67db633d17fab..72dd24cc238641547c7bdcd5f4855cc7f099936f 100644
--- a/share/libc/stdlib.c
+++ b/share/libc/stdlib.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stdlib.h b/share/libc/stdlib.h
index 5c703ee21b00fc050ad3a2eb43a0d2c20b09140c..acdbbf87f659a078e3a89127771f0089eb11704c 100644
--- a/share/libc/stdlib.h
+++ b/share/libc/stdlib.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/string.c b/share/libc/string.c
index 9a1b82b0b3b1ea7a788be0bfdad7cada52cb4bff..06662b1f297c20820c33eed85b77ad1febdcc9da 100644
--- a/share/libc/string.c
+++ b/share/libc/string.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/string.h b/share/libc/string.h
index 57c5196c07feae9b6994913bb96834702a7ccd69..f810f9a8067f6cdceadb0bea39c93ec3bd01c8e8 100644
--- a/share/libc/string.h
+++ b/share/libc/string.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/strings.h b/share/libc/strings.h
index 2914e6cbe7e4546f1454a5955de3a7943be51de1..f1091001fc4b1bf80ad01cf123ceba53cda6431e 100644
--- a/share/libc/strings.h
+++ b/share/libc/strings.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/stropts.h b/share/libc/stropts.h
index e09547dd3bfc7548446411c9494c45bccee0ca77..48351585e7e3537806592d6ac9d2d6cf81d9f2af 100644
--- a/share/libc/stropts.h
+++ b/share/libc/stropts.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/file.h b/share/libc/sys/file.h
index 78d64f1428e58815b9c5a79cbb4558e2ee52a0e8..0414b8b04b99075105b304560360a9a49c3b4538 100644
--- a/share/libc/sys/file.h
+++ b/share/libc/sys/file.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/ioctl.h b/share/libc/sys/ioctl.h
index 4b3ddc551034459f2350307f60c73b548e2cd534..21fb87e02b4666e1649d15cdaff90fd2bfbe3b36 100644
--- a/share/libc/sys/ioctl.h
+++ b/share/libc/sys/ioctl.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/ipc.h b/share/libc/sys/ipc.h
index 90280e6f255a9a02e438dd03a721a75afc7978d7..0f7c9558af7add11dc0418da359cd629b91e38c3 100644
--- a/share/libc/sys/ipc.h
+++ b/share/libc/sys/ipc.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/mman.h b/share/libc/sys/mman.h
index fff6efa9f426aae3f54d1aa9f5398ee9e29ffd9c..5c0d1c5b751463644e33feb05be11c8f8a3d9326 100644
--- a/share/libc/sys/mman.h
+++ b/share/libc/sys/mman.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/param.h b/share/libc/sys/param.h
index 691bdd5a720ded321f8aa9e8fc393a75b0e3169a..93e55b1606cdcd6eeec17f095f0e59482a8a8729 100644
--- a/share/libc/sys/param.h
+++ b/share/libc/sys/param.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/random.h b/share/libc/sys/random.h
index 00d33703c995857322e080b1e825b36b7a0b4b36..833ab6b4d7b25bf889cd7e5fd617f1de5e559005 100644
--- a/share/libc/sys/random.h
+++ b/share/libc/sys/random.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/resource.h b/share/libc/sys/resource.h
index 6d88b3be41810dfddca8a4b1e47e8d288df00146..566a0fa31e89d69517d1abc749a81056d01f6c07 100644
--- a/share/libc/sys/resource.h
+++ b/share/libc/sys/resource.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/select.h b/share/libc/sys/select.h
index 14134d27bbd99da10e06213db78b6a0926f2042a..8e1608d267e3da518ee4f933fc4e891b2e3a3a30 100644
--- a/share/libc/sys/select.h
+++ b/share/libc/sys/select.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/shm.h b/share/libc/sys/shm.h
index 6dffdaf658917c9f21853304d1165b86c9131419..b630e30ba8a2100fcb12a3c9cd4cab0e26bb2ecc 100644
--- a/share/libc/sys/shm.h
+++ b/share/libc/sys/shm.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/signal.h b/share/libc/sys/signal.h
index 1fc06ade177b0d9c2ef47be5f25186aa6da95940..5468c1a1b7a621e58daff361c0569074356fc04a 100644
--- a/share/libc/sys/signal.h
+++ b/share/libc/sys/signal.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/socket.h b/share/libc/sys/socket.h
index de87e135671ecc3d470bdeb4832e11b2c4c1bd11..20b339c5ed8e978866fbbcb07cd91fdd55b3c0b0 100644
--- a/share/libc/sys/socket.h
+++ b/share/libc/sys/socket.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/stat.h b/share/libc/sys/stat.h
index 7ae9fa5b0a767a233d4518e0621c79580553a33a..7aa8cbf24176675e835ef830386dd226f4893c21 100644
--- a/share/libc/sys/stat.h
+++ b/share/libc/sys/stat.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/sysctl.h b/share/libc/sys/sysctl.h
index 8c8d3f58a31c2a8f2fc7eb9177926329f3731906..bd14e7820b752c14887790e628692ff83d7d4a87 100644
--- a/share/libc/sys/sysctl.h
+++ b/share/libc/sys/sysctl.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/time.h b/share/libc/sys/time.h
index 9f1b4f9a36d712814cb001abdbb9ccc5ea872a25..73fed482445f4c6a663ae88e8535b45fc5c704a8 100644
--- a/share/libc/sys/time.h
+++ b/share/libc/sys/time.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/times.h b/share/libc/sys/times.h
index d2355d49d96642348092156783a725267a3cf540..beb930fec77ebe34943b60fe8cc0623d9e3adc31 100644
--- a/share/libc/sys/times.h
+++ b/share/libc/sys/times.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/timex.h b/share/libc/sys/timex.h
index 8ecc4f32d9c7ca5fb979a8770fd3fa79e5373ba2..0650f0ed55902e8e7b190c2866da98b6a5d9a90d 100644
--- a/share/libc/sys/timex.h
+++ b/share/libc/sys/timex.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/types.h b/share/libc/sys/types.h
index c5e3911fccba93ca478a8506ec73c3c98c359f34..08d8cabb47038e948f734ff7a81deaa648f14832 100644
--- a/share/libc/sys/types.h
+++ b/share/libc/sys/types.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/uio.h b/share/libc/sys/uio.h
index 9cfc073432daf51692f3a30ae33b5b940f35ad06..2898fc9bb9e48659978ac1b218d86dc4cf6ef71f 100644
--- a/share/libc/sys/uio.h
+++ b/share/libc/sys/uio.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/un.h b/share/libc/sys/un.h
index 7848cc8d8031900ef05b8fee0811b439b854ece4..5bd678020a65bdf7e01a86b743541a65097e1e35 100644
--- a/share/libc/sys/un.h
+++ b/share/libc/sys/un.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/utsname.h b/share/libc/sys/utsname.h
index 91e67def6260cf0623f454afc591f19abc747454..0b1fde579832175f48983147be562ed361baaaaf 100644
--- a/share/libc/sys/utsname.h
+++ b/share/libc/sys/utsname.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/sys/wait.h b/share/libc/sys/wait.h
index a7d2315b4ebca08f2a4f8a78f7f32024171f9f51..91de3d80201d127012d5b0e6339f52da4379de6b 100644
--- a/share/libc/sys/wait.h
+++ b/share/libc/sys/wait.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/syslog.h b/share/libc/syslog.h
index 701308e6344881cd330bc402863dc7487dbeeba0..937e3fcfbe3a1a9e781946dcc26615d65afade6c 100644
--- a/share/libc/syslog.h
+++ b/share/libc/syslog.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/termios.h b/share/libc/termios.h
index 1affded1d8727ef038157bae73f6afa89b621f09..240140cc8455e61bf91ddff463c55ee665085500 100644
--- a/share/libc/termios.h
+++ b/share/libc/termios.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/tgmath.h b/share/libc/tgmath.h
index 921081b6b26e268b9ef4694f3204b9bd1efb9142..b43c795e9c22813ae14a21c1de71111246fa1e0f 100644
--- a/share/libc/tgmath.h
+++ b/share/libc/tgmath.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/time.c b/share/libc/time.c
index 5873b4c76d2491dc09ccb183b21a81a34b41045f..6c11356f00d1a07f59ce763958a0517a668dc750 100644
--- a/share/libc/time.c
+++ b/share/libc/time.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/time.h b/share/libc/time.h
index 9ca1d0cadab05c06e25d70c1771262e87be61a89..2906228203f8ab73f85cc8fa4eaab65be8f95a39 100644
--- a/share/libc/time.h
+++ b/share/libc/time.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/uchar.h b/share/libc/uchar.h
index 7a5c7b61f61d2fcfb6ebde1ced94b9bb22dc4ea9..61011a2d979742edf859fbf2c054aa58c83d4023 100644
--- a/share/libc/uchar.h
+++ b/share/libc/uchar.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/unistd.h b/share/libc/unistd.h
index 43b48cfafc214a5a7f28e866c61ba066fd9a46a1..7edb5316c3ee84e9f688d89f65d67a5a3d34ac02 100644
--- a/share/libc/unistd.h
+++ b/share/libc/unistd.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/utime.h b/share/libc/utime.h
index 9e548e84a85ffbfdbec5ddfc1bd0689fb245b8f9..a3d4f41d26b9748d0573f79c5d5ce190feddff76 100644
--- a/share/libc/utime.h
+++ b/share/libc/utime.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/utmpx.h b/share/libc/utmpx.h
index c17d890500517024d5f62f8e4205417083d70420..cc1c85dc142c5fed93416b518f92ef9fc5e4d068 100644
--- a/share/libc/utmpx.h
+++ b/share/libc/utmpx.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/wchar.c b/share/libc/wchar.c
index 825666ea07e370b1b65b9efa5459bce84da9e4a3..047b875431dc9a832c330089d67f0177be38c1cc 100644
--- a/share/libc/wchar.c
+++ b/share/libc/wchar.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/wchar.h b/share/libc/wchar.h
index 5c6cab790a0deffa3ee412b3c47f8854672bbaa2..aeb08ed3eae799080bb75fd042674f6e138af0e1 100644
--- a/share/libc/wchar.h
+++ b/share/libc/wchar.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/share/libc/wctype.h b/share/libc/wctype.h
index f6a3128b00dc7052022d8e963f84f22e1b304556..33a357b65f3766ef6167651813e7564943f6acbc 100644
--- a/share/libc/wctype.h
+++ b/share/libc/wctype.h
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/src/kernel_internals/parsing/check_logic_parser.ml b/src/kernel_internals/parsing/check_logic_parser.ml
index b9ded2c35cb438b19d0e2622c3a2d86b4ef5c40e..aee38d9cbe09fa16cdcd19943321e36be088cb4b 100644
--- a/src/kernel_internals/parsing/check_logic_parser.ml
+++ b/src/kernel_internals/parsing/check_logic_parser.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/parsing/logic_lexer.mli b/src/kernel_internals/parsing/logic_lexer.mli
index a83a0e2c2a7ec72eea8259135fecf06309e6752c..97eab7669f2faa1fb063e2ab74b0d504ae29a8f1 100644
--- a/src/kernel_internals/parsing/logic_lexer.mli
+++ b/src/kernel_internals/parsing/logic_lexer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_internals/parsing/logic_lexer.mll b/src/kernel_internals/parsing/logic_lexer.mll
index e39192b490684a67476a3993da30dbc8891f03ae..c02a126964259ed12cdceb977060569ca62eaed4 100644
--- a/src/kernel_internals/parsing/logic_lexer.mll
+++ b/src/kernel_internals/parsing/logic_lexer.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
@@ -127,7 +127,8 @@
"module", MODULE, false;(* ACSL extension for external spec file *)
"pragma", PRAGMA, false;
"predicate", PREDICATE, false;
- "reads", READS, false;
+ "reads", READS, true; (* treated specifically in the parser to
+ avoid issue in volatile clause. *)
"requires", REQUIRES, false;
"returns", RETURNS, false;
"short", SHORT, true;
@@ -142,7 +143,8 @@
"variant", VARIANT, false;
"void", VOID, true;
"volatile", VOLATILE, true;
- "writes", WRITES, false;
+ "writes", WRITES, true; (* treated specifically in the parser to
+ avoid issue in volatile clause. *)
];
List.iter (fun (x, y) -> Hashtbl.add type_kw x y)
["integer", INTEGER; "real", REAL; "boolean", BOOLEAN; ];
diff --git a/src/kernel_internals/parsing/logic_parser.mly b/src/kernel_internals/parsing/logic_parser.mly
index 86d705460a976694d980ddca728df44d77246f40..489cf83599cba3d1c347d9b5f45f835d5c7d29a2 100644
--- a/src/kernel_internals/parsing/logic_parser.mly
+++ b/src/kernel_internals/parsing/logic_parser.mly
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* INRIA (Institut National de Recherche en Informatique et en */
@@ -879,6 +879,10 @@ full_zones:
| enter_kw_c_mode zones exit_kw_c_mode { $2 }
;
+full_ne_zones:
+| enter_kw_c_mode ne_zones exit_kw_c_mode { $2 }
+;
+
full_ne_lexpr_list:
enter_kw_c_mode ne_lexpr_list exit_kw_c_mode { $2 }
;
@@ -1106,7 +1110,9 @@ clause_kw:
/* often, we'll be in c_kw_mode, where these keywords are
recognized as identifiers... */
| IDENTIFIER { $1 }
+| EXT_CONTRACT { $1 }
| EOF { "end of annotation" }
+;
requires:
| /* epsilon */ { [] }
@@ -1266,43 +1272,33 @@ custom_tree:
;
custom_tree_list:
-| custom_tree { [$1] }
-| custom_tree COMMA custom_tree_list { $1::$3 }
+| custom_tree { [$1] }
+| custom_tree COMMA custom_tree_list { $1::$3 }
+;
annotation:
| loop_annotations
{ let (b,v,p) = $1 in
- (* TODO: do better, do not lose the structure ! *)
- let l = b@v@p in
+ (* TODO: do better, do not lose the structure ! *)
+ let l = b@v@p in
Aloop_annot (loc (), l) }
-| FOR ne_behavior_name_list COLON contract
- { let s, pos = $4 in Acode_annot (pos, AStmtSpec ($2,s)) }
-| code_annotation { Acode_annot (loc(),$1) }
-| code_annotation beg_code_annotation
+| FOR ne_behavior_name_list COLON contract_or_code_annotation
+ { $4 $2 }
+| pragma_or_code_annotation { Acode_annot (loc(),$1) }
+| pragma_or_code_annotation beg_pragma_or_code_annotation
{ raise
(Not_well_formed (loc(),
"Only one code annotation is allowed per comment"))
}
-| EXT_CODE_ANNOT grammar_extension SEMICOLON
- {
- let open Cil_types in
- let ext = $1 in
- match Logic_env.extension_category ext with
- | Some (Ext_code_annot (Ext_here | Ext_next_stmt | Ext_next_both)) ->
- Acode_annot (loc(), Logic_ptree.AExtended([],false,(ext,$2)))
- | Some (Ext_code_annot Ext_next_loop) ->
- raise
- (Not_well_formed
- (lexeme_loc 1,
- ext ^ " is not a loop annotation extension. It can't be used as \
- plain code annotation extension"))
- | Some (Ext_contract | Ext_global) | None ->
- Kernel.fatal ~source:(lexeme_start 1)
- "%s is not a code annotation extension. Parser got wrong lexeme" ext
- }
| full_identifier_or_typename { Aattribute_annot (loc (), $1) }
;
+contract_or_code_annotation:
+| contract
+ { fun bhvs -> let s, pos = $1 in Acode_annot (pos, AStmtSpec (bhvs,s)) }
+| code_annotation { fun bhvs -> Acode_annot (loc(), ($1 bhvs)) }
+;
+
/*** loop annotations ***/
loop_annotations:
@@ -1429,23 +1425,42 @@ loop_pragma:
/*** code annotations ***/
-beg_code_annotation:
+beg_pragma_or_code_annotation:
| IMPACT {}
| SLICE {}
| FOR {}
| ASSERT {}
| INVARIANT {}
+| EXT_CODE_ANNOT {}
;
-code_annotation:
+pragma_or_code_annotation:
| slice_pragma { APragma (Slice_pragma $1) }
| impact_pragma { APragma (Impact_pragma $1) }
-| FOR ne_behavior_name_list COLON ASSERT full_lexpr SEMICOLON
- { AAssert ($2,$5) }
-| FOR ne_behavior_name_list COLON INVARIANT full_lexpr SEMICOLON
- { AInvariant ($2,false,$5) }
-| ASSERT full_lexpr SEMICOLON { AAssert ([],$2) }
-| INVARIANT full_lexpr SEMICOLON { AInvariant ([],false,$2) }
+| code_annotation { $1 [] }
+;
+
+code_annotation:
+| ASSERT full_lexpr SEMICOLON
+ { fun bhvs -> AAssert (bhvs,$2) }
+| INVARIANT full_lexpr SEMICOLON { fun bhvs -> AInvariant (bhvs,false,$2) }
+| EXT_CODE_ANNOT grammar_extension SEMICOLON
+ { fun bhvs ->
+ let open Cil_types in
+ let ext = $1 in
+ match Logic_env.extension_category ext with
+ | Some (Ext_code_annot (Ext_here | Ext_next_stmt | Ext_next_both)) ->
+ Logic_ptree.AExtended(bhvs,false,(ext,$2))
+ | Some (Ext_code_annot Ext_next_loop) ->
+ raise
+ (Not_well_formed
+ (lexeme_loc 1,
+ ext ^ " is not a loop annotation extension. It can't be used as \
+ plain code annotation extension"))
+ | Some (Ext_contract | Ext_global) | None ->
+ Kernel.fatal ~source:(lexeme_start 1)
+ "%s is not a code annotation extension. Parser got wrong lexeme" ext
+ }
;
slice_pragma:
@@ -1476,7 +1491,7 @@ decl_list:
decl:
| GLOBAL INVARIANT any_identifier COLON full_lexpr SEMICOLON
{ LDinvariant ($3, $5) }
-| VOLATILE ne_zones volatile_opt SEMICOLON { LDvolatile ($2, $3) }
+| VOLATILE full_ne_zones volatile_opt SEMICOLON { LDvolatile ($2, $3) }
| type_annot {LDtype_annot $1}
| model_annot {LDmodel_annot $1}
| logic_def { $1 }
@@ -1652,7 +1667,7 @@ logic_decl_loc:
reads_clause:
| /* epsilon */ { None }
-| READS zones { Some $2 }
+| READS full_zones { Some $2 }
;
typedef:
@@ -1754,6 +1769,8 @@ identifier_or_typename:
identifier:
| IDENTIFIER { $1 }
+| READS { "reads" }
+| WRITES { "writes" }
;
bounded_var:
@@ -1794,7 +1811,7 @@ acsl_c_keyword:
;
post_cond:
-| ENSURES { Normal, "normal" }
+| ENSURES { Normal, "ensures" }
| EXITS { Exits, "exits" }
| BREAKS { Breaks, "breaks" }
| CONTINUES { Continues, "continues" }
@@ -1816,8 +1833,10 @@ is_acsl_spec:
;
is_acsl_decl_or_code_annot:
-| ASSERT { "assert" }
+| EXT_CODE_ANNOT { $1 }
+| EXT_GLOBAL { $1 }
| ASSUMES { "assumes" }
+| ASSERT { "assert" }
| GLOBAL { "global" }
| IMPACT { "impact" }
| INDUCTIVE { "inductive" }
@@ -1855,6 +1874,7 @@ is_ext_spec:
keyword:
| LOGIC { "logic" }
| non_logic_keyword { $1 }
+;
non_logic_keyword:
| c_keyword { $1 }
@@ -1963,8 +1983,6 @@ wildcard:
| STRING_LITERAL { () }
| TILDE { () }
| IN { () }
-| EXT_GLOBAL { () }
-| EXT_CODE_ANNOT { () }
;
any:
diff --git a/src/kernel_internals/parsing/logic_preprocess.mli b/src/kernel_internals/parsing/logic_preprocess.mli
index 92303230c129d22cc774597dbea72d71481a780b..c84f6e2dd8b97982cc3fa5e5fcaba5d84ece2ebd 100644
--- a/src/kernel_internals/parsing/logic_preprocess.mli
+++ b/src/kernel_internals/parsing/logic_preprocess.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_internals/parsing/logic_preprocess.mll b/src/kernel_internals/parsing/logic_preprocess.mll
index a8ae715b2c2f5da18bcbeaf6e1cd7e4e15502e10..91018631d2efcede80e905a502b411a8b51215c5 100644
--- a/src/kernel_internals/parsing/logic_preprocess.mll
+++ b/src/kernel_internals/parsing/logic_preprocess.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_internals/runtime/boot.ml b/src/kernel_internals/runtime/boot.ml
index cf4d984887027307a912f76228b124200701f505..f1d0ce13fe9804f3627541aaf0ca9bc63b470392 100644
--- a/src/kernel_internals/runtime/boot.ml
+++ b/src/kernel_internals/runtime/boot.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/config.ml.in b/src/kernel_internals/runtime/config.ml.in
index 3ae6289122723981aef42c1fe98eb370b968339a..c0f5852814ae1f34681f122f7a672be1ee95ed92 100644
--- a/src/kernel_internals/runtime/config.ml.in
+++ b/src/kernel_internals/runtime/config.ml.in
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -36,28 +36,41 @@ let ocamlc = "@OCAMLC@"
let ocamlopt = "@OCAMLOPT@"
let ocaml_wflags = "@WARNINGS@"
+let getenv_list name =
+ let path = Sys.getenv name in
+ Str.split (Str.regexp ":") path
+
+let add_symbolic_dir_list name = function
+ | [d] -> Filepath.add_symbolic_dir name d
+ | ds ->
+ List.iteri
+ (fun i d ->
+ let path = Printf.sprintf "%s#%d" name (succ i) in
+ Filepath.add_symbolic_dir path d)
+ ds
+
+
let datadir = try Sys.getenv "FRAMAC_SHARE" with Not_found -> "@FRAMAC_DATADIR@"
+let framac_libc = datadir ^ "/libc"
+let extra_datadir = try getenv_list "FRAMAC_EXTRA_SHARE" with Not_found -> []
+let () = add_symbolic_dir_list "FRAMAC_EXTRA_SHARE" extra_datadir
+(** After so that it has the priority for pretty printing *)
let () = Filepath.add_symbolic_dir "FRAMAC_SHARE" datadir
+
+let datadirs = datadir::extra_datadir
+
let libdir = try Sys.getenv "FRAMAC_LIB" with Not_found -> "@FRAMAC_LIBDIR@"
let () = Filepath.add_symbolic_dir "FRAMAC_LIB" libdir
let plugin_dir =
try
- let path = Sys.getenv "FRAMAC_PLUGIN" in
- Str.split (Str.regexp ":") path
+ getenv_list "FRAMAC_PLUGIN"
with Not_found ->
try [ Sys.getenv "FRAMAC_LIB" ^ "/plugins" ]
with Not_found -> [ "@FRAMAC_PLUGINDIR@" ]
let plugin_path = String.concat ":" plugin_dir
-let () = match plugin_dir with
- | [d] -> Filepath.add_symbolic_dir "FRAMAC_PLUGIN" d
- | ds ->
- Array.iteri
- (fun i d ->
- let path = Printf.sprintf "FRAMAC_PLUGIN#%d" (succ i) in
- Filepath.add_symbolic_dir path d)
- (Array.of_list ds)
+let () = add_symbolic_dir_list "FRAMAC_PLUGIN" plugin_dir
let default_cpp = "@FRAMAC_DEFAULT_CPP@"
diff --git a/src/kernel_internals/runtime/config.mli b/src/kernel_internals/runtime/config.mli
index 105dc24fd3334aa6204f9ebfaf638b693c0e7854..d223daf3b963e3919f947abc024a05619d04c9f4 100644
--- a/src/kernel_internals/runtime/config.mli
+++ b/src/kernel_internals/runtime/config.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -59,7 +59,17 @@ val ocaml_wflags: string
@since Chlorine-20180501 *)
val datadir: string
- (** Directory where architecture independent files are. *)
+ (** Directory where architecture independent files are.
+ Main directory, use {!datadirs} for the others *)
+
+val datadirs: string list
+ (** Directories where architecture independent files are in order of
+ priority.
+ @since Frama-C-trunk*)
+
+val framac_libc: string
+ (** Directory where Frama-C libc headers are.
+ @since Frama-C-trunk*)
val libdir: string
(** Directory where the Frama-C kernel library is.
diff --git a/src/kernel_internals/runtime/frama_c_config.ml.in b/src/kernel_internals/runtime/frama_c_config.ml.in
index 872ca17eb22548a5ab7711e89b32378f5a5add01..15f01b713b6e94cbc096e0bbff64a88a9bae3d93 100644
--- a/src/kernel_internals/runtime/frama_c_config.ml.in
+++ b/src/kernel_internals/runtime/frama_c_config.ml.in
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/frama_c_init.ml b/src/kernel_internals/runtime/frama_c_init.ml
index 5587705baafb5425e175afef27a11485e1b73c09..94099da7b5febdc09bf9fc158a5ab3389c7f74ba 100644
--- a/src/kernel_internals/runtime/frama_c_init.ml
+++ b/src/kernel_internals/runtime/frama_c_init.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/frama_c_init.mli b/src/kernel_internals/runtime/frama_c_init.mli
index 0b78298540d2c54f3b1c88027f2cdf7ff6461e16..fff1a57dde130f657e49841a9f66314510d72cff 100644
--- a/src/kernel_internals/runtime/frama_c_init.mli
+++ b/src/kernel_internals/runtime/frama_c_init.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/gui_init.ml b/src/kernel_internals/runtime/gui_init.ml
index b06914a5cea3eb221b29b2072b9e6d49fe5ecd76..aaaf9362a05a095b78854ced947a73a1a695f4da 100644
--- a/src/kernel_internals/runtime/gui_init.ml
+++ b/src/kernel_internals/runtime/gui_init.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/gui_init.mli b/src/kernel_internals/runtime/gui_init.mli
index 4ec9af8d63ae3487115c38ea94d6171bd0c479a4..de5814abead6a05e0d90e214c19096fba5aa219d 100644
--- a/src/kernel_internals/runtime/gui_init.mli
+++ b/src/kernel_internals/runtime/gui_init.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/messages.ml b/src/kernel_internals/runtime/messages.ml
index 42d142ebb8c7f784c6372eebf4e0eb9dfdd6dd11..9d32138b4df31616c75d96d46e008967af5fda13 100644
--- a/src/kernel_internals/runtime/messages.ml
+++ b/src/kernel_internals/runtime/messages.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/messages.mli b/src/kernel_internals/runtime/messages.mli
index 49fc8d6646a91857ec4b958c71926181af8bb856..5a7da51baa5a65f6f3287a57e9155ed58667963d 100644
--- a/src/kernel_internals/runtime/messages.mli
+++ b/src/kernel_internals/runtime/messages.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/special_hooks.ml b/src/kernel_internals/runtime/special_hooks.ml
index c302651359ef88cf75158a60d265e9919ac06900..9aecb292da713a7214e26574f10a62229de8f029 100644
--- a/src/kernel_internals/runtime/special_hooks.ml
+++ b/src/kernel_internals/runtime/special_hooks.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/special_hooks.mli b/src/kernel_internals/runtime/special_hooks.mli
index 223a8bc98bfd63e6ce270e622b32859d42359d82..0b4bb35903abcd92d7213a16ae5b200b28d29a2f 100644
--- a/src/kernel_internals/runtime/special_hooks.mli
+++ b/src/kernel_internals/runtime/special_hooks.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/runtime/toplevel_config.ml b/src/kernel_internals/runtime/toplevel_config.ml
index b78c7a82b4790e7582266afaa3d0b920343a730a..6c03708b5d536796d917176cccb9c296ab0bbb5c 100644
--- a/src/kernel_internals/runtime/toplevel_config.ml
+++ b/src/kernel_internals/runtime/toplevel_config.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/allocates.ml b/src/kernel_internals/typing/allocates.ml
index 7fa2691165885362cd5bed069473b51fe7981820..708ffa5705235244f0416d78b0b413b32eb0b376 100644
--- a/src/kernel_internals/typing/allocates.ml
+++ b/src/kernel_internals/typing/allocates.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/allocates.mli b/src/kernel_internals/typing/allocates.mli
index ae41367e2949bdb90827dbf97f36a8b078290d64..8e03dec87599f7dd73882a6a401822fbfc28fd29 100644
--- a/src/kernel_internals/typing/allocates.mli
+++ b/src/kernel_internals/typing/allocates.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/asm_contracts.ml b/src/kernel_internals/typing/asm_contracts.ml
index 8442c9d157b20f1a20576307981da91ec131dd86..3bf647bcaa472e030cd5ddb1868c4e77f8d504b4 100644
--- a/src/kernel_internals/typing/asm_contracts.ml
+++ b/src/kernel_internals/typing/asm_contracts.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/asm_contracts.mli b/src/kernel_internals/typing/asm_contracts.mli
index 3cc03df63f0f990ba1e5f3bf4f1005ad51322d76..068fe6ab31027d0bae2d6769ba4a99dfcd542079 100644
--- a/src/kernel_internals/typing/asm_contracts.mli
+++ b/src/kernel_internals/typing/asm_contracts.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/cabs2cil.ml b/src/kernel_internals/typing/cabs2cil.ml
index c8b732b1e23a056c6be1133086cc5135f662ab15..3b2efa166105a7aff67e0a393a03683f3c33ab64 100644
--- a/src/kernel_internals/typing/cabs2cil.ml
+++ b/src/kernel_internals/typing/cabs2cil.ml
@@ -315,7 +315,7 @@ let process_stdlib_pragma name args =
match args with
| [ ACons ("pop",_) ] -> pop_stdheader (); None
| [ ACons ("push",_); AStr s ] ->
- let base_name = Config.datadir ^ "/libc" in
+ let base_name = Config.framac_libc in
let relative_name = Filepath.relativize ~base_name s in
push_stdheader relative_name;
None
diff --git a/src/kernel_internals/typing/infer_annotations.ml b/src/kernel_internals/typing/infer_annotations.ml
index ce6db212ee42f28a0ed2bda736cd0d7b1cc071ed..d4d4103964a90292cadc12908ab670513e9f0b7a 100644
--- a/src/kernel_internals/typing/infer_annotations.ml
+++ b/src/kernel_internals/typing/infer_annotations.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/infer_annotations.mli b/src/kernel_internals/typing/infer_annotations.mli
index 300f0660f60a3663e0e7581e3efbb12b5668b718..a1178c10203390e3849db3a87a02837a84c04a8b 100644
--- a/src/kernel_internals/typing/infer_annotations.mli
+++ b/src/kernel_internals/typing/infer_annotations.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/logic_builtin.ml b/src/kernel_internals/typing/logic_builtin.ml
index f4abac663caa34e324cb0ed2a640324ae3158a0e..ae1a73a97132d659383b01a7ec8643a7f72c002d 100644
--- a/src/kernel_internals/typing/logic_builtin.ml
+++ b/src/kernel_internals/typing/logic_builtin.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_internals/typing/logic_builtin.mli b/src/kernel_internals/typing/logic_builtin.mli
index 344158dea5e2fd00fbd531e1d6c6ec1ec5ea22af..450424692e24d917270d85f301063c3f003989a0 100644
--- a/src/kernel_internals/typing/logic_builtin.mli
+++ b/src/kernel_internals/typing/logic_builtin.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_internals/typing/translate_lightweight.ml b/src/kernel_internals/typing/translate_lightweight.ml
index 9cef8543bca6a3cd3ae5db537a662f0bedf9b300..6a0d0782976a50aed991de0cb5bea509d9b12cff 100644
--- a/src/kernel_internals/typing/translate_lightweight.ml
+++ b/src/kernel_internals/typing/translate_lightweight.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_internals/typing/translate_lightweight.mli b/src/kernel_internals/typing/translate_lightweight.mli
index 4d16614c777c866145e3ccafd272f53b5fee24a9..de459d4d757afdc55a337b0a53f4f3df05ef37b1 100644
--- a/src/kernel_internals/typing/translate_lightweight.mli
+++ b/src/kernel_internals/typing/translate_lightweight.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_internals/typing/unroll_loops.ml b/src/kernel_internals/typing/unroll_loops.ml
index a14e8c949d178ccb6ae85753051397b002291ff6..c85d9b2aa7178af7dff2298349b53fb2639bff72 100644
--- a/src/kernel_internals/typing/unroll_loops.ml
+++ b/src/kernel_internals/typing/unroll_loops.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_internals/typing/unroll_loops.mli b/src/kernel_internals/typing/unroll_loops.mli
index d6d265978d4d136a14628c71b6e47612cb790118..010ba3032136293a5bdf9f972d55cf4e45c19fa9 100644
--- a/src/kernel_internals/typing/unroll_loops.mli
+++ b/src/kernel_internals/typing/unroll_loops.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/abstract_interp.ml b/src/kernel_services/abstract_interp/abstract_interp.ml
index 9048a2f38903e22f39c073f2def2881b06aca866..31bdbd7a92432988a8e4002ce562aa327740cd50 100644
--- a/src/kernel_services/abstract_interp/abstract_interp.ml
+++ b/src/kernel_services/abstract_interp/abstract_interp.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/abstract_interp.mli b/src/kernel_services/abstract_interp/abstract_interp.mli
index d76e2edee1ad4e7de7fd965cef2972be066e1371..140949d5b2561e5ff91009bf111cbcc86a25b54d 100644
--- a/src/kernel_services/abstract_interp/abstract_interp.mli
+++ b/src/kernel_services/abstract_interp/abstract_interp.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/base.ml b/src/kernel_services/abstract_interp/base.ml
index 559048aacaeeb540be77d5108eee34599f55f1cc..87254965dd6ab4feac9e7fcfffa6109a7ab4d2eb 100644
--- a/src/kernel_services/abstract_interp/base.ml
+++ b/src/kernel_services/abstract_interp/base.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/base.mli b/src/kernel_services/abstract_interp/base.mli
index 0bcd2352f29fa9cbf8feb26d20e9ad39593af07c..0c4cefd19495e11fb35129e8649ca2b1e9bd3346 100644
--- a/src/kernel_services/abstract_interp/base.mli
+++ b/src/kernel_services/abstract_interp/base.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/bottom.ml b/src/kernel_services/abstract_interp/bottom.ml
index 213248a9c5618a58be1d14e9f59350a0045007f1..c6ae61d80ae4388dd589aefb37f602232ed75845 100644
--- a/src/kernel_services/abstract_interp/bottom.ml
+++ b/src/kernel_services/abstract_interp/bottom.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/bottom.mli b/src/kernel_services/abstract_interp/bottom.mli
index 50c9aa6ab3fcdd45e2d5c00899e98a077acc5acd..7fca1504bf344fe2b83b1036d3026be61a54a1ec 100644
--- a/src/kernel_services/abstract_interp/bottom.mli
+++ b/src/kernel_services/abstract_interp/bottom.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/fc_float.ml b/src/kernel_services/abstract_interp/fc_float.ml
index 82d8e62c7b182b22553910b4cde33b001263c246..3d0b23e3631f7bfb202e8e67e383728d05b71b8b 100644
--- a/src/kernel_services/abstract_interp/fc_float.ml
+++ b/src/kernel_services/abstract_interp/fc_float.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/fc_float.mli b/src/kernel_services/abstract_interp/fc_float.mli
index 1b6925274029ddf0510b62759290e5e1b1b3741f..f440bcbc3952dcca315240edc24118981c56b16e 100644
--- a/src/kernel_services/abstract_interp/fc_float.mli
+++ b/src/kernel_services/abstract_interp/fc_float.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/float_interval.ml b/src/kernel_services/abstract_interp/float_interval.ml
index 1726ff540f395749908db9cd33444394e54db903..719eaa98d82b78b55698343539bd1a6351e3cf5b 100644
--- a/src/kernel_services/abstract_interp/float_interval.ml
+++ b/src/kernel_services/abstract_interp/float_interval.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/float_interval.mli b/src/kernel_services/abstract_interp/float_interval.mli
index 4deca1935b871aaefb9f70d24d6dfc62f5906d82..51cb520393b5c50cb8390dadddfdf829c78602ba 100644
--- a/src/kernel_services/abstract_interp/float_interval.mli
+++ b/src/kernel_services/abstract_interp/float_interval.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/float_interval_sig.mli b/src/kernel_services/abstract_interp/float_interval_sig.mli
index 5b23a28afe6b81976a13422c735077b2465ce41a..d2250132fe1b9cf1497adf4cd7b6469ff8e10045 100644
--- a/src/kernel_services/abstract_interp/float_interval_sig.mli
+++ b/src/kernel_services/abstract_interp/float_interval_sig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/float_sig.mli b/src/kernel_services/abstract_interp/float_sig.mli
index fc133f4b842676e71f7d36f88c99e08b6ea5d3d3..37c9d5be3d16637b75a742a64d47f7914e8b0dc6 100644
--- a/src/kernel_services/abstract_interp/float_sig.mli
+++ b/src/kernel_services/abstract_interp/float_sig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/fval.ml b/src/kernel_services/abstract_interp/fval.ml
index 4e408d7501dda2045959a736f6b1b7084269fc8c..401366d2a1119228bdf5fb580ea2925c0159d1a7 100644
--- a/src/kernel_services/abstract_interp/fval.ml
+++ b/src/kernel_services/abstract_interp/fval.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/fval.mli b/src/kernel_services/abstract_interp/fval.mli
index 00fa44e87ee170ce8c5d12af5d47673e74131617..4bebb2da3ebd637dcf68cfed1baf656a8cf5d696 100644
--- a/src/kernel_services/abstract_interp/fval.mli
+++ b/src/kernel_services/abstract_interp/fval.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/int_Base.ml b/src/kernel_services/abstract_interp/int_Base.ml
index f9c8f71d1ee5a3630990789e67afdf472d7bb1ac..c7a469da08bb20c41907029a939a63759b3cccdc 100644
--- a/src/kernel_services/abstract_interp/int_Base.ml
+++ b/src/kernel_services/abstract_interp/int_Base.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/int_Base.mli b/src/kernel_services/abstract_interp/int_Base.mli
index eb0c01c0bb8aebebfa1b9317f33a0d21568ba9be..c7b6247c930f80e62063c33aeff07282c810a38b 100644
--- a/src/kernel_services/abstract_interp/int_Base.mli
+++ b/src/kernel_services/abstract_interp/int_Base.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/int_Intervals.ml b/src/kernel_services/abstract_interp/int_Intervals.ml
index 3401fa0e714a2173e4653e86d0ed4993759c9bfe..8e2225bd7ad3b21ed9f2df6bd76c216b9d507deb 100644
--- a/src/kernel_services/abstract_interp/int_Intervals.ml
+++ b/src/kernel_services/abstract_interp/int_Intervals.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/int_Intervals.mli b/src/kernel_services/abstract_interp/int_Intervals.mli
index 5cda124f221e0236f31e2b0d649fd0b91f0b5fd9..58537df64aec31018c9d0d8851a5b89f0e73864d 100644
--- a/src/kernel_services/abstract_interp/int_Intervals.mli
+++ b/src/kernel_services/abstract_interp/int_Intervals.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/int_Intervals_sig.mli b/src/kernel_services/abstract_interp/int_Intervals_sig.mli
index 732ae85767f32f04befb0da4c609939daa61e5b8..a949c184f7c360df07ec538eefacc76bd4fe8f5b 100644
--- a/src/kernel_services/abstract_interp/int_Intervals_sig.mli
+++ b/src/kernel_services/abstract_interp/int_Intervals_sig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/ival.ml b/src/kernel_services/abstract_interp/ival.ml
index 7a70c5e190c63bc239521e4d5aecdbdc4de4ef6f..ce2e6ad7ca77b84a1848fc74c0a9dcb318db2f4a 100644
--- a/src/kernel_services/abstract_interp/ival.ml
+++ b/src/kernel_services/abstract_interp/ival.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/ival.mli b/src/kernel_services/abstract_interp/ival.mli
index 4f2438bc90fbd3a1a2faf0e4d639ab41c7564917..b4f3e5a485b8c26e3936e919e65ade6a44346eef 100644
--- a/src/kernel_services/abstract_interp/ival.mli
+++ b/src/kernel_services/abstract_interp/ival.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lattice_messages.ml b/src/kernel_services/abstract_interp/lattice_messages.ml
index 04ee0ac4327b5e1817586cc1ddde5c9ad94c95f0..4f03bc4633845ca4e4ba75f7e58b204bf90b9486 100644
--- a/src/kernel_services/abstract_interp/lattice_messages.ml
+++ b/src/kernel_services/abstract_interp/lattice_messages.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lattice_messages.mli b/src/kernel_services/abstract_interp/lattice_messages.mli
index 417eed1923406c25f3ff21bbe4091e2cadc961a1..553ef235babc1d1dbc1b6d9dfbed103eb852f33f 100644
--- a/src/kernel_services/abstract_interp/lattice_messages.mli
+++ b/src/kernel_services/abstract_interp/lattice_messages.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lattice_type.mli b/src/kernel_services/abstract_interp/lattice_type.mli
index d4cc251e5d4db201c721338ba78a78d63c1d3abe..a494ea5ea67ac6c910bc95c9f441970c807a1f72 100644
--- a/src/kernel_services/abstract_interp/lattice_type.mli
+++ b/src/kernel_services/abstract_interp/lattice_type.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lmap.ml b/src/kernel_services/abstract_interp/lmap.ml
index fdffff1b6fab76c2367d9dd4c2b8b523acd3f012..28caf337006fcec6b57e30107c4995b82d084cc5 100644
--- a/src/kernel_services/abstract_interp/lmap.ml
+++ b/src/kernel_services/abstract_interp/lmap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lmap.mli b/src/kernel_services/abstract_interp/lmap.mli
index 881cea3c9677097fb8453a5079ed15a0f3907280..44f39505c5bc96129f0a44021069b449f4c71229 100644
--- a/src/kernel_services/abstract_interp/lmap.mli
+++ b/src/kernel_services/abstract_interp/lmap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lmap_bitwise.ml b/src/kernel_services/abstract_interp/lmap_bitwise.ml
index e64ae1790eed2d5b3368cc530ec57dc47c6c93d5..3c87d3bcbc353aa1a405681a6483f058f9bc9dcb 100644
--- a/src/kernel_services/abstract_interp/lmap_bitwise.ml
+++ b/src/kernel_services/abstract_interp/lmap_bitwise.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lmap_bitwise.mli b/src/kernel_services/abstract_interp/lmap_bitwise.mli
index 6965e5c2cf17b8f403e7c034f6d2d9a38e57cc46..7a35801ca87f9c61d1132140139642f36673f121 100644
--- a/src/kernel_services/abstract_interp/lmap_bitwise.mli
+++ b/src/kernel_services/abstract_interp/lmap_bitwise.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/lmap_sig.mli b/src/kernel_services/abstract_interp/lmap_sig.mli
index 470d6b791d0171ce65f46bf2e09f54fbb3e3f939..5ce3fde3695c5cb108532ec53d8ffc221385917d 100644
--- a/src/kernel_services/abstract_interp/lmap_sig.mli
+++ b/src/kernel_services/abstract_interp/lmap_sig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/locations.ml b/src/kernel_services/abstract_interp/locations.ml
index a1ab29ef8ea8ae2d8579e823c7b65ab0bcefc98e..f508068d2dbd6d7c4ccf4594625a23e2f5ea903d 100644
--- a/src/kernel_services/abstract_interp/locations.ml
+++ b/src/kernel_services/abstract_interp/locations.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/locations.mli b/src/kernel_services/abstract_interp/locations.mli
index e534cab24f86193d73753b69b75852faaea4d1d0..f1facdc393237c64a1b8892bf852f36ff05f83d0 100644
--- a/src/kernel_services/abstract_interp/locations.mli
+++ b/src/kernel_services/abstract_interp/locations.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/map_lattice.ml b/src/kernel_services/abstract_interp/map_lattice.ml
index 2e0ac18fa3c7f9f922f998c53e4d5335375be203..6dbc13c604bf1a7bff81817254fb141a0e401eff 100644
--- a/src/kernel_services/abstract_interp/map_lattice.ml
+++ b/src/kernel_services/abstract_interp/map_lattice.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/map_lattice.mli b/src/kernel_services/abstract_interp/map_lattice.mli
index 943df7027ccb38bf73f69580842b1b5d294499a8..d8148633719f381f557367cc2e23c5735d128263 100644
--- a/src/kernel_services/abstract_interp/map_lattice.mli
+++ b/src/kernel_services/abstract_interp/map_lattice.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/offsetmap.ml b/src/kernel_services/abstract_interp/offsetmap.ml
index 7914f54871a6507f283a8ff4e01cbfc1cdee548a..65b75830d44797231236f36c18da41f0e86135f4 100644
--- a/src/kernel_services/abstract_interp/offsetmap.ml
+++ b/src/kernel_services/abstract_interp/offsetmap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/offsetmap.mli b/src/kernel_services/abstract_interp/offsetmap.mli
index af0d3548205d32bd62c3bec8198bf174a89f1a7a..88e2986c36d8cebb73384279ffd563b139a00eb3 100644
--- a/src/kernel_services/abstract_interp/offsetmap.mli
+++ b/src/kernel_services/abstract_interp/offsetmap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.mli b/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.mli
index 74e5c282130c78464971be5212ea7cbacaac6dc6..96c829e1f81f8253473b48b2046efcd80b233ac2 100644
--- a/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.mli
+++ b/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/offsetmap_lattice_with_isotropy.mli b/src/kernel_services/abstract_interp/offsetmap_lattice_with_isotropy.mli
index 10794055e3aa4aa80753f3c0850c3d850a436e2e..e2dfef042edd030211d9100ad5ac0ee2819d52f3 100644
--- a/src/kernel_services/abstract_interp/offsetmap_lattice_with_isotropy.mli
+++ b/src/kernel_services/abstract_interp/offsetmap_lattice_with_isotropy.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/offsetmap_sig.mli b/src/kernel_services/abstract_interp/offsetmap_sig.mli
index 538ae8984af8fd019f4cb602d375aa744df47767..87ee6349e914f8f428991146cde7aeba63c5a113 100644
--- a/src/kernel_services/abstract_interp/offsetmap_sig.mli
+++ b/src/kernel_services/abstract_interp/offsetmap_sig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/origin.ml b/src/kernel_services/abstract_interp/origin.ml
index f5df03b9dfb29002f0f4346893ddb7dc9791a2a1..a52ccdf1187cd648944c4d929001b78e75108b5f 100644
--- a/src/kernel_services/abstract_interp/origin.ml
+++ b/src/kernel_services/abstract_interp/origin.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/origin.mli b/src/kernel_services/abstract_interp/origin.mli
index 8b6af5208aa36992fd8f0f84b3ea6ce7c6da0b85..cbad78145bef6661246cf06c3a58ed7a3424e793 100644
--- a/src/kernel_services/abstract_interp/origin.mli
+++ b/src/kernel_services/abstract_interp/origin.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/tr_offset.ml b/src/kernel_services/abstract_interp/tr_offset.ml
index 2a6af76e8fc4357ce4167bf45eb6b2027e33f688..190317dfd3faa1084880a06df2395fe5ecb7b58f 100644
--- a/src/kernel_services/abstract_interp/tr_offset.ml
+++ b/src/kernel_services/abstract_interp/tr_offset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/abstract_interp/tr_offset.mli b/src/kernel_services/abstract_interp/tr_offset.mli
index c88fd738bfdfad100b26ba64b3d211614ebb585f..d59336ec349c56dce580427d086d84151453dc43 100644
--- a/src/kernel_services/abstract_interp/tr_offset.mli
+++ b/src/kernel_services/abstract_interp/tr_offset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/bit_utils.ml b/src/kernel_services/analysis/bit_utils.ml
index a820ec1df7cb803c4fb017e8349faba02686f465..136e76937003d473afea011ffa5282634c8f44a6 100644
--- a/src/kernel_services/analysis/bit_utils.ml
+++ b/src/kernel_services/analysis/bit_utils.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/bit_utils.mli b/src/kernel_services/analysis/bit_utils.mli
index d606f6adac536e4dfa43e185db834f86b95fc52a..a1848f842b42c957b06776b71158aceefd4e596e 100644
--- a/src/kernel_services/analysis/bit_utils.mli
+++ b/src/kernel_services/analysis/bit_utils.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/dataflow2.ml b/src/kernel_services/analysis/dataflow2.ml
index 5581e725e9895dd79c370c5b7dcef71e0c1e4eb4..bb3745381898398296e8fceefb6b9503fa870e04 100644
--- a/src/kernel_services/analysis/dataflow2.ml
+++ b/src/kernel_services/analysis/dataflow2.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/dataflow2.mli b/src/kernel_services/analysis/dataflow2.mli
index bdcf36b4806674e44d54e2e1a33e59493bd99cc6..70a682c02acc54472493023e76cb23570df9a651 100644
--- a/src/kernel_services/analysis/dataflow2.mli
+++ b/src/kernel_services/analysis/dataflow2.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/destructors.ml b/src/kernel_services/analysis/destructors.ml
index 5218c823d0e2e408da05510bdbd924034a7927ed..366440d2a58930a27ac6f61d9191bd4c32af8856 100644
--- a/src/kernel_services/analysis/destructors.ml
+++ b/src/kernel_services/analysis/destructors.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/destructors.mli b/src/kernel_services/analysis/destructors.mli
index 6a499055ae14fe0f8eafe287f55094c0172ee514..dc5f1828661cbd79621809ed9e7052de7acd7738 100644
--- a/src/kernel_services/analysis/destructors.mli
+++ b/src/kernel_services/analysis/destructors.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/dominators.ml b/src/kernel_services/analysis/dominators.ml
index 54d6c678932f29a4841bae89fdf0e5a0f3e50bb4..5fceb38618ee843b01ab0135654ffc2baa4a803e 100644
--- a/src/kernel_services/analysis/dominators.ml
+++ b/src/kernel_services/analysis/dominators.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/dominators.mli b/src/kernel_services/analysis/dominators.mli
index 35853c21ed2711dd8774b15428efd310155a8719..e390bf5e3a059439af8f7a0beba5f84eeab009cb 100644
--- a/src/kernel_services/analysis/dominators.mli
+++ b/src/kernel_services/analysis/dominators.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/exn_flow.ml b/src/kernel_services/analysis/exn_flow.ml
index e45cdac76203cd0451c323929021bd740af5c0e2..fb55879b28007bff7b40df5665fd34b94e42863f 100644
--- a/src/kernel_services/analysis/exn_flow.ml
+++ b/src/kernel_services/analysis/exn_flow.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/exn_flow.mli b/src/kernel_services/analysis/exn_flow.mli
index 37b29cbe7b0d9e0e1a40570297280dcefd851ad7..3bd95fd0b51da72134e6a141ff28270cc5ead0c4 100644
--- a/src/kernel_services/analysis/exn_flow.mli
+++ b/src/kernel_services/analysis/exn_flow.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/interpreted_automata.ml b/src/kernel_services/analysis/interpreted_automata.ml
index c9b421da2f531f86c7c971febf4e5425cb438477..7038bbce318da3fdf1a9a6541b73a257930490db 100644
--- a/src/kernel_services/analysis/interpreted_automata.ml
+++ b/src/kernel_services/analysis/interpreted_automata.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/interpreted_automata.mli b/src/kernel_services/analysis/interpreted_automata.mli
index 6d51fe680a44990ec91db2de73954143af54c9d6..c7c1b86d8732efb66b29bd2448ba60f0b8fa557c 100644
--- a/src/kernel_services/analysis/interpreted_automata.mli
+++ b/src/kernel_services/analysis/interpreted_automata.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/logic_interp.ml b/src/kernel_services/analysis/logic_interp.ml
index f40ed55aec7ff66c75402e1c937d960bcc51b140..8a82bb7009c44cdb18b0358052dc123bf79527ad 100644
--- a/src/kernel_services/analysis/logic_interp.ml
+++ b/src/kernel_services/analysis/logic_interp.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/logic_interp.mli b/src/kernel_services/analysis/logic_interp.mli
index b8e1fcb314c080e7177cfff079eaa45290c68630..af93fc8fb44946d5614f441e1cc6e6220289e994 100644
--- a/src/kernel_services/analysis/logic_interp.mli
+++ b/src/kernel_services/analysis/logic_interp.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/loop.ml b/src/kernel_services/analysis/loop.ml
index d54e6aa71a6299b21a4f299d564cb78a282d90d6..9daa7eace4299ae3e788f41156bcb14439d537dd 100644
--- a/src/kernel_services/analysis/loop.ml
+++ b/src/kernel_services/analysis/loop.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/loop.mli b/src/kernel_services/analysis/loop.mli
index 2f580026d3b2b3f04b8f1a2f8d8fb3145da1c821..da142b70ce20bc926594c640e12be5b09337a906 100644
--- a/src/kernel_services/analysis/loop.mli
+++ b/src/kernel_services/analysis/loop.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/ordered_stmt.ml b/src/kernel_services/analysis/ordered_stmt.ml
index 46320f0f5a7f9f9414bbe1c66c337438742ea515..762f37254ff368a8b32f51c0e6814e5639a4ddb4 100644
--- a/src/kernel_services/analysis/ordered_stmt.ml
+++ b/src/kernel_services/analysis/ordered_stmt.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/ordered_stmt.mli b/src/kernel_services/analysis/ordered_stmt.mli
index e0ee49e2ebf5b4a22dd00e05a58b0d27c325542a..6ad24780272bd2f488fdcb412522cbe6f16265dc 100644
--- a/src/kernel_services/analysis/ordered_stmt.mli
+++ b/src/kernel_services/analysis/ordered_stmt.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/service_graph.ml b/src/kernel_services/analysis/service_graph.ml
index d00a785c30b76a0835bbfecdbee68e46d2456dce..f7f042288ff4983d7d709296ae1c5546953a8b4e 100644
--- a/src/kernel_services/analysis/service_graph.ml
+++ b/src/kernel_services/analysis/service_graph.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/service_graph.mli b/src/kernel_services/analysis/service_graph.mli
index 66a5eefb362a2a2ab99d46091097ecb62cb8b8b7..0ada83031f4e81619d41f95bdc20078e2de97236 100644
--- a/src/kernel_services/analysis/service_graph.mli
+++ b/src/kernel_services/analysis/service_graph.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/stmts_graph.ml b/src/kernel_services/analysis/stmts_graph.ml
index 88b588cc0e08b60320a3fcd020e947bf0835a7f6..096e3a9ce0be525bb6dc26725287de8e1d1b5ccc 100644
--- a/src/kernel_services/analysis/stmts_graph.ml
+++ b/src/kernel_services/analysis/stmts_graph.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/stmts_graph.mli b/src/kernel_services/analysis/stmts_graph.mli
index cb29d1310c2f598e6f77002e5add4b71a64e17ee..dd64d3a01a81f74fee60bd63a66000e5e5f73a49 100644
--- a/src/kernel_services/analysis/stmts_graph.mli
+++ b/src/kernel_services/analysis/stmts_graph.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/undefined_sequence.ml b/src/kernel_services/analysis/undefined_sequence.ml
index c7fd90985fc4dccaeacc15188b79b8131ffafab7..1fbc213478de01a00dbde6968197a8d438b70b30 100644
--- a/src/kernel_services/analysis/undefined_sequence.ml
+++ b/src/kernel_services/analysis/undefined_sequence.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/undefined_sequence.mli b/src/kernel_services/analysis/undefined_sequence.mli
index 489295ecd5dca3482af5df1f3fe3cba9ec9ca273..48b80a46be1d222af219924748b529fdce3bf513 100644
--- a/src/kernel_services/analysis/undefined_sequence.mli
+++ b/src/kernel_services/analysis/undefined_sequence.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/wto_statement.ml b/src/kernel_services/analysis/wto_statement.ml
index 17d5fb33a64a523fb2b354623c439ad170077c6d..7cb1c48e8d78dbe61504b9fb6504bba135bbccaf 100644
--- a/src/kernel_services/analysis/wto_statement.ml
+++ b/src/kernel_services/analysis/wto_statement.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/analysis/wto_statement.mli b/src/kernel_services/analysis/wto_statement.mli
index 1e6fd83213227179a05c44f5176e444bd372f974..7c51d4c53c293b0cf378d6dfb67be02a9be51880 100644
--- a/src/kernel_services/analysis/wto_statement.mli
+++ b/src/kernel_services/analysis/wto_statement.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/alarms.ml b/src/kernel_services/ast_data/alarms.ml
index 44148a384ac7d4f05e4fd45685377db432f015cd..ff279b93cf08519395f6ef3652339a5a93912ccf 100644
--- a/src/kernel_services/ast_data/alarms.ml
+++ b/src/kernel_services/ast_data/alarms.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/alarms.mli b/src/kernel_services/ast_data/alarms.mli
index 220176b34cb7f082d0ff09b426eedfa69eee796a..c8a332f79f106f52fef155317c6004704ca2e210 100644
--- a/src/kernel_services/ast_data/alarms.mli
+++ b/src/kernel_services/ast_data/alarms.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/annotations.ml b/src/kernel_services/ast_data/annotations.ml
index 340218eafb9aa88e87767599e958c29a187926cf..8051b863e0d6e10256fff2665917d6a25abaa14f 100644
--- a/src/kernel_services/ast_data/annotations.ml
+++ b/src/kernel_services/ast_data/annotations.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/annotations.mli b/src/kernel_services/ast_data/annotations.mli
index ae97a1ea5d865b000529f30a96f15e196a74a791..3252d40e661210bc7754c71483567110d4a31abc 100644
--- a/src/kernel_services/ast_data/annotations.mli
+++ b/src/kernel_services/ast_data/annotations.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/ast.ml b/src/kernel_services/ast_data/ast.ml
index 2e90deaeb70e3b812726884bf92f538a2707ee84..c7fcabb67d62459612d5e4cb52e16d4ca19a7386 100644
--- a/src/kernel_services/ast_data/ast.ml
+++ b/src/kernel_services/ast_data/ast.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/ast.mli b/src/kernel_services/ast_data/ast.mli
index 27380d5e97c933cdf45217e273c7873ac2215db7..0385cecc9181b85c762953238def70075c43ffb4 100644
--- a/src/kernel_services/ast_data/ast.mli
+++ b/src/kernel_services/ast_data/ast.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/globals.ml b/src/kernel_services/ast_data/globals.ml
index 0d6653284553b0c3317794c33b56ca5b0244f16e..b84dfc4a2b8b68eda18195b19b57f12e2468b223 100644
--- a/src/kernel_services/ast_data/globals.ml
+++ b/src/kernel_services/ast_data/globals.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/globals.mli b/src/kernel_services/ast_data/globals.mli
index d80e4af7670f923d25bd0e21f1caea1bc46b71fa..7ec981f70ba9afa672cbe7f060f914862d16f897 100644
--- a/src/kernel_services/ast_data/globals.mli
+++ b/src/kernel_services/ast_data/globals.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/kernel_function.ml b/src/kernel_services/ast_data/kernel_function.ml
index e24380065ea8bc793b15a3c2ab5506c1ab3039a6..1d7d7d982b0cda0c31270cbb7c6692eb9d426f48 100644
--- a/src/kernel_services/ast_data/kernel_function.ml
+++ b/src/kernel_services/ast_data/kernel_function.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/kernel_function.mli b/src/kernel_services/ast_data/kernel_function.mli
index db00a8d5768d7120fb9a17069db38b4aa7f1be7d..d6700783c495fe773ecb3fc9af317b1732058340 100644
--- a/src/kernel_services/ast_data/kernel_function.mli
+++ b/src/kernel_services/ast_data/kernel_function.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/property.ml b/src/kernel_services/ast_data/property.ml
index 2a71f4d4ae45e372aefb32dd88de747514dd796c..b9b66ce0d750ec0a3ef33c2f5ea3dd369217b470 100644
--- a/src/kernel_services/ast_data/property.ml
+++ b/src/kernel_services/ast_data/property.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/property.mli b/src/kernel_services/ast_data/property.mli
index ed53e7c7258ba11a63a39e0457bfb5960b69a7bc..61f401c12a113f0abec2eebf75176897db61c6cb 100644
--- a/src/kernel_services/ast_data/property.mli
+++ b/src/kernel_services/ast_data/property.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/property_status.ml b/src/kernel_services/ast_data/property_status.ml
index cb1d6cebb3f268c8bb14e190e18002db612b4193..10e25594bfed19cfedf49dca7ae9938475b680cf 100644
--- a/src/kernel_services/ast_data/property_status.ml
+++ b/src/kernel_services/ast_data/property_status.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/property_status.mli b/src/kernel_services/ast_data/property_status.mli
index 4b78fabe9f20fbb21190946d03272b490f635037..7a6ea9770f65e1a447bb408dd4fe4e1114246186 100644
--- a/src/kernel_services/ast_data/property_status.mli
+++ b/src/kernel_services/ast_data/property_status.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/statuses_by_call.ml b/src/kernel_services/ast_data/statuses_by_call.ml
index 03d33c01f5dd0e9eec5aaae7d791e16612063a9c..e5506a00785c6ed8f974d911d05ab7b3e730d42a 100644
--- a/src/kernel_services/ast_data/statuses_by_call.ml
+++ b/src/kernel_services/ast_data/statuses_by_call.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_data/statuses_by_call.mli b/src/kernel_services/ast_data/statuses_by_call.mli
index 9479c3a2f15e0586eb5113a1670d25a0b6bfaafe..7894fc6a191b84f94d0d5164ad3c255553f30107 100644
--- a/src/kernel_services/ast_data/statuses_by_call.mli
+++ b/src/kernel_services/ast_data/statuses_by_call.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cabs_debug.ml b/src/kernel_services/ast_printing/cabs_debug.ml
index 758cfab2983cb7a73821eee32e09b288259fe31a..25dca2c6207f8d27ae96479aed86d11ac27fba69 100644
--- a/src/kernel_services/ast_printing/cabs_debug.ml
+++ b/src/kernel_services/ast_printing/cabs_debug.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cabs_debug.mli b/src/kernel_services/ast_printing/cabs_debug.mli
index 969d3a6e3fe7e4715503728c4aaec78e2456033a..ba13a2c40491768333012a2324db26646c74ded0 100644
--- a/src/kernel_services/ast_printing/cabs_debug.mli
+++ b/src/kernel_services/ast_printing/cabs_debug.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cil_descriptive_printer.ml b/src/kernel_services/ast_printing/cil_descriptive_printer.ml
index 79f7fa7e3be44f372873731cbbdf0c13229bcbd3..f4c2885c06426178197a2e74108e4b3f5fc03843 100644
--- a/src/kernel_services/ast_printing/cil_descriptive_printer.ml
+++ b/src/kernel_services/ast_printing/cil_descriptive_printer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cil_descriptive_printer.mli b/src/kernel_services/ast_printing/cil_descriptive_printer.mli
index 1d2f0ddc685d6905a4980e7a5b23c9a62f52844f..c3e0e0ba2cdcb7d42fe7daefde26a796e9ec5396 100644
--- a/src/kernel_services/ast_printing/cil_descriptive_printer.mli
+++ b/src/kernel_services/ast_printing/cil_descriptive_printer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cil_printer.ml b/src/kernel_services/ast_printing/cil_printer.ml
index 1da7b9aa53ffc9d030056d865ebbe672fce02f9c..583f672121c9f591f3c6691ecf4d37bf5a1726a9 100644
--- a/src/kernel_services/ast_printing/cil_printer.ml
+++ b/src/kernel_services/ast_printing/cil_printer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cil_printer.mli b/src/kernel_services/ast_printing/cil_printer.mli
index 8e01bb196cc2c097dc2ca6abbe95f7557202004b..1eb890808ea36782f8e71e5e506f5211a25df895 100644
--- a/src/kernel_services/ast_printing/cil_printer.mli
+++ b/src/kernel_services/ast_printing/cil_printer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cil_types_debug.ml b/src/kernel_services/ast_printing/cil_types_debug.ml
index e07632dee25ef9a048e3501d6f9e27f94ab6c2e9..8a0c8c33b31b0bc6d935ae21281db06035f22010 100644
--- a/src/kernel_services/ast_printing/cil_types_debug.ml
+++ b/src/kernel_services/ast_printing/cil_types_debug.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/cil_types_debug.mli b/src/kernel_services/ast_printing/cil_types_debug.mli
index ffaae353ea05ad8577a851ad210e446430f11804..e8b52c76c1c5ebdde2b17623a18563afc710a189 100644
--- a/src/kernel_services/ast_printing/cil_types_debug.mli
+++ b/src/kernel_services/ast_printing/cil_types_debug.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/description.ml b/src/kernel_services/ast_printing/description.ml
index 4dbb21c9455022dfd23d5cc4c152f3210b83bf30..c4fe1d6cdfd06e13ccd79cae4b4d75a690744bb7 100644
--- a/src/kernel_services/ast_printing/description.ml
+++ b/src/kernel_services/ast_printing/description.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/description.mli b/src/kernel_services/ast_printing/description.mli
index 02b1ea479eef6d4c1174fd8e2bb51393d9284250..a27280f88ac6fee91de4764000671b93f4d5b63b 100644
--- a/src/kernel_services/ast_printing/description.mli
+++ b/src/kernel_services/ast_printing/description.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/logic_print.ml b/src/kernel_services/ast_printing/logic_print.ml
index fa85c594c505c6be0a885e2c3d72211fb55e1e16..c81c74c97ee67bd26927d81afb46bd787b7efb7b 100644
--- a/src/kernel_services/ast_printing/logic_print.ml
+++ b/src/kernel_services/ast_printing/logic_print.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_printing/logic_print.mli b/src/kernel_services/ast_printing/logic_print.mli
index 40f8d8903d74ac7048c38d6bcf2e454c3586d3ea..db94c84ee9d5a5e40c36f53ed38b5d7e171cdefb 100644
--- a/src/kernel_services/ast_printing/logic_print.mli
+++ b/src/kernel_services/ast_printing/logic_print.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_printing/printer.ml b/src/kernel_services/ast_printing/printer.ml
index b6ced2eb01a5166366c46d2026e418b1c6779152..27c8a438e075f0d31e60e9db083b7402677e1c88 100644
--- a/src/kernel_services/ast_printing/printer.ml
+++ b/src/kernel_services/ast_printing/printer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/printer.mli b/src/kernel_services/ast_printing/printer.mli
index 7b43534d83e8df68802b7e0483c3f28911392822..2f8f4723c892681ebcbddc0439ec7c79c67c8ca9 100644
--- a/src/kernel_services/ast_printing/printer.mli
+++ b/src/kernel_services/ast_printing/printer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/printer_api.mli b/src/kernel_services/ast_printing/printer_api.mli
index 15bfee3925cc10931886343dd1a88b79320cf67a..ad1b05fafc42fe074cd0743c7edb7d5705f619bf 100644
--- a/src/kernel_services/ast_printing/printer_api.mli
+++ b/src/kernel_services/ast_printing/printer_api.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/printer_builder.ml b/src/kernel_services/ast_printing/printer_builder.ml
index 67a8019325bc0dc9825ce3071030a3be65e03483..f8947c807d7fdcb243ed4dc569713409282d00e2 100644
--- a/src/kernel_services/ast_printing/printer_builder.ml
+++ b/src/kernel_services/ast_printing/printer_builder.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_printing/printer_builder.mli b/src/kernel_services/ast_printing/printer_builder.mli
index cc52b60774b315c7ef97f2c5166cb159cc4c8260..4e433b73d0fde0437a39bc8f3f51ebbfc3becd04 100644
--- a/src/kernel_services/ast_printing/printer_builder.mli
+++ b/src/kernel_services/ast_printing/printer_builder.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/ast_info.ml b/src/kernel_services/ast_queries/ast_info.ml
index 40fd2abfac6e3f5b8fca0620e24b5a7879fe10ca..56fe55253d37e7c986f3157ef79b830d844a923d 100644
--- a/src/kernel_services/ast_queries/ast_info.ml
+++ b/src/kernel_services/ast_queries/ast_info.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/ast_info.mli b/src/kernel_services/ast_queries/ast_info.mli
index fdbba765191b76ddc390bd2ed5b54d1d57a8cf86..967ade48a3a0dc0b57e02349f6c73f56d237d0a2 100644
--- a/src/kernel_services/ast_queries/ast_info.mli
+++ b/src/kernel_services/ast_queries/ast_info.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/cil_datatype.ml b/src/kernel_services/ast_queries/cil_datatype.ml
index 4603eeb11fa5b9f38eee5d96a67ca73ace3757de..634eb66b2073c730f0e81b163e457b71c957c347 100644
--- a/src/kernel_services/ast_queries/cil_datatype.ml
+++ b/src/kernel_services/ast_queries/cil_datatype.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/cil_datatype.mli b/src/kernel_services/ast_queries/cil_datatype.mli
index 3f1a856bcb76c557b73932b07bf36f52cdc7ea92..f2552c6d88bf094febf927dafbbf53ac612336bb 100644
--- a/src/kernel_services/ast_queries/cil_datatype.mli
+++ b/src/kernel_services/ast_queries/cil_datatype.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/cil_state_builder.ml b/src/kernel_services/ast_queries/cil_state_builder.ml
index af9776fa1f9c6429425e595687642b46c4decd71..aab2fc7dc74439733b4d2251f6aea72a69ddb715 100644
--- a/src/kernel_services/ast_queries/cil_state_builder.ml
+++ b/src/kernel_services/ast_queries/cil_state_builder.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/cil_state_builder.mli b/src/kernel_services/ast_queries/cil_state_builder.mli
index cdb8546e65602f1c3fd271dde409ad55a1c8936e..933a31430eabf4b7cc235b062cc7ce243b7f4721 100644
--- a/src/kernel_services/ast_queries/cil_state_builder.mli
+++ b/src/kernel_services/ast_queries/cil_state_builder.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/file.ml b/src/kernel_services/ast_queries/file.ml
index 0d0b2949cf04b95003c0fd38891e45d4e700d069..cc22eb64b92a5628a90b5cb3d00c82b73c678fbd 100644
--- a/src/kernel_services/ast_queries/file.ml
+++ b/src/kernel_services/ast_queries/file.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -477,7 +477,7 @@ let parse_cabs = function
(* Hypothesis: the preprocessor is POSIX compliant,
hence understands -I and -D. *)
let include_args =
- if Kernel.FramaCStdLib.get () then [Config.datadir ^ "/libc"]
+ if Kernel.FramaCStdLib.get () then [Config.framac_libc]
else []
in
let define_args =
diff --git a/src/kernel_services/ast_queries/file.mli b/src/kernel_services/ast_queries/file.mli
index d9a7013f5a2e5c0395c20748c23b64955fc1193b..d529d99e0f47a07a1dec138c7d4dd2197b6f48af 100644
--- a/src/kernel_services/ast_queries/file.mli
+++ b/src/kernel_services/ast_queries/file.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/filecheck.ml b/src/kernel_services/ast_queries/filecheck.ml
index 1ff90088732981b7eae1ae4411ed6dfe0ab30359..d9769c7e6d957dcf0031a5bedccf8c9ecab785c4 100644
--- a/src/kernel_services/ast_queries/filecheck.ml
+++ b/src/kernel_services/ast_queries/filecheck.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/filecheck.mli b/src/kernel_services/ast_queries/filecheck.mli
index 358e00d3cc7cec0bbafd8a68df6f9193e2fe58d5..75dc0cfa7c741b2e5574e2a45e1242b5a906b128 100644
--- a/src/kernel_services/ast_queries/filecheck.mli
+++ b/src/kernel_services/ast_queries/filecheck.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/json_compilation_database.ko.ml b/src/kernel_services/ast_queries/json_compilation_database.ko.ml
index 414499c6ddacb0ff22e34a9c94ccf0f4aff3d762..079422abcf706e5f3d4052bf209cbe9055686379 100644
--- a/src/kernel_services/ast_queries/json_compilation_database.ko.ml
+++ b/src/kernel_services/ast_queries/json_compilation_database.ko.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/json_compilation_database.mli b/src/kernel_services/ast_queries/json_compilation_database.mli
index f343d4a1f4cc8aed52019ce213ee41ca5b8e0b40..8bd90611e25f9aded8fb15a36f03c1eef384daeb 100644
--- a/src/kernel_services/ast_queries/json_compilation_database.mli
+++ b/src/kernel_services/ast_queries/json_compilation_database.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/json_compilation_database.ok.ml b/src/kernel_services/ast_queries/json_compilation_database.ok.ml
index 6ae9e02ee25d6cdd5f5b409eebf0acedb0d45063..2f2990575fa4e91b7e24bf26fee4fb02bd6b415e 100644
--- a/src/kernel_services/ast_queries/json_compilation_database.ok.ml
+++ b/src/kernel_services/ast_queries/json_compilation_database.ok.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_queries/logic_const.ml b/src/kernel_services/ast_queries/logic_const.ml
index fba0d666986e185d8d9607a2187b1cf4ddd8f46c..61114f0c37af579d784cc9e23106db3f0ddcaed8 100644
--- a/src/kernel_services/ast_queries/logic_const.ml
+++ b/src/kernel_services/ast_queries/logic_const.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_queries/logic_const.mli b/src/kernel_services/ast_queries/logic_const.mli
index 0a10bccaffa9298760d40a61d79bd93371ec2ff7..75813d76de60c4eb44c2a57a4165f2a6f74bf612 100644
--- a/src/kernel_services/ast_queries/logic_const.mli
+++ b/src/kernel_services/ast_queries/logic_const.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_queries/logic_env.ml b/src/kernel_services/ast_queries/logic_env.ml
index ffefb54619259bf8b409c61181c016c768731c09..5c09918e303db103dbf6ea685ef0c85b6638eb26 100644
--- a/src/kernel_services/ast_queries/logic_env.ml
+++ b/src/kernel_services/ast_queries/logic_env.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_queries/logic_env.mli b/src/kernel_services/ast_queries/logic_env.mli
index e9081e5021f77973732a2641382ff73203e99aea..afa488e5c8e8770e01b7c23807a6807a3df0fb41 100644
--- a/src/kernel_services/ast_queries/logic_env.mli
+++ b/src/kernel_services/ast_queries/logic_env.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_queries/logic_typing.ml b/src/kernel_services/ast_queries/logic_typing.ml
index a4fd18e3d362b2e13a0ff30cd311d41bcc8f9a07..c08ee2865a60efb4ba15286969b41bf8c63cb094 100644
--- a/src/kernel_services/ast_queries/logic_typing.ml
+++ b/src/kernel_services/ast_queries/logic_typing.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_queries/logic_typing.mli b/src/kernel_services/ast_queries/logic_typing.mli
index e978b3e829ab0e7a77f27cc5dbcf961bcd189fec..d6c27a03d9228306a4d0841a24aa1e78666341fd 100644
--- a/src/kernel_services/ast_queries/logic_typing.mli
+++ b/src/kernel_services/ast_queries/logic_typing.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_queries/logic_utils.ml b/src/kernel_services/ast_queries/logic_utils.ml
index 67728f142ba9df8fb382ca541748af96839ffba4..0a7ec7f9bd67fe6ebfa6465c2b1d4de18a4c9a73 100644
--- a/src/kernel_services/ast_queries/logic_utils.ml
+++ b/src/kernel_services/ast_queries/logic_utils.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_queries/logic_utils.mli b/src/kernel_services/ast_queries/logic_utils.mli
index cb754dd910de3ba128b1b89634f1654fd4c4b060..c5c7be4b017ea70d3b412c0fb03c8b6bea7939be 100644
--- a/src/kernel_services/ast_queries/logic_utils.mli
+++ b/src/kernel_services/ast_queries/logic_utils.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/ast_transformations/clone.ml b/src/kernel_services/ast_transformations/clone.ml
index 8b3ca2ee6ec444ff57f9c6bcdc02195c7a6ddad0..485b19f9893029c125c93c96554fb3e821330eaa 100644
--- a/src/kernel_services/ast_transformations/clone.ml
+++ b/src/kernel_services/ast_transformations/clone.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_transformations/clone.mli b/src/kernel_services/ast_transformations/clone.mli
index 6a5e1198cb568136079ccfe2533d7c5ef90bd747..ef7bb3e4d3f1100c0bafbcf35d151c8f1021d60e 100644
--- a/src/kernel_services/ast_transformations/clone.mli
+++ b/src/kernel_services/ast_transformations/clone.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_transformations/filter.ml b/src/kernel_services/ast_transformations/filter.ml
index b198c1a0de7f5824e226a2fa4edf508eb02d1e44..50fcb567f702d5a7393eca2815b87e50bd6a5797 100644
--- a/src/kernel_services/ast_transformations/filter.ml
+++ b/src/kernel_services/ast_transformations/filter.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_transformations/filter.mli b/src/kernel_services/ast_transformations/filter.mli
index af8825cba399b072230cf694c6d707f03b8f95d5..572a9406603fbbe7e1fe0a97e3389d52d2755c27 100644
--- a/src/kernel_services/ast_transformations/filter.mli
+++ b/src/kernel_services/ast_transformations/filter.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_transformations/inline.ml b/src/kernel_services/ast_transformations/inline.ml
index 8cac0d7edec0f5ad7ba770eb3a7f52edfae515bc..ea63e968b7c1392aa4b18bf91fb9aecf8db1d505 100644
--- a/src/kernel_services/ast_transformations/inline.ml
+++ b/src/kernel_services/ast_transformations/inline.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/ast_transformations/inline.mli b/src/kernel_services/ast_transformations/inline.mli
index 5571b25c71a8e08c1799e7e7905d395b8cea9d64..b7a5ede211435c5c7219a02064667dbb9be60f62 100644
--- a/src/kernel_services/ast_transformations/inline.mli
+++ b/src/kernel_services/ast_transformations/inline.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/cmdline.ml b/src/kernel_services/cmdline_parameters/cmdline.ml
index d7ed4cb2f35fbbdbeb5c507d6891ce1c71b90897..d74c0ed2086143d36929e877277bd6d6557b9ebb 100644
--- a/src/kernel_services/cmdline_parameters/cmdline.ml
+++ b/src/kernel_services/cmdline_parameters/cmdline.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/cmdline.mli b/src/kernel_services/cmdline_parameters/cmdline.mli
index 3f50efd89d592f4e3af44fdf8f82322f8462d5b9..995dc90f77fd682ac9850f8505257801068b8472 100644
--- a/src/kernel_services/cmdline_parameters/cmdline.mli
+++ b/src/kernel_services/cmdline_parameters/cmdline.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_builder.ml b/src/kernel_services/cmdline_parameters/parameter_builder.ml
index 9599166243234d7bf8455d00298791016ec6b426..d74de525bfa58a548f5990215ab66750e7423ef6 100644
--- a/src/kernel_services/cmdline_parameters/parameter_builder.ml
+++ b/src/kernel_services/cmdline_parameters/parameter_builder.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_builder.mli b/src/kernel_services/cmdline_parameters/parameter_builder.mli
index b8e15ab961cf3823da562115b93554989b3d50ad..4b532d65558c4e26656ffe1daf647d8593ee6511 100644
--- a/src/kernel_services/cmdline_parameters/parameter_builder.mli
+++ b/src/kernel_services/cmdline_parameters/parameter_builder.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_category.ml b/src/kernel_services/cmdline_parameters/parameter_category.ml
index c8980893e1cfe83e2ae4bb502c6565b813ad4137..1e0e4f6a97b346f26cf59d93574b33d3774bdbe5 100644
--- a/src/kernel_services/cmdline_parameters/parameter_category.ml
+++ b/src/kernel_services/cmdline_parameters/parameter_category.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_category.mli b/src/kernel_services/cmdline_parameters/parameter_category.mli
index 145677672c201430a269ce4cc0e2da0fda83f481..f0c2617271cde15723125b0f2df19bf14350d13b 100644
--- a/src/kernel_services/cmdline_parameters/parameter_category.mli
+++ b/src/kernel_services/cmdline_parameters/parameter_category.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_customize.ml b/src/kernel_services/cmdline_parameters/parameter_customize.ml
index 70d45e94e7bcebb6a7111ab27ed9d8faace7f2e5..caf53dedc93917ca5c828489260009af8299082b 100644
--- a/src/kernel_services/cmdline_parameters/parameter_customize.ml
+++ b/src/kernel_services/cmdline_parameters/parameter_customize.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_customize.mli b/src/kernel_services/cmdline_parameters/parameter_customize.mli
index 9547fd027a97f315aa100e67283448207ecb7a8f..dea727cbbbd15f6bebc2f8dc9f74b09c929c9132 100644
--- a/src/kernel_services/cmdline_parameters/parameter_customize.mli
+++ b/src/kernel_services/cmdline_parameters/parameter_customize.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_sig.mli b/src/kernel_services/cmdline_parameters/parameter_sig.mli
index 3814c586131795fce6a3713b7bfc0bf6ade8fc57..bb827691793567e0bbe804f712a2fb7293d5a96b 100644
--- a/src/kernel_services/cmdline_parameters/parameter_sig.mli
+++ b/src/kernel_services/cmdline_parameters/parameter_sig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_state.ml b/src/kernel_services/cmdline_parameters/parameter_state.ml
index 82493f524f524308b0cbdc5db777bb9806534a3d..ad30035bc2541227bd1385e016712a4b27b6bcc4 100644
--- a/src/kernel_services/cmdline_parameters/parameter_state.ml
+++ b/src/kernel_services/cmdline_parameters/parameter_state.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/parameter_state.mli b/src/kernel_services/cmdline_parameters/parameter_state.mli
index c78567515a5fd05b4ac9ba9cda23486c0597dd9d..487efa787ebb313fb29b3d483a1194f2f01b61f3 100644
--- a/src/kernel_services/cmdline_parameters/parameter_state.mli
+++ b/src/kernel_services/cmdline_parameters/parameter_state.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/typed_parameter.ml b/src/kernel_services/cmdline_parameters/typed_parameter.ml
index 84a36f04897113dbd4680edfa64254d9b69ca5a5..1790a0a7b0943a3843faec230b9870ecb8dcd305 100644
--- a/src/kernel_services/cmdline_parameters/typed_parameter.ml
+++ b/src/kernel_services/cmdline_parameters/typed_parameter.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/cmdline_parameters/typed_parameter.mli b/src/kernel_services/cmdline_parameters/typed_parameter.mli
index 015d3044182e6d8265d13c2bd51e01dbe899a7e8..93ce23f4ba8d84f2eb7934a9dcf47ff2d845af18 100644
--- a/src/kernel_services/cmdline_parameters/typed_parameter.mli
+++ b/src/kernel_services/cmdline_parameters/typed_parameter.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/parsetree/logic_ptree.mli b/src/kernel_services/parsetree/logic_ptree.mli
index ea5a3d072be27850366bb39e8d82daefc4fa70da..3b97808c2aa5ec0230cd69ae7945420ea918677a 100644
--- a/src/kernel_services/parsetree/logic_ptree.mli
+++ b/src/kernel_services/parsetree/logic_ptree.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/kernel_services/plugin_entry_points/db.ml b/src/kernel_services/plugin_entry_points/db.ml
index 9d6eb7c394f969e49d0ff150e5d2f7940b00a410..092c6039c77899f16c43862f59dccac0949fc8b3 100644
--- a/src/kernel_services/plugin_entry_points/db.ml
+++ b/src/kernel_services/plugin_entry_points/db.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/db.mli b/src/kernel_services/plugin_entry_points/db.mli
index f44e4e197c4e86794b74229a643b5347ee1ec849..873a8c6eb4b31069846a9cead7452983943d2d76 100644
--- a/src/kernel_services/plugin_entry_points/db.mli
+++ b/src/kernel_services/plugin_entry_points/db.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/dynamic.ml b/src/kernel_services/plugin_entry_points/dynamic.ml
index 47716f23a018609dc1c204ee8e5a4ec3d502401c..5666e51558b4c86c74e925a73b5c5f36d71bb469 100644
--- a/src/kernel_services/plugin_entry_points/dynamic.ml
+++ b/src/kernel_services/plugin_entry_points/dynamic.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -125,7 +125,7 @@ let is_object base =
let packages = Hashtbl.create 64
-let () = List.iter (fun p -> Hashtbl.add packages p ()) Config.library_names
+let () = List.iter (fun p -> Hashtbl.add packages p ()) ("frama-c.kernel"::Config.library_names)
let missing pkg = not (Hashtbl.mem packages pkg)
@@ -281,8 +281,9 @@ let set_module_load_path path =
Klog.debug ~dkey "plugin_dir: %s" (String.concat ":" Config.plugin_dir);
load_path :=
List.fold_right (add_dir ~user:true) path
- (List.fold_right (add_dir ~user:false) Config.plugin_dir []);
- let findlib_path = String.concat ":" !load_path in
+ (List.fold_right (add_dir ~user:false) (Config.libdir::Config.plugin_dir) []);
+ let env_ocamlpath = try Str.split (Str.regexp ":") (Sys.getenv "OCAMLPATH") with Not_found -> [] in
+ let findlib_path = String.concat ":" (!load_path@env_ocamlpath) in
Klog.debug ~dkey "setting findlib path to %s" findlib_path;
Findlib.init ~env_ocamlpath:findlib_path ()
diff --git a/src/kernel_services/plugin_entry_points/dynamic.mli b/src/kernel_services/plugin_entry_points/dynamic.mli
index 721aab61421ca33e3a76ec09183b6a5b54afe6b2..c837a15601e045eb08dfe2a936ba8c4960687689 100644
--- a/src/kernel_services/plugin_entry_points/dynamic.mli
+++ b/src/kernel_services/plugin_entry_points/dynamic.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/emitter.ml b/src/kernel_services/plugin_entry_points/emitter.ml
index f4e74b4b178bbb5f66dfd028ac822e7538c04e0b..b79daa99120742b7c7bb406883ddce0df76b05a3 100644
--- a/src/kernel_services/plugin_entry_points/emitter.ml
+++ b/src/kernel_services/plugin_entry_points/emitter.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/emitter.mli b/src/kernel_services/plugin_entry_points/emitter.mli
index f838151c6e15788beb325d2fdebd05f3806440fa..0138bd0e372f962501678102d82a4facbf312857 100644
--- a/src/kernel_services/plugin_entry_points/emitter.mli
+++ b/src/kernel_services/plugin_entry_points/emitter.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/journal.ml b/src/kernel_services/plugin_entry_points/journal.ml
index f7a7a9164d3d08aae5da84c9b1b32fb9b37580a2..cec362c256961bb8d530fbf329aad550db0f70cf 100644
--- a/src/kernel_services/plugin_entry_points/journal.ml
+++ b/src/kernel_services/plugin_entry_points/journal.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/journal.mli b/src/kernel_services/plugin_entry_points/journal.mli
index fa0baee3c1e8f589258190ab1d56cae24ca53a60..698ef5ffc5905ec7382dfe159d5ebfecedf9d9b8 100644
--- a/src/kernel_services/plugin_entry_points/journal.mli
+++ b/src/kernel_services/plugin_entry_points/journal.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/kernel.ml b/src/kernel_services/plugin_entry_points/kernel.ml
index 4cbb8f05fa6190032bfc22190a614aefaf02a238..67ce287c622a05eeac0be83690abf937b4bd95ad 100644
--- a/src/kernel_services/plugin_entry_points/kernel.ml
+++ b/src/kernel_services/plugin_entry_points/kernel.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/kernel.mli b/src/kernel_services/plugin_entry_points/kernel.mli
index 56b88d4c0527351813247e2127f9b2d5e4e07ef4..d3d940dfc5ce9d3ec2bb9fd5e38528a09b5d8b78 100644
--- a/src/kernel_services/plugin_entry_points/kernel.mli
+++ b/src/kernel_services/plugin_entry_points/kernel.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/log.ml b/src/kernel_services/plugin_entry_points/log.ml
index c64e11b3987e0a6ba072959df24372967ae3b832..be6d501cfc71e95f795400fbbd97ead1fa8e7257 100644
--- a/src/kernel_services/plugin_entry_points/log.ml
+++ b/src/kernel_services/plugin_entry_points/log.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/log.mli b/src/kernel_services/plugin_entry_points/log.mli
index 436820f29d8691c8bbdd16bcc1618f7306cca624..590127009215bfc31da81364f17b64a425baf38b 100644
--- a/src/kernel_services/plugin_entry_points/log.mli
+++ b/src/kernel_services/plugin_entry_points/log.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/plugin_entry_points/plugin.ml b/src/kernel_services/plugin_entry_points/plugin.ml
index d810847a57e275bdcbf2e1d762c68d29a1ff9260..6048de1b0a82fa0d40d1a4205d38cd22201f09d9 100644
--- a/src/kernel_services/plugin_entry_points/plugin.ml
+++ b/src/kernel_services/plugin_entry_points/plugin.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -277,10 +277,10 @@ struct
include Parameter_builder.Make
(struct
- let shortname = P.shortname
- module L = L
- let messages_group = messages
- let parameters = plugin.p_parameters
+ let shortname = P.shortname
+ module L = L
+ let messages_group = messages
+ let parameters = plugin.p_parameters
end)
let prefix =
@@ -297,7 +297,7 @@ struct
module Make_specific_dir
(O: Parameter_sig.Input_with_arg)
(D: sig
- val dir: unit -> string
+ val dirs: unit -> string list
val visible_ref: bool
val force_dir: bool
end)
@@ -325,44 +325,54 @@ struct
let mk_dir d =
try
- Unix.mkdir d 0o755;
- L.warning "creating %s directory `%s'" O.option_name d;
- d
+ Unix.mkdir d 0o755;
+ L.warning "creating %s directory `%s'" O.option_name d;
+ d
with Unix.Unix_error _ ->
- L.warning "cannot create %s directory `%s'" O.option_name d;
- raise No_dir
-
- let get_and_check_dir ?(error=true) d =
- (* DO NOT Filepath.normalize the argument, since it can transform an
- absolute path into a relative one, leading to issues if a chdir occurs
- at some point. *)
- if (try Sys.is_directory d with Sys_error _ -> false) then d
- else
- if error then
- L.abort "no %s directory `%s' for plug-in `%s'"
- O.option_name
- d
- P.name
- else begin
- if force_dir then begin
- (* create the parent, if it does not exist *)
- let p = Filename.dirname d in
- if not (try Sys.is_directory p with Sys_error _ -> false) then
- ignore (mk_dir p);
- mk_dir d
- end else
- raise No_dir
- end
+ L.warning "cannot create %s directory `%s'" O.option_name d;
+ raise No_dir
+
+ let rec get_and_check_dirs error = function
+ | [] ->
+ raise No_dir
+ | d::l ->
+ if (try Sys.is_directory d with Sys_error _ -> false) then d
+ else
+ get_and_check_dirs error l
+
+ let get_and_check_dirs ?(error=true) = function
+ | [] ->
+ if error then
+ L.abort "no %s directories to look into" O.option_name
+ else
+ raise No_dir
+ | (first::_) as l ->
+ try
+ get_and_check_dirs error l
+ with
+ | No_dir when error ->
+ L.abort "no %s directory for plug-in `%s' among %a"
+ O.option_name
+ P.name
+ Pretty_utils.(pp_list ~sep:",@ " Format.pp_print_string) l
+ | No_dir when force_dir ->
+ (* create the parent, if it does not exist *)
+ let p = Filename.dirname first in
+ if not (try Sys.is_directory p with Sys_error _ -> false) then
+ ignore (mk_dir p);
+ mk_dir first
let dir ?error () =
(* get the specified dir if any *)
let d = if is_visible then Dir_name.get () else empty_string in
if d = empty_string then
- (* no specified dir: look for the default one. *)
- if is_kernel then get_and_check_dir ?error (D.dir ())
- else get_and_check_dir ?error (D.dir () ^ "/" ^ plugin_subpath)
+ (* no specified dir: look for the default one. *)
+ if is_kernel then get_and_check_dirs ?error (D.dirs ())
+ else
+ let dirs = List.map (fun x -> x ^ "/" ^ plugin_subpath) (D.dirs ()) in
+ get_and_check_dirs ?error dirs
else
- get_and_check_dir ?error d
+ get_and_check_dirs ?error [d]
let file ?error f = dir ?error () ^ "/" ^ f
@@ -371,32 +381,32 @@ struct
module Share =
Make_specific_dir
(struct
- let option_name = "share"
- let arg_name = "dir"
- let help = "set the plug-in share directory to <dir> \
+ let option_name = "share"
+ let arg_name = "dir"
+ let help = "set the plug-in share directory to <dir> \
(may be used if the plug-in is not installed at the same place as Frama-C)"
end)
(struct
- let dir () = Config.datadir
- let visible_ref = !share_visible_ref
- let force_dir = false
+ let dirs () = Config.datadirs
+ let visible_ref = !share_visible_ref
+ let force_dir = false
end)
module Session =
Make_specific_dir
(struct
- let option_name = "session"
- let arg_name = "dir"
- let help = "set the plug-in session directory to <dir>"
+ let option_name = "session"
+ let arg_name = "dir"
+ let help = "set the plug-in session directory to <dir>"
end)
(struct
- let dir () =
- if !session_is_set_ref () then !session_ref ()
- else
- try Sys.getenv "FRAMAC_SESSION"
- with Not_found -> "./.frama-c"
- let visible_ref = !session_visible_ref
- let force_dir = true
+ let dirs () = [
+ if !session_is_set_ref () then !session_ref ()
+ else
+ try Sys.getenv "FRAMAC_SESSION"
+ with Not_found -> "./.frama-c"]
+ let visible_ref = !session_visible_ref
+ let force_dir = true
end)
let () =
if is_kernel () then Journal.get_session_file := Session.file ~error:false
@@ -404,29 +414,30 @@ struct
module Config =
Make_specific_dir
(struct
- let option_name = "config"
- let arg_name = "dir"
- let help = "set the plug-in config directory to <dir> \
+ let option_name = "config"
+ let arg_name = "dir"
+ let help = "set the plug-in config directory to <dir> \
(may be used on systems with no default user directory)"
end)
(struct
- let dir () =
- let d, vis =
- if !config_is_set_ref () then !config_ref (), false
- else
- try Sys.getenv "FRAMAC_CONFIG", false
- with Not_found ->
- try Sys.getenv "USERPROFILE", false (* Win32 *)
- with Not_found ->
- (* Unix like *)
- try Sys.getenv "XDG_CONFIG_HOME", true
- with Not_found ->
- try Sys.getenv "HOME" ^ "/.config", true
- with Not_found -> ".", false
- in
- d ^ if vis then "/frama-c" else "/.frama-c"
- let visible_ref = !config_visible_ref
- let force_dir = true
+ let dirs () = [
+ let d, vis =
+ if !config_is_set_ref () then !config_ref (), false
+ else
+ try Sys.getenv "FRAMAC_CONFIG", false
+ with Not_found ->
+ try Sys.getenv "USERPROFILE", false (* Win32 *)
+ with Not_found ->
+ (* Unix like *)
+ try Sys.getenv "XDG_CONFIG_HOME", true
+ with Not_found ->
+ try Sys.getenv "HOME" ^ "/.config", true
+ with Not_found -> ".", false
+ in
+ d ^ if vis then "/frama-c" else "/.frama-c"
+ ]
+ let visible_ref = !config_visible_ref
+ let force_dir = true
end)
let help = add_group "Getting Information"
@@ -588,10 +599,10 @@ struct
(* line order below matters *)
set_range ~min:0 ~max:max_int;
if is_kernel () then begin
- Cmdline.kernel_verbose_atleast_ref := (fun n -> get () >= n);
- match !Cmdline.Kernel_verbose_level.value_if_set with
- | None -> ()
- | Some n -> set n
+ Cmdline.kernel_verbose_atleast_ref := (fun n -> get () >= n);
+ match !Cmdline.Kernel_verbose_level.value_if_set with
+ | None -> ()
+ | Some n -> set n
end
end
@@ -614,15 +625,15 @@ struct
set_range ~min:0 ~max:max_int;
add_set_hook
(fun old n ->
- (* the level of verbose is at least the level of debug *)
- if n > Verbose.get () then Verbose.set n;
+ (* the level of verbose is at least the level of debug *)
+ if n > Verbose.get () then Verbose.set n;
if n = 0 then Pervasives.decr positive_debug_ref
else if old = 0 then Pervasives.incr positive_debug_ref);
if is_kernel () then begin
- Cmdline.kernel_debug_atleast_ref := (fun n -> get () >= n);
- match !Cmdline.Kernel_debug_level.value_if_set with
- | None -> ()
- | Some n -> set n
+ Cmdline.kernel_debug_atleast_ref := (fun n -> get () >= n);
+ match !Cmdline.Kernel_debug_level.value_if_set with
+ | None -> ()
+ | Some n -> set n
end
end
diff --git a/src/kernel_services/plugin_entry_points/plugin.mli b/src/kernel_services/plugin_entry_points/plugin.mli
index cf9adbaa4e1277bc9b94a1199256dc12a729aa79..11afcfe00f71a0841c99f67b645cd64e327301f9 100644
--- a/src/kernel_services/plugin_entry_points/plugin.mli
+++ b/src/kernel_services/plugin_entry_points/plugin.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/visitors/visitor.ml b/src/kernel_services/visitors/visitor.ml
index 5058818c14f3ecf517713f6726efc1a3d66296be..9e6738a2b39efce81be89b924d4670a5263211d2 100644
--- a/src/kernel_services/visitors/visitor.ml
+++ b/src/kernel_services/visitors/visitor.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/kernel_services/visitors/visitor.mli b/src/kernel_services/visitors/visitor.mli
index 96bafb4c9c5d6ec656510b01d9c1e1a9d22a0624..3fffe6a974c20e101b8ec86108f970214b55c417 100644
--- a/src/kernel_services/visitors/visitor.mli
+++ b/src/kernel_services/visitors/visitor.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/datatype.ml b/src/libraries/datatype/datatype.ml
index cdc1856a568a14b5dbda399e838cb8d5690f841b..9752b11209c61111831cfa57d7b0ce6dfea3e5a9 100644
--- a/src/libraries/datatype/datatype.ml
+++ b/src/libraries/datatype/datatype.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/datatype.mli b/src/libraries/datatype/datatype.mli
index 605282f8bf42b4535e71b736934c9adc36139508..42e15dfc1435e7bc523eaeeb6353663fb00d7398 100644
--- a/src/libraries/datatype/datatype.mli
+++ b/src/libraries/datatype/datatype.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/descr.ml b/src/libraries/datatype/descr.ml
index 7346fbfd94a61e1223ba528221d3e18a5a5bcd41..7e202ea947e83401e530a320a3e6132a3c254694 100644
--- a/src/libraries/datatype/descr.ml
+++ b/src/libraries/datatype/descr.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/descr.mli b/src/libraries/datatype/descr.mli
index e36720b0f9ed0742adcd913e3aa283f4ba0c0e09..3d78c05751e5601a92f093b8ffe99bc0b1ea96e4 100644
--- a/src/libraries/datatype/descr.mli
+++ b/src/libraries/datatype/descr.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/structural_descr.ml b/src/libraries/datatype/structural_descr.ml
index 1aa20d721afe987d9c71bc9a7e064c28498d7fae..e9dbf9b24794477bb06140162ee4711314d6198d 100644
--- a/src/libraries/datatype/structural_descr.ml
+++ b/src/libraries/datatype/structural_descr.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/structural_descr.mli b/src/libraries/datatype/structural_descr.mli
index 70132a3c24194472c3230b32fa14a7f5173f9b91..5b244746a4ac4829822fea8a426f9807f4e7036e 100644
--- a/src/libraries/datatype/structural_descr.mli
+++ b/src/libraries/datatype/structural_descr.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/type.ml b/src/libraries/datatype/type.ml
index 234bc5779a1d9b5491534f372f6f0fde054f4a60..07c3e89fe6ba4ffe08aeffa3a4201d1a4a60d025 100644
--- a/src/libraries/datatype/type.ml
+++ b/src/libraries/datatype/type.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/type.mli b/src/libraries/datatype/type.mli
index a9c035e24c50501d96a1a902912019d88fa8cc7d..c92568997443644687b15e5c3242f7139e8dfebb 100644
--- a/src/libraries/datatype/type.mli
+++ b/src/libraries/datatype/type.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/unmarshal_z.ml b/src/libraries/datatype/unmarshal_z.ml
index dd27d22134e0a2798d953afdfa80c0264dbedf34..2697d1a317efdd5801c6b7ae31050ff5f9dae5dc 100644
--- a/src/libraries/datatype/unmarshal_z.ml
+++ b/src/libraries/datatype/unmarshal_z.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/datatype/unmarshal_z.mli b/src/libraries/datatype/unmarshal_z.mli
index 75bdb5a5c65100d292a651f939e7787376f177cc..20a52aa659aee1ac05ca6daecf93317a9372d953 100644
--- a/src/libraries/datatype/unmarshal_z.mli
+++ b/src/libraries/datatype/unmarshal_z.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/project.ml b/src/libraries/project/project.ml
index 88a80c647fe9e6544387584c9769780e02f5e731..55280721f01c32fbc314ed7bc74e1571363aae86 100644
--- a/src/libraries/project/project.ml
+++ b/src/libraries/project/project.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/project.mli b/src/libraries/project/project.mli
index f91dfa1ea8ef5583de9aaaf133917d4d149f441e..d24b9b72f021aa85a77861a275c364da006b82cf 100644
--- a/src/libraries/project/project.mli
+++ b/src/libraries/project/project.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/project_skeleton.ml b/src/libraries/project/project_skeleton.ml
index 8e4681538efcdd9945d5211f26371242384e5e7f..cf06e41cca0fe367ad957221121f91451f7d8d8d 100644
--- a/src/libraries/project/project_skeleton.ml
+++ b/src/libraries/project/project_skeleton.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/project_skeleton.mli b/src/libraries/project/project_skeleton.mli
index 4a2783d543b2be9cd22a4b46b430379dff3ead16..68bdc765344d2514dd34c15b32a42d1d76f04656 100644
--- a/src/libraries/project/project_skeleton.mli
+++ b/src/libraries/project/project_skeleton.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state.ml b/src/libraries/project/state.ml
index 9217522bf17e7d868261d21bc28cfaa4a5303512..259b86356980d59d15527bd5d543a87f06013bae 100644
--- a/src/libraries/project/state.ml
+++ b/src/libraries/project/state.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state.mli b/src/libraries/project/state.mli
index 7719b7d407ffeb1eb7265c959a1a61853c2b3426..22589bef865139354f32df97b04da65a979d1ae5 100644
--- a/src/libraries/project/state.mli
+++ b/src/libraries/project/state.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state_builder.ml b/src/libraries/project/state_builder.ml
index 08ea62a2eec8779987e9d5ce68da090f940053ce..de752d5a942768757f3a238c5e01d66dfa1431da 100644
--- a/src/libraries/project/state_builder.ml
+++ b/src/libraries/project/state_builder.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state_builder.mli b/src/libraries/project/state_builder.mli
index 311256777108da1bfe69202f03a7b1d405b78cc5..e328a4012d9c9b7fd89f909e65945be2ea594a97 100644
--- a/src/libraries/project/state_builder.mli
+++ b/src/libraries/project/state_builder.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state_dependency_graph.ml b/src/libraries/project/state_dependency_graph.ml
index 949ea746b596fae412ad459ebfa1c6eb96edcf06..c5b32d329ec29bc812e3892a85160945f39b11f5 100644
--- a/src/libraries/project/state_dependency_graph.ml
+++ b/src/libraries/project/state_dependency_graph.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state_dependency_graph.mli b/src/libraries/project/state_dependency_graph.mli
index 8ef4dc9bf55f8b8c2663317547b1291efef85b68..8a8adeb933cb533d44f1a5076e1a8c261d411896 100644
--- a/src/libraries/project/state_dependency_graph.mli
+++ b/src/libraries/project/state_dependency_graph.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state_selection.ml b/src/libraries/project/state_selection.ml
index f1ed9db1b20d00315cbddb6bd270271588714948..7a10b4fcd77da4808d5868185b72f45b346a81cb 100644
--- a/src/libraries/project/state_selection.ml
+++ b/src/libraries/project/state_selection.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/project/state_selection.mli b/src/libraries/project/state_selection.mli
index 1dd9d889102eda81259301f0526d24ee427ffa36..b5cf6ab6e599deb2a2c2a3e2eb1e80642d88428f 100644
--- a/src/libraries/project/state_selection.mli
+++ b/src/libraries/project/state_selection.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/stdlib/FCHashtbl.ml b/src/libraries/stdlib/FCHashtbl.ml
index 2954bc00a21aa80089a5dc70e5a4b7b8cb1846b3..4e84f1b3ced33540d4cb72ff7b1f797937ef2bfe 100644
--- a/src/libraries/stdlib/FCHashtbl.ml
+++ b/src/libraries/stdlib/FCHashtbl.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/stdlib/FCHashtbl.mli b/src/libraries/stdlib/FCHashtbl.mli
index 642af0598487ec316f16531b9f70c839b45001c1..33805c33f6cc4075930e49e2673bd891c53dee60 100644
--- a/src/libraries/stdlib/FCHashtbl.mli
+++ b/src/libraries/stdlib/FCHashtbl.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/stdlib/extlib.ml b/src/libraries/stdlib/extlib.ml
index 97279cf59ccd579fb2b1bb346d61260f7267cbec..6ec413e5c12a3a40379b4c3d3e786609b54915e0 100644
--- a/src/libraries/stdlib/extlib.ml
+++ b/src/libraries/stdlib/extlib.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/stdlib/extlib.mli b/src/libraries/stdlib/extlib.mli
index 9c98ba0a4c5279adbef1699ea0768febaf901e80..389a34fc00dbc551f3b374f637439aa4d90aa880 100644
--- a/src/libraries/stdlib/extlib.mli
+++ b/src/libraries/stdlib/extlib.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/stdlib/integer.ml b/src/libraries/stdlib/integer.ml
index 377cf8997c2310876fdafb2070dd68f2b2e483ec..1a7e593f79aede19b4ecddaf53d51964fa7020ce 100644
--- a/src/libraries/stdlib/integer.ml
+++ b/src/libraries/stdlib/integer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -109,11 +109,9 @@ let popcount = Z.popcount
raises multiple [Failure _] exceptions *)
failwith "Integer.of_string"
-
let max_int64 = of_int64 Int64.max_int
let min_int64 = of_int64 Int64.min_int
-
let to_string = Z.to_string
let to_float = Z.to_float
let of_float z =
@@ -145,13 +143,13 @@ let popcount = Z.popcount
let pp_hex_pos fmt r = Format.fprintf fmt "%04X" r
let pp_hex_neg fmt r = Format.fprintf fmt "%04X" (0xFFFF-r)
- let bmask_bin = Z.of_int 15
- let bmask_hex = Z.of_int 0xFFFF
+ let bmask_bin = Z.of_int 0xF (* 4 bits mask *)
+ let bmask_hex = Z.of_int 0xFFFF (* 64 bits mask *)
type digits = {
nbits : int ; (* max number of bits *)
bsize : int ; (* bits in each bloc *)
- bmask : Z.t ; (* block mask *)
+ bmask : Z.t ; (* block mask, must be (1 << bsize) - 1 *)
sep : string ;
pp : Format.formatter -> int -> unit ; (* print one block *)
}
@@ -167,7 +165,8 @@ let popcount = Z.popcount
d.pp fmt r ;
end
- let pp_bin ?(nbits=0) ?(sep="") fmt v =
+ let pp_bin ?(nbits=1) ?(sep="") fmt v =
+ let nbits = if nbits <= 0 then 1 else nbits in
if le zero v then
( Format.pp_print_string fmt "0b" ;
pp_digits { nbits ; sep ; bsize=4 ;
@@ -177,7 +176,8 @@ let popcount = Z.popcount
pp_digits { nbits ; sep ; bsize=4 ;
bmask = bmask_bin ; pp = pp_bin_neg } fmt 0 (Z.lognot v) )
- let pp_hex ?(nbits=0) ?(sep="") fmt v =
+ let pp_hex ?(nbits=1) ?(sep="") fmt v =
+ let nbits = if nbits <= 0 then 1 else nbits in
if le zero v then
( Format.pp_print_string fmt "0x" ;
pp_digits { nbits ; sep ; bsize=16 ;
@@ -187,6 +187,7 @@ let popcount = Z.popcount
( Format.pp_print_string fmt "1x" ;
pp_digits { nbits ; sep ; bsize=16 ;
bmask = bmask_hex ; pp = pp_hex_neg } fmt 0 (Z.lognot v) )
+
let pretty ?(hexa=false) fmt v =
let rec aux v =
if gt v two_power_60 then
diff --git a/src/libraries/stdlib/integer.mli b/src/libraries/stdlib/integer.mli
index b3d9bf0436ad955090aa64ec0929d8652603a4a7..3ed0f1297471b8c393056437955eec4085c79363 100644
--- a/src/libraries/stdlib/integer.mli
+++ b/src/libraries/stdlib/integer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -151,15 +151,17 @@ val popcount: t -> int
val pretty : ?hexa:bool -> t Pretty_utils.formatter
val pp_bin : ?nbits:int -> ?sep:string -> t Pretty_utils.formatter
-(** Print binary format. Digits are output by blocs of 4 bits
- separated by [~sep] with at least [~nbits] total bits.
+(** Print binary format. Digits are output by blocs of 4 bits
+ separated by [~sep] with at least [~nbits] total bits. If [nbits] is
+ non positive, it will be ignored.
- Positive values are preffixed with ["0b"] and negative values
+ Positive values are prefixed with ["0b"] and negative values
are printed as their 2-complement ([lnot]) with prefix ["1b"]. *)
val pp_hex : ?nbits:int -> ?sep:string -> t Pretty_utils.formatter
(** Print hexadecimal format. Digits are output by blocs of 16 bits
- (4 hex digits) separated by [~sep] with at least [~nbits] total bits.
+ (4 hex digits) separated by [~sep] with at least [~nbits] total bits.
+ If [nbits] is non positive, it will be ignored.
Positive values are preffixed with ["0x"] and negative values
are printed as their 2-complement ([lnot]) with prefix ["1x"]. *)
diff --git a/src/libraries/stdlib/transitioning.ml.in b/src/libraries/stdlib/transitioning.ml.in
index 635167b68b28f494bd01b14a8636893e26f12f71..053b4627244c1fcbc7e79231494b20f7747b7d9c 100644
--- a/src/libraries/stdlib/transitioning.ml.in
+++ b/src/libraries/stdlib/transitioning.ml.in
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/stdlib/transitioning.mli b/src/libraries/stdlib/transitioning.mli
index 2038c085a07399c9ed1ff38d079969f0534df2f3..c138f09e9b9b1daa70928d14d302664d2875b73f 100644
--- a/src/libraries/stdlib/transitioning.mli
+++ b/src/libraries/stdlib/transitioning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/bag.ml b/src/libraries/utils/bag.ml
index 14394e49248e2015062c2540deb996696917d141..667efc3e03825b89dc6977eab34702ab7f26564e 100644
--- a/src/libraries/utils/bag.ml
+++ b/src/libraries/utils/bag.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/bag.mli b/src/libraries/utils/bag.mli
index 1222b3293f1783e971b31e897aa03cf0571d2d26..5be0132ac86a6b8073fb8cbd438f23ec34dfe967 100644
--- a/src/libraries/utils/bag.mli
+++ b/src/libraries/utils/bag.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/binary_cache.ml b/src/libraries/utils/binary_cache.ml
index ac9256daa871f80bd61e801c818baba485480de8..6e3f0aff434203da187112c6548b5e34744a7055 100644
--- a/src/libraries/utils/binary_cache.ml
+++ b/src/libraries/utils/binary_cache.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/binary_cache.mli b/src/libraries/utils/binary_cache.mli
index 106c39ae5d30b87688cbb496c7875b7d93e6fef6..19e947519a56794659890ccfeecbdac40d871607 100644
--- a/src/libraries/utils/binary_cache.mli
+++ b/src/libraries/utils/binary_cache.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/bitvector.ml b/src/libraries/utils/bitvector.ml
index d0832a92bfaedd6181b4b7ea49696f4782318041..a1dfcfa38a4fedeaedb472bed9e4da705168d501 100644
--- a/src/libraries/utils/bitvector.ml
+++ b/src/libraries/utils/bitvector.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/bitvector.mli b/src/libraries/utils/bitvector.mli
index 94a0712c51db815d46466d84402b1f9079f14127..4ef47ae578f358a97b39024960e6fc71c40fccd4 100644
--- a/src/libraries/utils/bitvector.mli
+++ b/src/libraries/utils/bitvector.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/c_bindings.c b/src/libraries/utils/c_bindings.c
index 3436ae57b98374859a98fe95eade8a06f1049c96..992111ceb27a10cd953c5df066a095a2895834cb 100644
--- a/src/libraries/utils/c_bindings.c
+++ b/src/libraries/utils/c_bindings.c
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/src/libraries/utils/command.ml b/src/libraries/utils/command.ml
index aad137db03bbc65edbaf84a1c9bf8c82c300cdeb..3e08c8037a6c31de22960dd26f2553b9e6d9e8dd 100644
--- a/src/libraries/utils/command.ml
+++ b/src/libraries/utils/command.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/command.mli b/src/libraries/utils/command.mli
index 45486f7ad2acc0311baee4294ec1e948411d4a28..c3bb0ea3fa1f78f72746d98a95b7951a04e7c6ba 100644
--- a/src/libraries/utils/command.mli
+++ b/src/libraries/utils/command.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/filepath.ml b/src/libraries/utils/filepath.ml
index 1e9bed543f11cb24cb0dd27a0366259a1000486d..0e774657a818b0b5f91cafba14f4b21197480427 100644
--- a/src/libraries/utils/filepath.ml
+++ b/src/libraries/utils/filepath.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/filepath.mli b/src/libraries/utils/filepath.mli
index b5fe7d255f9e545fb317ebdb064611c5759f766d..6ea46d821541a1de524e1baad38bbadcf6339b54 100644
--- a/src/libraries/utils/filepath.mli
+++ b/src/libraries/utils/filepath.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/floating_point.ml b/src/libraries/utils/floating_point.ml
index a9c8af45ec6d028d1ec6228b6bb5bbccb025d936..c8361ffa26a50e71ea52282b8ee9653872c2202e 100644
--- a/src/libraries/utils/floating_point.ml
+++ b/src/libraries/utils/floating_point.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/floating_point.mli b/src/libraries/utils/floating_point.mli
index c39eb54a561e9098351f0985567de5bd04b755d6..8e82a0a59b39867adac48ab0f6eed8e32a7c8880 100644
--- a/src/libraries/utils/floating_point.mli
+++ b/src/libraries/utils/floating_point.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/hook.ml b/src/libraries/utils/hook.ml
index f2fb12679e486bfe8f056328400d7f7877386081..c8a1ea7c6e231a2dbbdc2b3b3fa1b38312d5cc1e 100644
--- a/src/libraries/utils/hook.ml
+++ b/src/libraries/utils/hook.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/hook.mli b/src/libraries/utils/hook.mli
index cdbe96ea503ef3fcaeba8ea10a26ff75a7613d44..945e5baef4450bd034980a14812af305e9d13e27 100644
--- a/src/libraries/utils/hook.mli
+++ b/src/libraries/utils/hook.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/hptset.ml b/src/libraries/utils/hptset.ml
index f5c71cb736d69d29134c384f300f26183a9ac39a..7624684f2e8c855e3b9873f397cdde077d74aeeb 100644
--- a/src/libraries/utils/hptset.ml
+++ b/src/libraries/utils/hptset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/hptset.mli b/src/libraries/utils/hptset.mli
index 1f3ff9a6a2550790166bab52d2436c7c64559aaf..e1dc4f1678a4f6a160cb4fa7ed144548bc4b740b 100644
--- a/src/libraries/utils/hptset.mli
+++ b/src/libraries/utils/hptset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/indexer.ml b/src/libraries/utils/indexer.ml
index aefcd248fc0821cd838d189fcd90cd2581dac59b..f4cee597ec2bd91e10ebea04706e6edf5e7b5dd0 100644
--- a/src/libraries/utils/indexer.ml
+++ b/src/libraries/utils/indexer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/indexer.mli b/src/libraries/utils/indexer.mli
index 93d56bff17d7d4ec9251659a358a581bcc122629..95fff6e7fd8273aa01503ed11acad3fb24dfc1e5 100644
--- a/src/libraries/utils/indexer.mli
+++ b/src/libraries/utils/indexer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/json.mli b/src/libraries/utils/json.mli
index cf55c270225edec718fddf83d4445567b9cc9e9e..76a2b809f0f5ba08e5f0117059e845ce146b5539 100644
--- a/src/libraries/utils/json.mli
+++ b/src/libraries/utils/json.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -20,27 +20,30 @@
(* *)
(**************************************************************************)
-(** Json Library
+(** Json Library
Remarks:
- - UTF-8 escaping is not supported;
- - Parsers are less {i strict} than Json format;
- - Printers are supposed to {i strictly} conforms to Json format;
- - [Number] can be used to encode non OCaml-primitive numbers,
+ - UTF-8 escaping is not supported;
+ - Parsers are less {i strict} than Json format;
+ - Printers are supposed to {i strictly} conforms to Json format;
+ - [Number] can be used to encode non OCaml-primitive numbers,
for instance Zarith.
*)
-(** Json Objects *)
-type t =
- | Null
- | True | False
- | String of string
- | Number of string
- | Int of int
- | Float of float
- | Array of t list
- | Assoc of (string * t) list
+(** Json Objects
+ Same type than [Yojson.Basic.json]
+*)
+type json =
+ [ `Assoc of (string * json) list
+ | `Bool of bool
+ | `Float of float
+ | `Int of int
+ | `List of json list
+ | `Null
+ | `String of string ]
+
+type t = json
val equal : t -> t -> bool (** Pervasives *)
val compare : t -> t -> int (** Pervasives *)
val pp : Format.formatter -> t -> unit
@@ -79,11 +82,11 @@ val save_file : ?pretty:bool -> string -> t -> unit
format. *)
val bool : t -> bool
-(** Extract [True] and [False] only.
+(** Extract [True] and [False] only.
@raise Invalid_argument when the conversion fails. *)
val int : t -> int
-(** Convert [Null], [Int], [Float], [Number] and [String] to an [int].
+(** Convert [Null], [Int], [Float], [Number] and [String] to an [int].
Floats are truncated with [int_of_float] and [Null] to 0.
@raise Invalid_argument when the conversion fails. *)
@@ -97,12 +100,12 @@ val float : t -> float
@raise Invalid_argument when the conversion fails. *)
val array : t -> t array
-(** Extract the array of an [Array] object.
+(** Extract the array of an [Array] object.
[Null] is considered an empty array.
@raise Invalid_argument if the object is not an array. *)
val list : t -> t list
-(** Extract the list of an [Array] object.
+(** Extract the list of an [Array] object.
[Null] is considered an empty list.
@raise Invalid_argument if the object is not a list. *)
@@ -112,9 +115,9 @@ val assoc : t -> (string * t) list
@raise Invalid_argument if the object is not a list. *)
val fold : (string -> t -> 'a -> 'a) -> t -> 'a -> 'a
-(** Fold over all fields of the object.
+(** Fold over all fields of the object.
[Null] is considered an empty object.
- Typical usage is [fold M.add t M.empty] where [M=Map.Make(String)].
+ Typical usage is [fold M.add t M.empty] where [M=Map.Make(String)].
@raise Invalid_argument if the object is not an [Assoc] or [Null] object. *)
val field : string -> t -> t
diff --git a/src/libraries/utils/json.mll b/src/libraries/utils/json.mll
index 5dabdbed5bbc5ef254c6999807ef11ed06235c6e..8444a4bc8ed32eb86fd517fedf9d7fd74143df47 100644
--- a/src/libraries/utils/json.mll
+++ b/src/libraries/utils/json.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -26,16 +26,16 @@
{
-type t =
- | Null
- | True | False
- | String of string
- | Number of string
- | Int of int
- | Float of float
- | Array of t list
- | Assoc of (string * t) list
+type json =
+ [ `Assoc of (string * json) list
+ | `Bool of bool
+ | `Float of float
+ | `Int of int
+ | `List of json list
+ | `Null
+ | `String of string ]
+type t = json
let equal = (=)
let compare = Pervasives.compare
@@ -88,15 +88,15 @@ let skip input =
*)
let rec parse_value input =
match input.token with
- | EOF -> Null
- | TRUE -> skip input ; True
- | FALSE -> skip input ; False
- | NULL -> skip input ; Null
- | STR a -> skip input ; String a
- | INT a -> skip input ; (try Int(int_of_string a) with _ -> Number a)
- | DEC a -> skip input ; (try Float(float_of_string a) with _ -> Number a)
- | KEY '[' -> skip input ; Array (parse_array [] input)
- | KEY '{' -> skip input ; Assoc (parse_object [] input)
+ | EOF -> `Null
+ | TRUE -> skip input ; `Bool true
+ | FALSE -> skip input ; `Bool false
+ | NULL -> skip input ; `Null
+ | STR a -> skip input ; `String a
+ | INT a -> skip input ; (try `Int(int_of_string a) with _ -> `String a)
+ | DEC a -> skip input ; (try `Float(float_of_string a) with _ -> `String a)
+ | KEY '[' -> skip input ; `List (parse_array [] input)
+ | KEY '{' -> skip input ; `Assoc (parse_object [] input)
| _ -> failwith "unexpected token"
and parse_array es input =
@@ -163,20 +163,18 @@ let load_file file =
let rec pp fmt v = let open Format in
match v with
- | Null -> pp_print_string fmt "null"
- | True -> pp_print_string fmt "true"
- | False -> pp_print_string fmt "false"
- | String s -> fprintf fmt "%S" s
- | Number s -> pp_print_string fmt s
- | Int a -> pp_print_int fmt a
- | Float f -> pp_print_float fmt f
- | Array [] -> pp_print_string fmt "[]"
- | Array (e::es) ->
+ | `Null -> pp_print_string fmt "null"
+ | `Bool b -> pp_print_bool fmt b
+ | `String s -> fprintf fmt "%S" s
+ | `Int a -> pp_print_int fmt a
+ | `Float f -> pp_print_float fmt f
+ | `List [] -> pp_print_string fmt "[]"
+ | `List (e::es) ->
Format.fprintf fmt "@[<hov 2>[ %a" pp e ;
List.iter (fun e -> Format.fprintf fmt ",@ %a" pp e) es ;
Format.fprintf fmt " ]@]"
- | Assoc [] -> pp_print_string fmt "{}"
- | Assoc (e::es) ->
+ | `Assoc [] -> pp_print_string fmt "{}"
+ | `Assoc (e::es) ->
Format.fprintf fmt "@[<hov 2>{ %a" pp_entry e ;
List.iter (fun e -> Format.fprintf fmt ",@ %a" pp_entry e) es ;
Format.fprintf fmt " }@]"
@@ -188,20 +186,19 @@ let dump_string f s =
f quote ; f (String.escaped s) ; f quote
let rec dump f = function
- | Null -> f "null"
- | True -> f "true"
- | False -> f "false"
- | String s -> dump_string f s
- | Number s -> f s
- | Int a -> f (string_of_int a)
- | Float x -> f (string_of_float x)
- | Array [] -> f "[]"
- | Array (e::es) ->
+ | `Null -> f "null"
+ | `Bool true -> f "true"
+ | `Bool false -> f "false"
+ | `String s -> dump_string f s
+ | `Int a -> f (string_of_int a)
+ | `Float x -> f (string_of_float x)
+ | `List [] -> f "[]"
+ | `List (e::es) ->
f "[" ; dump f e ;
List.iter (fun e -> f "," ; dump f e) es ;
f "]"
- | Assoc [] -> f "{}"
- | Assoc (e::es) ->
+ | `Assoc [] -> f "{}"
+ | `Assoc (e::es) ->
f "{" ;
dump_entry f e ;
List.iter (fun e -> f "," ; dump_entry f e) es ;
@@ -244,62 +241,59 @@ let save_file ?(pretty=true) file v =
let invalid name = raise (Invalid_argument ("Json." ^ name))
let bool = function
- | True -> true
- | False -> false
+ | `Bool b -> b
| _ -> invalid "bool"
let int = function
- | Null -> 0
- | Int n -> n
- | Float f -> (try int_of_float f with _ -> invalid "int")
- | Number s | String s -> (try int_of_string s with _ -> invalid "int")
+ | `Null -> 0
+ | `Int n -> n
+ | `Float f -> (try int_of_float f with _ -> invalid "int")
| _ -> invalid "int"
let float = function
- | Null -> 0.0
- | Float f -> f
- | Int n -> (try float_of_int n with _ -> invalid "float")
- | Number s | String s -> (try float_of_string s with _ -> invalid "float")
+ | `Null -> 0.0
+ | `Float f -> f
+ | `Int n -> (try float_of_int n with _ -> invalid "float")
| _ -> invalid "float"
let string = function
- | Null -> ""
- | Int n -> string_of_int n
- | Float f -> string_of_float f
- | Number s | String s -> s
+ | `Null -> ""
+ | `Int n -> string_of_int n
+ | `Float f -> string_of_float f
+ | `String s -> s
| _ -> invalid "string"
let list = function
- | Null -> []
- | Array es -> es
+ | `Null -> []
+ | `List es -> es
| _ -> invalid "list"
let array = function
- | Null -> [| |]
- | Array es -> Array.of_list es
+ | `Null -> [| |]
+ | `List es -> Array.of_list es
| _ -> invalid "array"
let assoc = function
- | Null -> []
- | Assoc fs -> fs
+ | `Null -> []
+ | `Assoc fs -> fs
| _ -> invalid "assoc"
let field f = function
- | Null -> raise Not_found
- | Assoc fs -> List.assoc f fs
+ | `Null -> raise Not_found
+ | `Assoc fs -> List.assoc f fs
| _ -> invalid "field"
let fold f v w = match v with
- | Null -> w
- | Assoc fs -> List.fold_left (fun w (e,v) -> f e v w) w fs
+ | `Null -> w
+ | `Assoc fs -> List.fold_left (fun w (e,v) -> f e v w) w fs
| _ -> invalid "fold"
-let of_bool b = if b then True else False
-let of_int k = Int k
-let of_string s = String s
-let of_float f = Float f
-let of_list xs = Array xs
-let of_array xs = Array (Array.to_list xs)
-let of_fields m = Assoc m
+let of_bool b = `Bool b
+let of_int k = `Int k
+let of_string s = `String s
+let of_float f = `Float f
+let of_list xs = `List xs
+let of_array xs = `List (Array.to_list xs)
+let of_fields m = `Assoc m
}
diff --git a/src/libraries/utils/pretty_utils.ml b/src/libraries/utils/pretty_utils.ml
index 025134145a19814d56979985d0d005cc9e03b128..3ecc2ed1913e5f0d15842863071b9cd74435c621 100644
--- a/src/libraries/utils/pretty_utils.ml
+++ b/src/libraries/utils/pretty_utils.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/pretty_utils.mli b/src/libraries/utils/pretty_utils.mli
index 9917bdd7855e0dd58f819db8ddcfb563332e85a6..c0cfa39b1b6543cf0fc3e5d46704bb93846ed55b 100644
--- a/src/libraries/utils/pretty_utils.mli
+++ b/src/libraries/utils/pretty_utils.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/qstack.ml b/src/libraries/utils/qstack.ml
index 55cd0c5dc68048d2b2d34dc596940adde824aa3d..525e2f7f130eb332ae7e7c79eb8acac30802c12f 100644
--- a/src/libraries/utils/qstack.ml
+++ b/src/libraries/utils/qstack.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/qstack.mli b/src/libraries/utils/qstack.mli
index 5fc4fbd7eac621822f1fbb02f8615ce5e1d21971..5a3dfdcc202a2ea1d36f6fcd79e2a6b82f1553dd 100644
--- a/src/libraries/utils/qstack.mli
+++ b/src/libraries/utils/qstack.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/rgmap.ml b/src/libraries/utils/rgmap.ml
index 840274b5143f9aca1300ceee785b24bc83a74fa0..054bb4b9cfac56c9129dd6daf04d862a9df3feed 100644
--- a/src/libraries/utils/rgmap.ml
+++ b/src/libraries/utils/rgmap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/rgmap.mli b/src/libraries/utils/rgmap.mli
index 7571afcc1b635268ed97a297a4ceeec4e8d00f11..0c6bacd6e2f188c42080fdd871b555dfff36bd52 100644
--- a/src/libraries/utils/rgmap.mli
+++ b/src/libraries/utils/rgmap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/rich_text.ml b/src/libraries/utils/rich_text.ml
index 301306fb270b347a12157a04a72cb004464afbde..b29ffe37e52a7ac8d08f4291ed80042613f362c9 100644
--- a/src/libraries/utils/rich_text.ml
+++ b/src/libraries/utils/rich_text.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/rich_text.mli b/src/libraries/utils/rich_text.mli
index 537a8e4a94c5593b62bd278971b597fd8f892d21..9e84fc4b9960e6ad0d3ca848c0e9dd3f7cc54001 100644
--- a/src/libraries/utils/rich_text.mli
+++ b/src/libraries/utils/rich_text.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/sanitizer.mli b/src/libraries/utils/sanitizer.mli
index ea850a8587f0950630d3ad7d7d6838073de4f8f3..3371d4cd4a5930320d2f77bc70b1b0d8242b61fc 100644
--- a/src/libraries/utils/sanitizer.mli
+++ b/src/libraries/utils/sanitizer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/task.ml b/src/libraries/utils/task.ml
index 44c5d8502339d4c73d8869b60de32a051c23d46d..aaaf758d4f84ec83e4fdfeff05bbf92ad7fb1fc7 100644
--- a/src/libraries/utils/task.ml
+++ b/src/libraries/utils/task.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/task.mli b/src/libraries/utils/task.mli
index 9de878ba092c33e1073293990cfc013541ed497d..af8a018bd16ab0d4da61e1aa5ddea83b3ba381bc 100644
--- a/src/libraries/utils/task.mli
+++ b/src/libraries/utils/task.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/unicode.ml b/src/libraries/utils/unicode.ml
index 070e83d04256e89f012a144df394b7f9f4b2a665..f4f7ad09a1998d0ca055a1bc94d5e6e5730ead04 100644
--- a/src/libraries/utils/unicode.ml
+++ b/src/libraries/utils/unicode.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/unicode.mli b/src/libraries/utils/unicode.mli
index b085178748d92180cffd83ecd57e80d6d4078b85..4d02557081388e1b234785ed9e327452e939ad99 100644
--- a/src/libraries/utils/unicode.mli
+++ b/src/libraries/utils/unicode.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/utf8_logic.ml b/src/libraries/utils/utf8_logic.ml
index a00be6b94204433e86fa3cc8d30fd534433978bc..6e303a0a8b140a4fe5ac3138d7290b885784d769 100644
--- a/src/libraries/utils/utf8_logic.ml
+++ b/src/libraries/utils/utf8_logic.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/libraries/utils/utf8_logic.mli b/src/libraries/utils/utf8_logic.mli
index c1cdcf07a41872676b1b63c5344fa5fb869738f1..89256c6e961a6b34fa711199ae40668dedfc6633 100644
--- a/src/libraries/utils/utf8_logic.mli
+++ b/src/libraries/utils/utf8_logic.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/libraries/utils/vector.ml b/src/libraries/utils/vector.ml
index 0ddf8515fa6f768151d6c233a20aeced21a293e1..916a3f7249c286b24066502b2091387b0fa21759 100644
--- a/src/libraries/utils/vector.ml
+++ b/src/libraries/utils/vector.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/vector.mli b/src/libraries/utils/vector.mli
index 86a3a0609d8dbe095a9438b69562f2afb11dfdac..51798840e16bbe0371580d5b1a70ddbe06687f6e 100644
--- a/src/libraries/utils/vector.mli
+++ b/src/libraries/utils/vector.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/wto.ml b/src/libraries/utils/wto.ml
index 9dfb1741e05f60a31e2178639cb443ede81e839d..617ae52bb06bbbe839ee1c99b7f562f00df96d04 100644
--- a/src/libraries/utils/wto.ml
+++ b/src/libraries/utils/wto.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/libraries/utils/wto.mli b/src/libraries/utils/wto.mli
index 884a49c931018f34ede4c7a40b4972e97bed81f7..ffd631371e9663c2367ddb2a899c391195fb091c 100644
--- a/src/libraries/utils/wto.mli
+++ b/src/libraries/utils/wto.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/aorai/Aorai.mli b/src/plugins/aorai/Aorai.mli
index de19722cd7f714ba1d6aead4acd02edb87f7de43..b4832d9d2ffb220ccbd4a26ca27d9d3764d16726 100644
--- a/src/plugins/aorai/Aorai.mli
+++ b/src/plugins/aorai/Aorai.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/Makefile.in b/src/plugins/aorai/Makefile.in
index ed34bdac8c1bc5ecaa61fd173deb4968d67b4f3a..423244b822a3af9883971dd6deabac001cfed778 100644
--- a/src/plugins/aorai/Makefile.in
+++ b/src/plugins/aorai/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of Aorai plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# INRIA (Institut National de Recherche en Informatique et en #
@@ -80,7 +80,7 @@ PLUGIN_NO_DEFAULT_TEST:=yes
endif
PLUGIN_TESTS_DIRS:=aorai
-PLUGIN_TESTS_LIB:=$(PLUGIN_DIR)/tests/aorai/Aorai_test.ml
+PLUGIN_TESTS_LIB:=$(PLUGIN_DIR)/tests/aorai/Aorai_test.ml $(PLUGIN_DIR)/tests/aorai/name_projects.ml
include $(FRAMAC_SHARE)/Makefile.dynamic
@@ -101,7 +101,7 @@ $(Aorai_DIR)/tests/test_config_prove: \
$(SED) -e 's!@AORAI_WP_SHARE@!$(AORAI_WP_SHARE)!' $< > $@
$(CHMOD_RO) $@
-Aorai_DEFAULT_TESTS: $(Aorai_DIR)/tests/aorai/Aorai_test.cmxs $(Aorai_DIR)/tests/aorai/Aorai_test.cmo
+Aorai_DEFAULT_TESTS: $(Aorai_DIR)/tests/aorai/Aorai_test.cmxs $(Aorai_DIR)/tests/aorai/Aorai_test.cmo $(Aorai_DIR)/tests/aorai/name_projects.cmxs $(Aorai_DIR)/tests/aorai/name_projects.cmo
# Regenerating the Makefile on need
diff --git a/src/plugins/aorai/aorai_dataflow.ml b/src/plugins/aorai/aorai_dataflow.ml
index ceeeb64841b50b4f92179b170434244d6a341b0d..cc59c904b410d06ee0ba89fbd5d8333d107446d6 100644
--- a/src/plugins/aorai/aorai_dataflow.ml
+++ b/src/plugins/aorai/aorai_dataflow.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/aorai_dataflow.mli b/src/plugins/aorai/aorai_dataflow.mli
index 70bbf0869ed329486416ce9385d1805c63fec8f8..42c10c4f9363e68db1a6e1ff01b7005f41bcd3df 100644
--- a/src/plugins/aorai/aorai_dataflow.mli
+++ b/src/plugins/aorai/aorai_dataflow.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/aorai_option.ml b/src/plugins/aorai/aorai_option.ml
index 01de3a72d1c1ac53026daa4c88f15ff94a59679e..39c321eca169cd8565cdd87e1fda114c5f1783a9 100644
--- a/src/plugins/aorai/aorai_option.ml
+++ b/src/plugins/aorai/aorai_option.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/aorai_option.mli b/src/plugins/aorai/aorai_option.mli
index 4f589da88f64c642ae080f847df1078a19728608..9e394d8c66cfb58652aeb6457f6a35d6b1a41eb6 100644
--- a/src/plugins/aorai/aorai_option.mli
+++ b/src/plugins/aorai/aorai_option.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/aorai_register.ml b/src/plugins/aorai/aorai_register.ml
index a907f9b4b06e25808e3413d942a49d1538498319..83ebdfe08da71c6b90605f8dff1ee21eff65a0fc 100644
--- a/src/plugins/aorai/aorai_register.ml
+++ b/src/plugins/aorai/aorai_register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/aorai_utils.ml b/src/plugins/aorai/aorai_utils.ml
index 5360d8304522d5d1fb8609b228165780dbf4fbaf..1480c68e82977d189855c1f94b3d42061162df72 100644
--- a/src/plugins/aorai/aorai_utils.ml
+++ b/src/plugins/aorai/aorai_utils.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/aorai_utils.mli b/src/plugins/aorai/aorai_utils.mli
index 05a745a07e0c7cb51171ca0e91838380670548b0..1d1fabbe7a9b3510055097ca014d3e62f52ff489 100644
--- a/src/plugins/aorai/aorai_utils.mli
+++ b/src/plugins/aorai/aorai_utils.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/aorai_visitors.ml b/src/plugins/aorai/aorai_visitors.ml
index 085dfb3e8f64e7c363753e5e3f246c737ae0dfc1..68571210062b0840fed735fc4ff2666354155d20 100644
--- a/src/plugins/aorai/aorai_visitors.ml
+++ b/src/plugins/aorai/aorai_visitors.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/bool3.ml b/src/plugins/aorai/bool3.ml
index cdd78632256220cc220ec5ba55e10a3e2d854b56..248626909b891694e5b705876ecb4f69002daf17 100644
--- a/src/plugins/aorai/bool3.ml
+++ b/src/plugins/aorai/bool3.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/bool3.mli b/src/plugins/aorai/bool3.mli
index bc229ba5a3be9bf7103f9ddb5567a88abf8ff63a..024b37c6481f05966fed845deb2ae2e6b371fc59 100644
--- a/src/plugins/aorai/bool3.mli
+++ b/src/plugins/aorai/bool3.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/configure.ac b/src/plugins/aorai/configure.ac
index 0587fc1fc6646541e050b9c4f7e043e8c3b8ed3b..00fdcfbc1557ab7ab7cf8eb51fde5fd55bf54237 100644
--- a/src/plugins/aorai/configure.ac
+++ b/src/plugins/aorai/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Aorai plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# INRIA (Institut National de Recherche en Informatique et en #
diff --git a/src/plugins/aorai/data_for_aorai.ml b/src/plugins/aorai/data_for_aorai.ml
index 7e4985c84147a9eee7439a4b7bddb7061cb98579..b2933c2f6e1ffc0be435368090607402e25e9095 100644
--- a/src/plugins/aorai/data_for_aorai.ml
+++ b/src/plugins/aorai/data_for_aorai.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/data_for_aorai.mli b/src/plugins/aorai/data_for_aorai.mli
index 3ee8e092cfeab74e33679497504909386b77f508..a867e23e7f0493a1e6bdc842b612b0be1fac88bf 100644
--- a/src/plugins/aorai/data_for_aorai.mli
+++ b/src/plugins/aorai/data_for_aorai.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/logic_simplification.ml b/src/plugins/aorai/logic_simplification.ml
index 38c5111c5eabfbd7b0a8cab334d3f44d0406d012..bb887b17b028a35533a7054cbe42be840b65f4ae 100644
--- a/src/plugins/aorai/logic_simplification.ml
+++ b/src/plugins/aorai/logic_simplification.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/logic_simplification.mli b/src/plugins/aorai/logic_simplification.mli
index fb67eaf2ae1f4d3d732f4a9d3b7f6ffbb78dc886..6e363d3bf464f552c433265ad2749886a611f351 100644
--- a/src/plugins/aorai/logic_simplification.mli
+++ b/src/plugins/aorai/logic_simplification.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/ltl_output.ml b/src/plugins/aorai/ltl_output.ml
index 15973dff9405c670e5fbafd45f282511c3ce1b46..ae142d75373dd60d85bac9cd2727b94b0fd75fb3 100644
--- a/src/plugins/aorai/ltl_output.ml
+++ b/src/plugins/aorai/ltl_output.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/ltl_output.mli b/src/plugins/aorai/ltl_output.mli
index 83d663ef3ec73a57e32962b1088b7e6fc20649be..9e2b7d50dc38b31e3e774ca34f297836f6f4c742 100644
--- a/src/plugins/aorai/ltl_output.mli
+++ b/src/plugins/aorai/ltl_output.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/ltlast.mli b/src/plugins/aorai/ltlast.mli
index c378d7eae7f6fcc9b16120caaa50147f5890ec6a..34c4d002eb44a22739cb466962a513c496eaba43 100644
--- a/src/plugins/aorai/ltlast.mli
+++ b/src/plugins/aorai/ltlast.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/ltllexer.mll b/src/plugins/aorai/ltllexer.mll
index 36a45d8f1c566bcd991714cb3b9792f09fa891e0..c5c61547f9ac97759d5aabcdfe0551ab1bb7914c 100644
--- a/src/plugins/aorai/ltllexer.mll
+++ b/src/plugins/aorai/ltllexer.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/ltlparser.mly b/src/plugins/aorai/ltlparser.mly
index 5787f52c62d8326a77e1b4b2ad90988cee25bc16..43a9315ae6f42e088b6f457f6c668fe71599eb6f 100644
--- a/src/plugins/aorai/ltlparser.mly
+++ b/src/plugins/aorai/ltlparser.mly
@@ -2,7 +2,7 @@
/* */
/* This file is part of Aorai plug-in of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* INRIA (Institut National de Recherche en Informatique et en */
diff --git a/src/plugins/aorai/path_analysis.ml b/src/plugins/aorai/path_analysis.ml
index d917ce72db8e794d44778cc180c48e2655f3fb19..9fc9fe7b0c58084fb2345b3bb7a787e28638804f 100644
--- a/src/plugins/aorai/path_analysis.ml
+++ b/src/plugins/aorai/path_analysis.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/promelaast.mli b/src/plugins/aorai/promelaast.mli
index 4b5c7b8d6c67782e6f0ae871af61d093a9406027..d8d31f6a91db78e112187e8fd2972c8c733b1a99 100644
--- a/src/plugins/aorai/promelaast.mli
+++ b/src/plugins/aorai/promelaast.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/promelalexer.mll b/src/plugins/aorai/promelalexer.mll
index f1e48f0799e771a955223843df027a7849ced66b..99b85aa300ab57e4e1504f3bee34af5b1f4f7c48 100644
--- a/src/plugins/aorai/promelalexer.mll
+++ b/src/plugins/aorai/promelalexer.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/promelalexer_withexps.mll b/src/plugins/aorai/promelalexer_withexps.mll
index 31d9d5a58558e01531577bc5702449c9f3adc02e..ef8c86af957d856b202f0f5402aa8e564d5dbe34 100644
--- a/src/plugins/aorai/promelalexer_withexps.mll
+++ b/src/plugins/aorai/promelalexer_withexps.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/promelaoutput.ml b/src/plugins/aorai/promelaoutput.ml
index 9ad118a5ef91932d9a5aaa6b67565073ed6e00b1..54d24c477aba9824d4aac45830587e54b2c1c88c 100644
--- a/src/plugins/aorai/promelaoutput.ml
+++ b/src/plugins/aorai/promelaoutput.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/promelaoutput.mli b/src/plugins/aorai/promelaoutput.mli
index 4c8f23b5915df77a9ef36701c5fed65d25078cc5..6128bf35f6b4d3574269aeff13da74d0ee819efd 100644
--- a/src/plugins/aorai/promelaoutput.mli
+++ b/src/plugins/aorai/promelaoutput.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/promelaparser.mly b/src/plugins/aorai/promelaparser.mly
index 8e92c2f31d681b35eb47dc162931eb084c873f96..4c3a51ada47bf0ed9b241e638ed250633880177c 100644
--- a/src/plugins/aorai/promelaparser.mly
+++ b/src/plugins/aorai/promelaparser.mly
@@ -2,7 +2,7 @@
/* */
/* This file is part of Aorai plug-in of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* INRIA (Institut National de Recherche en Informatique et en */
diff --git a/src/plugins/aorai/promelaparser_withexps.mly b/src/plugins/aorai/promelaparser_withexps.mly
index 788b7c65e2593252dc7c299c22503479237ba402..c15b6b1cbc66c6b72c3fe857c8f44728be9395c8 100644
--- a/src/plugins/aorai/promelaparser_withexps.mly
+++ b/src/plugins/aorai/promelaparser_withexps.mly
@@ -2,7 +2,7 @@
/* */
/* This file is part of Aorai plug-in of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* INRIA (Institut National de Recherche en Informatique et en */
diff --git a/src/plugins/aorai/tests/aorai/assigns.c b/src/plugins/aorai/tests/aorai/assigns.c
index 7eb67e2087bbaa0ad8c729ab2efbf1bff2d8b1e9..c8d63fdb9dba75b9fb13a0021f32cf20f1435241 100644
--- a/src/plugins/aorai/tests/aorai/assigns.c
+++ b/src/plugins/aorai/tests/aorai/assigns.c
@@ -1,7 +1,8 @@
/* run.config*
+ EXECNOW: make -s @PTEST_DIR@/name_projects.cmxs
OPT: -aorai-automata tests/aorai/assigns.ya -aorai-test 1 -load-module tests/aorai/Aorai_test.cmxs -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
OPT: -aorai-automata tests/aorai/assigns_det.ya -aorai-test 1 -load-module tests/aorai/Aorai_test.cmxs -aorai-test-number @PTEST_NUMBER@ @PROVE_OPTIONS@
- OPT: -aorai-automata tests/aorai/assigns.ya -load-script tests/aorai/name_projects.ml -aorai-test 1 -then -print
+ OPT: -aorai-automata tests/aorai/assigns.ya -load-module @PTEST_DIR@/name_projects -aorai-test 1 -then -print
*/
int X;
diff --git a/src/plugins/aorai/utils_parser.ml b/src/plugins/aorai/utils_parser.ml
index b3e46009328f22a9aef87e01a84946114bc67f65..5ceb0fa4042a37208a03e190dc762593328d7840 100644
--- a/src/plugins/aorai/utils_parser.ml
+++ b/src/plugins/aorai/utils_parser.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/yalexer.mll b/src/plugins/aorai/yalexer.mll
index a24e98a7e809795fc13ebcafd2868f24704a9db3..22443951159580d1065598530b1c2e810fad2c2d 100644
--- a/src/plugins/aorai/yalexer.mll
+++ b/src/plugins/aorai/yalexer.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Aorai plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* INRIA (Institut National de Recherche en Informatique et en *)
diff --git a/src/plugins/aorai/yaparser.mly b/src/plugins/aorai/yaparser.mly
index 20db3fb7c93a6a2ddb9a7b0aec0cbc3adc8b4e91..64f7a429d5c00f32a7d2a2cd129f8e1cc9cfb234 100644
--- a/src/plugins/aorai/yaparser.mly
+++ b/src/plugins/aorai/yaparser.mly
@@ -2,7 +2,7 @@
/* */
/* This file is part of Aorai plug-in of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* INRIA (Institut National de Recherche en Informatique et en */
diff --git a/src/plugins/callgraph/Callgraph.mli b/src/plugins/callgraph/Callgraph.mli
index a3fad812d5798a6fd0d1c7a67038d03b3664f945..62a2fb73d12710ae78d3d458b8038cda2d2f86b1 100644
--- a/src/plugins/callgraph/Callgraph.mli
+++ b/src/plugins/callgraph/Callgraph.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/callgraph_api.mli b/src/plugins/callgraph/callgraph_api.mli
index 348e322af86da2c69a1a86ae5e9ddaec57055074..b584d46c5c14b1958cd89ca9617cff8fa0e7f3ce 100644
--- a/src/plugins/callgraph/callgraph_api.mli
+++ b/src/plugins/callgraph/callgraph_api.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/cg.ml b/src/plugins/callgraph/cg.ml
index 00111bb59dbd323c37bda5b39a2fd12c1f767223..9373f93f9d25e7a6be3f7ce87be71664588ccf2d 100644
--- a/src/plugins/callgraph/cg.ml
+++ b/src/plugins/callgraph/cg.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/cg.mli b/src/plugins/callgraph/cg.mli
index 97bbb6fb5a888c054b2fe301f328aa0e2b771eb3..5e618b9d70ec00e9f07d1028d8b95163907cfecf 100644
--- a/src/plugins/callgraph/cg.mli
+++ b/src/plugins/callgraph/cg.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/cg_viewer.ml b/src/plugins/callgraph/cg_viewer.ml
index a18999eafb6bc5c881a46d18c977848ccadcc37c..26f47325cfcf36a1f50705424bfee48b100a9f4c 100644
--- a/src/plugins/callgraph/cg_viewer.ml
+++ b/src/plugins/callgraph/cg_viewer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/journalize.ml b/src/plugins/callgraph/journalize.ml
index 91c168b2ff2607030515abccffa1730ae2dd4366..2ac5a43428dfa2f9f56d8ff2e3f1dbb04d2d3c01 100644
--- a/src/plugins/callgraph/journalize.ml
+++ b/src/plugins/callgraph/journalize.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/journalize.mli b/src/plugins/callgraph/journalize.mli
index 0ca27be37a25038071a9dd3fb460e038106a235d..44890319dd4d9707f144ecf2b4801be4694cae5e 100644
--- a/src/plugins/callgraph/journalize.mli
+++ b/src/plugins/callgraph/journalize.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/options.ml b/src/plugins/callgraph/options.ml
index a1ff2536dbdcf252fd97a8c76543afad80187a3c..0b2871677733ce0e79af69eb121d9819b7749e65 100644
--- a/src/plugins/callgraph/options.ml
+++ b/src/plugins/callgraph/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/options.mli b/src/plugins/callgraph/options.mli
index d8e8e229569eb5fe8f70c2bdfe1ab5a50a690460..290810e64755d91920202a6f3ba612c240347eb7 100644
--- a/src/plugins/callgraph/options.mli
+++ b/src/plugins/callgraph/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/register.ml b/src/plugins/callgraph/register.ml
index 6f1ced2ca9ea1be23ab5318f4d53ccfb535313ec..f046df0b7f3b6ed4b2997a18dc334125c8888ee3 100644
--- a/src/plugins/callgraph/register.ml
+++ b/src/plugins/callgraph/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/services.ml b/src/plugins/callgraph/services.ml
index 6d8b6c34ff0ce3fcb9eba3f552202cf0258c1d9f..ecb761dd1eead8defd7144e60fd5166760bb2ca5 100644
--- a/src/plugins/callgraph/services.ml
+++ b/src/plugins/callgraph/services.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/services.mli b/src/plugins/callgraph/services.mli
index 9733a5e491b3a9d16adeff927d62b80e33f0f1fe..f537ce226ff1d8f0f926f1bbaa4309b05a9c3d6f 100644
--- a/src/plugins/callgraph/services.mli
+++ b/src/plugins/callgraph/services.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/subgraph.ml b/src/plugins/callgraph/subgraph.ml
index 27085e6be631aff93ef2927f1bef3e8b4b07f724..969a12886f1af85bb394fed6ac1923092bf1af70 100644
--- a/src/plugins/callgraph/subgraph.ml
+++ b/src/plugins/callgraph/subgraph.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/subgraph.mli b/src/plugins/callgraph/subgraph.mli
index 9c7ff8210033051a9d2a5c77f45584bcf5d58eb8..ef561cce1b1f91ef26b0732beb48369128b75f75 100644
--- a/src/plugins/callgraph/subgraph.mli
+++ b/src/plugins/callgraph/subgraph.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/uses.ml b/src/plugins/callgraph/uses.ml
index f4bd94d6e3f21288ad960fca7f45d124e34dc767..58c8b81a2036ccbb2450581a5eeb45434985ab2c 100644
--- a/src/plugins/callgraph/uses.ml
+++ b/src/plugins/callgraph/uses.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/callgraph/uses.mli b/src/plugins/callgraph/uses.mli
index 69f1e4ec959c7d3f63b21f260c5b4f133d607da7..320c7b7da26cb8da8575f4d32cc3cd57b4cce512 100644
--- a/src/plugins/callgraph/uses.mli
+++ b/src/plugins/callgraph/uses.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/constant_propagation/Constant_Propagation.mli b/src/plugins/constant_propagation/Constant_Propagation.mli
index 33b2040a09d630d03f7ed33881abc0a8ebcb6f55..5969f008c33bf8a4bc3a69bc44b5b5340bdaf9bf 100644
--- a/src/plugins/constant_propagation/Constant_Propagation.mli
+++ b/src/plugins/constant_propagation/Constant_Propagation.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/constant_propagation/api.ml b/src/plugins/constant_propagation/api.ml
index 8ea4319170e08416560d7ade049fcd52f7875531..46fcc0277d1924079f5fb58beb5961283859f7e4 100644
--- a/src/plugins/constant_propagation/api.ml
+++ b/src/plugins/constant_propagation/api.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/constant_propagation/api.mli b/src/plugins/constant_propagation/api.mli
index 3e61053a15a4e0176a0f21b3bf1025595e21952a..d8cd950d17b0b17519b589f817884f74024b130b 100644
--- a/src/plugins/constant_propagation/api.mli
+++ b/src/plugins/constant_propagation/api.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/constant_propagation/propagationParameters.ml b/src/plugins/constant_propagation/propagationParameters.ml
index 49ffa61e46304e31f317415892d3ebfe8a2070e9..1259a0c4a724e2bf84f09958dd23a070b48c8c0d 100644
--- a/src/plugins/constant_propagation/propagationParameters.ml
+++ b/src/plugins/constant_propagation/propagationParameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/constant_propagation/propagationParameters.mli b/src/plugins/constant_propagation/propagationParameters.mli
index 6dc58cc7ca92892a0356408cecf3abd0a9f18dce..91eb9283161cd30d0f887a642536fa2219379328 100644
--- a/src/plugins/constant_propagation/propagationParameters.mli
+++ b/src/plugins/constant_propagation/propagationParameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/From.mli b/src/plugins/from/From.mli
index d3d628e24191e79edd3a046898535212788f05e4..350ec6695d6cb18466a2f4df4c2d2577a652065b 100644
--- a/src/plugins/from/From.mli
+++ b/src/plugins/from/From.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/callwise.ml b/src/plugins/from/callwise.ml
index 60bf2c21ff4ed839a67d1e9b6f114ee68e9c3b63..d3c693b33c20200da2d0c76b9708b7052e3ba22a 100644
--- a/src/plugins/from/callwise.ml
+++ b/src/plugins/from/callwise.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/callwise.mli b/src/plugins/from/callwise.mli
index b6baae4b13eae5669531d67f21034291118e053d..19763a686e2fd29ae3347b37168669073055e9e4 100644
--- a/src/plugins/from/callwise.mli
+++ b/src/plugins/from/callwise.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_compute.ml b/src/plugins/from/from_compute.ml
index e981214f5801e59818080b49c4cbe96adcffb5aa..6217f6e42a334e014d44f07a1b24e1da0039c2b2 100644
--- a/src/plugins/from/from_compute.ml
+++ b/src/plugins/from/from_compute.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_compute.mli b/src/plugins/from/from_compute.mli
index 6da5695b3a197006f340ca54012b1218e3f3cde2..67c6424c758322397fb10f4db7a9f416c8c204ee 100644
--- a/src/plugins/from/from_compute.mli
+++ b/src/plugins/from/from_compute.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_parameters.ml b/src/plugins/from/from_parameters.ml
index 5a630f7d465b7ef77317df86038f8c0600aacf28..199db3316bef06476de4ca4a0d40413573718714 100644
--- a/src/plugins/from/from_parameters.ml
+++ b/src/plugins/from/from_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_parameters.mli b/src/plugins/from/from_parameters.mli
index 4e852c31bdc23ba375846fd0dc87d63f3e20caf4..8ec0e89c1f80e3780ab80d06b9241efe6c76235e 100644
--- a/src/plugins/from/from_parameters.mli
+++ b/src/plugins/from/from_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_register.ml b/src/plugins/from/from_register.ml
index 37f9782714d84cfaafad88a764c36ef6adef8ca8..a94fe66d8942f1c3737a79c75fb55a994cf77254 100644
--- a/src/plugins/from/from_register.ml
+++ b/src/plugins/from/from_register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_register.mli b/src/plugins/from/from_register.mli
index 0d64e5863e84a8b99130e01e29936e8d65f48fd7..12f4614f4d769fa7061c0347c96e01f25387d98c 100644
--- a/src/plugins/from/from_register.mli
+++ b/src/plugins/from/from_register.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_register_gui.ml b/src/plugins/from/from_register_gui.ml
index debc860af56fb541652a743a910c1d9534392b51..25ad337ee723ff730b3456eacd163085cf247afb 100644
--- a/src/plugins/from/from_register_gui.ml
+++ b/src/plugins/from/from_register_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/from_register_gui.mli b/src/plugins/from/from_register_gui.mli
index 1a2267ff8c6dfa201f1c1a023da59664f678ee66..9388d8500a0e6b9b149fabdd82e322f1c2d6fc65 100644
--- a/src/plugins/from/from_register_gui.mli
+++ b/src/plugins/from/from_register_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/functionwise.ml b/src/plugins/from/functionwise.ml
index 2503909a4f7d6ba9ad02d6ece0358ec42c69a459..66d83674fe4205892624c5fdf2c01c365a269c53 100644
--- a/src/plugins/from/functionwise.ml
+++ b/src/plugins/from/functionwise.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/from/functionwise.mli b/src/plugins/from/functionwise.mli
index b007d736e6717d12bfbdb5420aaf8918009d98d5..c986491ab554bef03788ef78c7018190b2c296bd 100644
--- a/src/plugins/from/functionwise.mli
+++ b/src/plugins/from/functionwise.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/GSourceView2.ml.in b/src/plugins/gui/GSourceView2.ml.in
new file mode 100644
index 0000000000000000000000000000000000000000..4e29ebc67e652ab7109a56490a2e8fbe067c8864
--- /dev/null
+++ b/src/plugins/gui/GSourceView2.ml.in
@@ -0,0 +1,37 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+(** compatibility layer between gtksourceview 2 and 3. *)
+include GSourceView2
+
+let make_marker_attributes
+ ~(source:source_view)
+ ~(category:string)
+ ~(priority: int)
+ ?(background: Gdk.color option)
+ ?(pixbuf:GdkPixbuf.pixbuf option)
+ ?(icon_name:string option)
+ () =
+ ignore icon_name; (* not in lablgtk2. *)
+ source#set_mark_category_priority ~category priority;
+ source#set_mark_category_pixbuf ~category pixbuf;
+ source#set_mark_category_background ~category background
diff --git a/src/plugins/gui/GSourceView2.mli.in b/src/plugins/gui/GSourceView2.mli.in
new file mode 100644
index 0000000000000000000000000000000000000000..4fbb9cf7b48fe706adafbaca81d998f9ce41834a
--- /dev/null
+++ b/src/plugins/gui/GSourceView2.mli.in
@@ -0,0 +1,34 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+(* compatibility between gtksourceview 2 and 3. *)
+include module type of GSourceView2
+
+val make_marker_attributes:
+ source:source_view ->
+ category:string ->
+ priority: int ->
+ ?background: Gdk.color ->
+ ?pixbuf:GdkPixbuf.pixbuf ->
+ ?icon_name:string ->
+ unit ->
+ unit
diff --git a/src/plugins/gui/GSourceView3.ml.in b/src/plugins/gui/GSourceView3.ml.in
new file mode 100644
index 0000000000000000000000000000000000000000..1bb745b6611d6288aa837a926206c1231448d95e
--- /dev/null
+++ b/src/plugins/gui/GSourceView3.ml.in
@@ -0,0 +1,38 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+(** compatibility layer between gtksourceview 2 and 3. *)
+include GSourceView3
+
+let make_marker_attributes
+ ~(source:source_view)
+ ~(category:string)
+ ~(priority: int)
+ ?(background: Gdk.rgba option)
+ ?(pixbuf:GdkPixbuf.pixbuf option)
+ ?(icon_name:string option)
+ () =
+ let my_attributes = GSourceView3.source_mark_attributes () in
+ Extlib.may my_attributes#set_background background;
+ Extlib.may my_attributes#set_pixbuf pixbuf;
+ Extlib.may my_attributes#set_icon_name icon_name;
+ source#set_mark_attributes ~category my_attributes priority
diff --git a/src/plugins/gui/GSourceView3.mli.in b/src/plugins/gui/GSourceView3.mli.in
new file mode 100644
index 0000000000000000000000000000000000000000..91bac811df4d50606c4bc91046f914d643763ef9
--- /dev/null
+++ b/src/plugins/gui/GSourceView3.mli.in
@@ -0,0 +1,34 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+(* compatibility between gtksourceview 2 and 3. *)
+include module type of GSourceView3
+
+val make_marker_attributes:
+ source:source_view ->
+ category:string ->
+ priority: int ->
+ ?background: Gdk.rgba ->
+ ?pixbuf:GdkPixbuf.pixbuf ->
+ ?icon_name:string ->
+ unit ->
+ unit
diff --git a/src/plugins/gui/analyses_manager.ml b/src/plugins/gui/analyses_manager.ml
index 5d895ae53bd2df8c3f29b66e4f3db01697f1834e..787a26083c232db5a65042182e836aba4ff9dcc3 100644
--- a/src/plugins/gui/analyses_manager.ml
+++ b/src/plugins/gui/analyses_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/analyses_manager.mli b/src/plugins/gui/analyses_manager.mli
index 0741d3d824dc12ca0e9346537efb24face2638a1..3cbf6ac4282feb762ec5e2545733c58ba11984ee 100644
--- a/src/plugins/gui/analyses_manager.mli
+++ b/src/plugins/gui/analyses_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/book_manager.ml b/src/plugins/gui/book_manager.ml
index 6b8d8785350055d8c59a7c7ea77d5130ef90e1d6..a00f5534f68ed7a5b23ff06b030a70918b5a8afa 100644
--- a/src/plugins/gui/book_manager.ml
+++ b/src/plugins/gui/book_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -24,7 +24,7 @@ let dkey = Gui_parameters.register_category "book_manager"
module Q = Qstack.Make
(struct
- type t = GSourceView2.source_view
+ type t = GSourceView.source_view
let equal x y = x == y
end)
@@ -112,7 +112,7 @@ let delete_all_views (t:t) =
Q.iter (fun _ -> t.notebook#remove_page 0) t.views;
Q.clear t.views
-let append_view (t:t) (v:GSourceView2.source_view) =
+let append_view (t:t) (v:GSourceView.source_view) =
let nb = t.notebook in
let next = Q.length t.views in
let text = Printf.sprintf "Page %d" next in
diff --git a/src/plugins/gui/book_manager.mli b/src/plugins/gui/book_manager.mli
index 3d96b5f103caad40097aaef574317023dd4586ef..697bfdf7de15caf0cb3888a6a46116fa3e39e562 100644
--- a/src/plugins/gui/book_manager.mli
+++ b/src/plugins/gui/book_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -34,9 +34,9 @@ val make:
val get_notebook: t -> GPack.notebook
-val append_source_tab : t -> string -> GSourceView2.source_view
+val append_source_tab : t -> string -> GSourceView.source_view
-val prepend_source_tab : t -> string -> GSourceView2.source_view
+val prepend_source_tab : t -> string -> GSourceView.source_view
val get_nth_page: t -> int -> GObj.widget
@@ -46,7 +46,7 @@ val last_page: t -> int
val set_current_view: t -> int -> unit
-val get_current_view: t -> GSourceView2.source_view
+val get_current_view: t -> GSourceView.source_view
val get_current_index: t -> int
@@ -56,9 +56,9 @@ val delete_view: t -> int -> unit
val delete_all_views: t -> unit
-val append_view: t -> GSourceView2.source_view -> unit
+val append_view: t -> GSourceView.source_view -> unit
-val get_nth_view: t -> int -> GSourceView2.source_view
+val get_nth_view: t -> int -> GSourceView.source_view
val enable_popup : t -> bool -> unit
diff --git a/src/plugins/gui/debug_manager.ml b/src/plugins/gui/debug_manager.ml
index 4d7e45a1d505eca845707c743f67b47296ad77c9..8f6be189f5ba1e1555accccd1d2a05be6cf2c414 100644
--- a/src/plugins/gui/debug_manager.ml
+++ b/src/plugins/gui/debug_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -49,9 +49,7 @@ let graph_window main_window title mk_view =
let height = int_of_float (float main_window#default_height *. 3. /. 4.) in
let width = int_of_float (float main_window#default_width *. 3. /. 4.) in
let window =
- GWindow.window
- ~width ~height ~title ~allow_shrink:true ~allow_grow:true
- ~position:`CENTER ()
+ GWindow.window ~width ~height ~title ~resizable:true ~position:`CENTER ()
in
let view = mk_view ~packing:window#add () in
window#show ();
diff --git a/src/plugins/gui/debug_manager.mli b/src/plugins/gui/debug_manager.mli
index 0741d3d824dc12ca0e9346537efb24face2638a1..3cbf6ac4282feb762ec5e2545733c58ba11984ee 100644
--- a/src/plugins/gui/debug_manager.mli
+++ b/src/plugins/gui/debug_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/design.ml b/src/plugins/gui/design.ml
index d695a38cb3a02e8a70074293c30ec6e5127737e6..eb1636c296c32fb083ff6359c212595fcdf6410c 100644
--- a/src/plugins/gui/design.ml
+++ b/src/plugins/gui/design.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -34,7 +34,7 @@ let use_external_viewer = false
class type reactive_buffer = object
inherit error_manager
- method buffer : GSourceView2.source_buffer
+ method buffer : GSourceView.source_buffer
method locs : Pretty_source.Locs.state
method rehighlight: unit
method redisplay: unit
@@ -61,7 +61,7 @@ class type main_window_extension_points = object
(** Pretty print a message in the [annot_window]. *)
method launcher : unit -> unit
- method source_viewer : GSourceView2.source_view
+ method source_viewer : GSourceView.source_view
method source_viewer_scroll : GBin.scrolled_window
method display_globals : global list -> unit
method register_source_selector :
@@ -657,20 +657,19 @@ struct
let fold_category = "fold"
let unfold_category = "unfold"
- let declare_markers (source:GSourceView2.source_view) =
- source#set_mark_category_pixbuf
- ~category:fold_category (Some Gtk_helper.Icon.(get Fold));
- source#set_mark_category_pixbuf
- ~category:unfold_category (Some Gtk_helper.Icon.(get Unfold));
- (* Sets a high prioriy so that the icon for folding and unfolding are
- printed on top of the status bullets. *)
- source#set_mark_category_priority ~category:fold_category 2;
- source#set_mark_category_priority ~category:unfold_category 2;
+(*GTK3 does not exist anymore in gsourceview3. *)
+ let declare_markers (source:GSourceView.source_view) =
+ GSourceView.make_marker_attributes
+ ~source ~category:fold_category ~priority:2
+ ~pixbuf:(Gtk_helper.Icon.(get Fold)) ();
+ GSourceView.make_marker_attributes
+ ~source ~category:unfold_category ~priority:2
+ ~pixbuf:(Gtk_helper.Icon.(get Unfold)) ();
List.iter
(fun v ->
- source#set_mark_category_pixbuf
- ~category:(category v)
- (Some (Gtk_helper.Icon.get (Gtk_helper.Icon.Feedback v))))
+ GSourceView.make_marker_attributes
+ ~source ~category:(category v) ~priority:1
+ ~pixbuf:(Gtk_helper.Icon.get (Gtk_helper.Icon.Feedback v)) ())
[ F.Never_tried;
F.Considered_valid;
F.Valid;
@@ -695,19 +694,20 @@ struct
Hashtbl.clear tooltip_marks;
Hashtbl.clear call_sites
- let mark (source:GSourceView2.source_buffer) ?call_site ~offset validity =
+ let mark (source:GSourceView.source_buffer) ?call_site ~offset validity =
let iter = source#get_iter_at_char offset in
+ let mark = iter#set_line_offset 0 in
let category = category validity in
- source#remove_source_marks iter iter () ;
- ignore (source#create_source_mark ~category iter) ;
+ source#remove_source_marks mark mark () ;
+ ignore (source#create_source_mark ~category mark) ;
Hashtbl.replace tooltip_marks iter#line (long_category validity);
match call_site with
| None -> ()
| Some stmt ->
Hashtbl.replace call_sites iter#line stmt;
if Pretty_source.are_preconds_unfolded stmt
- then ignore (source#create_source_mark ~category:fold_category iter)
- else ignore (source#create_source_mark ~category:unfold_category iter)
+ then ignore (source#create_source_mark ~category:fold_category mark)
+ else ignore (source#create_source_mark ~category:unfold_category mark)
end
@@ -846,8 +846,7 @@ class main_window () : main_window_extension_points =
~width
~height
~position:`CENTER
- ~allow_shrink:true
- ~allow_grow:true
+ ~resizable:true
~show:false
()
in
@@ -865,9 +864,7 @@ class main_window () : main_window_extension_points =
in
(* status bar (at bottom) *)
(* toplevel_vbox->bottom_hbox-> *statusbar *)
- let statusbar =
- GMisc.statusbar ~has_resize_grip:false ~packing:bottom_hbox#add ()
- in
+ let statusbar = GMisc.statusbar ~packing:bottom_hbox#add () in
let status_context = statusbar#new_context "messages" in
(* progress bar (at bottom) *)
@@ -1187,6 +1184,10 @@ class main_window () : main_window_extension_points =
let show o =
history (fun () -> History.push (History.Localizable loc));
let iter = self#source_viewer#buffer#get_iter (`OFFSET o) in
+ Gui_parameters.debug
+ ~dkey:dkey_scroll "scrolling in current view at iter %d,%d"
+ iter#line iter#line_offset
+ ;
ignore (self#source_viewer#backward_display_line_start iter);
self#source_viewer#buffer#place_cursor iter;
ignore (self#source_viewer#scroll_to_mark
@@ -1367,7 +1368,7 @@ class main_window () : main_window_extension_points =
to be found (e.g. Ctrl+F). Otherwise, uses the last searched
text (e.g. F3). *)
method private focused_find_text use_dialog =
- let find_text_in_viewer ~where (viewer : [`GTextViewer of GText.view |`GSourceViewer of GSourceView2.source_view]) text =
+ let find_text_in_viewer ~where (viewer : [`GTextViewer of GText.view |`GSourceViewer of GSourceView.source_view]) text =
let buffer, scroll_to_iter =
match viewer with
| `GTextViewer v -> v#buffer,v#scroll_to_iter
@@ -1497,11 +1498,22 @@ class main_window () : main_window_extension_points =
let abs_x = int_of_float (GdkEvent.Button.x_root ev) in
(* This function returns the absolute position of the top window,
or the relative position of an intern widget. *)
+ let rec get_rel_from_main acc win =
+ let x = fst (Gdk.Window.get_position win) in
+ let acc = acc + x in
+ let win = Gdk.Window.get_parent win in
+ if Gobject.get_oid win =
+ Gobject.get_oid main_window#misc#window
+ then acc
+ else get_rel_from_main acc win
+ in
let get_x obj = fst (Gdk.Window.get_position obj#misc#window) in
(* Absolute position of the main window on the screen. *)
let window_abs_x = get_x main_window in
(* Relative position of the source_viewer in the main windows. *)
- let viewer_rel_x = get_x source_viewer in
+ let viewer_rel_x =
+ get_rel_from_main 0 source_viewer#misc#window
+ in
(* Width of the bullet column in the source viewer. *)
if abs_x - (window_abs_x + viewer_rel_x) < 20 then
begin
@@ -1513,15 +1525,76 @@ class main_window () : main_window_extension_points =
let line = iterpos#line in
try
let stmt = Hashtbl.find Feedback.call_sites line in
- let kf = Kernel_function.find_englobing_kf stmt in
Pretty_source.fold_preconds_at_callsite stmt;
- self#reactive_buffer#redisplay;
- self#scroll (PStmt (kf, stmt))
- with Not_found -> ()
+ self#reset ();
+ (* give some time for the sourceview to recompute
+ its height, otherwise scrolling is broken. *)
+ let has_stabilized = ref false in
+ (* According to the blog post here
+ https://picheta.me/articles/2013/08/gtk-plus--a-method-to-guarantee-scrolling.html
+ the best way to check whether we have correctly scrolled
+ is to retrieve the rectangle corresponding to the mark,
+ the rectangle effectively displayed, and see whether
+ the former is included in the latter.
+ *)
+ let check () =
+ (* not entirely accurate because of
+ the (un)fold action, but should do the trick.
+ We will do the real scroll after stabilization
+ anyway.
+ *)
+ let iter =
+ source_viewer#buffer#get_iter (`LINE line)
+ in
+ let my_rect = source_viewer#get_iter_location iter in
+ let visible_rect = source_viewer#visible_rect in
+ (* in Gdk, x,y represents the top left corner of the
+ rectangle. We just check whether the beginning of the
+ selection is visible (we only have one line of text
+ anyway). *)
+ let res =
+ Gdk.Rectangle.(
+ y my_rect >= y visible_rect &&
+ y my_rect <= y visible_rect + height visible_rect
+ )
+ in
+ Gdk.Rectangle.(Gui_parameters.debug ~dkey:dkey_scroll
+ "my rect is %d (+%d) %d (+%d)@\n\
+ vis rect is %d (+%d) %d (+%d)@\n\
+ my rect is visible: %B@."
+ (x my_rect) (width my_rect) (y my_rect) (height my_rect)
+ (x visible_rect) (width visible_rect) (y visible_rect)
+ (height visible_rect) res);
+ has_stabilized := res;
+ (* when added as an idle procedure below, check will
+ be removed whenever it returns false. *)
+ not res
+ in
+ (* in case we were lucky and have stabilized directly. *)
+ ignore (check());
+ let proc = Glib.Idle.add check in
+ (* in case we are unlucky, stop waiting after
+ 0.5 second and hope for the best. *)
+ let alarm =
+ Glib.Timeout.add
+ ~ms:500
+ ~callback:
+ (fun () ->
+ has_stabilized := true;
+ Glib.Idle.remove proc;
+ false)
+ in
+ while (not !has_stabilized) do
+ (* do one main loop step so that buffer gets
+ a chance to recompute its height. *)
+ ignore (Glib.Main.iteration false)
+ done;
+ Glib.Timeout.remove alarm;
+ self#view_stmt stmt;
+ with Not_found -> ()
end;
false)
in
-
let extra_accel_group = GtkData.AccelGroup.create () in
GtkData.AccelGroup.connect extra_accel_group
~key:GdkKeysyms._F
diff --git a/src/plugins/gui/design.mli b/src/plugins/gui/design.mli
index 7c6da50093d8633d871bd005c4a3ad0c6612c5bf..37ab9e4416273be9edd135eb2350c49df2f09b53 100644
--- a/src/plugins/gui/design.mli
+++ b/src/plugins/gui/design.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -30,7 +30,7 @@ open Cil_types
@since Beryllium-20090901 *)
class type reactive_buffer = object
inherit Gtk_helper.error_manager
- method buffer : GSourceView2.source_buffer
+ method buffer : GSourceView.source_buffer
method locs : Pretty_source.Locs.state
method rehighlight : unit
method redisplay : unit
@@ -122,7 +122,7 @@ class type main_window_extension_points = object
(** {4 Source viewers} *)
- method source_viewer : GSourceView2.source_view
+ method source_viewer : GSourceView.source_view
(** The [GText.view] showing the AST. *)
method source_viewer_scroll : GBin.scrolled_window
@@ -172,7 +172,7 @@ class type main_window_extension_points = object
top of the other.
@modify Aluminium-20160501: receives a {!reactive_buffer} instead
- of a {!GSourceView2.source_buffer} *)
+ of a {!GSourceView.source_buffer} *)
method register_panel :
(main_window_extension_points->(string*GObj.widget*(unit-> unit) option))
@@ -263,14 +263,14 @@ val reactive_buffer : main_window_extension_points ->
module Feedback :
sig
- val declare_markers: GSourceView2.source_view -> unit
+ val declare_markers: GSourceView.source_view -> unit
(** Declares the icons used for the property status bullets, as marks in
the left-margin of the source buffer.
These icons depend on the GUI theme, and must be reset when the
theme is changed.
@since Chlorine-20180501 *)
- val mark : GSourceView2.source_buffer
+ val mark : GSourceView.source_buffer
-> ?call_site:stmt
-> offset:int
-> Property_status.Feedback.t -> unit
diff --git a/src/plugins/gui/dgraph.ml.in b/src/plugins/gui/dgraph.ml.in
new file mode 100644
index 0000000000000000000000000000000000000000..f672460d995880f279523fed4cc47a9e9b3625a3
--- /dev/null
+++ b/src/plugins/gui/dgraph.ml.in
@@ -0,0 +1,38 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+(* dgraph module that always generates an error: Dgraph is not available
+ with gtk3
+*)
+
+module DGraphModel = struct
+ exception DotError of string
+end
+
+module DGraphContainer = struct
+ type status = Global | Tree | Both
+
+ module Dot = struct
+ let from_dot_with_commands ?packing:_ ?status:_ _ =
+ raise (DGraphModel.DotError "DGraph is unsupported in GTK3")
+ end
+end
diff --git a/src/plugins/gui/dgraph.mli.in b/src/plugins/gui/dgraph.mli.in
new file mode 100644
index 0000000000000000000000000000000000000000..5cf0b53f22586ca29745199c4b73efdbd7401939
--- /dev/null
+++ b/src/plugins/gui/dgraph.mli.in
@@ -0,0 +1,42 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+(* dgraph module that always generates an error: Dgraph is not available
+ with gtk3
+*)
+
+module DGraphModel: sig
+ exception DotError of string
+end
+
+module DGraphContainer: sig
+
+ type status = Global | Tree | Both
+
+ module Dot: sig
+ val from_dot_with_commands:
+ ?packing:(GObj.widget ->unit) ->
+ ?status:status ->
+ string ->
+ GPack.table * <adapt_zoom: unit -> unit>
+ end
+end
diff --git a/src/plugins/gui/file_manager.ml b/src/plugins/gui/file_manager.ml
index 2faba8cd78277ce2b9f7abbcd1ba77363fade909..ba532bf6bb70d030348711525496e36ee9584603 100644
--- a/src/plugins/gui/file_manager.ml
+++ b/src/plugins/gui/file_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/file_manager.mli b/src/plugins/gui/file_manager.mli
index 0741d3d824dc12ca0e9346537efb24face2638a1..3cbf6ac4282feb762ec5e2545733c58ba11984ee 100644
--- a/src/plugins/gui/file_manager.mli
+++ b/src/plugins/gui/file_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/filetree.ml b/src/plugins/gui/filetree.ml
index b835d12d195d52148fc8f004cb4e5b1bb246d5b2..025ade684ae402129dfc5500c43f66fafa9a3a0c 100644
--- a/src/plugins/gui/filetree.ml
+++ b/src/plugins/gui/filetree.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -630,7 +630,7 @@ let make (tree_view:GTree.view) =
let column = GTree.view_column ~renderer:(renderer,[]) () in
ignore (tree_view#append_column column);
let label = GMisc.label ~text:title () in
- (GData.tooltips ())#set_tip ~text:tooltip label#coerce;
+ Gtk_helper.do_tooltip ~tooltip label;
column#set_widget (Some label#coerce);
column#set_alignment 0.5;
column#set_reorderable true;
diff --git a/src/plugins/gui/filetree.mli b/src/plugins/gui/filetree.mli
index 017026685aaffbef0e43ca09c47ee8d1a8bed43a..de1edcb4c22c05bae45a541e7b42f386b913beb5 100644
--- a/src/plugins/gui/filetree.mli
+++ b/src/plugins/gui/filetree.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/gtk_compat.2.ml b/src/plugins/gui/gtk_compat.2.ml
new file mode 100644
index 0000000000000000000000000000000000000000..945c310aa97880c02aa80cec3c2bd9b35f1da11b
--- /dev/null
+++ b/src/plugins/gui/gtk_compat.2.ml
@@ -0,0 +1,24 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+let get_toolbar_index (toolbar:GButton.toolbar) (item:GButton.tool_item) =
+ toolbar#get_item_index item
diff --git a/src/plugins/gui/gtk_compat.3.ml b/src/plugins/gui/gtk_compat.3.ml
new file mode 100644
index 0000000000000000000000000000000000000000..b29fa610143511694a30dbd7a1358e153bbafeb6
--- /dev/null
+++ b/src/plugins/gui/gtk_compat.3.ml
@@ -0,0 +1,23 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+let get_toolbar_index toolbar item = toolbar#get_item_index item#as_tool_item
diff --git a/src/plugins/gui/gtk_compat.mli b/src/plugins/gui/gtk_compat.mli
new file mode 100644
index 0000000000000000000000000000000000000000..61f6af64a07b6d382d0fb836b8f19b96049280dc
--- /dev/null
+++ b/src/plugins/gui/gtk_compat.mli
@@ -0,0 +1,23 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2019 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+val get_toolbar_index: GButton.toolbar -> GButton.tool_item -> int
diff --git a/src/plugins/gui/gtk_form.ml b/src/plugins/gui/gtk_form.ml
index 2054b86d0f53785a83780613f6f0dca96062ebeb..1a8acc5377e50963ad3ed17166eac4e33a6a4539 100644
--- a/src/plugins/gui/gtk_form.ml
+++ b/src/plugins/gui/gtk_form.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -40,12 +40,6 @@ type 'a field =
?tooltip:string -> packing:(GObj.widget -> unit) ->
(unit -> 'a) -> ('a -> unit) -> demon -> unit
-let mk_tooltip ?tooltip obj = match tooltip with
- | None -> ()
- | Some text ->
- let tooltip = GData.tooltips () in
- tooltip#set_tip ~text obj#coerce
-
(* ------------------------------------------------------------------------ *)
(* --- Check Button --- *)
(* ------------------------------------------------------------------------ *)
@@ -54,7 +48,7 @@ let check ?label ?tooltip ~packing get set demon =
let button =
GButton.check_button ?label ~packing ~active:(get ()) ()
in
- mk_tooltip ?tooltip button ;
+ Gtk_helper.do_tooltip ?tooltip button ;
ignore (button#connect#toggled ~callback:(fun () -> set button#active));
register demon (fun () -> button#set_active (get()))
@@ -88,7 +82,7 @@ let menu entries ?width ?tooltip ~packing get set demon =
with Not_found -> ()
in
ignore (combo_box#connect#changed callback) ;
- mk_tooltip ?tooltip combo_box ;
+ Gtk_helper.do_tooltip ?tooltip combo_box ;
register demon update
(* ------------------------------------------------------------------------ *)
@@ -105,7 +99,7 @@ let spinner ?(lower=0) ?(upper=max_int) ?width ?tooltip ~packing get set demon =
if a<>b then set a in
let update () = spin#adjustment#set_value (float (get ())) in
ignore (spin#connect#value_changed ~callback) ;
- mk_tooltip ?tooltip spin ;
+ Gtk_helper.do_tooltip ?tooltip spin ;
register demon update
(* ------------------------------------------------------------------------ *)
@@ -137,5 +131,5 @@ let label ~text ~packing () =
let button ~label ?tooltip ~callback ~packing () =
let b = GButton.button ~label ~packing () in
- mk_tooltip ?tooltip b ;
+ Gtk_helper.do_tooltip ?tooltip b ;
ignore (b#connect#clicked ~callback)
diff --git a/src/plugins/gui/gtk_form.mli b/src/plugins/gui/gtk_form.mli
index 4b13156156b3c9e89b6c050dcfde683aeb59a73d..0ca26309745a2c4e3bc5bae9f839d3e5346f87e5 100644
--- a/src/plugins/gui/gtk_form.mli
+++ b/src/plugins/gui/gtk_form.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/gtk_helper.ml b/src/plugins/gui/gtk_helper.ml
index 0846a32080233072d06895460030f95c9ae73788..63bbcd3c9f4535fb2d4bce5a5ed485aaec8db6a4 100644
--- a/src/plugins/gui/gtk_helper.ml
+++ b/src/plugins/gui/gtk_helper.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -359,9 +359,7 @@ type 'a chooser =
let do_tooltip ?tooltip obj = match tooltip with
| None -> ()
- | Some text ->
- let tooltip = GData.tooltips () in
- tooltip#set_tip ~text obj#coerce
+ | Some text -> obj#coerce#misc#set_tooltip_text text
let on_bool ?tooltip ?use_markup (container:GPack.box) label get set =
let result = ref (get ()) in
@@ -550,10 +548,13 @@ let trace_event (w:GObj.event_ops) =
| `DROP_FINISHED -> "drop-finish"
| `CLIENT_EVENT -> "client-event"
| `VISIBILITY_NOTIFY -> "visibility-notify"
- | `NO_EXPOSE-> "no-expose"
+ (*GTK3 Event does not exist anymore *)
+ (* | `NO_EXPOSE-> "no-expose" *)
| `SCROLL -> "scroll"
| `WINDOW_STATE -> "window-state"
| `SETTING -> "setting"
+ (*GTK3: leave room for more events. *)
+ | _ -> "unknown-gtk3-event"
in
ignore (w#connect#any
~callback:(fun e ->
@@ -959,6 +960,45 @@ let source_files_chooser (main_ui: source_files_chooser_host) defaults f =
dialog#show ();
()
+let default_dir = ref ""
+
+let select_file ?title ?(dir=default_dir) ?(filename="") () =
+ let filename =
+ if Filename.is_relative filename then
+ if !dir <> "" then !dir ^ "/" ^ filename
+ else ""
+ else begin
+ dir:= Filename.dirname filename;
+ filename
+ end
+ in
+ let dialog: GWindow.Buttons.file_selection GWindow.file_chooser_dialog =
+ GWindow.file_chooser_dialog
+ ~action:`OPEN
+ ?title
+ ~modal:true
+ ()
+ in
+ ignore (dialog#set_filename filename);
+ let result = ref None in
+ let action r =
+ (match r with
+ | `OK ->
+ let file = dialog#filename in
+ (match file with
+ | None -> ()
+ | Some file ->
+ dir := Filename.dirname file;
+ result := Some file)
+ | _ -> ());
+ dialog#destroy ()
+ in
+ dialog#add_select_button "Open" `OK;
+ dialog#add_button "Cancel" `CANCEL;
+ dialog#show ();
+ action (dialog#run ());
+ !result
+
let spawn_command ?(timeout=0) ?stdout ?stderr s args f =
let check_result = Command.command_async s ?stdout ?stderr args in
let has_timeout = timeout > 0 in
@@ -984,8 +1024,8 @@ let graph_window ~parent ~title make_view =
let width = int_of_float (float parent#default_width *. 3. /. 4.) in
let graph_window =
GWindow.window
- ~width ~height ~title ~allow_shrink:true ~allow_grow:true
- ~position:`CENTER () in
+ ~width ~height ~title ~resizable:true ~position:`CENTER ()
+ in
let view = make_view ~packing:graph_window#add () in
graph_window#show();
view#adapt_zoom();
@@ -1017,6 +1057,16 @@ let graph_window_through_dot ~parent ~title dot_formatter =
(Printexc.to_string exn)
;;
+let image_menu_item ~(image:GObj.widget) ~text ~packing =
+ let mi = GMenu.menu_item () in
+ let box =
+ GPack.hbox ~spacing:2 ~border_width:0 ~packing:mi#add ()
+ in
+ box#add image;
+ box#add (GMisc.label ~justify:`LEFT ~xalign:0. ~xpad:0 ~text ())#coerce;
+ packing mi;
+ mi
+
(*
Local Variables:
compile-command: "make -C ../../.."
diff --git a/src/plugins/gui/gtk_helper.mli b/src/plugins/gui/gtk_helper.mli
index 679ebc2165cc9311ec086f817d689bb3248abbdc..37c82a18e9aa136c706fb35baa76c52a84bf370e 100644
--- a/src/plugins/gui/gtk_helper.mli
+++ b/src/plugins/gui/gtk_helper.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -162,11 +162,11 @@ val make_tag :
create_tag : ?name:string -> GText.tag_property list -> GText.tag ; .. >
-> name:string -> GText.tag_property list -> GText.tag
-val apply_tag : GSourceView2.source_buffer -> GText.tag -> int -> int -> unit
-val remove_tag : GSourceView2.source_buffer -> GText.tag -> int -> int -> unit
-val cleanup_tag : GSourceView2.source_buffer -> GText.tag -> unit
+val apply_tag : GSourceView.source_buffer -> GText.tag -> int -> int -> unit
+val remove_tag : GSourceView.source_buffer -> GText.tag -> int -> int -> unit
+val cleanup_tag : GSourceView.source_buffer -> GText.tag -> unit
-val cleanup_all_tags : GSourceView2.source_buffer -> unit
+val cleanup_all_tags : GSourceView.source_buffer -> unit
(* ************************************************************************** *)
(** {2 Channels} *)
@@ -321,6 +321,15 @@ val source_files_chooser:
(string list -> unit) ->
unit
+(** Launches a standard gtk file chooser window and returns the name
+ of the selected file. Replaces GToolbox.select_file that has not been
+ ported to lablgtk3.
+
+ @since Frama-C+dev
+*)
+val select_file:
+ ?title:string -> ?dir:(string ref)-> ?filename:string -> unit -> string option
+
(* ************************************************************************** *)
(** {2 Miscellaneous} *)
(* ************************************************************************** *)
@@ -432,6 +441,16 @@ val graph_window_through_dot:
(Format.formatter -> unit) ->
unit
+(** calls the packing function to append a new menu item
+ with an icon and a label.
+ replaces GMenu.image_menu_item that has been deprecated in GTK3
+*)
+val image_menu_item:
+ image:GObj.widget ->
+ text: string ->
+ packing: (GMenu.menu_item -> unit) ->
+ GMenu.menu_item
+
(*
Local Variables:
compile-command: "make -C ../../.."
diff --git a/src/plugins/gui/gui_parameters.ml b/src/plugins/gui/gui_parameters.ml
index fe643d590185a999f518c383b92e16e061a52629..8bbdf42c6a9470ce09ce6e23593a349c591d00c1 100644
--- a/src/plugins/gui/gui_parameters.ml
+++ b/src/plugins/gui/gui_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/gui_parameters.mli b/src/plugins/gui/gui_parameters.mli
index c01930e0da8232ec6dd2ba3ee4d2355b9c93d2a1..c205f24c1356d8e09b10e56ca447a94d3bea0d9d 100644
--- a/src/plugins/gui/gui_parameters.mli
+++ b/src/plugins/gui/gui_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/gui_printers.ml b/src/plugins/gui/gui_printers.ml
index 877033200d49626ac9a564472223a26a1be9a6fc..7ff3bd0ebf04fcbb140eb2648410456140f8c80f 100644
--- a/src/plugins/gui/gui_printers.ml
+++ b/src/plugins/gui/gui_printers.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/gui_printers.mli b/src/plugins/gui/gui_printers.mli
index 7ff1bb9eb34891ca171d3cc1b9c83e7eb3455da7..9a2a6a98420efa709c1807c727fc08e40c159d9c 100644
--- a/src/plugins/gui/gui_printers.mli
+++ b/src/plugins/gui/gui_printers.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/help_manager.ml b/src/plugins/gui/help_manager.ml
index 74077c4c5986735221125992067c1100fe953bb5..055d3b33c18c680a827179523038538884c4782f 100644
--- a/src/plugins/gui/help_manager.ml
+++ b/src/plugins/gui/help_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/help_manager.mli b/src/plugins/gui/help_manager.mli
index 0741d3d824dc12ca0e9346537efb24face2638a1..3cbf6ac4282feb762ec5e2545733c58ba11984ee 100644
--- a/src/plugins/gui/help_manager.mli
+++ b/src/plugins/gui/help_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/history.ml b/src/plugins/gui/history.ml
index 59666184e64350f7ad81c81b80e38f49dc26cf2c..d3b93d134ab5157d0d5401afed50607caeb28f57 100644
--- a/src/plugins/gui/history.ml
+++ b/src/plugins/gui/history.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/history.mli b/src/plugins/gui/history.mli
index d1ad34d8e0a7dbebcdc195083deeac5bf42a2747..fc0c35a5c08d6528d82ebe484a73f34ff609cc0a 100644
--- a/src/plugins/gui/history.mli
+++ b/src/plugins/gui/history.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/launcher.ml b/src/plugins/gui/launcher.ml
index 24761d0f03f493a6f77abbf0c2ead3deb7f63bd5..2ca7d6662843869e27bad911ff855e3cba0354ce 100644
--- a/src/plugins/gui/launcher.ml
+++ b/src/plugins/gui/launcher.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -253,11 +253,10 @@ let show ?height ?width ~(host:basic_main) () =
~title:"Launching analysis"
~modal:true
~position:`CENTER_ON_PARENT
- ~allow_shrink:true
+ ~resizable:true
?width
?height
~parent:host#main_window
- ~allow_grow:true
()
in
ignore (dialog#misc#connect#size_allocate
diff --git a/src/plugins/gui/launcher.mli b/src/plugins/gui/launcher.mli
index 7f19d5e23a4f122315679a4d31014f1473a6315d..3dff31269cd4fd784766742e9c5782ae890d711d 100644
--- a/src/plugins/gui/launcher.mli
+++ b/src/plugins/gui/launcher.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/menu_manager.ml b/src/plugins/gui/menu_manager.ml
index 0388411e620570cb58e3f13895611f70084c5a02..5fd3296da1ffcb65c4e41f94202129e6830df186 100644
--- a/src/plugins/gui/menu_manager.ml
+++ b/src/plugins/gui/menu_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -165,7 +165,10 @@ class menu_manager ?packing ~host:(_:Gtk_helper.host) =
By default, add all the others just before this very first group. *)
ref (match pos, first_tool_separator with
| None, None -> 0
- | None, Some sep -> max 0 (toolbar#get_item_index sep)
+ | None, Some sep ->
+ max
+ 0
+ (Gtk_compat.get_toolbar_index toolbar (sep:>GButton.tool_item))
| Some p, _ -> p)
in
let toolbar_packing w =
@@ -213,7 +216,7 @@ class menu_manager ?packing ~host:(_:Gtk_helper.host) =
(fun () -> b#set_active (active ())) :: set_active_states;
BToggle b
in
- (bt_type_as_skel b)#set_tooltip (GData.tooltips ()) tooltip "";
+ (bt_type_as_skel b)#misc#set_tooltip_text tooltip;
toolbar_buttons <- (b, sensitive) :: toolbar_buttons;
b
in
@@ -249,12 +252,10 @@ class menu_manager ?packing ~host:(_:Gtk_helper.host) =
ignore (mi#connect#activate callback);
MStandard mi
| Some stock, Unit_callback callback ->
- let image = GMisc.image ~stock () in
- let mi =
- (GMenu.image_menu_item
- ~image ~packing:!!menubar_packing ~label ()
- :> GMenu.menu_item)
- in
+ let image = (GMisc.image ~stock ~xalign:0. () :> GObj.widget) in
+ let text = label in
+ let packing = !!menubar_packing in
+ let mi = Gtk_helper.image_menu_item ~image ~text ~packing in
ignore (mi#connect#activate callback);
MStandard mi
| _, Bool_callback (callback, active) ->
diff --git a/src/plugins/gui/menu_manager.mli b/src/plugins/gui/menu_manager.mli
index a833dc1a4aa1afc9f0306dc0b7fddf530d5d4a64..5c0ae0244b3315c05721bf88e6decf4b03012b87 100644
--- a/src/plugins/gui/menu_manager.mli
+++ b/src/plugins/gui/menu_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/pretty_source.ml b/src/plugins/gui/pretty_source.ml
index 9bd7e7586f61a621f3bf1316e0e1b99fa52dc7f4..ec69447e74d6e46727fb501cde80ce7bf861bd82 100644
--- a/src/plugins/gui/pretty_source.ml
+++ b/src/plugins/gui/pretty_source.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -746,7 +746,7 @@ let buffer_formatter state source =
gtk_fmt
let display_source globals
- (source:GSourceView2.source_buffer) ~(host:Gtk_helper.host)
+ (source:GSourceView.source_buffer) ~(host:Gtk_helper.host)
~highlighter ~selector state =
Locs.clear state;
host#protect
diff --git a/src/plugins/gui/pretty_source.mli b/src/plugins/gui/pretty_source.mli
index 2f7473458f9abf6e00020fd60e7211b448915652..452f6727f9c3217ba03954864aa1da903f57dc9c 100644
--- a/src/plugins/gui/pretty_source.mli
+++ b/src/plugins/gui/pretty_source.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -59,7 +59,7 @@ val are_preconds_unfolded: stmt -> bool
val display_source :
global list ->
- GSourceView2.source_buffer ->
+ GSourceView.source_buffer ->
host:Gtk_helper.host ->
highlighter:(localizable -> start:int -> stop:int -> unit) ->
selector:(button:int -> localizable -> unit) ->
diff --git a/src/plugins/gui/project_manager.ml b/src/plugins/gui/project_manager.ml
index abea1ed48444ccfd1823969b6098c29cc284846c..23a8ecc27f0dd7f4ebc02e4697896bd6fde88c3d 100644
--- a/src/plugins/gui/project_manager.ml
+++ b/src/plugins/gui/project_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -218,10 +218,9 @@ and mk_project_entry window menu ?group p =
let box = GPack.hbox ~packing:p_item#add () in
ignore (GMisc.label ~text:pname ~packing:box#pack ());
let buttons_box = GPack.hbox ~packing:(box#pack ~from:`END) () in
- let tooltips = GData.tooltips () in
let add_action stock text callback =
let item = GButton.button ~packing:buttons_box#pack () in
- tooltips#set_tip item#coerce ~text;
+ Gtk_helper.do_tooltip ~tooltip:text item;
item#set_relief `NONE;
let image = GMisc.image ~stock () in
item#set_image image#coerce;
diff --git a/src/plugins/gui/project_manager.mli b/src/plugins/gui/project_manager.mli
index 49ff3d46f494a3655c26778d578f2aab0a588647..6ccde330cb950a0701a59c9c8d248b64f6052978 100644
--- a/src/plugins/gui/project_manager.mli
+++ b/src/plugins/gui/project_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/property_navigator.ml b/src/plugins/gui/property_navigator.ml
index 2ee3eee9554ead7eacfe014d5f949260eb9bf7bb..360a6326434a7a78bcc33e5d870c14ec8421c977 100644
--- a/src/plugins/gui/property_navigator.ml
+++ b/src/plugins/gui/property_navigator.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/property_navigator.mli b/src/plugins/gui/property_navigator.mli
index 2f85e4cf6b39500db83e97d59efba0779909559f..3192d2fc5e3e5b1ddf3f4b95b2e85346c0637fce 100644
--- a/src/plugins/gui/property_navigator.mli
+++ b/src/plugins/gui/property_navigator.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/source_manager.ml b/src/plugins/gui/source_manager.ml
index 08704a4f1b475140291a96d98993b39f574d75be..41c8e7f23323716e3574ffcf1348ea52bee585c6 100644
--- a/src/plugins/gui/source_manager.ml
+++ b/src/plugins/gui/source_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -25,7 +25,7 @@ type tab = {
tab_file : Datatype.Filepath.t ;
tab_page : int ;
tab_select : line:int -> unit ;
- tab_source_view : GSourceView2.source_view;
+ tab_source_view : GSourceView.source_view;
}
type t = {
diff --git a/src/plugins/gui/source_manager.mli b/src/plugins/gui/source_manager.mli
index 013cc6d35c6dfa65d11594e979a8b0b53c6cb8e4..8dcd10e6168beab275ca2f5f5969c1d80fab0a59 100644
--- a/src/plugins/gui/source_manager.mli
+++ b/src/plugins/gui/source_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -45,7 +45,7 @@ val load_file:
val select_file: t -> Datatype.Filepath.t -> unit (** Selection by page filename *)
val select_name: t -> string -> unit (** Selection by page title *)
-val get_current_source_view : t -> GSourceView2.source_view
+val get_current_source_view : t -> GSourceView.source_view
(** Returns the source viewer for the currently displayed tab *)
val clear : t -> unit
diff --git a/src/plugins/gui/source_viewer.ml b/src/plugins/gui/source_viewer.ml
index 0b7d27c8cd10cb5cd251e864fb868df05fe3327d..8e811b6ff6a7267862d32510ae17cebd916ab78b 100644
--- a/src/plugins/gui/source_viewer.ml
+++ b/src/plugins/gui/source_viewer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -23,9 +23,9 @@
(* Build a read only text view for C source code. *)
-let set_language_to_C (buffer:GSourceView2.source_buffer) =
+let set_language_to_C (buffer:GSourceView.source_buffer) =
let original_source_language_manager =
- GSourceView2.source_language_manager ~default:true
+ GSourceView.source_language_manager ~default:true
in
let original_lang =
original_source_language_manager#guess_language
@@ -44,7 +44,7 @@ let make ?name ~packing () =
Utf8_logic.forall Utf8_logic.exists Utf8_logic.eq Utf8_logic.neq) ;
*)
let original_source_window =
- GSourceView2.source_view
+ GSourceView.source_view
~show_line_numbers:true
~editable:false
~packing
@@ -69,6 +69,6 @@ let make ?name ~packing () =
let buffer () =
- let original_source_buffer = GSourceView2.source_buffer () in
+ let original_source_buffer = GSourceView.source_buffer () in
set_language_to_C original_source_buffer;
original_source_buffer
diff --git a/src/plugins/gui/source_viewer.mli b/src/plugins/gui/source_viewer.mli
index 7a3ef5e6ba0566ebff87867aa6539e429f22d927..5211d0a4d6233bc98f100226c150658448dc83cb 100644
--- a/src/plugins/gui/source_viewer.mli
+++ b/src/plugins/gui/source_viewer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -24,8 +24,8 @@
That is the buffer where Frama-C puts its pretty-printed AST. *)
val make : ?name:string -> packing:(GObj.widget -> unit) -> unit ->
- GSourceView2.source_view
+ GSourceView.source_view
(** Build a new source viewer. *)
-val buffer : unit -> GSourceView2.source_buffer
+val buffer : unit -> GSourceView.source_buffer
(** @return the buffer displaying the pretty-printed AST. *)
diff --git a/src/plugins/gui/warning_manager.ml b/src/plugins/gui/warning_manager.ml
index 33bad35ef988323e07a107a2ab9e5d91be300e88..c27f8f1070dd489bb877a35ee0597d8e7755f003 100644
--- a/src/plugins/gui/warning_manager.ml
+++ b/src/plugins/gui/warning_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/warning_manager.mli b/src/plugins/gui/warning_manager.mli
index d183c9a6f1548fd7190017f3f048b4aacc370a15..f939649d13a06410b7416358a56a67378fd1e777 100644
--- a/src/plugins/gui/warning_manager.mli
+++ b/src/plugins/gui/warning_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wbox.ml b/src/plugins/gui/wbox.ml
index 5e09ab8e1a68955e92edcdce75414a6495644dd5..593d2c11a6a2a80a7833e6895d25d18bf324a942 100644
--- a/src/plugins/gui/wbox.ml
+++ b/src/plugins/gui/wbox.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wbox.mli b/src/plugins/gui/wbox.mli
index 95a5698eaa4480b97074445c4a1f81b7fa050331..3cf819eb36ac278f6a07af3f760c791c668f0e29 100644
--- a/src/plugins/gui/wbox.mli
+++ b/src/plugins/gui/wbox.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wfile.ml b/src/plugins/gui/wfile.ml
index b32f0aa306380ab548345e8716db3e0bb9eff4eb..9b1fb7d925918d9db898595b68668adbaff60b4e 100644
--- a/src/plugins/gui/wfile.ml
+++ b/src/plugins/gui/wfile.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -77,7 +77,8 @@ class button ?kind ?title ?select ?tooltip ?parent () =
let fld = GMisc.label ~text:"(none)" ~xalign:0.0
~packing:(box#pack ~expand:true) () in
let _ = GMisc.separator `VERTICAL
- ~packing:(box#pack ~expand:false ~padding:2) ~show:true () in
+ ~packing:(box#pack ~expand:false ~padding:2) ~show:true ()
+ in
let _ = GMisc.image ~packing:(box#pack ~expand:false) ~stock:`OPEN () in
let button = GButton.button () in
let dialog = new dialog ?kind ?title ?select ?parent () in
diff --git a/src/plugins/gui/wfile.mli b/src/plugins/gui/wfile.mli
index 94f29291958eccbd30d773c35e1ad23bfc03088f..835f48352ea3231af7c8ad8b7e970a54f44e6c4a 100644
--- a/src/plugins/gui/wfile.mli
+++ b/src/plugins/gui/wfile.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/widget.ml b/src/plugins/gui/widget.ml
index bc9c1f649ce8d4077079dcd9d95f2c66d67727b7..c7aa3c8f8a3a53b1f775ca718d429a76ef8dfc13 100644
--- a/src/plugins/gui/widget.ml
+++ b/src/plugins/gui/widget.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -73,8 +73,8 @@ class label ?(style=`Label) ?(align=`Left) ?width ?text () =
| Some c0 , `NORMAL ->
w#misc#modify_fg [ `NORMAL , `COLOR c0 ]
| None , (#GDraw.color as c) ->
- fg <- Some (w#misc#style#fg `NORMAL) ;
- w#misc#modify_fg [ `NORMAL , c ]
+ fg <- Some (w#misc#style#fg `NORMAL) ;
+ w#misc#modify_fg [ `NORMAL , c ]
| Some _ , (#GDraw.color as c) ->
w#misc#modify_fg [ `NORMAL , c ]
@@ -84,8 +84,8 @@ class label ?(style=`Label) ?(align=`Left) ?width ?text () =
| Some c0 , `NORMAL ->
w#misc#modify_bg [ `NORMAL , `COLOR c0 ]
| None , (#GDraw.color as c) ->
- bg <- Some (w#misc#style#bg `NORMAL) ;
- w#misc#modify_bg [ `NORMAL , c ]
+ bg <- Some (w#misc#style#bg `NORMAL) ;
+ w#misc#modify_bg [ `NORMAL , c ]
| Some _ , (#GDraw.color as c) ->
w#misc#modify_bg [ `NORMAL , c ]
@@ -428,7 +428,7 @@ class popup () =
method add_item ~label ~callback =
if not empty && separator then
- ignore (GMenu.separator_item ~packing:menu#append ()) ;
+ ignore (GMenu.separator_item ~packing:menu#append ());
let item = GMenu.menu_item ~label ~packing:menu#append () in
ignore (item#connect#activate ~callback) ;
empty <- false ; separator <- false
diff --git a/src/plugins/gui/widget.mli b/src/plugins/gui/widget.mli
index 54f04b43e0c4bc40a0fb1db6b5e7337c76f5ead7..1e2d10f714bfa474ffeb2d57ff62280ae14576cd 100644
--- a/src/plugins/gui/widget.mli
+++ b/src/plugins/gui/widget.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wpalette.ml b/src/plugins/gui/wpalette.ml
index 497541b42f1c2bdc444c85d122c68840c665cc8f..b09ce3428296699ec841646223f4c3756c993dae 100644
--- a/src/plugins/gui/wpalette.ml
+++ b/src/plugins/gui/wpalette.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wpalette.mli b/src/plugins/gui/wpalette.mli
index aaf07c501b3868fecc07583a008837979ffbbc4f..46640567b9936a871c18cc41a1ca742c8d85c600 100644
--- a/src/plugins/gui/wpalette.mli
+++ b/src/plugins/gui/wpalette.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wpane.ml b/src/plugins/gui/wpane.ml
index 582ded99e873539e52573aef07d1967472eefb90..9f38f615462995d21eb459623eb3e69e7295f95f 100644
--- a/src/plugins/gui/wpane.ml
+++ b/src/plugins/gui/wpane.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -217,7 +217,7 @@ class ['a] dialog ~title ~window ?(resize=false) () =
let shell = GWindow.window
~title ~kind:`TOPLEVEL ~modal:true
~show:false ~decorated:true ~position:`CENTER_ON_PARENT
- ~allow_grow:resize ()
+ ~resizable:resize ()
in
let hclip = GBin.alignment ~packing:shell#add () in
diff --git a/src/plugins/gui/wpane.mli b/src/plugins/gui/wpane.mli
index 523c1ceb1d219f8c96d6b11695d2da5a1c9cdfdd..b7c9d371b433bf23b041e1a5bc4e56f4f7221822 100644
--- a/src/plugins/gui/wpane.mli
+++ b/src/plugins/gui/wpane.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wtable.ml b/src/plugins/gui/wtable.ml
index c6a8db052f516441f0a9c716d81cf084a506446c..d860a0fda1edf3f73f37671b5dedb808d9ec3b1d 100644
--- a/src/plugins/gui/wtable.ml
+++ b/src/plugins/gui/wtable.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wtable.mli b/src/plugins/gui/wtable.mli
index e7fac74e6b76ccdb8afe5ee4dbead3caf228279d..3486654303d26980f5d20f4e944c7c5781a0f732 100644
--- a/src/plugins/gui/wtable.mli
+++ b/src/plugins/gui/wtable.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wtext.ml b/src/plugins/gui/wtext.ml
index 828f80eb5b46279c5dfc433e069c97842df22042..53537274b92620d81cca223a4145bb68aaf8c66d 100644
--- a/src/plugins/gui/wtext.ml
+++ b/src/plugins/gui/wtext.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wtext.mli b/src/plugins/gui/wtext.mli
index e2db70110515e9ebaa50847033a9efea13b7997c..75c7b4038841cfae30a595683ac6fea94fd80875 100644
--- a/src/plugins/gui/wtext.mli
+++ b/src/plugins/gui/wtext.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wutil.ml b/src/plugins/gui/wutil.ml
index e9bc08890aaf9c46128b7cf644cb8649136aac5d..64421cb491ca77aab6056815a257086b0a8d803f 100644
--- a/src/plugins/gui/wutil.ml
+++ b/src/plugins/gui/wutil.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/gui/wutil.mli b/src/plugins/gui/wutil.mli
index fd8080c4180b22fd17b6cb87a51ab595d163e83c..aa07048eedd8128813b0655684314b569fed8b57 100644
--- a/src/plugins/gui/wutil.mli
+++ b/src/plugins/gui/wutil.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/Impact.mli b/src/plugins/impact/Impact.mli
index a5f48194f59239c24e5e41ffc15d98fcc328cbfe..5229c6a171611d5aa4d1a92f6615f2d7670e8c6c 100644
--- a/src/plugins/impact/Impact.mli
+++ b/src/plugins/impact/Impact.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/compute_impact.ml b/src/plugins/impact/compute_impact.ml
index 7469c4bdd437974f8c72fd2ca36e8b2ecd26fe3c..9755c2489b728b74a59b81d49b507f9db090d7ea 100644
--- a/src/plugins/impact/compute_impact.ml
+++ b/src/plugins/impact/compute_impact.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/compute_impact.mli b/src/plugins/impact/compute_impact.mli
index 5dae2604fdeb4ab0b2e07ba73c828fbc451e1d6d..2364e194d9ffb44eb9c51598fd387e61e010c1fd 100644
--- a/src/plugins/impact/compute_impact.mli
+++ b/src/plugins/impact/compute_impact.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/options.ml b/src/plugins/impact/options.ml
index fce8d81baf85409f0c266795de46481e9e15f4e3..ebf40c8b2fda93f2ff4161e7cbb8aeb5607b6498 100644
--- a/src/plugins/impact/options.ml
+++ b/src/plugins/impact/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/options.mli b/src/plugins/impact/options.mli
index ee4462716b6b7ab29c5aec9000952b5578db340f..3b406d65b2972d1ba5ff6d691d8204ef3c851443 100644
--- a/src/plugins/impact/options.mli
+++ b/src/plugins/impact/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/pdg_aux.ml b/src/plugins/impact/pdg_aux.ml
index 212ff56a1345c1cbbd8f96c04f93f6bb6724c223..e6eb1eb05068b4adef86c7e9f958e1a9f920bb71 100644
--- a/src/plugins/impact/pdg_aux.ml
+++ b/src/plugins/impact/pdg_aux.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/pdg_aux.mli b/src/plugins/impact/pdg_aux.mli
index 23e6d05b546a00408abe992f860254477c8bc536..94e0d409cd04671ec03407575c3c5d9fdd30e2e7 100644
--- a/src/plugins/impact/pdg_aux.mli
+++ b/src/plugins/impact/pdg_aux.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/reason_graph.ml b/src/plugins/impact/reason_graph.ml
index d800e760a73e34c3cc5b04a8c2497a311b8e5e4b..105e52e8137497b06ca8870dbaa70666c37160d6 100644
--- a/src/plugins/impact/reason_graph.ml
+++ b/src/plugins/impact/reason_graph.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/register.ml b/src/plugins/impact/register.ml
index 92619e2f2cc329c56824c1a5e84bfbd0e5db7b94..ddb6192baff94fd3579868f2317d9eac21f54f03 100644
--- a/src/plugins/impact/register.ml
+++ b/src/plugins/impact/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/impact/register_gui.ml b/src/plugins/impact/register_gui.ml
index a4a6d79740dac47aefd89442aecf8584adad557b..8d5440c104e789c97c1057151d64ef8d26847445 100644
--- a/src/plugins/impact/register_gui.ml
+++ b/src/plugins/impact/register_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -167,9 +167,7 @@ let reason_graph_window main_window ?in_kf reason =
let height = int_of_float (float main_window#default_height *. 3. /. 4.) in
let width = int_of_float (float main_window#default_width *. 3. /. 4.) in
let window =
- GWindow.window
- ~width ~height ~allow_shrink:true ~allow_grow:true
- ~position:`CENTER ()
+ GWindow.window ~width ~height ~resizable:true ~position:`CENTER ()
in
let view = reason_graph ~packing:window#add in
window#show ();
diff --git a/src/plugins/impact/register_gui.mli b/src/plugins/impact/register_gui.mli
index 2df5ce4f6f9bc993b91552f9f3c72492067b8173..7dd3f590611a44adb96d21928184cbc1b7453dba 100644
--- a/src/plugins/impact/register_gui.mli
+++ b/src/plugins/impact/register_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/Inout.mli b/src/plugins/inout/Inout.mli
index e06b12d09de053ce1888e750c127b5ef7b4a1f61..7b269eb66e735955a93bfffde84624208a6d511c 100644
--- a/src/plugins/inout/Inout.mli
+++ b/src/plugins/inout/Inout.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/context.mli b/src/plugins/inout/context.mli
index 691624a18d43a934503ff0cee5be090383f5d656..1e995906cded2b8932a0d6561d248aabcd7bd6b8 100644
--- a/src/plugins/inout/context.mli
+++ b/src/plugins/inout/context.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/cumulative_analysis.ml b/src/plugins/inout/cumulative_analysis.ml
index 3a5f4085c0b4e5c48368f187248a3bc5e6b6c393..ca86a013946ae195cc20b412acad4dbb69ecfe87 100644
--- a/src/plugins/inout/cumulative_analysis.ml
+++ b/src/plugins/inout/cumulative_analysis.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/cumulative_analysis.mli b/src/plugins/inout/cumulative_analysis.mli
index 328064a9ab740ff0e862454791f0fa69f01f3322..7844837205097c48d1c9ee32e21a0776190d9f29 100644
--- a/src/plugins/inout/cumulative_analysis.mli
+++ b/src/plugins/inout/cumulative_analysis.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/derefs.ml b/src/plugins/inout/derefs.ml
index c218e2c227ba4b2fde44040bbea15c84c7469bfe..17ef8fb7dd3197553754330618873ec11af6eadb 100644
--- a/src/plugins/inout/derefs.ml
+++ b/src/plugins/inout/derefs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/derefs.mli b/src/plugins/inout/derefs.mli
index 4739b8f6acf4a90fdf5fd396142d1073243f9a5f..292b58e0922204772d134a18170fb9c8a7da88f1 100644
--- a/src/plugins/inout/derefs.mli
+++ b/src/plugins/inout/derefs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/inout_parameters.ml b/src/plugins/inout/inout_parameters.ml
index ded19972913da7b04451bc9f2d61ef0b7b412329..d7d36cd91c2412a91784b8669f97e5ec66c8a70f 100644
--- a/src/plugins/inout/inout_parameters.ml
+++ b/src/plugins/inout/inout_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/inout_parameters.mli b/src/plugins/inout/inout_parameters.mli
index af8466915a7e1b22a32d1bbbbc1d9979d0023d1d..f8b4b5323434219510c8465c1ae98a0a95860a3c 100644
--- a/src/plugins/inout/inout_parameters.mli
+++ b/src/plugins/inout/inout_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/inputs.ml b/src/plugins/inout/inputs.ml
index 70053c1b14551519c4390d8776a4abb70cb5c8d2..2819a6864d3f9c3bc155efdc1e2cdad6f51cc583 100644
--- a/src/plugins/inout/inputs.ml
+++ b/src/plugins/inout/inputs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/inputs.mli b/src/plugins/inout/inputs.mli
index b230b68870f17ade086a86b867a3f1f234b68581..ba2009189b5dc82d4e0b1d82ecdb55667f7a7d9a 100644
--- a/src/plugins/inout/inputs.mli
+++ b/src/plugins/inout/inputs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/operational_inputs.ml b/src/plugins/inout/operational_inputs.ml
index bb8055aa2baa74ad4aa983c7ab1b4118ded0bb1d..2cb17a9f3117cab4c8b0094832818263a62a7124 100644
--- a/src/plugins/inout/operational_inputs.ml
+++ b/src/plugins/inout/operational_inputs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/outputs.ml b/src/plugins/inout/outputs.ml
index 3ffd7ce047ee8aa02a80c0786d049899c6dc7696..35e15968f181dfbce0c2683dd9af346f27e776a0 100644
--- a/src/plugins/inout/outputs.ml
+++ b/src/plugins/inout/outputs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/outputs.mli b/src/plugins/inout/outputs.mli
index 9b15efee1c6f29139dec774a3febd4238130041b..c5026b234a2044a3630c4a0f08455ed0cbaab284 100644
--- a/src/plugins/inout/outputs.mli
+++ b/src/plugins/inout/outputs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/inout/register.ml b/src/plugins/inout/register.ml
index a5be604821f752102bbdb5882586dcb9f5cd512f..8c1cfc00480ef89b21bf86ae5ffc4e9c0c962b7c 100644
--- a/src/plugins/inout/register.ml
+++ b/src/plugins/inout/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/LoopAnalysis.mli b/src/plugins/loop_analysis/LoopAnalysis.mli
index f1a198c8e31fc53622b6efb24fef65586dc0af0a..a8ebbc54d3e9a276856d89421f151187ac38198c 100644
--- a/src/plugins/loop_analysis/LoopAnalysis.mli
+++ b/src/plugins/loop_analysis/LoopAnalysis.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/Makefile.in b/src/plugins/loop_analysis/Makefile.in
index a4db47c12aee8da2b9c5de8f84abb0ce98a73a78..e835d79087e0263d335e09d82339dc428bf9cae6 100644
--- a/src/plugins/loop_analysis/Makefile.in
+++ b/src/plugins/loop_analysis/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/loop_analysis/configure.ac b/src/plugins/loop_analysis/configure.ac
index c3ee573ee5855256589f71b8e8b6b4bb26eb62d3..fef407134e857a48c481bc6a9287658792ba206f 100644
--- a/src/plugins/loop_analysis/configure.ac
+++ b/src/plugins/loop_analysis/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/loop_analysis/loop_analysis.ml b/src/plugins/loop_analysis/loop_analysis.ml
index 92bef5b6d808b3e5f12489bab3f488a33118319c..de7974e693b2dbf55feef29cd5271fc1bdbc12a7 100644
--- a/src/plugins/loop_analysis/loop_analysis.ml
+++ b/src/plugins/loop_analysis/loop_analysis.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/loop_analysis.mli b/src/plugins/loop_analysis/loop_analysis.mli
index 4c7348d319079c1253121b4c8dda54b9491a75f2..c81b6d9dd66291f4bd89d5ba7aa068ec2fd0095c 100644
--- a/src/plugins/loop_analysis/loop_analysis.mli
+++ b/src/plugins/loop_analysis/loop_analysis.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/options.ml b/src/plugins/loop_analysis/options.ml
index 035857981698216076a6937e5b042f36e27b037c..58848be42e5c1533a915fe22df28d5cc5193cf5f 100644
--- a/src/plugins/loop_analysis/options.ml
+++ b/src/plugins/loop_analysis/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/options.mli b/src/plugins/loop_analysis/options.mli
index 9111b3a180ee7e89018e3f89b5ce641e4c670500..1a6d952eeb0ff40da17f7ee72883c3e52684a781 100644
--- a/src/plugins/loop_analysis/options.mli
+++ b/src/plugins/loop_analysis/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/region_analysis.ml b/src/plugins/loop_analysis/region_analysis.ml
index 61d246c017ca70a6e311abb30427ea0a8ba65009..1031f4e2836d87e4e123fb19d70cf30bc8505863 100644
--- a/src/plugins/loop_analysis/region_analysis.ml
+++ b/src/plugins/loop_analysis/region_analysis.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/region_analysis.mli b/src/plugins/loop_analysis/region_analysis.mli
index d84811e58bb722f9665d15bd7ea10c1a1ad8b7ff..e674d19f3bd2757170585b9d8610c26ac804a70d 100644
--- a/src/plugins/loop_analysis/region_analysis.mli
+++ b/src/plugins/loop_analysis/region_analysis.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/region_analysis_sig.ml b/src/plugins/loop_analysis/region_analysis_sig.ml
index 0fda0291e8b371f8707bfd877f075ec9ed811543..636b16cfe8314493cebd1c041c5cf14a441bf7cb 100644
--- a/src/plugins/loop_analysis/region_analysis_sig.ml
+++ b/src/plugins/loop_analysis/region_analysis_sig.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/region_analysis_stmt.ml b/src/plugins/loop_analysis/region_analysis_stmt.ml
index 0776c368f34602e1a79720ea8242a5ec96f0c5a7..39001f4901f753404c5b3ebb8c00316c82c6b7d7 100644
--- a/src/plugins/loop_analysis/region_analysis_stmt.ml
+++ b/src/plugins/loop_analysis/region_analysis_stmt.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/region_analysis_stmt.mli b/src/plugins/loop_analysis/region_analysis_stmt.mli
index ebefb378fd8e9882857e461b37f24ca9d0fa6db6..26bbfb8d5e86889bc8220d2a9757bc16ae3da203 100644
--- a/src/plugins/loop_analysis/region_analysis_stmt.mli
+++ b/src/plugins/loop_analysis/region_analysis_stmt.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/register.ml b/src/plugins/loop_analysis/register.ml
index 8ff1ef77d6d5dda7af5c483fecc75968e767f39e..702af8118b853f12a5ed381eb1b75acad1b0b204 100644
--- a/src/plugins/loop_analysis/register.ml
+++ b/src/plugins/loop_analysis/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/loop_analysis/slevel_analysis.ml b/src/plugins/loop_analysis/slevel_analysis.ml
index 97f61c53028b4ab3e6d181c9e3bdb69fbe7b9df2..26625cfa02de3c3ccd0c17a96f764ab233db90f1 100644
--- a/src/plugins/loop_analysis/slevel_analysis.ml
+++ b/src/plugins/loop_analysis/slevel_analysis.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/Metrics.mli b/src/plugins/metrics/Metrics.mli
index caa33bee585a2c5ca88c0008b84ff6a47826b3c5..c25dba5b58f411843cb29c50f04b2500021afc50 100644
--- a/src/plugins/metrics/Metrics.mli
+++ b/src/plugins/metrics/Metrics.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/css_html.ml b/src/plugins/metrics/css_html.ml
index 02bc17caeafec817ae82639bcf687bfebcf0d1ec..b0f9f8b51500710b52bbe68a5c651bde94a5dbc0 100644
--- a/src/plugins/metrics/css_html.ml
+++ b/src/plugins/metrics/css_html.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_acsl.ml b/src/plugins/metrics/metrics_acsl.ml
index ff85291148cbf85744807d9a211e720b8c8ba6f2..ebba36bb4033ebaf551f4c050edcbbd8174ce1c5 100644
--- a/src/plugins/metrics/metrics_acsl.ml
+++ b/src/plugins/metrics/metrics_acsl.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_acsl.mli b/src/plugins/metrics/metrics_acsl.mli
index 4434b9e8a4d03a08eb5cc34ab08a387fb8e3c42c..40c80b55e3a1e04223741b725f83cc6646c149b1 100644
--- a/src/plugins/metrics/metrics_acsl.mli
+++ b/src/plugins/metrics/metrics_acsl.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_base.ml b/src/plugins/metrics/metrics_base.ml
index def398aecbd91e37419870b7a5e0c4ab2d663c6e..9eb22f91a2d9727170f3ed7feb4acca0819f6c86 100644
--- a/src/plugins/metrics/metrics_base.ml
+++ b/src/plugins/metrics/metrics_base.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_base.mli b/src/plugins/metrics/metrics_base.mli
index 6e09e4383c029262d94a8b8910389f58dbfdf08e..6976f2c9c73fae948a022030d2ad5d2c0ac439ae 100644
--- a/src/plugins/metrics/metrics_base.mli
+++ b/src/plugins/metrics/metrics_base.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_cabs.ml b/src/plugins/metrics/metrics_cabs.ml
index d753f2330bfd69a72cf3313c176609919eb27613..8b46580b8dde6c35a78ace8a40a456a403455382 100644
--- a/src/plugins/metrics/metrics_cabs.ml
+++ b/src/plugins/metrics/metrics_cabs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_cabs.mli b/src/plugins/metrics/metrics_cabs.mli
index 6216292b7e8f7cf11384b142d49b748f8fd39b37..3e8c434ff7fdb1461e2c41cbcbf8b9eaf2aa0268 100644
--- a/src/plugins/metrics/metrics_cabs.mli
+++ b/src/plugins/metrics/metrics_cabs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_cilast.ml b/src/plugins/metrics/metrics_cilast.ml
index e910774d6677e142a90f8c01d6ad2058c0ddd154..ca998ba41855e3cd990898ff02e1527f68ddb103 100644
--- a/src/plugins/metrics/metrics_cilast.ml
+++ b/src/plugins/metrics/metrics_cilast.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_cilast.mli b/src/plugins/metrics/metrics_cilast.mli
index 4a826d9e3a9bb2603e13ac2aa473762db5007344..e08175f12ea50fdf69cdc0b13db21c846f7c5f52 100644
--- a/src/plugins/metrics/metrics_cilast.mli
+++ b/src/plugins/metrics/metrics_cilast.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_coverage.ml b/src/plugins/metrics/metrics_coverage.ml
index b87cd233c076804823159fd2f21246f1442f66a2..485a187e58a1840e4c0c2c9b43432a2fbd78492f 100644
--- a/src/plugins/metrics/metrics_coverage.ml
+++ b/src/plugins/metrics/metrics_coverage.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_coverage.mli b/src/plugins/metrics/metrics_coverage.mli
index 40f176bf3358be7b4947ccbcfa96d0cef01af078..4667ae15ad7fb6583f36b63445e0e36b268505ed 100644
--- a/src/plugins/metrics/metrics_coverage.mli
+++ b/src/plugins/metrics/metrics_coverage.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_gui.ml b/src/plugins/metrics/metrics_gui.ml
index 7887b852c64180954bd0a32f51651783f6d9930d..79839db62fc96a2e7edf1629d96188edf3be73d5 100644
--- a/src/plugins/metrics/metrics_gui.ml
+++ b/src/plugins/metrics/metrics_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_gui.mli b/src/plugins/metrics/metrics_gui.mli
index d166c6e3e48153068e57164d424a6855f1fa8179..79bf1c0a381e1a51e4ec3c5a829c3556d2fb5773 100644
--- a/src/plugins/metrics/metrics_gui.mli
+++ b/src/plugins/metrics/metrics_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_parameters.ml b/src/plugins/metrics/metrics_parameters.ml
index 700b02c9d98449183afbfd8ba645d84148bf39aa..507ed4b9f059590599f08a00c24655bc9a1fe541 100644
--- a/src/plugins/metrics/metrics_parameters.ml
+++ b/src/plugins/metrics/metrics_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/metrics_parameters.mli b/src/plugins/metrics/metrics_parameters.mli
index c02f1e9c5b5fa310a60b67300a13c1caf4fc8f21..c7913b12adee8ac85bc148f2669bec9ada6d7570 100644
--- a/src/plugins/metrics/metrics_parameters.mli
+++ b/src/plugins/metrics/metrics_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/register.ml b/src/plugins/metrics/register.ml
index d0c031236bd3e8504c8887b81cb4f9353aeb84d9..79e90edeac270a0f83cfaa0521d26b3f52299ed0 100644
--- a/src/plugins/metrics/register.ml
+++ b/src/plugins/metrics/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/metrics/register_gui.ml b/src/plugins/metrics/register_gui.ml
index 409334f21a2e2780911581779251d22303acaf59..f16d7007a7d889cf4c4682d7dc563ca724b6de87 100644
--- a/src/plugins/metrics/register_gui.ml
+++ b/src/plugins/metrics/register_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/nonterm/Makefile.in b/src/plugins/nonterm/Makefile.in
index c134137e94f82234f57f442c44650c046ee9eefb..cd307311abf06fba69ae5b97c3969dc67d0153d6 100644
--- a/src/plugins/nonterm/Makefile.in
+++ b/src/plugins/nonterm/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/nonterm/Nonterm.mli b/src/plugins/nonterm/Nonterm.mli
index ce7a42b00627eefcc76a75a6f9e90daf8a01614f..3426449cefa0c916735da3acb7e7c1591161ebe9 100644
--- a/src/plugins/nonterm/Nonterm.mli
+++ b/src/plugins/nonterm/Nonterm.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/nonterm/configure.ac b/src/plugins/nonterm/configure.ac
index c87bed3e956dbd0d25378d18539c87ebd88ff136..358ec738c755d1fdf119717c7e593df49bcc22ce 100644
--- a/src/plugins/nonterm/configure.ac
+++ b/src/plugins/nonterm/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/nonterm/nonterm_run.ml b/src/plugins/nonterm/nonterm_run.ml
index ea7e98bba64fda50f824b60748b1a2354f6a7178..7b8bfe248d9a90b5237ef2555aba7a49e59b9263 100644
--- a/src/plugins/nonterm/nonterm_run.ml
+++ b/src/plugins/nonterm/nonterm_run.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/Makefile.in b/src/plugins/obfuscator/Makefile.in
index 8baa937c05c2433ffb9a36335b046731863cac83..e12a27e8ac3f1ee3df569dcf23d40728c8a8d706 100644
--- a/src/plugins/obfuscator/Makefile.in
+++ b/src/plugins/obfuscator/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/obfuscator/Obfuscator.mli b/src/plugins/obfuscator/Obfuscator.mli
index f485ca359542d646a90f681e0c987c9ad26c1d43..e78bcbb67bc76df70cd7909bec1c66db849f5d62 100644
--- a/src/plugins/obfuscator/Obfuscator.mli
+++ b/src/plugins/obfuscator/Obfuscator.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/configure.ac b/src/plugins/obfuscator/configure.ac
index 8ca06bc64fcca98571d5159bb2201c207c36b3e5..ff725af05b33b4402285622844604e872fd9d3c9 100644
--- a/src/plugins/obfuscator/configure.ac
+++ b/src/plugins/obfuscator/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/obfuscator/dictionary.ml b/src/plugins/obfuscator/dictionary.ml
index aebdd347bbba552421358940d53b00afd2687dd5..1ae55c07c0c65ce5661dd5eb3b841aefcd6ea444 100644
--- a/src/plugins/obfuscator/dictionary.ml
+++ b/src/plugins/obfuscator/dictionary.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/dictionary.mli b/src/plugins/obfuscator/dictionary.mli
index 5b2b362ac333c4fc9b260abe780ac727224da610..5756bf079679c0e6e13224632adcf7e4722e7369 100644
--- a/src/plugins/obfuscator/dictionary.mli
+++ b/src/plugins/obfuscator/dictionary.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/obfuscate.ml b/src/plugins/obfuscator/obfuscate.ml
index ab4d1a7991c24dcd51ffe3ee41a38952befedee4..213f983d1f4b5e0129ce8d670c81ebc49fdfcd13 100644
--- a/src/plugins/obfuscator/obfuscate.ml
+++ b/src/plugins/obfuscator/obfuscate.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/obfuscate.mli b/src/plugins/obfuscator/obfuscate.mli
index 2f52ce43ff52005bf3201cd3cc053c4e3f8cbbcd..44601430cbcc5814d40c2aca6dcc569989c03c98 100644
--- a/src/plugins/obfuscator/obfuscate.mli
+++ b/src/plugins/obfuscator/obfuscate.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/obfuscator_kind.ml b/src/plugins/obfuscator/obfuscator_kind.ml
index 175bec1ef6ff1bf85caa38330ab6636f0781c704..216651aca09b951745e6b6639b3be7cbf2f14f8f 100644
--- a/src/plugins/obfuscator/obfuscator_kind.ml
+++ b/src/plugins/obfuscator/obfuscator_kind.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/obfuscator_kind.mli b/src/plugins/obfuscator/obfuscator_kind.mli
index 05a7ab510d7cc1e8dbc63446215733b49c40bb9c..0aa33ec52230294a569a723f00e481c5e67c11e5 100644
--- a/src/plugins/obfuscator/obfuscator_kind.mli
+++ b/src/plugins/obfuscator/obfuscator_kind.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/obfuscator_register.ml b/src/plugins/obfuscator/obfuscator_register.ml
index 1d05a3df89afa4b21a3611cdc82c8fc306b7f760..0674063a9bfd7e2a9aafc0c5d4726a8072daafb4 100644
--- a/src/plugins/obfuscator/obfuscator_register.ml
+++ b/src/plugins/obfuscator/obfuscator_register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/options.ml b/src/plugins/obfuscator/options.ml
index 130e5d9b77748cf768e1073b1e9864a74b72d2aa..71c1587030719c71b3941123a02a998a5fcc6516 100644
--- a/src/plugins/obfuscator/options.ml
+++ b/src/plugins/obfuscator/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/obfuscator/options.mli b/src/plugins/obfuscator/options.mli
index aaed28477eb6067a70eae2e3550c439d21b92681..7cf70c9b4890aaf46c320e33126d4e3db19f73d3 100644
--- a/src/plugins/obfuscator/options.mli
+++ b/src/plugins/obfuscator/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/occurrence/Occurrence.mli b/src/plugins/occurrence/Occurrence.mli
index f2302bc5205f4668b3f015c48c7a93a1067d6297..7a994acd4786b43d3231aa387770e18578ab39f1 100644
--- a/src/plugins/occurrence/Occurrence.mli
+++ b/src/plugins/occurrence/Occurrence.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/occurrence/options.ml b/src/plugins/occurrence/options.ml
index 282c56dbb3660da67bec88af532dd53fac16d13a..121d7898dbcb116dc52c3aa4e7fdd6e708ebd06e 100644
--- a/src/plugins/occurrence/options.ml
+++ b/src/plugins/occurrence/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/occurrence/options.mli b/src/plugins/occurrence/options.mli
index 2e3920d05a9f11d3514fe6861aa3d55c249e1bc9..7b31e27f5ae5c269c2f8a53db8b42e90a8608211 100644
--- a/src/plugins/occurrence/options.mli
+++ b/src/plugins/occurrence/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/occurrence/register.ml b/src/plugins/occurrence/register.ml
index 423c20ce2a963ea59b00d025fa405e87132ecc0a..2842ba4673991dfc8a8d96b4ab331c21dcb1dc02 100644
--- a/src/plugins/occurrence/register.ml
+++ b/src/plugins/occurrence/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/occurrence/register_gui.ml b/src/plugins/occurrence/register_gui.ml
index 93857081bb7b31c5e6b7f4f03baac8063d944beb..f5de64c487702758a7c3581a8a0c5f8b5aef5d13 100644
--- a/src/plugins/occurrence/register_gui.ml
+++ b/src/plugins/occurrence/register_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/occurrence/register_gui.mli b/src/plugins/occurrence/register_gui.mli
index 129334496b6875f1d24225bc0407e63a5dd63141..eb565b9364df7b9d34fd51d0ec8682bc87e4a479 100644
--- a/src/plugins/occurrence/register_gui.mli
+++ b/src/plugins/occurrence/register_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/Pdg.mli b/src/plugins/pdg/Pdg.mli
index 71610fbf5226bbe8720e96af02b769d52677271b..dbb99cb05353f6cf92861443a289be0ecbd1f481 100644
--- a/src/plugins/pdg/Pdg.mli
+++ b/src/plugins/pdg/Pdg.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/annot.ml b/src/plugins/pdg/annot.ml
index 0fc782a338fa95b2d0ebfa94476933990a59a2a0..5d13fd69b773727811eaf98d34255739fa7756b7 100644
--- a/src/plugins/pdg/annot.ml
+++ b/src/plugins/pdg/annot.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/annot.mli b/src/plugins/pdg/annot.mli
index 56206eddfaebacad2b169a4cefc76b9393559774..44bd9249cfd43dcf6aa50f4a518f6dd3d084e913 100644
--- a/src/plugins/pdg/annot.mli
+++ b/src/plugins/pdg/annot.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/build.ml b/src/plugins/pdg/build.ml
index 28616d3d82468db87fcbf8d1443bfd8d1e054f07..29d65d3c4ca723ebf4c07abe6c55600d63a4015c 100644
--- a/src/plugins/pdg/build.ml
+++ b/src/plugins/pdg/build.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/build.mli b/src/plugins/pdg/build.mli
index b6a4c99841eb78cf50fe48a190cad979975b3f0b..d5f519b68a63f7eb596d4fa67dffd0239690e2a1 100644
--- a/src/plugins/pdg/build.mli
+++ b/src/plugins/pdg/build.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/ctrlDpds.ml b/src/plugins/pdg/ctrlDpds.ml
index c2bf5149bcf2a23fe34d82b17ccda939e972aae0..e75a06d60231e8ae9958c7306e1ee8bf5015a283 100644
--- a/src/plugins/pdg/ctrlDpds.ml
+++ b/src/plugins/pdg/ctrlDpds.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/ctrlDpds.mli b/src/plugins/pdg/ctrlDpds.mli
index 896be217692ce35e5290107ea9b3b5d36fa306f8..7feb4d2304cee1ae42ee5222d13174afdfc911cf 100644
--- a/src/plugins/pdg/ctrlDpds.mli
+++ b/src/plugins/pdg/ctrlDpds.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/marks.ml b/src/plugins/pdg/marks.ml
index 9d5e6ec6539504c339e83dd3037598c3b05c46cd..b2b261562ecaeafeeec70e5bcfda5fef3912e605 100644
--- a/src/plugins/pdg/marks.ml
+++ b/src/plugins/pdg/marks.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/marks.mli b/src/plugins/pdg/marks.mli
index 67e8ebacc5fdd2799def6017fb00102e6ea788ec..78f16accbdb7b01ffca8cfcb826771fdd6de5d99 100644
--- a/src/plugins/pdg/marks.mli
+++ b/src/plugins/pdg/marks.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/pdg_parameters.ml b/src/plugins/pdg/pdg_parameters.ml
index 287fbdc508ffd0d063206c81ba37884f0dfcb501..0b4a418e7836c54728fbbabf942bb16d55fbd10b 100644
--- a/src/plugins/pdg/pdg_parameters.ml
+++ b/src/plugins/pdg/pdg_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/pdg_parameters.mli b/src/plugins/pdg/pdg_parameters.mli
index 47cc3d5cc5d286d3eea050622e6ba589783e0275..e86fa9baf2719ba4279a8ae9be2de1cd1c649148 100644
--- a/src/plugins/pdg/pdg_parameters.mli
+++ b/src/plugins/pdg/pdg_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/pdg_state.ml b/src/plugins/pdg/pdg_state.ml
index 69f5c8122942759a7567a3df91b57ad51a496ac6..c43e3f7e1408077f5075b1ae1eaacc21cf629525 100644
--- a/src/plugins/pdg/pdg_state.ml
+++ b/src/plugins/pdg/pdg_state.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/pdg_state.mli b/src/plugins/pdg/pdg_state.mli
index f4575d421f50503c0a8da1619aa6abacf8df2404..7b6befacfa8e8b1f854122e87a294709f02233a2 100644
--- a/src/plugins/pdg/pdg_state.mli
+++ b/src/plugins/pdg/pdg_state.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/register.ml b/src/plugins/pdg/register.ml
index 99e4e28d7b1ab8170f9b629a1ed15ac0942c8898..d2ba48a8cccf755b4c6e8ce2fa45a2971832e502 100644
--- a/src/plugins/pdg/register.ml
+++ b/src/plugins/pdg/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/sets.ml b/src/plugins/pdg/sets.ml
index 00ce4d3fd1279482ecfecb86acb419a089a8fcfe..d2bd399d01b4beae2d72a7a19ca5deff6ce19a44 100644
--- a/src/plugins/pdg/sets.ml
+++ b/src/plugins/pdg/sets.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg/sets.mli b/src/plugins/pdg/sets.mli
index ab20b26b5147af9dda5edde615e5c6e9199727de..90d3e803663fd643d8dccc5e2d42a5aefc7ccb03 100644
--- a/src/plugins/pdg/sets.mli
+++ b/src/plugins/pdg/sets.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg_types/pdgIndex.ml b/src/plugins/pdg_types/pdgIndex.ml
index 32582569ec5175302cafd321086bc44fe45133eb..cbd70054e44bf564427c733e0321823e6c998bb8 100644
--- a/src/plugins/pdg_types/pdgIndex.ml
+++ b/src/plugins/pdg_types/pdgIndex.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg_types/pdgIndex.mli b/src/plugins/pdg_types/pdgIndex.mli
index f851ffdc7916394bb362beae3cb0ceac1552960d..7f2eb8bb9ed837d44090383b8749294a08b2949b 100644
--- a/src/plugins/pdg_types/pdgIndex.mli
+++ b/src/plugins/pdg_types/pdgIndex.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg_types/pdgMarks.ml b/src/plugins/pdg_types/pdgMarks.ml
index 58262686d3f9f6fad196703d43e0217af4740347..4e821825a0def318054d9dcd181d83a0117655ce 100644
--- a/src/plugins/pdg_types/pdgMarks.ml
+++ b/src/plugins/pdg_types/pdgMarks.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg_types/pdgMarks.mli b/src/plugins/pdg_types/pdgMarks.mli
index 822f8302980bbc1d7976d417307acd07b2a5bf98..02b2cb43eb9e6b475f8e3425fed4adda83650ed5 100644
--- a/src/plugins/pdg_types/pdgMarks.mli
+++ b/src/plugins/pdg_types/pdgMarks.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg_types/pdgTypes.ml b/src/plugins/pdg_types/pdgTypes.ml
index 45ad97155da5996fdbf2aafd0ca41f8e9841e5ed..fbc535bede0a646c12cf7abc5f7818ccedfda557 100644
--- a/src/plugins/pdg_types/pdgTypes.ml
+++ b/src/plugins/pdg_types/pdgTypes.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/pdg_types/pdgTypes.mli b/src/plugins/pdg_types/pdgTypes.mli
index 821bed7e11edb25a3ee04f57cc864200fb9908f1..00a87090f22adcd50fbd4964bc143ed5f6077526 100644
--- a/src/plugins/pdg_types/pdgTypes.mli
+++ b/src/plugins/pdg_types/pdgTypes.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/postdominators/Postdominators.mli b/src/plugins/postdominators/Postdominators.mli
index e5714845ed834dc071ba74909828fba524074cbe..3d30f40d2fd941e8df5381fd3191c4dfeeefaa05 100644
--- a/src/plugins/postdominators/Postdominators.mli
+++ b/src/plugins/postdominators/Postdominators.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/postdominators/compute.ml b/src/plugins/postdominators/compute.ml
index 6890a4f3f39fec089d3fcd71bf9b064eb4f48260..f766ae37ba196f9f95ca10abdae2be3a06f29bc3 100644
--- a/src/plugins/postdominators/compute.ml
+++ b/src/plugins/postdominators/compute.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/postdominators/postdominators_parameters.ml b/src/plugins/postdominators/postdominators_parameters.ml
index 306a092f231960550022a27625886b2621662e10..3df3d1d02b705053347a0eb1d20659e175fe541b 100644
--- a/src/plugins/postdominators/postdominators_parameters.ml
+++ b/src/plugins/postdominators/postdominators_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/postdominators/postdominators_parameters.mli b/src/plugins/postdominators/postdominators_parameters.mli
index 40e782789527080a999ad98a0efde146c1730c67..5fba2a98f47eb45e07d486d15a4beae86d498eaa 100644
--- a/src/plugins/postdominators/postdominators_parameters.mli
+++ b/src/plugins/postdominators/postdominators_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/postdominators/print.ml b/src/plugins/postdominators/print.ml
index 62e5d32c8ccf6039d739352712f32312cfa45c25..9da13536e5f0fe8479768e09a95285aacadd199b 100644
--- a/src/plugins/postdominators/print.ml
+++ b/src/plugins/postdominators/print.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/print_api/Makefile b/src/plugins/print_api/Makefile
index fc6fef61f9efae037492518df9a88390c424fd68..d19567e0b395b1411c28ab148d797815e6e077cc 100644
--- a/src/plugins/print_api/Makefile
+++ b/src/plugins/print_api/Makefile
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/print_api/Print_api.mli b/src/plugins/print_api/Print_api.mli
index 75bdb5a5c65100d292a651f939e7787376f177cc..20a52aa659aee1ac05ca6daecf93317a9372d953 100644
--- a/src/plugins/print_api/Print_api.mli
+++ b/src/plugins/print_api/Print_api.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/print_api/grammar.mly b/src/plugins/print_api/grammar.mly
index e18a1d639111b455534b6015a8ec5ad180c64fae..135acbfc15492ba7aac513d423dae4ddd1de71c1 100644
--- a/src/plugins/print_api/grammar.mly
+++ b/src/plugins/print_api/grammar.mly
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/src/plugins/print_api/lexer.mll b/src/plugins/print_api/lexer.mll
index d71791f2971b8037d5442952dc724be010cef53a..f2b1c81bb1666425bdffb98fda36ef97dee93084 100644
--- a/src/plugins/print_api/lexer.mll
+++ b/src/plugins/print_api/lexer.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/print_api/print_interface.ml b/src/plugins/print_api/print_interface.ml
index 6073a20530dcde2ba3e634f2c452bedceaff1fde..4d5c5e934406baa2c8eb7deb0290b75d25463e33 100644
--- a/src/plugins/print_api/print_interface.ml
+++ b/src/plugins/print_api/print_interface.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/Makefile b/src/plugins/qed/Makefile
index 55ead1807735a1144fccda6a697e8de242fba7ff..1ae301857fcc7ef990c97a5d55b6aaff89dd5132 100644
--- a/src/plugins/qed/Makefile
+++ b/src/plugins/qed/Makefile
@@ -2,7 +2,7 @@
# #
# This file is part of WP plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat a l'energie atomique et aux energies #
# alternatives) #
# #
diff --git a/src/plugins/qed/QedGui.ml b/src/plugins/qed/QedGui.ml
index 80e3d971c3d7510d07ce5b7035646a64a87ddaa8..06fad53cc421ccdcf594e4e47bf99fa300f1e232 100644
--- a/src/plugins/qed/QedGui.ml
+++ b/src/plugins/qed/QedGui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/bvars.ml b/src/plugins/qed/bvars.ml
index a79a96e7a219b7ae9d68a07fe1f13401d57424ca..3256d571e749ef642f16466932a35e476695e753 100644
--- a/src/plugins/qed/bvars.ml
+++ b/src/plugins/qed/bvars.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/bvars.mli b/src/plugins/qed/bvars.mli
index 803c8e427137d12ef6e7d807a8cc2ae0d2183e91..a6d3147db9c71c4cdf0317386a603969d10e5c6a 100644
--- a/src/plugins/qed/bvars.mli
+++ b/src/plugins/qed/bvars.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/cache.ml b/src/plugins/qed/cache.ml
index 15e6f32f708762b220e3692cb8bb2d02a6fd3e66..25cb8661e672c7185ce84a2d5c5d6929c07291ed 100644
--- a/src/plugins/qed/cache.ml
+++ b/src/plugins/qed/cache.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/cache.mli b/src/plugins/qed/cache.mli
index ef13fadc520849be59ce04582627598b4d2fbbf6..838d4e51cb90833fb6f0e1fb7a1cdacc90e93a5d 100644
--- a/src/plugins/qed/cache.mli
+++ b/src/plugins/qed/cache.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/collection.ml b/src/plugins/qed/collection.ml
index 52f90ae9f24fb16ed67aa0edbca14df52d242738..b2f95fce33ed008f1ac6cc36a9c010a64cfc93fe 100644
--- a/src/plugins/qed/collection.ml
+++ b/src/plugins/qed/collection.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/collection.mli b/src/plugins/qed/collection.mli
index e3645f1f9a7fd34030256055eb4c1e64a65ae1ae..2b87079b64796dacb13ba2d6e77287728c925ad2 100644
--- a/src/plugins/qed/collection.mli
+++ b/src/plugins/qed/collection.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/engine.ml b/src/plugins/qed/engine.ml
index 7cd4d3ba03d82b833a410ae707ba36a951066df2..99de3004ab94a7afdc6edc13b6d4343451504ad1 100644
--- a/src/plugins/qed/engine.ml
+++ b/src/plugins/qed/engine.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export.ml b/src/plugins/qed/export.ml
index c44a99dea37d60de6a3450e03893182eb465acf3..b36fca33b8152f2f7dcba4a777d08de35fdf37f7 100644
--- a/src/plugins/qed/export.ml
+++ b/src/plugins/qed/export.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export.mli b/src/plugins/qed/export.mli
index beea594e3bb71124b3dc8979a1e260e473560bbf..aa15d1f6f46c6bb61742c4e58a29410c77a522fd 100644
--- a/src/plugins/qed/export.mli
+++ b/src/plugins/qed/export.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_altergo.ml b/src/plugins/qed/export_altergo.ml
index e0ad7d149ebb12a348189e4600040111cab1d4c0..52864b8b16668ab498ef8c25f9eeebb6ff98629a 100644
--- a/src/plugins/qed/export_altergo.ml
+++ b/src/plugins/qed/export_altergo.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_altergo.mli b/src/plugins/qed/export_altergo.mli
index aca09cb46685e227b4db8004a29b00cd49a8136f..55ba547b3586527e3afc8938ec68360daba1e316 100644
--- a/src/plugins/qed/export_altergo.mli
+++ b/src/plugins/qed/export_altergo.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_coq.ml b/src/plugins/qed/export_coq.ml
index f486bf44644b33c26d007d428152eede078d7817..0c4862c0175ea3f4310a2472b40fe20b9b1d35c8 100644
--- a/src/plugins/qed/export_coq.ml
+++ b/src/plugins/qed/export_coq.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_coq.mli b/src/plugins/qed/export_coq.mli
index c7ab31365464be9f7ca07ee21fe11fa886b5943c..7b9f366badfab043020ead1bd915b811048010e6 100644
--- a/src/plugins/qed/export_coq.mli
+++ b/src/plugins/qed/export_coq.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_why3.ml b/src/plugins/qed/export_why3.ml
index f635a9b96ccdd20fa67b9ffdd9e7d1c19c37b8a9..f940aa001d959d5df4e7367751dd1fa65bbde490 100644
--- a/src/plugins/qed/export_why3.ml
+++ b/src/plugins/qed/export_why3.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_why3.mli b/src/plugins/qed/export_why3.mli
index 2dec2c29a5928cf26f758b05a04a4e2b5720c09d..61028ef4915f25b41916475ecf69faf492991629 100644
--- a/src/plugins/qed/export_why3.mli
+++ b/src/plugins/qed/export_why3.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_whycore.ml b/src/plugins/qed/export_whycore.ml
index 9ca5c20bcd585478e0dae383328d41387d3f320b..42f239cecf27106b6406455c49877982fdecf546 100644
--- a/src/plugins/qed/export_whycore.ml
+++ b/src/plugins/qed/export_whycore.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/export_whycore.mli b/src/plugins/qed/export_whycore.mli
index 14c4acdc15b935a03dec33968afb7e973c765d7a..47151160a610231e3ce4f63466c39eecb1b28059 100644
--- a/src/plugins/qed/export_whycore.mli
+++ b/src/plugins/qed/export_whycore.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/hcons.ml b/src/plugins/qed/hcons.ml
index d32de87bcefc8a34d11107f0bd4d4ccb3b781d95..b0f2f3f137ce7cf3362a7f6d726737c0f0476eca 100644
--- a/src/plugins/qed/hcons.ml
+++ b/src/plugins/qed/hcons.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/hcons.mli b/src/plugins/qed/hcons.mli
index bb291b6718f5c3c8bc00483de208bd9e4d71920f..c930717f982736826f5ffdbf12e8ff001be68a5e 100644
--- a/src/plugins/qed/hcons.mli
+++ b/src/plugins/qed/hcons.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/idxmap.ml b/src/plugins/qed/idxmap.ml
index 5e2ff3248e30f6247cc1468b711e25a8cc0195e5..5191cc5a62032c9c0e179f2f71e885d5e9649b33 100644
--- a/src/plugins/qed/idxmap.ml
+++ b/src/plugins/qed/idxmap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/idxmap.mli b/src/plugins/qed/idxmap.mli
index bee26749571290db85f0661f7c9a14919472a070..4a9f0fc8960a814b260a29c6aedbb3f8b5357ebe 100644
--- a/src/plugins/qed/idxmap.mli
+++ b/src/plugins/qed/idxmap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/idxset.ml b/src/plugins/qed/idxset.ml
index a72a859d1b454d5f0037fe5b09266afd118382d3..1f8b790394f25e86b71ebf7803e7eb62c4d2dfab 100644
--- a/src/plugins/qed/idxset.ml
+++ b/src/plugins/qed/idxset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/idxset.mli b/src/plugins/qed/idxset.mli
index 917eb06fabad3348249998f46f3d3bdb83509c89..f0fe4c700e57fbc469053bafa477d97d9ab49368 100644
--- a/src/plugins/qed/idxset.mli
+++ b/src/plugins/qed/idxset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/intmap.ml b/src/plugins/qed/intmap.ml
index a1254aa4dccca30ad93b1249089c0a1703057b49..70ded406022bd1b52ee7eedd9236f579e9f76dd3 100644
--- a/src/plugins/qed/intmap.ml
+++ b/src/plugins/qed/intmap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/intmap.mli b/src/plugins/qed/intmap.mli
index 71429cb4a84759589d8ef917ffc1f9972f422b1d..851009ede74488f66f5afa0d3480ff055c61900b 100644
--- a/src/plugins/qed/intmap.mli
+++ b/src/plugins/qed/intmap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/intset.ml b/src/plugins/qed/intset.ml
index 350cadbd84a0af520dfb5ec4b5c9abc2d5df05af..92c19c13c4613e27723dc94e42c1e79b21428fe7 100644
--- a/src/plugins/qed/intset.ml
+++ b/src/plugins/qed/intset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/intset.mli b/src/plugins/qed/intset.mli
index 36ee6b56140186d4ee985b3e5c24adc7eae0307c..9dcb84a2282c487538cda84f6a053193897fc8c9 100644
--- a/src/plugins/qed/intset.mli
+++ b/src/plugins/qed/intset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/kind.ml b/src/plugins/qed/kind.ml
index df1cb665479a43ae1840bf4dbee3714bded491c4..93d8d7fae87f4b8c513545a64548ea6273696858 100644
--- a/src/plugins/qed/kind.ml
+++ b/src/plugins/qed/kind.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/kind.mli b/src/plugins/qed/kind.mli
index ef0426be02c5e38fe9ad89158432a6ddedfc3457..66dda5dab744ee43591ec87cb6a1af37c6e09bcc 100644
--- a/src/plugins/qed/kind.mli
+++ b/src/plugins/qed/kind.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/listmap.ml b/src/plugins/qed/listmap.ml
index 76ec6a744acd88a757553ad4f7ab10e612eb95f9..d83fbecf9bc96f487b8932022a807d2bdd756a1b 100644
--- a/src/plugins/qed/listmap.ml
+++ b/src/plugins/qed/listmap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/listmap.mli b/src/plugins/qed/listmap.mli
index ea5ee970c51784dd82ff41508075ea139132530a..5819c1b62ae7b9918baf261a6939ec1c76c3a004 100644
--- a/src/plugins/qed/listmap.mli
+++ b/src/plugins/qed/listmap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/listset.ml b/src/plugins/qed/listset.ml
index d6b60b8f5f294fac748942e8b38c0cd1437fbcba..228dfd3439e239797292da925ac9ac6f07e73920 100644
--- a/src/plugins/qed/listset.ml
+++ b/src/plugins/qed/listset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/listset.mli b/src/plugins/qed/listset.mli
index 384079f7e4020ebda62746c99c28502ff62477a8..e37b3a70c4cfcc71b479a66a7cb74560bc9be49d 100644
--- a/src/plugins/qed/listset.mli
+++ b/src/plugins/qed/listset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/logic.ml b/src/plugins/qed/logic.ml
index d780bc42c4566df56a4e7e5d92ad4e91ca7e604c..a9079819ed7e584f342faa4a7aff9129d5ffda47 100644
--- a/src/plugins/qed/logic.ml
+++ b/src/plugins/qed/logic.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/mergemap.ml b/src/plugins/qed/mergemap.ml
index fb52db99a528098e662b06cf08a05e9ffbd6b593..e33f068739c1ecf49720ee702748b84179403c18 100644
--- a/src/plugins/qed/mergemap.ml
+++ b/src/plugins/qed/mergemap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/mergemap.mli b/src/plugins/qed/mergemap.mli
index 4748684190b4f6ee72f2725aaf0f624a565b37e7..f5c9ae80412e6dbeaeb5a03d82a7b9f425c8437f 100644
--- a/src/plugins/qed/mergemap.mli
+++ b/src/plugins/qed/mergemap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/mergeset.ml b/src/plugins/qed/mergeset.ml
index 6dbe78f37692caa97d4a7a0962b7e6670abd64df..8bde72b1aae066597354ff9dd827bb7853a0023b 100644
--- a/src/plugins/qed/mergeset.ml
+++ b/src/plugins/qed/mergeset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/mergeset.mli b/src/plugins/qed/mergeset.mli
index a59c26f308307d93063e77bf8b658e7aff5b12a4..2309644e2178adf4d43b49c2623d39e81833f70e 100644
--- a/src/plugins/qed/mergeset.mli
+++ b/src/plugins/qed/mergeset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/partition.ml b/src/plugins/qed/partition.ml
index 16c6b4ddeb8858c45f3a77f31661742b73b13f36..f91a6739c9a15db8a6cf9ac13721e9242636dd2d 100644
--- a/src/plugins/qed/partition.ml
+++ b/src/plugins/qed/partition.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/partition.mli b/src/plugins/qed/partition.mli
index 87313b74442659edf8c38f51471aea2b402ec422..3956ca12d034e0cfbf8658326811f51da5ea5490 100644
--- a/src/plugins/qed/partition.mli
+++ b/src/plugins/qed/partition.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/plib.ml b/src/plugins/qed/plib.ml
index 7d2691d4435107381c3ca27053aa7492a94a0248..f6cea0df8fb1701f27383acdd2b4ee47f347a6eb 100644
--- a/src/plugins/qed/plib.ml
+++ b/src/plugins/qed/plib.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/plib.mli b/src/plugins/qed/plib.mli
index 87eb363d58ae4562905d684e7e2ee7008fa460b7..a69bde53ce190b30c7c68b52067a23d98aaef5e9 100644
--- a/src/plugins/qed/plib.mli
+++ b/src/plugins/qed/plib.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/pool.ml b/src/plugins/qed/pool.ml
index b8193ed8f1511f04dae49ea99207fc1d77ebc729..868e99b8a5791a5c5ac6e8a43aba25690daf7a51 100644
--- a/src/plugins/qed/pool.ml
+++ b/src/plugins/qed/pool.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/pool.mli b/src/plugins/qed/pool.mli
index 7294a710ff8fb24c668dd1237d2f322561f5bea7..765ef3baecc390801f6558971f709ff3438ea68f 100644
--- a/src/plugins/qed/pool.mli
+++ b/src/plugins/qed/pool.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/pretty.ml b/src/plugins/qed/pretty.ml
index 4d744d29f03ebbd1dc7c9f268827108efbe69718..a0e222ce890a6edbba5c3b95f085cdb9c0cfa306 100644
--- a/src/plugins/qed/pretty.ml
+++ b/src/plugins/qed/pretty.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/pretty.mli b/src/plugins/qed/pretty.mli
index 87c92115b665bd8a7382a719ff340327dfa019d0..c7059cb415444ab33eca1ddc193cd73bc15062fd 100644
--- a/src/plugins/qed/pretty.mli
+++ b/src/plugins/qed/pretty.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/qed/term.ml b/src/plugins/qed/term.ml
index 9790f471ec7b31b5fd2f28d04dd145d478493380..99e54cad0af764e053ee1dafc7e361387e30b2e1 100644
--- a/src/plugins/qed/term.ml
+++ b/src/plugins/qed/term.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -2540,7 +2540,8 @@ struct
| (Bool|Prop) , (Bool|Prop) -> Prop
| Int , Int -> Int
| (Int|Real) , (Int|Real) -> Real
- | _ -> raise Not_found
+ | _ ->
+ if Tau.equal a b then a else raise Not_found
let rec merge_list t f = function
| [] -> t
diff --git a/src/plugins/qed/term.mli b/src/plugins/qed/term.mli
index 54e3228f25a7308a0a4a197456f399e9d0817f4d..b8c79ff5c3bfe48f4546f1b8e8e5a33c873b07ee 100644
--- a/src/plugins/qed/term.mli
+++ b/src/plugins/qed/term.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/Makefile.in b/src/plugins/report/Makefile.in
index c3464e1ebdd7c85ce5b42b63e9e562d102323439..7011cc664417688ec84af0e515664f7db4dd7504 100644
--- a/src/plugins/report/Makefile.in
+++ b/src/plugins/report/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/report/Report.mli b/src/plugins/report/Report.mli
index abcd40e9e0ec26b45e47c0bab96a3a4964ee251c..ff1fa82ea87e897f4c8d12f6f0b4e325a1b8b2e1 100644
--- a/src/plugins/report/Report.mli
+++ b/src/plugins/report/Report.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/classify.ml b/src/plugins/report/classify.ml
index e92506e697f099b820ed2632f62330357d604657..f14ae80130e34ff8adf403f3605582636f5ad075 100644
--- a/src/plugins/report/classify.ml
+++ b/src/plugins/report/classify.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -150,7 +150,7 @@ let get_queue env plugin =
let add_rule jvalue =
try
match jvalue with
- | Json.Assoc fields ->
+ | `Assoc fields ->
let tgt , rule = List.fold_left rule_of_fields default fields in
let properties p =
if rule.r_plugin <> (snd default).r_plugin then
@@ -177,7 +177,7 @@ let configure file =
R.feedback "Loading '%a'" Datatype.Filepath.pretty path;
try
match Json.load_file file with
- | Json.Array values -> List.iter add_rule values
+ | `List values -> List.iter add_rule values
| _ -> failwith "Array expected"
with
| Json.Error(file,line,msg) ->
@@ -230,7 +230,7 @@ let json_of_source = function
]
let json_of_event e =
- Json.Assoc
+ `Assoc
begin [
"classid" , Json.of_string e.e_id ;
"action" , Json.of_string @@ string_of_action e.e_action ;
diff --git a/src/plugins/report/classify.mli b/src/plugins/report/classify.mli
index a3a448dd758cc2fe4ca231b5d4b38917804871b2..c403765cb3d230915ab1139db3aef1f34efec03b 100644
--- a/src/plugins/report/classify.mli
+++ b/src/plugins/report/classify.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/configure.ac b/src/plugins/report/configure.ac
index 7a1ebd578478845656eccb6ebb881751e82224bf..e8ba69ec2a36616aa0ef82a145c4925795ee1f59 100644
--- a/src/plugins/report/configure.ac
+++ b/src/plugins/report/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/report/csv.ml b/src/plugins/report/csv.ml
index 646966112ef751e58e5e4ea46018a74c456bc30e..643168a388f3184f1ae4eea2a25a6995aa887656 100644
--- a/src/plugins/report/csv.ml
+++ b/src/plugins/report/csv.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/csv.mli b/src/plugins/report/csv.mli
index ce7a42b00627eefcc76a75a6f9e90daf8a01614f..3426449cefa0c916735da3acb7e7c1591161ebe9 100644
--- a/src/plugins/report/csv.mli
+++ b/src/plugins/report/csv.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/dump.ml b/src/plugins/report/dump.ml
index 87fa117fc9c473399ecf8b0e8ebbf7af76b9258d..a41dfb25e6e3410fe8218dc5bbd10f52d6d6cbe5 100644
--- a/src/plugins/report/dump.ml
+++ b/src/plugins/report/dump.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/dump.mli b/src/plugins/report/dump.mli
index ebb00e3481e8da401ce3d508d19776719ba66a07..0b412443d18e001b889511899518f00ec90c2902 100644
--- a/src/plugins/report/dump.mli
+++ b/src/plugins/report/dump.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/register.ml b/src/plugins/report/register.ml
index 1bb13f3ea9b516d512e17b6bddff7c35e020776c..973c77728b4e202f183acea9e3649642052c3bfd 100644
--- a/src/plugins/report/register.ml
+++ b/src/plugins/report/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/register.mli b/src/plugins/report/register.mli
index 4d5a7d21592bc5f1825631eeeb9e83eaa9bfbf24..349e981744e406fa9853fae543542b39b69e35f8 100644
--- a/src/plugins/report/register.mli
+++ b/src/plugins/report/register.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/report_parameters.ml b/src/plugins/report/report_parameters.ml
index 0741efc5214520e0ef5cc85c15769d18a12b9295..0c92d67b4b0c8c616b9ee021c96ace986fd23c8e 100644
--- a/src/plugins/report/report_parameters.ml
+++ b/src/plugins/report/report_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/report_parameters.mli b/src/plugins/report/report_parameters.mli
index b1dd169b3330a1f37a97a3872e6588116ad739fa..49b7c8db13fb8a70fd961cab4c73c720590855ac 100644
--- a/src/plugins/report/report_parameters.mli
+++ b/src/plugins/report/report_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/scan.ml b/src/plugins/report/scan.ml
index f830c660887f75a08606e832da68cb1514ba91c4..72128bedbef5b67eba275b97ea68231e7e09bc6a 100644
--- a/src/plugins/report/scan.ml
+++ b/src/plugins/report/scan.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/report/scan.mli b/src/plugins/report/scan.mli
index cccce842b570b2e9cb02a8d3412c5695d06abeca..6d34d6094322f62ccefcaea68d780e143d0e890a 100644
--- a/src/plugins/report/scan.mli
+++ b/src/plugins/report/scan.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/RteGen.mli b/src/plugins/rte/RteGen.mli
index 19ed668df98207f3ab59ecb13d4db7adf9644fd3..9926f78e4a0920cb8cc90aa4c4082d8b86e8dad7 100644
--- a/src/plugins/rte/RteGen.mli
+++ b/src/plugins/rte/RteGen.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/generator.ml b/src/plugins/rte/generator.ml
index eb028233479bd084ad50817c16c3f27990c56315..b6c626b68c4f91251fcdb19397896dc6fec6c40d 100644
--- a/src/plugins/rte/generator.ml
+++ b/src/plugins/rte/generator.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/generator.mli b/src/plugins/rte/generator.mli
index fe1bc704b6e5a40b5e5b6a2b97d59e954c12cbc9..2ed6fe38a32711de556d8e0466b224b5050a7655 100644
--- a/src/plugins/rte/generator.mli
+++ b/src/plugins/rte/generator.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/options.ml b/src/plugins/rte/options.ml
index 5e524548226b08f91ada9eb23928266eb3955cb2..7c646c80c6e977aaf0ae01337b4425641a45e1c1 100644
--- a/src/plugins/rte/options.ml
+++ b/src/plugins/rte/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/options.mli b/src/plugins/rte/options.mli
index dc9ba70440b639b8ce38747718a94e3e3445f2ac..b589769be9d80587d572b2f245fb1d02072de4c3 100644
--- a/src/plugins/rte/options.mli
+++ b/src/plugins/rte/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/register.ml b/src/plugins/rte/register.ml
index d5d298f765af140292c97886bfc5bd915e3b8894..5a7a9ba4af947ea862faa59e349c55e4b3cb1805 100644
--- a/src/plugins/rte/register.ml
+++ b/src/plugins/rte/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/rte.ml b/src/plugins/rte/rte.ml
index 677399a2325b5e810d3ee84033f17566aab8a61e..855e2b4e729349a97a695626041ebe7d19df816c 100644
--- a/src/plugins/rte/rte.ml
+++ b/src/plugins/rte/rte.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/rte.mli b/src/plugins/rte/rte.mli
index f71f39eaae91a32f04b349180ad8a5af0f423fe0..0b1d55a21e304b9ccec0cb61b1c270fe232f69a9 100644
--- a/src/plugins/rte/rte.mli
+++ b/src/plugins/rte/rte.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/visit.ml b/src/plugins/rte/visit.ml
index 506d5a0c6ca1fba2cffd49280d327c887f215261..c8091e90c750efa7277e1caec1f71c0451f8906e 100644
--- a/src/plugins/rte/visit.ml
+++ b/src/plugins/rte/visit.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/rte/visit.mli b/src/plugins/rte/visit.mli
index 053f8d8e13b27781b1856db222a537f2ee043474..1413e3b8f7bf3411f312dd1401f8664fa1c4d521 100644
--- a/src/plugins/rte/visit.mli
+++ b/src/plugins/rte/visit.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/Scope.mli b/src/plugins/scope/Scope.mli
index e9ccc605c8ffe94b5236ef65f5e9143d836a8acb..ef9bd97b7afe2853f67f00c5d9fd87a2d36c53bf 100644
--- a/src/plugins/scope/Scope.mli
+++ b/src/plugins/scope/Scope.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/datascope.ml b/src/plugins/scope/datascope.ml
index 9230b2cc714db7943a140b0f80d920c26820cf62..b64f3530965336676e0abe2f7855017ae6475bb3 100644
--- a/src/plugins/scope/datascope.ml
+++ b/src/plugins/scope/datascope.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/datascope.mli b/src/plugins/scope/datascope.mli
index 389abf383186d16b80e704af403b1deed5dd45ce..fec9e9beb33b119df4fa0e711f9b17d0fd7bc417 100644
--- a/src/plugins/scope/datascope.mli
+++ b/src/plugins/scope/datascope.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/defs.ml b/src/plugins/scope/defs.ml
index 208eeefb9655dfd82f2c935a37abb90450650124..71a16a540e41288bca6c81ce5ec846e94303a9cf 100644
--- a/src/plugins/scope/defs.ml
+++ b/src/plugins/scope/defs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/defs.mli b/src/plugins/scope/defs.mli
index 35278fe4c69ee7d74ab951db1008101d72efcb18..98dc4ad615ddda145f0544a271b3dff865a7d128 100644
--- a/src/plugins/scope/defs.mli
+++ b/src/plugins/scope/defs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/dpds_gui.ml b/src/plugins/scope/dpds_gui.ml
index 410bb216d697e3d0ccaa144efca88a25068e8915..6347c07315429e8aca621ee5c55d44b597ed0731 100644
--- a/src/plugins/scope/dpds_gui.ml
+++ b/src/plugins/scope/dpds_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/zones.ml b/src/plugins/scope/zones.ml
index a9b23f3233bf7d7712bc2e83b1a671d06657a425..2a31ef57059930ac2687e3b1e1031598f834940e 100644
--- a/src/plugins/scope/zones.ml
+++ b/src/plugins/scope/zones.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/scope/zones.mli b/src/plugins/scope/zones.mli
index 23252d450dfcd3c8eb60a9ef6da6520d144d089b..7f4aebfb3c75b09b5a701c265aefd22016bb1212 100644
--- a/src/plugins/scope/zones.mli
+++ b/src/plugins/scope/zones.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/security_slicing/Makefile.in b/src/plugins/security_slicing/Makefile.in
index 0a934acbdc7cea14d5773eaec7a8aa5ee8aa74da..cdb19ff6ef7a431d6ea0e1ef2e21990c6f58ff47 100644
--- a/src/plugins/security_slicing/Makefile.in
+++ b/src/plugins/security_slicing/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/security_slicing/Security_slicing.mli b/src/plugins/security_slicing/Security_slicing.mli
index e3d48c472069ae34644336209b58c872dd1fa784..33e47692473b7d355666ea1a781bcaa388acab54 100644
--- a/src/plugins/security_slicing/Security_slicing.mli
+++ b/src/plugins/security_slicing/Security_slicing.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/security_slicing/components.ml b/src/plugins/security_slicing/components.ml
index d66e418e75abee0e1903162b352d59774b8a5d04..d126b3dfeb4f6495088c1b50f39bc3d01aee34ad 100644
--- a/src/plugins/security_slicing/components.ml
+++ b/src/plugins/security_slicing/components.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/security_slicing/components.mli b/src/plugins/security_slicing/components.mli
index 6a6e4a6dc38e0613bb9dd8fcb24cc8e9d721ce88..b5141d0bb58ca8edbe5b2ab765a05be8a6a96689 100644
--- a/src/plugins/security_slicing/components.mli
+++ b/src/plugins/security_slicing/components.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/security_slicing/configure.ac b/src/plugins/security_slicing/configure.ac
index bd2896471aa66cff305a4ae2214a62e77c69cdc2..97058ce4811d40a6a345ab9dab6ddd6c8dfaf188 100644
--- a/src/plugins/security_slicing/configure.ac
+++ b/src/plugins/security_slicing/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/security_slicing/register_gui.ml b/src/plugins/security_slicing/register_gui.ml
index 68f0663912c564ae879567813a40704a9d1a9dd5..b18a51f45e0049294800154b8cf04ebc79acb208 100644
--- a/src/plugins/security_slicing/register_gui.ml
+++ b/src/plugins/security_slicing/register_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/security_slicing/register_gui.mli b/src/plugins/security_slicing/register_gui.mli
index b629e7abe107df74dc438fe37a64900e506bc80c..6b0e6a98505e2f63ea33f8c8cb1e91b7bebbd52a 100644
--- a/src/plugins/security_slicing/register_gui.mli
+++ b/src/plugins/security_slicing/register_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/security_slicing/security_slicing_parameters.ml b/src/plugins/security_slicing/security_slicing_parameters.ml
index 047e4b6d07f44f14cb02e0e09a3b5844fc78c6d3..7ab89e0f0914bb580892017db993878de7c4489c 100644
--- a/src/plugins/security_slicing/security_slicing_parameters.ml
+++ b/src/plugins/security_slicing/security_slicing_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/security_slicing/security_slicing_parameters.mli b/src/plugins/security_slicing/security_slicing_parameters.mli
index b1ee7bf5431335d7598135aa56ba8febc04451b2..eb20275210da8366d5069a2e0309d0427c3a65b7 100644
--- a/src/plugins/security_slicing/security_slicing_parameters.mli
+++ b/src/plugins/security_slicing/security_slicing_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/Slicing.mli b/src/plugins/slicing/Slicing.mli
index f96cc3f347288a2787896161ac9637babd7b1161..422c2cabb567f591c3f99cf9393cf952e7458f18 100644
--- a/src/plugins/slicing/Slicing.mli
+++ b/src/plugins/slicing/Slicing.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/api.ml b/src/plugins/slicing/api.ml
index b65f92a8f9f6f1aa74086f93d735cc4ec3ba5ebc..2ada57e9d0e831ba21e5fd8f1b3bc3050ff96a81 100644
--- a/src/plugins/slicing/api.ml
+++ b/src/plugins/slicing/api.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/fct_slice.ml b/src/plugins/slicing/fct_slice.ml
index 9f84620fdca807e8e57e89b28ab56cb83a5db92e..ae957bc05f425bac74797f557e0a4f6bfff7112f 100644
--- a/src/plugins/slicing/fct_slice.ml
+++ b/src/plugins/slicing/fct_slice.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/fct_slice.mli b/src/plugins/slicing/fct_slice.mli
index cc5ac28ac433dfed3e0713a1a625ec99997ac4a9..989184c2cdba2fee99a8027ec3e1ae1dbb37abdb 100644
--- a/src/plugins/slicing/fct_slice.mli
+++ b/src/plugins/slicing/fct_slice.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/printSlice.ml b/src/plugins/slicing/printSlice.ml
index 37e5f8a1c6704e77656fca762cf1ad60d1ae412d..ab5ff941236c1838428f38f7483f90a1229641d5 100644
--- a/src/plugins/slicing/printSlice.ml
+++ b/src/plugins/slicing/printSlice.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/printSlice.mli b/src/plugins/slicing/printSlice.mli
index 120a904f5e473c089b3cc8da67d1d4d9e680c989..5832e94bb25e33001a2b3a820594dacea140a2a6 100644
--- a/src/plugins/slicing/printSlice.mli
+++ b/src/plugins/slicing/printSlice.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/register.ml b/src/plugins/slicing/register.ml
index 5f5f376a784e03db921b99ae81143f3e052e6d6f..888b5b31500e719a48025aff744d22167c41b853 100644
--- a/src/plugins/slicing/register.ml
+++ b/src/plugins/slicing/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/register_gui.ml b/src/plugins/slicing/register_gui.ml
index e8abaf50f85479ec6199298d5fd0d143f3a6e3c4..5a962f17d8a94827f442b5bf1ba59c97cff00158 100644
--- a/src/plugins/slicing/register_gui.ml
+++ b/src/plugins/slicing/register_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/register_gui.mli b/src/plugins/slicing/register_gui.mli
index c4385f438ab5808e16abca3fe60270ced837545f..3f278a7d75e4d5a0a4ca62f0c703be09d0781f92 100644
--- a/src/plugins/slicing/register_gui.mli
+++ b/src/plugins/slicing/register_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingActions.ml b/src/plugins/slicing/slicingActions.ml
index ff80ca3f9b93fa0e413baaebbb79498e938e74e7..e59c8e9c6a9399eea3c4f3edf01844074b2c275b 100644
--- a/src/plugins/slicing/slicingActions.ml
+++ b/src/plugins/slicing/slicingActions.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingActions.mli b/src/plugins/slicing/slicingActions.mli
index 3fe904c8ce1f2320255ea5a63ea61a33110222d7..01896e758b6ab0fee699f7d5444b09666c36459a 100644
--- a/src/plugins/slicing/slicingActions.mli
+++ b/src/plugins/slicing/slicingActions.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingCmds.ml b/src/plugins/slicing/slicingCmds.ml
index 59c1f30ae8ae4b9e570b6bfa9656e67f2043149a..7ab823c36cfaa2028c440af02fcbbc3b2277313e 100644
--- a/src/plugins/slicing/slicingCmds.ml
+++ b/src/plugins/slicing/slicingCmds.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingCmds.mli b/src/plugins/slicing/slicingCmds.mli
index 7afdfe94c708dd1afbd250663e9b68ef08d88696..9c018a7e44cf41f2cf8299fab91f5b1e8c7251ad 100644
--- a/src/plugins/slicing/slicingCmds.mli
+++ b/src/plugins/slicing/slicingCmds.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingInternals.ml b/src/plugins/slicing/slicingInternals.ml
index 7fea8d0516f87ec06d1a38fe187e761ff16d4603..6142277b74918cd255794e1405b88fb7b705318e 100644
--- a/src/plugins/slicing/slicingInternals.ml
+++ b/src/plugins/slicing/slicingInternals.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingMacros.ml b/src/plugins/slicing/slicingMacros.ml
index f22b685dd6d9f18602b8924ee3d123ca3ec2bbd0..7031f9dd07bb37aea6a5b40358b859d03771e2dd 100644
--- a/src/plugins/slicing/slicingMacros.ml
+++ b/src/plugins/slicing/slicingMacros.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingMacros.mli b/src/plugins/slicing/slicingMacros.mli
index bc1f6fd3ceee3d9244f2d22ea3f4bbbe805d4576..3c4ebe51fcd9ef19d6c74eb32ecd123116d5d859 100644
--- a/src/plugins/slicing/slicingMacros.mli
+++ b/src/plugins/slicing/slicingMacros.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingMarks.ml b/src/plugins/slicing/slicingMarks.ml
index 6d7b888acb06c3fb3b5d1b7e6ebec2d5f2d842cd..db24b76b89468ea13f51767f32ba54227a2f0669 100644
--- a/src/plugins/slicing/slicingMarks.ml
+++ b/src/plugins/slicing/slicingMarks.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingMarks.mli b/src/plugins/slicing/slicingMarks.mli
index 0945f18ed2a32ea21366bc8f04a2c8c2b88cb2e4..e9bacd135ff26119c87afcd7bf5fa0b619f6a9b5 100644
--- a/src/plugins/slicing/slicingMarks.mli
+++ b/src/plugins/slicing/slicingMarks.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingParameters.ml b/src/plugins/slicing/slicingParameters.ml
index 431c0641c968781c1b327b473f969e1be4491986..a7cb63cfe760f95f3e4353d3cbb938109ed0f1a9 100644
--- a/src/plugins/slicing/slicingParameters.ml
+++ b/src/plugins/slicing/slicingParameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingParameters.mli b/src/plugins/slicing/slicingParameters.mli
index e9960bafe954dd2c4fd5c94f407bdf3e6e9b1ca8..40f8eb2f1fe7dad9b2ef233042aaf321bbd992d8 100644
--- a/src/plugins/slicing/slicingParameters.mli
+++ b/src/plugins/slicing/slicingParameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingProject.ml b/src/plugins/slicing/slicingProject.ml
index 5d6ab46ceb3f782f369968ac3cd585c5e8648646..a02fcaf8fd2339de2ff76b4a33ed3274632faef3 100644
--- a/src/plugins/slicing/slicingProject.ml
+++ b/src/plugins/slicing/slicingProject.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingProject.mli b/src/plugins/slicing/slicingProject.mli
index 2be6bc082ba3ab21077c08adb2754e1a230e15e9..c09d98f5ff563b7c7a582311ca79cad31700eb40 100644
--- a/src/plugins/slicing/slicingProject.mli
+++ b/src/plugins/slicing/slicingProject.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingSelect.ml b/src/plugins/slicing/slicingSelect.ml
index 43fb69b15721102d89d540f36fdf6495f1e9c18f..87c704d27573c40a14420bbfa5984185157742dd 100644
--- a/src/plugins/slicing/slicingSelect.ml
+++ b/src/plugins/slicing/slicingSelect.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingState.ml b/src/plugins/slicing/slicingState.ml
index 2681d66cad177c0cad32fe2e28388bf84f6668c2..41ddc0ae1958a1e8c1f4a7c6705b16c32db2c1ce 100644
--- a/src/plugins/slicing/slicingState.ml
+++ b/src/plugins/slicing/slicingState.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingState.mli b/src/plugins/slicing/slicingState.mli
index 581c23f618f35d1d4b92e27e354fd2b6c1fe4734..0254acc7435ca613f27ecbf98347ebe54b127032 100644
--- a/src/plugins/slicing/slicingState.mli
+++ b/src/plugins/slicing/slicingState.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingTransform.ml b/src/plugins/slicing/slicingTransform.ml
index 399ff0b2d1f34fd1fb1383e3340163493460fb5b..35b30b376fe483d7977fe7a8790adfcafb84a1f6 100644
--- a/src/plugins/slicing/slicingTransform.ml
+++ b/src/plugins/slicing/slicingTransform.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingTransform.mli b/src/plugins/slicing/slicingTransform.mli
index 0d4b56e4499b9a7585ded548ee650c58bd0a9327..36fdb2a39945bb4d988af7050189ebbc1df8f6d3 100644
--- a/src/plugins/slicing/slicingTransform.mli
+++ b/src/plugins/slicing/slicingTransform.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/slicing/slicingTypes.ml b/src/plugins/slicing/slicingTypes.ml
index e4e4703b699db017dddb8300b5a71179b41a82eb..2de02cd5faf3e2cb35e3cfb423e3c4c5a62c2f3e 100644
--- a/src/plugins/slicing/slicingTypes.ml
+++ b/src/plugins/slicing/slicingTypes.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/Sparecode.mli b/src/plugins/sparecode/Sparecode.mli
index 215ceebc480a3ebc6367086812ec7e1b77d2cc97..e2a726634a19d35cb2e54f142c1b6413051aaa06 100644
--- a/src/plugins/sparecode/Sparecode.mli
+++ b/src/plugins/sparecode/Sparecode.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/globs.ml b/src/plugins/sparecode/globs.ml
index ef643b0063b604806c8cacdd044df7686b7702c0..eb84a71c48abcc51a8426777bde0d3247c18dfec 100644
--- a/src/plugins/sparecode/globs.ml
+++ b/src/plugins/sparecode/globs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/register.ml b/src/plugins/sparecode/register.ml
index 175f8b328abfb88ad69882fa234faa6ac44ced8c..cb375e46dba0a36fbd09762813273405092901a3 100644
--- a/src/plugins/sparecode/register.ml
+++ b/src/plugins/sparecode/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/spare_marks.ml b/src/plugins/sparecode/spare_marks.ml
index 7f87e25c71119697f95768a9f7ef0b5e513e99d7..5d9c7acde6a326f5811c508aa7acebbf33c25e97 100644
--- a/src/plugins/sparecode/spare_marks.ml
+++ b/src/plugins/sparecode/spare_marks.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/spare_marks.mli b/src/plugins/sparecode/spare_marks.mli
index ac2a77a631e169468f2ecc11727caa7d2ca6f359..a054113cbebe508d15ba826b810a458ecffcca27 100644
--- a/src/plugins/sparecode/spare_marks.mli
+++ b/src/plugins/sparecode/spare_marks.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/sparecode_params.ml b/src/plugins/sparecode/sparecode_params.ml
index a78279b94db9b5870c4bb4988c52bd4deb4569c4..fee87425697c25d573de6c90acb24097b77b1de9 100644
--- a/src/plugins/sparecode/sparecode_params.ml
+++ b/src/plugins/sparecode/sparecode_params.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/sparecode_params.mli b/src/plugins/sparecode/sparecode_params.mli
index f9d91498312e7a9840b2270ca9ab788466bc4908..4db44d3e28a7277dabbd1978b4c45b30d379b511 100644
--- a/src/plugins/sparecode/sparecode_params.mli
+++ b/src/plugins/sparecode/sparecode_params.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/sparecode/transform.ml b/src/plugins/sparecode/transform.ml
index a59dd97535c7c268ad3ea6efe385f3f5ff71f833..7812565a7daadc4a2f226f626cc375bb37ae31bc 100644
--- a/src/plugins/sparecode/transform.ml
+++ b/src/plugins/sparecode/transform.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/Makefile b/src/plugins/studia/Makefile
index 0f8b72e7d638df4a2a6d9c829b9406a86d24740e..b7665d764aa3b3bd662493144754cf2d67af457c 100644
--- a/src/plugins/studia/Makefile
+++ b/src/plugins/studia/Makefile
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/studia/Studia.mli b/src/plugins/studia/Studia.mli
index c10d7cb05c978340c8f3e5dfc7bd530ee607ad2c..52715cb61ccce3275ea10d616c62724ed5cb3178 100644
--- a/src/plugins/studia/Studia.mli
+++ b/src/plugins/studia/Studia.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/options.ml b/src/plugins/studia/options.ml
index af6dccf4f8fbc71babc80c9fb08cdd1bfc7b0bfe..69fc4caf32fc5739c0c986208748f25f43b27886 100644
--- a/src/plugins/studia/options.ml
+++ b/src/plugins/studia/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/options.mli b/src/plugins/studia/options.mli
index 7139184c3a8e2cc0ddd9ddaafc922d24955efc61..e5247f0055e95441826a5bc4b5214dbf3657e18f 100644
--- a/src/plugins/studia/options.mli
+++ b/src/plugins/studia/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/reads.ml b/src/plugins/studia/reads.ml
index 5404eac5118aecfd73d9b725ca794addeccfb495..0fb3d4ac68954ff1786f0213fe6e35ea59597126 100644
--- a/src/plugins/studia/reads.ml
+++ b/src/plugins/studia/reads.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/reads.mli b/src/plugins/studia/reads.mli
index 72df6b67cedd03f14ed36bd5feb5b4fa9db436ff..1207e9d1d35b0770db3dc3d45de1b338aba4a86f 100644
--- a/src/plugins/studia/reads.mli
+++ b/src/plugins/studia/reads.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/studia_gui.ml b/src/plugins/studia/studia_gui.ml
index 552a1ee2e0c214b8217a9e6c635beaa4349574e6..230c8b7940580c619b214f1fbb1a6b139efcc97d 100644
--- a/src/plugins/studia/studia_gui.ml
+++ b/src/plugins/studia/studia_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/studia_gui.mli b/src/plugins/studia/studia_gui.mli
index 8248830969f5f25208000c856c64f412b78695ea..1ff3bd8f076fe0200d1c9b41fc599428aa4876b2 100644
--- a/src/plugins/studia/studia_gui.mli
+++ b/src/plugins/studia/studia_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/writes.ml b/src/plugins/studia/writes.ml
index 1178f50bfa321338fe16a257f7ba1d1aad98826d..87cd013914e0db622f3151e0e55038017520c9ee 100644
--- a/src/plugins/studia/writes.ml
+++ b/src/plugins/studia/writes.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/studia/writes.mli b/src/plugins/studia/writes.mli
index 8b04c5e0b16d9e674f7129695f75a0ad8bb1be07..963ded99e680c475142439bc1ce1ca7dc0b5d65c 100644
--- a/src/plugins/studia/writes.mli
+++ b/src/plugins/studia/writes.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/users/Users.mli b/src/plugins/users/Users.mli
index f9510c0056cc4daaffd633efa2955229cc8e4665..5a726447229afaef03d997276378e33961831584 100644
--- a/src/plugins/users/Users.mli
+++ b/src/plugins/users/Users.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/users/users_register.ml b/src/plugins/users/users_register.ml
index f61d4e7665edab65d0a7d48774088c57fa021f0b..0d775e8b8a96d943030977b2cc992c4b4ee683a5 100644
--- a/src/plugins/users/users_register.ml
+++ b/src/plugins/users/users_register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/Eva.mli b/src/plugins/value/Eva.mli
index e095c472ff8a40e6bdac196683ca9ef344fdf434..d27f426c32f2806ad0bd341278af380fbaad0195 100644
--- a/src/plugins/value/Eva.mli
+++ b/src/plugins/value/Eva.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/alarmset.ml b/src/plugins/value/alarmset.ml
index 203797e611ca718d11798d5edee3a6f516da3faa..062f57f05174f880780c1207d6b44d8f42d9f9ec 100644
--- a/src/plugins/value/alarmset.ml
+++ b/src/plugins/value/alarmset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/alarmset.mli b/src/plugins/value/alarmset.mli
index 16b15ec5dcb0cc42532323d8ecdd285443376242..e978d5708b4bdc5de5789104fbfbc93f691cedd1 100644
--- a/src/plugins/value/alarmset.mli
+++ b/src/plugins/value/alarmset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/abstract_domain.mli b/src/plugins/value/domains/abstract_domain.mli
index 1443485df2b94efc35622b9d975f2c7abe6a6ba5..f2dc9ff30e5586e3f4e7d7eb7ed713781fe82655 100644
--- a/src/plugins/value/domains/abstract_domain.mli
+++ b/src/plugins/value/domains/abstract_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/apron/apron_domain.ko.ml b/src/plugins/value/domains/apron/apron_domain.ko.ml
index 0683e0d3ba738a7ffa651d64b48c6663c7101b6a..9ccb3680e2919874b7ad15a85c8b3c597e39083d 100644
--- a/src/plugins/value/domains/apron/apron_domain.ko.ml
+++ b/src/plugins/value/domains/apron/apron_domain.ko.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/apron/apron_domain.mli b/src/plugins/value/domains/apron/apron_domain.mli
index 993f8bb70dd955de64456396db742acbe18245ab..19c6611afb1159e90e569e04971eec187da1bbab 100644
--- a/src/plugins/value/domains/apron/apron_domain.mli
+++ b/src/plugins/value/domains/apron/apron_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/apron/apron_domain.ok.ml b/src/plugins/value/domains/apron/apron_domain.ok.ml
index 7b8510916ff3c3a3da4eea71780fcf7a2944d8ec..6c7817dff14e3c75d297c337029daa911d0d6d9a 100644
--- a/src/plugins/value/domains/apron/apron_domain.ok.ml
+++ b/src/plugins/value/domains/apron/apron_domain.ok.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins.ml b/src/plugins/value/domains/cvalue/builtins.ml
index d4132f06f95e3655939340f0485a3ae3e86028d4..fb2479c5e3c896d33ad478cb4d07bd459e6354d1 100644
--- a/src/plugins/value/domains/cvalue/builtins.ml
+++ b/src/plugins/value/domains/cvalue/builtins.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins.mli b/src/plugins/value/domains/cvalue/builtins.mli
index e08655ff57eeb067d7e5b475e7ecaed8aa077a00..351bf9a11ddd32c6df1c74fbba77bbe45f1ecf6e 100644
--- a/src/plugins/value/domains/cvalue/builtins.mli
+++ b/src/plugins/value/domains/cvalue/builtins.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_float.ml b/src/plugins/value/domains/cvalue/builtins_float.ml
index e86afb819ce7f4ce89672805a3dec951f252b898..458470bfbd5d68f8ad26fab04d9ce4939cdc3369 100644
--- a/src/plugins/value/domains/cvalue/builtins_float.ml
+++ b/src/plugins/value/domains/cvalue/builtins_float.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_float.mli b/src/plugins/value/domains/cvalue/builtins_float.mli
index 7929492d6e6fbdfbe9915eb44a174212d44c160d..2c8eaa212090b6c862e8d9a043c0657d81da4acf 100644
--- a/src/plugins/value/domains/cvalue/builtins_float.mli
+++ b/src/plugins/value/domains/cvalue/builtins_float.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_malloc.ml b/src/plugins/value/domains/cvalue/builtins_malloc.ml
index c3f6e9ce06e866ac373bbb37d95c52fdc37fd10e..ae944aa55f87b4c15792a40735e33ef0c1bd7bee 100644
--- a/src/plugins/value/domains/cvalue/builtins_malloc.ml
+++ b/src/plugins/value/domains/cvalue/builtins_malloc.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_malloc.mli b/src/plugins/value/domains/cvalue/builtins_malloc.mli
index 85c2d2d2eee33a1fcf478936255f8daabc413fcd..ddb847fde07c1b902e21b1e54681648ec071ba84 100644
--- a/src/plugins/value/domains/cvalue/builtins_malloc.mli
+++ b/src/plugins/value/domains/cvalue/builtins_malloc.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_memory.ml b/src/plugins/value/domains/cvalue/builtins_memory.ml
index a66f81bdeb013e52ce3351b90ac1a40f22bf9226..e413f5d9ac2483cb764c1ee6bcf84d08d4b3f7f4 100644
--- a/src/plugins/value/domains/cvalue/builtins_memory.ml
+++ b/src/plugins/value/domains/cvalue/builtins_memory.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_memory.mli b/src/plugins/value/domains/cvalue/builtins_memory.mli
index c7addb3ec5c933bf96ec9e72714aa442959b2c57..185407cdb125e4b63ec5a242f7297e46b67727e5 100644
--- a/src/plugins/value/domains/cvalue/builtins_memory.mli
+++ b/src/plugins/value/domains/cvalue/builtins_memory.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_misc.ml b/src/plugins/value/domains/cvalue/builtins_misc.ml
index 9fd4aedcde6ded2fb3b922a820102705669ce894..fa69ac070b47b5a2288656980f50350bfefc11aa 100644
--- a/src/plugins/value/domains/cvalue/builtins_misc.ml
+++ b/src/plugins/value/domains/cvalue/builtins_misc.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_misc.mli b/src/plugins/value/domains/cvalue/builtins_misc.mli
index d6cad0553821faf26ecfad001cd80e4152c2d948..f21a8808855a093e83bf1821b84748fa3bf1e540 100644
--- a/src/plugins/value/domains/cvalue/builtins_misc.mli
+++ b/src/plugins/value/domains/cvalue/builtins_misc.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_print_c.ml b/src/plugins/value/domains/cvalue/builtins_print_c.ml
index a0faa9434838c52a2dc1f348ffd20e091f519440..f32792786051a017156a912f62ad8b92542688bb 100644
--- a/src/plugins/value/domains/cvalue/builtins_print_c.ml
+++ b/src/plugins/value/domains/cvalue/builtins_print_c.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_print_c.mli b/src/plugins/value/domains/cvalue/builtins_print_c.mli
index c8f11e3bee0cc0ffe5a7bf56617605a841e3ec24..80f0da7ad4b8e9bddfd782ee398b542ad1f34e0e 100644
--- a/src/plugins/value/domains/cvalue/builtins_print_c.mli
+++ b/src/plugins/value/domains/cvalue/builtins_print_c.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_split.ml b/src/plugins/value/domains/cvalue/builtins_split.ml
index af7b11e3b0cd321cff2161c75d035b3b676634a3..91d13f06f876ea2f94e5bb36888ad8d43436842e 100644
--- a/src/plugins/value/domains/cvalue/builtins_split.ml
+++ b/src/plugins/value/domains/cvalue/builtins_split.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_split.mli b/src/plugins/value/domains/cvalue/builtins_split.mli
index b2bc6e43aff24a610877258dad99dc57eb10dbbf..534162c0101132c4e2f6707cf38e2512e7561c52 100644
--- a/src/plugins/value/domains/cvalue/builtins_split.mli
+++ b/src/plugins/value/domains/cvalue/builtins_split.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_string.ml b/src/plugins/value/domains/cvalue/builtins_string.ml
index d3d2477f886fdcf33b70ea803c87154aad84d7ec..d6c9c6040bdc299c6f7333e710b8a18838236c41 100644
--- a/src/plugins/value/domains/cvalue/builtins_string.ml
+++ b/src/plugins/value/domains/cvalue/builtins_string.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_string.mli b/src/plugins/value/domains/cvalue/builtins_string.mli
index 8106fdbca792516c9bb87d930af8a490a92e6a5e..a19e4d7b09194af36918c3be2c7a7146782d9c47 100644
--- a/src/plugins/value/domains/cvalue/builtins_string.mli
+++ b/src/plugins/value/domains/cvalue/builtins_string.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_watchpoint.ml b/src/plugins/value/domains/cvalue/builtins_watchpoint.ml
index 32bb43ff20c32bfadd523d4e3367ff0ed73271ab..fbebe367bbff602be7ae2806f782669b01358ff8 100644
--- a/src/plugins/value/domains/cvalue/builtins_watchpoint.ml
+++ b/src/plugins/value/domains/cvalue/builtins_watchpoint.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/builtins_watchpoint.mli b/src/plugins/value/domains/cvalue/builtins_watchpoint.mli
index 6f878a7648805a1b4310e0d9ea44f1de6bd9b01c..94b276ff5a639b62fc8cb7b9fbd4a25152470153 100644
--- a/src/plugins/value/domains/cvalue/builtins_watchpoint.mli
+++ b/src/plugins/value/domains/cvalue/builtins_watchpoint.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_domain.ml b/src/plugins/value/domains/cvalue/cvalue_domain.ml
index a079226139cf67156b5a9f570465a1c9fa144c8c..798c4ea72f7d652d2d5a98d80780ce0f814e5619 100644
--- a/src/plugins/value/domains/cvalue/cvalue_domain.ml
+++ b/src/plugins/value/domains/cvalue/cvalue_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_domain.mli b/src/plugins/value/domains/cvalue/cvalue_domain.mli
index 62b8a279b0f70209e7ab5fc074da46edebd07297..34436ded0ad5db8a2d0b97d157f0d802891256a4 100644
--- a/src/plugins/value/domains/cvalue/cvalue_domain.mli
+++ b/src/plugins/value/domains/cvalue/cvalue_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_init.ml b/src/plugins/value/domains/cvalue/cvalue_init.ml
index 0826cdec7d9539da8c47485874db975a4d45d3c7..60d60a97157b848e6a0d39a1a6283617002810c0 100644
--- a/src/plugins/value/domains/cvalue/cvalue_init.ml
+++ b/src/plugins/value/domains/cvalue/cvalue_init.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_init.mli b/src/plugins/value/domains/cvalue/cvalue_init.mli
index 1d20d46c2a9fdc845879eb0be5eece5d9a021f30..163e195deece5f2105d7f9b31b1731ea88695987 100644
--- a/src/plugins/value/domains/cvalue/cvalue_init.mli
+++ b/src/plugins/value/domains/cvalue/cvalue_init.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_offsetmap.ml b/src/plugins/value/domains/cvalue/cvalue_offsetmap.ml
index 876fa9f8c07974c920722980238b0e0af75c91d1..63d5ecc055684941150765ddeecf4633f48ce626 100644
--- a/src/plugins/value/domains/cvalue/cvalue_offsetmap.ml
+++ b/src/plugins/value/domains/cvalue/cvalue_offsetmap.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_offsetmap.mli b/src/plugins/value/domains/cvalue/cvalue_offsetmap.mli
index 2210ce9a62dbcbfb5a2a8ff96406df8386e296b3..0616e65de568f8945ba6c21a0d87fa2622ad0f67 100644
--- a/src/plugins/value/domains/cvalue/cvalue_offsetmap.mli
+++ b/src/plugins/value/domains/cvalue/cvalue_offsetmap.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_specification.ml b/src/plugins/value/domains/cvalue/cvalue_specification.ml
index 78eafb146fa49b529afda90d7f1dfef2f55ff15a..69a39589b185ee6e2704837a43b0681356a91340 100644
--- a/src/plugins/value/domains/cvalue/cvalue_specification.ml
+++ b/src/plugins/value/domains/cvalue/cvalue_specification.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_specification.mli b/src/plugins/value/domains/cvalue/cvalue_specification.mli
index 2736468c75a7b0547a7c3b4cc5a1c106c11dd134..fd1768ba7917eed2249efe75f81a3440c2ebfe3b 100644
--- a/src/plugins/value/domains/cvalue/cvalue_specification.mli
+++ b/src/plugins/value/domains/cvalue/cvalue_specification.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_transfer.ml b/src/plugins/value/domains/cvalue/cvalue_transfer.ml
index 32065df1460ccfeb77971aea5a42c6bd0e20fdbf..a53f6cf775e0fd80581d1887435b1336fc636403 100644
--- a/src/plugins/value/domains/cvalue/cvalue_transfer.ml
+++ b/src/plugins/value/domains/cvalue/cvalue_transfer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/cvalue_transfer.mli b/src/plugins/value/domains/cvalue/cvalue_transfer.mli
index e09a9f0ccc24085c6d312a37bfa63efb2a6f7d56..a2bff4ae04a3cf219e64549d2aa4e701b6545dfa 100644
--- a/src/plugins/value/domains/cvalue/cvalue_transfer.mli
+++ b/src/plugins/value/domains/cvalue/cvalue_transfer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/locals_scoping.ml b/src/plugins/value/domains/cvalue/locals_scoping.ml
index 0848647262e988b767613b579f13bbe919b81239..2059c345c71b2421ed931990f7471fccdfa83ad5 100644
--- a/src/plugins/value/domains/cvalue/locals_scoping.ml
+++ b/src/plugins/value/domains/cvalue/locals_scoping.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/locals_scoping.mli b/src/plugins/value/domains/cvalue/locals_scoping.mli
index 67d4cdfd3fb02a92c9ee83296efddcd93a6c40f0..e0b8c5d181d57181580186b48c8a832594d15550 100644
--- a/src/plugins/value/domains/cvalue/locals_scoping.mli
+++ b/src/plugins/value/domains/cvalue/locals_scoping.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/warn.ml b/src/plugins/value/domains/cvalue/warn.ml
index 187b99bac2c1e494266dd8119672b459ef3450c7..d97c541ab5cc3c2ce14edc09a88752c4af8b237a 100644
--- a/src/plugins/value/domains/cvalue/warn.ml
+++ b/src/plugins/value/domains/cvalue/warn.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/cvalue/warn.mli b/src/plugins/value/domains/cvalue/warn.mli
index 8bd3c81baa06a49b073d86a0f1f9925037c66a4d..3e60e835876ad42d9d7aa4b56df63dfde7f007b0 100644
--- a/src/plugins/value/domains/cvalue/warn.mli
+++ b/src/plugins/value/domains/cvalue/warn.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_builder.ml b/src/plugins/value/domains/domain_builder.ml
index 88bbc85b21d0d757728ed1849c20cc4ba1b32dfc..108c1c4eada23618cd0484c2038734e547a3503d 100644
--- a/src/plugins/value/domains/domain_builder.ml
+++ b/src/plugins/value/domains/domain_builder.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_builder.mli b/src/plugins/value/domains/domain_builder.mli
index 40a364106085914c7314e539b7e44afb5c87a1d7..7d3b426a606878abe05699292d827739fcec4948 100644
--- a/src/plugins/value/domains/domain_builder.mli
+++ b/src/plugins/value/domains/domain_builder.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_lift.ml b/src/plugins/value/domains/domain_lift.ml
index caf7b8e1533bbf87390eef8227340e761d72369f..02eaa96e98d63b5f8cccfe3bfa8463d6565ef361 100644
--- a/src/plugins/value/domains/domain_lift.ml
+++ b/src/plugins/value/domains/domain_lift.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_lift.mli b/src/plugins/value/domains/domain_lift.mli
index f3a3f84eec375414e1b0e2e61408eb12ae2df2bd..9e16a8a292ee65d5fd7ff670ac2e9228b9180ba1 100644
--- a/src/plugins/value/domains/domain_lift.mli
+++ b/src/plugins/value/domains/domain_lift.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_product.ml b/src/plugins/value/domains/domain_product.ml
index 08a9cf5b6eb2f03bec67ca21ec75420940c8442b..35ada8461ccc5a2169f4c2a5be3ccbb3bfb8e483 100644
--- a/src/plugins/value/domains/domain_product.ml
+++ b/src/plugins/value/domains/domain_product.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_product.mli b/src/plugins/value/domains/domain_product.mli
index 196495d26de0b569280e7234d55fbe976d4c2ff6..c883a94ba8d1cb26816c742f8c8bf9a5bbe8532c 100644
--- a/src/plugins/value/domains/domain_product.mli
+++ b/src/plugins/value/domains/domain_product.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_store.ml b/src/plugins/value/domains/domain_store.ml
index 448ef904987aeaf4eca09f7d6f249f3600bd1be4..22d08a628389a8585217a2e021dd8e381598a756 100644
--- a/src/plugins/value/domains/domain_store.ml
+++ b/src/plugins/value/domains/domain_store.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/domain_store.mli b/src/plugins/value/domains/domain_store.mli
index 01c6ab0a8ac691a02b9d647207aa6088877b3e70..0e310a36d82fc4734954ea133285456322a2e9f9 100644
--- a/src/plugins/value/domains/domain_store.mli
+++ b/src/plugins/value/domains/domain_store.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/equality/equality.ml b/src/plugins/value/domains/equality/equality.ml
index 9fac38b57f2cf8121a8e0d11399bf726c5ef605b..278404749c6349fd2f5ac17cbc0a3cf21da46c44 100644
--- a/src/plugins/value/domains/equality/equality.ml
+++ b/src/plugins/value/domains/equality/equality.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/equality/equality.mli b/src/plugins/value/domains/equality/equality.mli
index f77042ade83f10406fd9b0384cd89651b9de15cc..9c5800dfd1f01daba51afb0a6508eef34810e005 100644
--- a/src/plugins/value/domains/equality/equality.mli
+++ b/src/plugins/value/domains/equality/equality.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/equality/equality_domain.ml b/src/plugins/value/domains/equality/equality_domain.ml
index 69c822f12d8d82379993cecfb6ae7027c97daf6d..844b890277e5e45e324a1911239fec5037816f51 100644
--- a/src/plugins/value/domains/equality/equality_domain.ml
+++ b/src/plugins/value/domains/equality/equality_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/equality/equality_domain.mli b/src/plugins/value/domains/equality/equality_domain.mli
index 0e0371e9697f2bf7a727c421a054b8492475d3bf..6f6d041654125ff27303bcd95cd853297b8ba836 100644
--- a/src/plugins/value/domains/equality/equality_domain.mli
+++ b/src/plugins/value/domains/equality/equality_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/gauges/gauges_domain.ml b/src/plugins/value/domains/gauges/gauges_domain.ml
index be42a47ede4e59ec9447a15559539711ed40b63e..e6845dd9d7764f6dd6d671e1143e04b3738958a1 100644
--- a/src/plugins/value/domains/gauges/gauges_domain.ml
+++ b/src/plugins/value/domains/gauges/gauges_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/gauges/gauges_domain.mli b/src/plugins/value/domains/gauges/gauges_domain.mli
index f5655172d17f14ae3653bb1acef26021fe5ec346..a1609d838a046745346cd36f02e063314057b88a 100644
--- a/src/plugins/value/domains/gauges/gauges_domain.mli
+++ b/src/plugins/value/domains/gauges/gauges_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/hcexprs.ml b/src/plugins/value/domains/hcexprs.ml
index aeb38a8e29d818ef207f3c54d24fb69a9f01cc35..449fe39ffdebac08675489ab196560b6d3d0ee5a 100644
--- a/src/plugins/value/domains/hcexprs.ml
+++ b/src/plugins/value/domains/hcexprs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/hcexprs.mli b/src/plugins/value/domains/hcexprs.mli
index ffd04c2f5b9e1d7e39fed5f7fb5fd567795c9359..54e76aaebff0dd600cc181065f535abd3d4a3fcb 100644
--- a/src/plugins/value/domains/hcexprs.mli
+++ b/src/plugins/value/domains/hcexprs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/inout_domain.ml b/src/plugins/value/domains/inout_domain.ml
index 8621fc06e9bc74e931793c612fe12b5ff8854a05..d6dd5b5afde403c01c75a6bb3e40162e6f017069 100644
--- a/src/plugins/value/domains/inout_domain.ml
+++ b/src/plugins/value/domains/inout_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/inout_domain.mli b/src/plugins/value/domains/inout_domain.mli
index 9bd5cad97b8bfa5d04903a40a1be8f362ebcfec9..0304f94f6900c3178afd03ca5c1d3534896a70a6 100644
--- a/src/plugins/value/domains/inout_domain.mli
+++ b/src/plugins/value/domains/inout_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/numerors/numerors_domain.ko.ml b/src/plugins/value/domains/numerors/numerors_domain.ko.ml
index 9c6b7345979bad5fb2b36d69877f4325b3eebb1d..eb6bc8b9a4fd68b544826004a66bc62dc4b3f43d 100644
--- a/src/plugins/value/domains/numerors/numerors_domain.ko.ml
+++ b/src/plugins/value/domains/numerors/numerors_domain.ko.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/numerors/numerors_domain.mli b/src/plugins/value/domains/numerors/numerors_domain.mli
index 48f8be955e71dba357aa1bb70bebbc7243aaa689..d08ef39909623588ccb4c7582daf7c7a05bdce2a 100644
--- a/src/plugins/value/domains/numerors/numerors_domain.mli
+++ b/src/plugins/value/domains/numerors/numerors_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/numerors/numerors_domain.ok.ml b/src/plugins/value/domains/numerors/numerors_domain.ok.ml
index 3b1c183d85262c608917a0722bbab334078dd1c7..daf171d6528b56b29e439ba2b843f0927a835d62 100644
--- a/src/plugins/value/domains/numerors/numerors_domain.ok.ml
+++ b/src/plugins/value/domains/numerors/numerors_domain.ok.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/offsm_domain.ml b/src/plugins/value/domains/offsm_domain.ml
index b97f63123ef2c681284b0c5aafd7fa7fa73e9489..c2653e2de79aad95f7cc5d6d6b5d7fbf056deb03 100644
--- a/src/plugins/value/domains/offsm_domain.ml
+++ b/src/plugins/value/domains/offsm_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/offsm_domain.mli b/src/plugins/value/domains/offsm_domain.mli
index f7bc45f4ecfb22b772766df11c3b860c3ea39468..4567fc14d3f21c1ad2db640e9264fe6ec387e4cb 100644
--- a/src/plugins/value/domains/offsm_domain.mli
+++ b/src/plugins/value/domains/offsm_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/powerset.ml b/src/plugins/value/domains/powerset.ml
index 15a746153c4ed0bea6a9a3c40baf065f353e77f5..a431bce712e76a8dd69049202264e15a8d277d8e 100644
--- a/src/plugins/value/domains/powerset.ml
+++ b/src/plugins/value/domains/powerset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/powerset.mli b/src/plugins/value/domains/powerset.mli
index b482fb4a17f69a8834c522a4a951ab558cf0bb59..1af4f56c15fc7632d333f1642fd05103b857e887 100644
--- a/src/plugins/value/domains/powerset.mli
+++ b/src/plugins/value/domains/powerset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/printer_domain.ml b/src/plugins/value/domains/printer_domain.ml
index 5dba02581423cfad72de991eae94882f6d8057fc..6e77dfe64e77dc709f991386cd8cbc65199cc2a1 100644
--- a/src/plugins/value/domains/printer_domain.ml
+++ b/src/plugins/value/domains/printer_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/printer_domain.mli b/src/plugins/value/domains/printer_domain.mli
index 7e340510eac6033ceeade92538717c0d950a31fd..5355cebbd9cbf82b76690098e670e0af76855c9c 100644
--- a/src/plugins/value/domains/printer_domain.mli
+++ b/src/plugins/value/domains/printer_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/sign_domain.ml b/src/plugins/value/domains/sign_domain.ml
index cc271dd112351a22f85671fe876775539532fd78..ef15d89e009d8ff9a34541c42976af3671bac13b 100644
--- a/src/plugins/value/domains/sign_domain.ml
+++ b/src/plugins/value/domains/sign_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/sign_domain.mli b/src/plugins/value/domains/sign_domain.mli
index 0c23ee538eccde6f807ca430779f0d9332721922..fafc9f18c67cf1cd72ee5d88375dfce1631f8fe6 100644
--- a/src/plugins/value/domains/sign_domain.mli
+++ b/src/plugins/value/domains/sign_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/simple_memory.ml b/src/plugins/value/domains/simple_memory.ml
index b747e4990a2f34fe2c046aef884c44c2d92586f1..9612b41755a7250178110686083158252d2d048d 100644
--- a/src/plugins/value/domains/simple_memory.ml
+++ b/src/plugins/value/domains/simple_memory.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/simple_memory.mli b/src/plugins/value/domains/simple_memory.mli
index aae5f8623381d008db759acd7c99300e78370245..e45eef5cb3a61dcb648a8934330ceabd2d36552f 100644
--- a/src/plugins/value/domains/simple_memory.mli
+++ b/src/plugins/value/domains/simple_memory.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/simpler_domains.mli b/src/plugins/value/domains/simpler_domains.mli
index dcff643730fa3b0e69355686f2521817d4e4b2e3..2b4d654bdde07ef30011bb6c4a568da82dfa7c54 100644
--- a/src/plugins/value/domains/simpler_domains.mli
+++ b/src/plugins/value/domains/simpler_domains.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/symbolic_locs.ml b/src/plugins/value/domains/symbolic_locs.ml
index 13f955dfe652a63f0e0a94a29498a142424a8a00..6bf6163b4fa0a638d1735a23b11ae68bcb8376b9 100644
--- a/src/plugins/value/domains/symbolic_locs.ml
+++ b/src/plugins/value/domains/symbolic_locs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/symbolic_locs.mli b/src/plugins/value/domains/symbolic_locs.mli
index 288ea0e90887672540e462762b13f3050baefe3e..06cda3ce5eb47f2d1ac33fdfe85205c3dbb1afbb 100644
--- a/src/plugins/value/domains/symbolic_locs.mli
+++ b/src/plugins/value/domains/symbolic_locs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/unit_domain.ml b/src/plugins/value/domains/unit_domain.ml
index 79b07a092e046bc59ff51da4f641ce997e52e807..62aba6028cf854463f08c4ed2e6e2d6b6a308070 100644
--- a/src/plugins/value/domains/unit_domain.ml
+++ b/src/plugins/value/domains/unit_domain.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/domains/unit_domain.mli b/src/plugins/value/domains/unit_domain.mli
index 5af811c418fa65d1a134dfeaf8b8cc6707e4f572..03a18359466383b2b457973f30e5d872e498228f 100644
--- a/src/plugins/value/domains/unit_domain.mli
+++ b/src/plugins/value/domains/unit_domain.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/abstractions.ml b/src/plugins/value/engine/abstractions.ml
index 1dc30656cba4182863f7c94759661e59f405b794..a15c6bb25a6ae1ad5012ae5f60c65402df76b20c 100644
--- a/src/plugins/value/engine/abstractions.ml
+++ b/src/plugins/value/engine/abstractions.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/abstractions.mli b/src/plugins/value/engine/abstractions.mli
index 308dd9b6a2e6eb50418d70c70365b5f5b49a2613..499cb28161de7616d59642119cb7b820b0825050 100644
--- a/src/plugins/value/engine/abstractions.mli
+++ b/src/plugins/value/engine/abstractions.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/analysis.ml b/src/plugins/value/engine/analysis.ml
index 752da011df58f00616da3f64781bd30fc6dd98aa..d11f2ec4640a155548971d5acf9d85c146c377d1 100644
--- a/src/plugins/value/engine/analysis.ml
+++ b/src/plugins/value/engine/analysis.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/analysis.mli b/src/plugins/value/engine/analysis.mli
index 72e3662a5b608291a3349592daf5ce8d7683c315..4ecfde378fd0c90f6ca56c0bb9c93909e95c18d6 100644
--- a/src/plugins/value/engine/analysis.mli
+++ b/src/plugins/value/engine/analysis.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/basic_partitioning.ml b/src/plugins/value/engine/basic_partitioning.ml
index ae99cfef5dc0c0e3fa85292ba024326b7ccbfa92..4a790f63214cb4110f506432f5b5a23262b78576 100644
--- a/src/plugins/value/engine/basic_partitioning.ml
+++ b/src/plugins/value/engine/basic_partitioning.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/basic_partitioning.mli b/src/plugins/value/engine/basic_partitioning.mli
index fe7972d190564ee0224be97a4b2b4f58eedf26f5..9006e977b10eb7d8b3f6c62af203180b23055a08 100644
--- a/src/plugins/value/engine/basic_partitioning.mli
+++ b/src/plugins/value/engine/basic_partitioning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/compute_functions.ml b/src/plugins/value/engine/compute_functions.ml
index c0bc45aa552d631451eb8e32270b9ec98810b74c..8d30fe872600f79d13bc9f9a24482987d2d06122 100644
--- a/src/plugins/value/engine/compute_functions.ml
+++ b/src/plugins/value/engine/compute_functions.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/compute_functions.mli b/src/plugins/value/engine/compute_functions.mli
index 33d60700a7fd28c4a38101c8e33d99454b59e948..2e04b81105ccdd39ca0cd1ce04bc941516580d8a 100644
--- a/src/plugins/value/engine/compute_functions.mli
+++ b/src/plugins/value/engine/compute_functions.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/evaluation.ml b/src/plugins/value/engine/evaluation.ml
index 14af242908ead4186f697795717423c67e0a1b7f..abc4b8f7c0214faa1e1662cb269a16906cb1a39f 100644
--- a/src/plugins/value/engine/evaluation.ml
+++ b/src/plugins/value/engine/evaluation.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/evaluation.mli b/src/plugins/value/engine/evaluation.mli
index 3a17bf67f9bb49f5c079088c105a61e6057d471d..9f263d86b3617566128fbf0c44959873c4f65810 100644
--- a/src/plugins/value/engine/evaluation.mli
+++ b/src/plugins/value/engine/evaluation.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/initialization.ml b/src/plugins/value/engine/initialization.ml
index eea8d5276e9495123916642b1584326b85c530f2..317446467c2dcd3b4e657f30019dc3407b098146 100644
--- a/src/plugins/value/engine/initialization.ml
+++ b/src/plugins/value/engine/initialization.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/initialization.mli b/src/plugins/value/engine/initialization.mli
index 45e78a129c74aeec9c3d990a0e65f0254a3a1834..d3bf03c164d12c1a524f8efffead3446eb2b17eb 100644
--- a/src/plugins/value/engine/initialization.mli
+++ b/src/plugins/value/engine/initialization.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/legacy_partitioning.ml b/src/plugins/value/engine/legacy_partitioning.ml
index bee9eba706bbe1df282416ca133e6ad35c265c87..bb2b4660552bdd4cb95ac52621f595d414375e5b 100644
--- a/src/plugins/value/engine/legacy_partitioning.ml
+++ b/src/plugins/value/engine/legacy_partitioning.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/legacy_partitioning.mli b/src/plugins/value/engine/legacy_partitioning.mli
index fe7972d190564ee0224be97a4b2b4f58eedf26f5..9006e977b10eb7d8b3f6c62af203180b23055a08 100644
--- a/src/plugins/value/engine/legacy_partitioning.mli
+++ b/src/plugins/value/engine/legacy_partitioning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/loop_partitioning.ml b/src/plugins/value/engine/loop_partitioning.ml
index a6700d0c89021b88247c4f6f692926140260bc04..03d1616d54cfadb27310fdf87453a80adf9b288e 100644
--- a/src/plugins/value/engine/loop_partitioning.ml
+++ b/src/plugins/value/engine/loop_partitioning.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -522,7 +522,7 @@ struct
let merge t1 t2 =
if not (is_empty_propagation_tree t2) then
Value_parameters.warning ~once:true ~current:true
- ~wkey:Value_parameters.wkey_loop_unrolling
+ ~wkey:Value_parameters.wkey_loop_unroll
"loop not completely unrolled";
join_propagation_tree t1 t2
in
diff --git a/src/plugins/value/engine/loop_partitioning.mli b/src/plugins/value/engine/loop_partitioning.mli
index fe7972d190564ee0224be97a4b2b4f58eedf26f5..9006e977b10eb7d8b3f6c62af203180b23055a08 100644
--- a/src/plugins/value/engine/loop_partitioning.mli
+++ b/src/plugins/value/engine/loop_partitioning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/mem_exec.ml b/src/plugins/value/engine/mem_exec.ml
index b3a94a8126fcfedd2b2687c07c2f41f8e4693c88..85441fdeda5600eda20137d367788091b923b6e6 100644
--- a/src/plugins/value/engine/mem_exec.ml
+++ b/src/plugins/value/engine/mem_exec.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/mem_exec.mli b/src/plugins/value/engine/mem_exec.mli
index 8ccd52d98f72cc92e020759014d0f219dde96f40..0b3fc959820db051608932a33d8a7d781b2850c9 100644
--- a/src/plugins/value/engine/mem_exec.mli
+++ b/src/plugins/value/engine/mem_exec.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/partitioned_dataflow.ml b/src/plugins/value/engine/partitioned_dataflow.ml
index aa0be86c0bb64f3d80441a05509ce8adab7a4037..c5ba74ba824eabb2efdf771143bf2cc87247045d 100644
--- a/src/plugins/value/engine/partitioned_dataflow.ml
+++ b/src/plugins/value/engine/partitioned_dataflow.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -110,7 +110,22 @@ module Make_Dataflow
let unroll (stmt : stmt) : int =
let local_unroll = match Unroll_annots.get_unroll_terms stmt with
- | [] -> None
+ | [] ->
+ let is_attribute a = Cil.hasAttribute a stmt.sattr in
+ begin
+ match List.filter is_attribute ["for" ; "while" ; "dowhile"] with
+ | [] -> ()
+ | loop_kind :: _ ->
+ let wkey =
+ if loop_kind = "for"
+ then Value_parameters.wkey_missing_loop_unroll_for
+ else Value_parameters.wkey_missing_loop_unroll
+ in
+ Value_parameters.warning
+ ~wkey ~source:(fst (Cil_datatype.Stmt.loc stmt)) ~once:true
+ "%s loop without unroll annotation" loop_kind
+ end;
+ None
| [t] ->
(* Inlines the value of const variables in [t]. *)
let global_init vi =
diff --git a/src/plugins/value/engine/partitioned_dataflow.mli b/src/plugins/value/engine/partitioned_dataflow.mli
index eba1a96907d13d635b9c6296e67c592c24229ca7..e65f83e2d4f777f2173a8969d034145da641fb28 100644
--- a/src/plugins/value/engine/partitioned_dataflow.mli
+++ b/src/plugins/value/engine/partitioned_dataflow.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/partitioning.ml b/src/plugins/value/engine/partitioning.ml
index 4299bf9ab95e6f0e5d88e8c6050c1625c721f94e..3b6f292b4f6f572cb609f4d6054c7c9b8dd33c84 100644
--- a/src/plugins/value/engine/partitioning.ml
+++ b/src/plugins/value/engine/partitioning.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/partitioning.mli b/src/plugins/value/engine/partitioning.mli
index 895b4a244e647851776ba91f1b237b88a2f4ab1d..40bb50a1f25a6f772a4f8980cec36c87c0f883a3 100644
--- a/src/plugins/value/engine/partitioning.mli
+++ b/src/plugins/value/engine/partitioning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/recursion.ml b/src/plugins/value/engine/recursion.ml
index 331252d3e02393ba0c256a47803ae6e6dcaa6f43..4380f2bff85338347f5a784628334dae89f38014 100644
--- a/src/plugins/value/engine/recursion.ml
+++ b/src/plugins/value/engine/recursion.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/recursion.mli b/src/plugins/value/engine/recursion.mli
index 97df11c77c155d4d40d60b9b0bd4f125beae7ad0..de91c06f2ef3cd31972294f4315cdf22d8540138 100644
--- a/src/plugins/value/engine/recursion.mli
+++ b/src/plugins/value/engine/recursion.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/split_return.ml b/src/plugins/value/engine/split_return.ml
index de949160de431266a213feda34e261ee90876284..1eee0ba4880351fe4ec4f855e9a5a78acc882655 100644
--- a/src/plugins/value/engine/split_return.ml
+++ b/src/plugins/value/engine/split_return.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/split_return.mli b/src/plugins/value/engine/split_return.mli
index 974c221242b4ee9c89141a8858f6c4ae9c8de2ff..ca01a8bea7ab879d9717332b5cdf0852f0cc0f62 100644
--- a/src/plugins/value/engine/split_return.mli
+++ b/src/plugins/value/engine/split_return.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/state_partitioning.mli b/src/plugins/value/engine/state_partitioning.mli
index a76253bb3b3c35a6ecffcdfc75cdd2c1a269bd30..b9958356da1a916830c3c1d4bcce6a9164e61f50 100644
--- a/src/plugins/value/engine/state_partitioning.mli
+++ b/src/plugins/value/engine/state_partitioning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/subdivided_evaluation.ml b/src/plugins/value/engine/subdivided_evaluation.ml
index 61af69319604dbc4cea28939d3c48b3e6bdc5142..ae1efe494c8c2dd823b6c5a7dd6b428795ecf024 100644
--- a/src/plugins/value/engine/subdivided_evaluation.ml
+++ b/src/plugins/value/engine/subdivided_evaluation.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/subdivided_evaluation.mli b/src/plugins/value/engine/subdivided_evaluation.mli
index 0a19f1989e556988f0f4cf84db9a940bea301d6c..745624c457517ac366c4f7734bd7960c9bb6d3d7 100644
--- a/src/plugins/value/engine/subdivided_evaluation.mli
+++ b/src/plugins/value/engine/subdivided_evaluation.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/transfer_logic.ml b/src/plugins/value/engine/transfer_logic.ml
index b6473fd05be862991d7a497167eadaa2a5eedbad..c9e1050abf3cda4b83c8429a7bdcb8145d129bd5 100644
--- a/src/plugins/value/engine/transfer_logic.ml
+++ b/src/plugins/value/engine/transfer_logic.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/transfer_logic.mli b/src/plugins/value/engine/transfer_logic.mli
index 6762a2ae21d03e1872c78032859ffd4e9a45a8af..c31c1938545a89d95c0ea782c779761e74f1642a 100644
--- a/src/plugins/value/engine/transfer_logic.mli
+++ b/src/plugins/value/engine/transfer_logic.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/transfer_specification.ml b/src/plugins/value/engine/transfer_specification.ml
index 9f6183bed8376ef98376e99d3d97d00c1ec878d2..4caa148ad2398fe93a5674f80078f0e6e6367b63 100644
--- a/src/plugins/value/engine/transfer_specification.ml
+++ b/src/plugins/value/engine/transfer_specification.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/transfer_specification.mli b/src/plugins/value/engine/transfer_specification.mli
index 63c97deb7e45d211a8624454e03918e37e9bd72f..056587e6cbbf6557ef0b850e86d56e39be369520 100644
--- a/src/plugins/value/engine/transfer_specification.mli
+++ b/src/plugins/value/engine/transfer_specification.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/transfer_stmt.ml b/src/plugins/value/engine/transfer_stmt.ml
index 7aac4ed59485aa399d691ccdc62e25129478e960..2a2ac4ca72bba20f9bb343495dacf900ba5c5799 100644
--- a/src/plugins/value/engine/transfer_stmt.ml
+++ b/src/plugins/value/engine/transfer_stmt.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/engine/transfer_stmt.mli b/src/plugins/value/engine/transfer_stmt.mli
index 1e83ea5538cc65a1b27a4989436257189780f4d5..3fb197fdbc085a8259e64ac6bad5bd02f9a3b12a 100644
--- a/src/plugins/value/engine/transfer_stmt.mli
+++ b/src/plugins/value/engine/transfer_stmt.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/eval.ml b/src/plugins/value/eval.ml
index 23e0e1f91c38d2e7821f146b3e75fc7defe5e5db..90deaf2c91746955b9fa3e61f2f3990e4e122b4b 100644
--- a/src/plugins/value/eval.ml
+++ b/src/plugins/value/eval.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/eval.mli b/src/plugins/value/eval.mli
index 02c603aa44121362b4393f31a92ab9d16945e4cc..a00ef79939cf24710edc64b6b25d351f388e68ef 100644
--- a/src/plugins/value/eval.mli
+++ b/src/plugins/value/eval.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_callstacks_filters.ml b/src/plugins/value/gui_files/gui_callstacks_filters.ml
index 3105c9f97aa23b8b07e2def286fc3fb9bf417f43..540a16d761b49f518bb2810cb8daf85e40b3ff28 100644
--- a/src/plugins/value/gui_files/gui_callstacks_filters.ml
+++ b/src/plugins/value/gui_files/gui_callstacks_filters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_callstacks_filters.mli b/src/plugins/value/gui_files/gui_callstacks_filters.mli
index 13d41c7437d5a438ee472d73205ed401bc35d871..f0c1cf8d2800389f6c790eba80ef6afb672b351e 100644
--- a/src/plugins/value/gui_files/gui_callstacks_filters.mli
+++ b/src/plugins/value/gui_files/gui_callstacks_filters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_callstacks_manager.ml b/src/plugins/value/gui_files/gui_callstacks_manager.ml
index 2d6a51bb4e7065d60798c25627b6407439db3676..d75eefad24279240861c589c4aa2a7199f74d8a5 100644
--- a/src/plugins/value/gui_files/gui_callstacks_manager.ml
+++ b/src/plugins/value/gui_files/gui_callstacks_manager.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -326,7 +326,6 @@ module Make (Input: Input) = struct
list_mem equal_column_type col_type model.hidden_columns
then
let show = GMenu.check_menu_item ~label:txt () in
- show#set_show_toggle true;
show#set_active column#visible;
(* Hide this column. Keep it alive for filters and co. *)
let callback_show_hide () =
@@ -354,8 +353,7 @@ module Make (Input: Input) = struct
let _lbl = GMisc.label ~text ~packing:h#pack () in
let icon = GMisc.image ~xpad:10 ~stock:`COLOR_PICKER ~packing:h#pack () in
icon#misc#hide ();
- let tooltip_before = GData.tooltips () in
- tooltip_before#set_tip ~text:tooltip h#coerce;
+ Gtk_helper.do_tooltip ~tooltip h;
(* set_widget forces Gtk to create a header button for the view_column. *)
col#set_widget (Some h#coerce);
icon
diff --git a/src/plugins/value/gui_files/gui_callstacks_manager.mli b/src/plugins/value/gui_files/gui_callstacks_manager.mli
index 500bc0a1ccad7aa4e997c5acc725608b44f7443d..0485419075741ff6ce43530dee0a2a10e4d82219 100644
--- a/src/plugins/value/gui_files/gui_callstacks_manager.mli
+++ b/src/plugins/value/gui_files/gui_callstacks_manager.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_eval.ml b/src/plugins/value/gui_files/gui_eval.ml
index a97979e0a092e4fee9e653311fa501510394c18c..a2b2f89b7048974510abc4680a7c074a3a0223b9 100644
--- a/src/plugins/value/gui_files/gui_eval.ml
+++ b/src/plugins/value/gui_files/gui_eval.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_eval.mli b/src/plugins/value/gui_files/gui_eval.mli
index f6811bb4174dadece2591965d6ea3ac88cf4afd5..8939fb156438dd19d513d2e3e61449a0cd37d02a 100644
--- a/src/plugins/value/gui_files/gui_eval.mli
+++ b/src/plugins/value/gui_files/gui_eval.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_red.ml b/src/plugins/value/gui_files/gui_red.ml
index a55f8bfddf8dc723e2360468d46f5ba937080469..03929af50d5f22280fc3dec000de633004b5d86e 100644
--- a/src/plugins/value/gui_files/gui_red.ml
+++ b/src/plugins/value/gui_files/gui_red.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_red.mli b/src/plugins/value/gui_files/gui_red.mli
index 188b2adb2b1299a7a974bba8cd83de01a42243c6..71b07d1bac0fa5b931cda9ac35b52d637c349408 100644
--- a/src/plugins/value/gui_files/gui_red.mli
+++ b/src/plugins/value/gui_files/gui_red.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_types.ml b/src/plugins/value/gui_files/gui_types.ml
index 50b4054e9d2adf807f1c6020b9a3b6a88f68bfa9..683fa0398606aed22d2fafb21e85f26d2de82070 100644
--- a/src/plugins/value/gui_files/gui_types.ml
+++ b/src/plugins/value/gui_files/gui_types.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/gui_types.mli b/src/plugins/value/gui_files/gui_types.mli
index 6aab7eaa4b256fc357f880a58352fa6b81527837..538247fa92dbd26e535d14362659b9d9ecc0fe87 100644
--- a/src/plugins/value/gui_files/gui_types.mli
+++ b/src/plugins/value/gui_files/gui_types.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/register_gui.ml b/src/plugins/value/gui_files/register_gui.ml
index ad278fcbb078c8c6a11a3d2735d9343f66fb7fab..d08b1885786992b4d040968c64670554f8fb6eab 100644
--- a/src/plugins/value/gui_files/register_gui.ml
+++ b/src/plugins/value/gui_files/register_gui.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/gui_files/register_gui.mli b/src/plugins/value/gui_files/register_gui.mli
index d8d9c5ac42a6a0358dedcfa61048785fc114217f..eb1db4e991f0aa9bff556c4aff0f607e61f68001 100644
--- a/src/plugins/value/gui_files/register_gui.mli
+++ b/src/plugins/value/gui_files/register_gui.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/eval_annots.ml b/src/plugins/value/legacy/eval_annots.ml
index 87eaf8c5a645cbe31e73a729cdb23822c9dfa4cb..e81cf164105c817b09af211696cd504a5c6ca7b7 100644
--- a/src/plugins/value/legacy/eval_annots.ml
+++ b/src/plugins/value/legacy/eval_annots.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/eval_annots.mli b/src/plugins/value/legacy/eval_annots.mli
index 0d142c044c522fef06eca32c62a90a53aa67261a..615cb9b0190583e182d34ed3549b116420141fd5 100644
--- a/src/plugins/value/legacy/eval_annots.mli
+++ b/src/plugins/value/legacy/eval_annots.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/eval_op.ml b/src/plugins/value/legacy/eval_op.ml
index 9d71ea3b085fb3b8706c1162294f007d59969fc3..ce1da249d7ff3a4dc6ddf6b9b77d02544940d87f 100644
--- a/src/plugins/value/legacy/eval_op.ml
+++ b/src/plugins/value/legacy/eval_op.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/eval_op.mli b/src/plugins/value/legacy/eval_op.mli
index d9b3c013e096838e54102819ac9c92151425a697..a50dbf5673ea90f5b762553805b77c48e0bbeb5f 100644
--- a/src/plugins/value/legacy/eval_op.mli
+++ b/src/plugins/value/legacy/eval_op.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/eval_terms.ml b/src/plugins/value/legacy/eval_terms.ml
index b020a7e58cbfaf6defce3089cead6f710d3862da..1b237eb589ee34e3a7dd7d79530a7dbabe304302 100644
--- a/src/plugins/value/legacy/eval_terms.ml
+++ b/src/plugins/value/legacy/eval_terms.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/eval_terms.mli b/src/plugins/value/legacy/eval_terms.mli
index 8afa6108f9ecef98c10944ab60c7ec2b24a7e325..6f8c8f5334b54504e3ccafaa95d2f48351c0ad50 100644
--- a/src/plugins/value/legacy/eval_terms.mli
+++ b/src/plugins/value/legacy/eval_terms.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/function_args.ml b/src/plugins/value/legacy/function_args.ml
index 7aa5f25fde6bf47297dcdcb3733bec6eb20f75c1..9db8d461bfeb742479e496bc1521bea71f4881ad 100644
--- a/src/plugins/value/legacy/function_args.ml
+++ b/src/plugins/value/legacy/function_args.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/legacy/function_args.mli b/src/plugins/value/legacy/function_args.mli
index e2bd17bfb39fd19f5c33c2de87a8e07dad801e0e..b37af105c94ad5fa82a19265cbc57c0657b8b611 100644
--- a/src/plugins/value/legacy/function_args.mli
+++ b/src/plugins/value/legacy/function_args.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/register.ml b/src/plugins/value/register.ml
index 7a4d0873531b213f01e070a0b594a17bf565dae2..2c7b988317afb6be1d88c75938e1ede69361e660 100644
--- a/src/plugins/value/register.ml
+++ b/src/plugins/value/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/register.mli b/src/plugins/value/register.mli
index 290b8de3083d37543b1acb4f00e1dbd1eb5f783e..4ed6b42d7f17f9b73bfdf65d4e90b79e9cb0c706 100644
--- a/src/plugins/value/register.mli
+++ b/src/plugins/value/register.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/slevel/per_stmt_slevel.ml b/src/plugins/value/slevel/per_stmt_slevel.ml
index b5a596bb4eeb9f514c200b8bf20093ecc1023d62..6d07d943e250a6db6bd7007a021c8a5a46aef69c 100644
--- a/src/plugins/value/slevel/per_stmt_slevel.ml
+++ b/src/plugins/value/slevel/per_stmt_slevel.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/slevel/per_stmt_slevel.mli b/src/plugins/value/slevel/per_stmt_slevel.mli
index 1a930ee2b3468339af1bac76003acbcf5de63b11..9da6b39a44eed6afc1ffc90a09b4d926a2481f70 100644
--- a/src/plugins/value/slevel/per_stmt_slevel.mli
+++ b/src/plugins/value/slevel/per_stmt_slevel.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/slevel/split_strategy.ml b/src/plugins/value/slevel/split_strategy.ml
index 9b2ccd3224dd25de32127ab56978ad5c19a6e44d..cc8b20271d996dcc80bd9b6c414945a7abd545c3 100644
--- a/src/plugins/value/slevel/split_strategy.ml
+++ b/src/plugins/value/slevel/split_strategy.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/slevel/split_strategy.mli b/src/plugins/value/slevel/split_strategy.mli
index 85b7bda61d4ca0d365fa01908386a951967ad45b..68b35e3c53523b38c3a2f815c39c748cda508476 100644
--- a/src/plugins/value/slevel/split_strategy.mli
+++ b/src/plugins/value/slevel/split_strategy.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/backward_formals.ml b/src/plugins/value/utils/backward_formals.ml
index 92890ea9d83a7fcbd91114c8a18169c27699b828..d7be9c99b5b18ff1c74af1fde6d2234fb94a26da 100644
--- a/src/plugins/value/utils/backward_formals.ml
+++ b/src/plugins/value/utils/backward_formals.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/backward_formals.mli b/src/plugins/value/utils/backward_formals.mli
index f94bdb657990b17332a640d2fd9933c4f3929f08..9e5cfddf70a64ef45b05ae99060d272d97c35203 100644
--- a/src/plugins/value/utils/backward_formals.mli
+++ b/src/plugins/value/utils/backward_formals.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/eval_typ.ml b/src/plugins/value/utils/eval_typ.ml
index b32fb9967cfac7ac90ae8e70dab3ade910023c19..d749568e9f5bb57c6b531f14ef9d693a76856e19 100644
--- a/src/plugins/value/utils/eval_typ.ml
+++ b/src/plugins/value/utils/eval_typ.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/eval_typ.mli b/src/plugins/value/utils/eval_typ.mli
index 95eb4c0f4205f95a7e97b7998a519f36945dc60f..ed2cdd50fecc1b0df0244d3ea86bad8db0d38fe3 100644
--- a/src/plugins/value/utils/eval_typ.mli
+++ b/src/plugins/value/utils/eval_typ.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/library_functions.ml b/src/plugins/value/utils/library_functions.ml
index 3fe6e14423bd51ab084fc456529b6b677725e6ea..0cb2c758547d844a1af22eb5b4376b1d3c459a98 100644
--- a/src/plugins/value/utils/library_functions.ml
+++ b/src/plugins/value/utils/library_functions.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/library_functions.mli b/src/plugins/value/utils/library_functions.mli
index b022aa4fe880bc6b28e816d586f2996db75c2469..39ac19bb895faf7c8acff10e373024bc96d0bd88 100644
--- a/src/plugins/value/utils/library_functions.mli
+++ b/src/plugins/value/utils/library_functions.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/mark_noresults.ml b/src/plugins/value/utils/mark_noresults.ml
index 6835134d2350db10d766c391818e20d785091301..17243d0575b3e248058347c73e26bdd47e564797 100644
--- a/src/plugins/value/utils/mark_noresults.ml
+++ b/src/plugins/value/utils/mark_noresults.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/red_statuses.ml b/src/plugins/value/utils/red_statuses.ml
index 9703fc1cc626a4203bed2b4a227fbaa7daa1985d..016ab1eedc87bec67799bc703b2c2f783f61c343 100644
--- a/src/plugins/value/utils/red_statuses.ml
+++ b/src/plugins/value/utils/red_statuses.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/red_statuses.mli b/src/plugins/value/utils/red_statuses.mli
index aab3c842eb17c00682661c7a009391837ca865bf..8c6402fddee0c5cdc05b0c0eb5276f21acac5be6 100644
--- a/src/plugins/value/utils/red_statuses.mli
+++ b/src/plugins/value/utils/red_statuses.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/state_import.ml b/src/plugins/value/utils/state_import.ml
index e2b8b75cbb8076fa08be3c224a98790cbd36829c..a9416c835aff3982f9930deeaf01dbe65110d412 100644
--- a/src/plugins/value/utils/state_import.ml
+++ b/src/plugins/value/utils/state_import.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/state_import.mli b/src/plugins/value/utils/state_import.mli
index d876e3896c3f2bf10ad80edcc15d88ef9a35ff58..91c1c43e9149888c1ee16b811c93561aa3915f36 100644
--- a/src/plugins/value/utils/state_import.mli
+++ b/src/plugins/value/utils/state_import.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/structure.ml b/src/plugins/value/utils/structure.ml
index 0bb9ceff120d4d35e6409361709d89f2eab99866..af63dc0f92d72a2a76c7fa92211b4802e02d1cc5 100644
--- a/src/plugins/value/utils/structure.ml
+++ b/src/plugins/value/utils/structure.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/structure.mli b/src/plugins/value/utils/structure.mli
index 0a9c35a199988b2f77f7a324a31822931a18432c..9d52978f6930c2a52e2231c8bb41468ce4ca24e6 100644
--- a/src/plugins/value/utils/structure.mli
+++ b/src/plugins/value/utils/structure.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/unroll_annots.ml b/src/plugins/value/utils/unroll_annots.ml
index 53ee56b7bc884e132682503dbaf237e4ef04784b..8ef330e7a56731f5a03e374463a54299eb1d380d 100644
--- a/src/plugins/value/utils/unroll_annots.ml
+++ b/src/plugins/value/utils/unroll_annots.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/unroll_annots.mli b/src/plugins/value/utils/unroll_annots.mli
index c6bbbc78cd62505c26c6f8d35a91d5ff4c0d98c0..f47d4f9ea36ca3fc749f09f85f500c0e6db00255 100644
--- a/src/plugins/value/utils/unroll_annots.mli
+++ b/src/plugins/value/utils/unroll_annots.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/value_perf.ml b/src/plugins/value/utils/value_perf.ml
index 71e990cdb7a8c41d31eb1afe4e50c70f9ce97cb7..9476dbbb11f8dd59b13b986fb989f0bb918a95a2 100644
--- a/src/plugins/value/utils/value_perf.ml
+++ b/src/plugins/value/utils/value_perf.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/value_perf.mli b/src/plugins/value/utils/value_perf.mli
index 4fe17c229aa24e99a532e638899dbb606fe30595..71a78b8802f814e6c8c5f06a27ca4664d3d90faa 100644
--- a/src/plugins/value/utils/value_perf.mli
+++ b/src/plugins/value/utils/value_perf.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/value_results.ml b/src/plugins/value/utils/value_results.ml
index 7ec7a62390f818c967fd831a1925592eefc71e26..c9db33d1cca57a42727963b1c262e568220b01df 100644
--- a/src/plugins/value/utils/value_results.ml
+++ b/src/plugins/value/utils/value_results.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/value_results.mli b/src/plugins/value/utils/value_results.mli
index 24ca466621275c913b1c59d97ac56e69fd72fe64..ae92d8878ad5f6a6dd35716ef6a6fdac8abbae83 100644
--- a/src/plugins/value/utils/value_results.mli
+++ b/src/plugins/value/utils/value_results.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/value_util.ml b/src/plugins/value/utils/value_util.ml
index 509706949c4a74c3f2be0fe9d311dac6c298a855..db6e355de381ed3b50f4901515712679478e4972 100644
--- a/src/plugins/value/utils/value_util.ml
+++ b/src/plugins/value/utils/value_util.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/value_util.mli b/src/plugins/value/utils/value_util.mli
index c5591484346ace29a5b93c027b1171492113898a..a631d797987bfab295360fc4b9e837bcaf042922 100644
--- a/src/plugins/value/utils/value_util.mli
+++ b/src/plugins/value/utils/value_util.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/widen.ml b/src/plugins/value/utils/widen.ml
index e54fd1dac304e5d58527c46088ffee2832310ecf..2356d40a5625ee76dca0b91c517da77d1160d3e7 100644
--- a/src/plugins/value/utils/widen.ml
+++ b/src/plugins/value/utils/widen.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/widen.mli b/src/plugins/value/utils/widen.mli
index 9d0697f9145e39d5d85de83e610071c203e20e57..283459456db5881ad44fa1aeef2dd4be2f6ed06c 100644
--- a/src/plugins/value/utils/widen.mli
+++ b/src/plugins/value/utils/widen.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/widen_hints_ext.ml b/src/plugins/value/utils/widen_hints_ext.ml
index 122fa78c73ef554368db5d580e86a72bffb62a15..4917e6810c90b5d0d315a24bde976b79dd1442db 100644
--- a/src/plugins/value/utils/widen_hints_ext.ml
+++ b/src/plugins/value/utils/widen_hints_ext.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/utils/widen_hints_ext.mli b/src/plugins/value/utils/widen_hints_ext.mli
index ce4b5a15631c92bfb4ca88d6dfeebea5b4573edf..fc66e3f6ba84fff2d9738f5cc1e0597f55012955 100644
--- a/src/plugins/value/utils/widen_hints_ext.mli
+++ b/src/plugins/value/utils/widen_hints_ext.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/value_parameters.ml b/src/plugins/value/value_parameters.ml
index 5e3234f75f8b2094bf7900a1f20b1b64516d4849..7eda5b6c514775c67657840a9e3910d2109fec0a 100644
--- a/src/plugins/value/value_parameters.ml
+++ b/src/plugins/value/value_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -90,8 +90,12 @@ let () = set_warn_status wkey_garbled_mix Log.Winactive
let wkey_builtins_missing_spec = register_warn_category "builtins:missing-spec"
let wkey_builtins_override = register_warn_category "builtins:override"
let wkey_libc_unsupported_spec = register_warn_category "libc:unsupported-spec"
-let wkey_loop_unrolling = register_warn_category "loop-unrolling"
-let () = set_warn_status wkey_loop_unrolling Log.Wfeedback
+let wkey_loop_unroll = register_warn_category "loop-unroll"
+let () = set_warn_status wkey_loop_unroll Log.Wfeedback
+let wkey_missing_loop_unroll = register_warn_category "missing-loop-unroll"
+let () = set_warn_status wkey_missing_loop_unroll Log.Winactive
+let wkey_missing_loop_unroll_for = register_warn_category "missing-loop-unroll:for"
+let () = set_warn_status wkey_missing_loop_unroll_for Log.Winactive
module ForceValues =
WithOutput
diff --git a/src/plugins/value/value_parameters.mli b/src/plugins/value/value_parameters.mli
index 65bf98a6d20653d1cb99aeba7e07282495bbbe1f..66b79243da3954408a1b7a1bddf828ecf4d4fb82 100644
--- a/src/plugins/value/value_parameters.mli
+++ b/src/plugins/value/value_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
@@ -180,7 +180,13 @@ val wkey_builtins_override: warn_category
val wkey_libc_unsupported_spec : warn_category
(** Warning category used for "loop not completely unrolled" *)
-val wkey_loop_unrolling : warn_category
+val wkey_loop_unroll : warn_category
+
+(** Warning category used to identify loops without unroll annotations *)
+val wkey_missing_loop_unroll : warn_category
+
+(** Warning category used to identify for loops without unroll annotations *)
+val wkey_missing_loop_unroll_for : warn_category
(** Debug category used to print information about invalid pointer comparisons*)
val dkey_pointer_comparison: category
diff --git a/src/plugins/value/values/abstract_location.mli b/src/plugins/value/values/abstract_location.mli
index 8045f9a568dff9c4c7e4bd5d843ddc746a1c072d..2c7266aa87353cdcf86e012121bc23f026d2d010 100644
--- a/src/plugins/value/values/abstract_location.mli
+++ b/src/plugins/value/values/abstract_location.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/abstract_value.mli b/src/plugins/value/values/abstract_value.mli
index abffc3316d89f99ff61bed3a5537afe424c55750..28fec80b0e53acad4535b0655b86601a5e0b690d 100644
--- a/src/plugins/value/values/abstract_value.mli
+++ b/src/plugins/value/values/abstract_value.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/cvalue_backward.ml b/src/plugins/value/values/cvalue_backward.ml
index a4296ad5a415dd4e0efec7790319fa65e5537576..64356b2faf5b109a805661bcc8fcd0a6ca891e67 100644
--- a/src/plugins/value/values/cvalue_backward.ml
+++ b/src/plugins/value/values/cvalue_backward.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/cvalue_backward.mli b/src/plugins/value/values/cvalue_backward.mli
index aa45654c89426fa541266ac01f8f71d7ca6898fe..ff2ea2825d067a749fab17b0354fbaabd6da3592 100644
--- a/src/plugins/value/values/cvalue_backward.mli
+++ b/src/plugins/value/values/cvalue_backward.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/cvalue_forward.ml b/src/plugins/value/values/cvalue_forward.ml
index c1a6a73c03d3e1033a252f44239ced56b307d191..9051330001c931db8f5ab8ba54637a8e4bf402c5 100644
--- a/src/plugins/value/values/cvalue_forward.ml
+++ b/src/plugins/value/values/cvalue_forward.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/cvalue_forward.mli b/src/plugins/value/values/cvalue_forward.mli
index e3dd0ec771be750523e503c156768f1f86d15b96..4196228166df01aa55f908cd7655ae54fdb071b6 100644
--- a/src/plugins/value/values/cvalue_forward.mli
+++ b/src/plugins/value/values/cvalue_forward.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/location_lift.ml b/src/plugins/value/values/location_lift.ml
index 1ef5e92f7429675b3d401d76164fb5d20404494c..ce5ae27c8641259ef90652d9d36dffffee6ad2bf 100644
--- a/src/plugins/value/values/location_lift.ml
+++ b/src/plugins/value/values/location_lift.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/location_lift.mli b/src/plugins/value/values/location_lift.mli
index 4fbcd262fa8905360d2e07500de6f2d6643aa35f..1eb2d98d38c1da61d05b0891f7e6f88cda650e87 100644
--- a/src/plugins/value/values/location_lift.mli
+++ b/src/plugins/value/values/location_lift.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/main_locations.ml b/src/plugins/value/values/main_locations.ml
index ba547df614f9d6e0d44b29f715f2b5f3414c980b..3645e0e14d083b08ac4c3f6e9908415602b18d1f 100644
--- a/src/plugins/value/values/main_locations.ml
+++ b/src/plugins/value/values/main_locations.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/main_locations.mli b/src/plugins/value/values/main_locations.mli
index 976f6ca01e96bcc0dcdb7f48cd427355d56e7490..28d11c16b762f742bdcc3364c4d01de67d6ca0c3 100644
--- a/src/plugins/value/values/main_locations.mli
+++ b/src/plugins/value/values/main_locations.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/main_values.ml b/src/plugins/value/values/main_values.ml
index 838588191bf20919c58d9c9aaeab8f4666eb9699..155133c9fc98f532e16842e46134d19220b4096c 100644
--- a/src/plugins/value/values/main_values.ml
+++ b/src/plugins/value/values/main_values.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/main_values.mli b/src/plugins/value/values/main_values.mli
index 0aadefff4e30185f9c661cf6a3850eca406b1a81..fd148fcfcc5208e58353e0a847249b4d715a3c14 100644
--- a/src/plugins/value/values/main_values.mli
+++ b/src/plugins/value/values/main_values.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_arithmetics.ml b/src/plugins/value/values/numerors/numerors_arithmetics.ml
index ca4a121106d215bce1c773bba7fd2db44f6d9688..d4c6fb2559c4abea9155fb49a663962fb8ec6540 100644
--- a/src/plugins/value/values/numerors/numerors_arithmetics.ml
+++ b/src/plugins/value/values/numerors/numerors_arithmetics.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_arithmetics.mli b/src/plugins/value/values/numerors/numerors_arithmetics.mli
index 26b87324db689649790776ef5ff82f9a77652811..6e30d9c1c793f729c398c29d61ced85bb2ae1308 100644
--- a/src/plugins/value/values/numerors/numerors_arithmetics.mli
+++ b/src/plugins/value/values/numerors/numerors_arithmetics.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_float.ml b/src/plugins/value/values/numerors/numerors_float.ml
index b57d99f90868468f27d587fabbc4df2da2856a70..a080a79ed23030f7fee606fc0868747c9226e17d 100644
--- a/src/plugins/value/values/numerors/numerors_float.ml
+++ b/src/plugins/value/values/numerors/numerors_float.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_float.mli b/src/plugins/value/values/numerors/numerors_float.mli
index e1ce8a3fcf482487a22c97b75dd6a0d3912ef419..2f673a73003824d3cb1d275980c773797a84a579 100644
--- a/src/plugins/value/values/numerors/numerors_float.mli
+++ b/src/plugins/value/values/numerors/numerors_float.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_interval.ml b/src/plugins/value/values/numerors/numerors_interval.ml
index fd14446bf90481716601a94e0ce1670192344873..bb9f4c20a7d2b931b41a6d160b0bc5c07bc3191e 100644
--- a/src/plugins/value/values/numerors/numerors_interval.ml
+++ b/src/plugins/value/values/numerors/numerors_interval.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_interval.mli b/src/plugins/value/values/numerors/numerors_interval.mli
index 4a5a13318c2112154a0e7d4004f492ec756fb467..158f875c67345ee2bf6cbc58962c48e308f5de61 100644
--- a/src/plugins/value/values/numerors/numerors_interval.mli
+++ b/src/plugins/value/values/numerors/numerors_interval.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_utils.ml b/src/plugins/value/values/numerors/numerors_utils.ml
index c0c27d7e2a6d21780869c7c4ad6d0b34dd7cfade..b456540037a4cf3864cdd94c2955030e80216a6a 100644
--- a/src/plugins/value/values/numerors/numerors_utils.ml
+++ b/src/plugins/value/values/numerors/numerors_utils.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_utils.mli b/src/plugins/value/values/numerors/numerors_utils.mli
index e985cb5d7ee786b165e782b7532c861153788352..e44fa0b29c6e70b5e6fe0c05286473a2d23f6b1c 100644
--- a/src/plugins/value/values/numerors/numerors_utils.mli
+++ b/src/plugins/value/values/numerors/numerors_utils.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_value.ml b/src/plugins/value/values/numerors/numerors_value.ml
index 1c1b1bfc95b294f76ceb928d58577cafd7d403ae..8fa47dc923f6337a7a09483991e497cb2d08da7f 100644
--- a/src/plugins/value/values/numerors/numerors_value.ml
+++ b/src/plugins/value/values/numerors/numerors_value.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/numerors/numerors_value.mli b/src/plugins/value/values/numerors/numerors_value.mli
index 96663a724fc4f238386d20fc24a7905607da850b..d73b689cd75ca60a4fe10a2cb2eaad9bc625d97a 100644
--- a/src/plugins/value/values/numerors/numerors_value.mli
+++ b/src/plugins/value/values/numerors/numerors_value.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/offsm_value.ml b/src/plugins/value/values/offsm_value.ml
index 5f5b29937cdefea143768bf1d91254bb5975d2e6..ad5cffc13e11f7d514c14e8a0ce508935d8a8d2d 100644
--- a/src/plugins/value/values/offsm_value.ml
+++ b/src/plugins/value/values/offsm_value.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/offsm_value.mli b/src/plugins/value/values/offsm_value.mli
index cedd4c2d50911b05970d72e569f71ff7b7ad6a72..1ad67480937996b32bffb54068b50d30ec4ef640 100644
--- a/src/plugins/value/values/offsm_value.mli
+++ b/src/plugins/value/values/offsm_value.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/sign_value.ml b/src/plugins/value/values/sign_value.ml
index 8f980b33d015ba7e5dc25bc63022a9fd0a402fcc..2a6908fcf334bc60a6ace07bf11fbdeeb28be111 100644
--- a/src/plugins/value/values/sign_value.ml
+++ b/src/plugins/value/values/sign_value.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/sign_value.mli b/src/plugins/value/values/sign_value.mli
index ab680b44d2b17aee74010c6bb113be034f00103f..14deeda643e120747070f6106980b9acb1d5494f 100644
--- a/src/plugins/value/values/sign_value.mli
+++ b/src/plugins/value/values/sign_value.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/value_product.ml b/src/plugins/value/values/value_product.ml
index 948475014791a74364455213fd777ff7a13f7446..131d47bfa680cd438e8146e4de79bcf1a3b99d29 100644
--- a/src/plugins/value/values/value_product.ml
+++ b/src/plugins/value/values/value_product.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value/values/value_product.mli b/src/plugins/value/values/value_product.mli
index b2ed9ee170df4eb1cdda87492674494c814e1ee3..f6369ee2efd75c5241cb13ca4243de875428f610 100644
--- a/src/plugins/value/values/value_product.mli
+++ b/src/plugins/value/values/value_product.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/cilE.ml b/src/plugins/value_types/cilE.ml
index d78ee56ab881fba193b00b7b34b218c95f2a4c0b..5636a43d9e76432a01a8ed2084cf85f0d4ff8ecb 100644
--- a/src/plugins/value_types/cilE.ml
+++ b/src/plugins/value_types/cilE.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/cilE.mli b/src/plugins/value_types/cilE.mli
index d74af69de2cb1e0371181e27cfbf0d09a5670757..64dacbc5d17aca92a2582d59d3056170658d44b9 100644
--- a/src/plugins/value_types/cilE.mli
+++ b/src/plugins/value_types/cilE.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/cvalue.ml b/src/plugins/value_types/cvalue.ml
index 2ad0734894a1d9793eb398e9cc0d26a29a3ddb94..86e61503023a0e0a5a52bc0dff2daa06f7a2a4e4 100644
--- a/src/plugins/value_types/cvalue.ml
+++ b/src/plugins/value_types/cvalue.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/cvalue.mli b/src/plugins/value_types/cvalue.mli
index bff937fb16374a54aa67ea81a7dc50c85959502f..050be2bc75fa411d4c3a971f1c5366e597aac08c 100644
--- a/src/plugins/value_types/cvalue.mli
+++ b/src/plugins/value_types/cvalue.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/function_Froms.ml b/src/plugins/value_types/function_Froms.ml
index 687906c47e166b429322d2aa1d8e7aa08871cfed..4fd759f702f1107d6c7c6cd8a7626235e56c6fc7 100644
--- a/src/plugins/value_types/function_Froms.ml
+++ b/src/plugins/value_types/function_Froms.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/function_Froms.mli b/src/plugins/value_types/function_Froms.mli
index d2781866ad38a3daeb5dace5bfb48a4568fa038a..0c385d0254460a1a49b0e71bdef0a6be2dac09fd 100644
--- a/src/plugins/value_types/function_Froms.mli
+++ b/src/plugins/value_types/function_Froms.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/inout_type.ml b/src/plugins/value_types/inout_type.ml
index 61f6e5af355eb835436e5f64ef3510a47861b334..e1215d02c1cbef10cae6fd63ad6f8d3e33cce9fc 100644
--- a/src/plugins/value_types/inout_type.ml
+++ b/src/plugins/value_types/inout_type.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/inout_type.mli b/src/plugins/value_types/inout_type.mli
index 2609f0a542de28d2ea17e1119d600cc70630a479..9b3c40753085f610550f23d3db314609699b4be2 100644
--- a/src/plugins/value_types/inout_type.mli
+++ b/src/plugins/value_types/inout_type.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/precise_locs.ml b/src/plugins/value_types/precise_locs.ml
index d1768d9ee197b28ae4c6bc0bd2290da3037e19b5..9d0eb8c75c7e121ae1b213838bcc975f50337be0 100644
--- a/src/plugins/value_types/precise_locs.ml
+++ b/src/plugins/value_types/precise_locs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/precise_locs.mli b/src/plugins/value_types/precise_locs.mli
index e2d1907544271b3058be88317e01aa178fb3e5e0..2ed59ce10ab8a729bfc076f87a4c58731256d525 100644
--- a/src/plugins/value_types/precise_locs.mli
+++ b/src/plugins/value_types/precise_locs.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/value_types.ml b/src/plugins/value_types/value_types.ml
index 2af2fae927240061be7a72dc6b8eb92fbd6599c9..b35e493a677f3c3a654ff7835bab32018972ebd2 100644
--- a/src/plugins/value_types/value_types.ml
+++ b/src/plugins/value_types/value_types.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/value_types.mli b/src/plugins/value_types/value_types.mli
index fb7297abd75f5d258384ac52b698bcdd352897f0..31e044c34ecb432616c8ab3d10b9571f3f126609 100644
--- a/src/plugins/value_types/value_types.mli
+++ b/src/plugins/value_types/value_types.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/widen_type.ml b/src/plugins/value_types/widen_type.ml
index d30eaba6b121d1c72fd26caad2a4050ea330160c..7f05346b3e9d56a45b2dadca0d11a8f5cf87301d 100644
--- a/src/plugins/value_types/widen_type.ml
+++ b/src/plugins/value_types/widen_type.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/value_types/widen_type.mli b/src/plugins/value_types/widen_type.mli
index b3fa02b6a85561a9af02014ba8eafe5a2e3cf63c..e017c3c17f7aab7600aeca22737eac6b22f8001c 100644
--- a/src/plugins/value_types/widen_type.mli
+++ b/src/plugins/value_types/widen_type.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/Makefile.in b/src/plugins/variadic/Makefile.in
index c57f5cbf9aeba86ea116b6be2f3e3d6358fe843d..da8434256a8abdd5193f66acd434b784d334aaa6 100644
--- a/src/plugins/variadic/Makefile.in
+++ b/src/plugins/variadic/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/variadic/Variadic.mli b/src/plugins/variadic/Variadic.mli
index 943f778bca3727a58eddb17fa47d26f16e44d0ba..c1c6015cbe39ba3a17299024432c6a604b6f4de7 100644
--- a/src/plugins/variadic/Variadic.mli
+++ b/src/plugins/variadic/Variadic.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/classify.ml b/src/plugins/variadic/classify.ml
index 158c514e48827c4cfee7f721c0f4e6ba20716415..a5d940464abe384f438c75730f8bbfea3f7a3c63 100644
--- a/src/plugins/variadic/classify.ml
+++ b/src/plugins/variadic/classify.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/configure.ac b/src/plugins/variadic/configure.ac
index 7d4a3627f5f51c914f7136803da682702a1fd623..5deee2d144395ceceb3e14f13897e9808c61baf7 100644
--- a/src/plugins/variadic/configure.ac
+++ b/src/plugins/variadic/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat à l'énergie atomique et aux énergies #
# alternatives) #
# #
diff --git a/src/plugins/variadic/environment.ml b/src/plugins/variadic/environment.ml
index 50005f1648bbe6b7286f1f314ea610f4171d36b8..a99f08c3c917d87de489aace909f4f709d9d66b4 100644
--- a/src/plugins/variadic/environment.ml
+++ b/src/plugins/variadic/environment.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/extends.ml b/src/plugins/variadic/extends.ml
index 0be934087b468897db3e4d4679290ed5fa7ec744..3b796f36c97be94451b34b454527c86ec004f633 100644
--- a/src/plugins/variadic/extends.ml
+++ b/src/plugins/variadic/extends.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/extends.mli b/src/plugins/variadic/extends.mli
index 1dccf5b2e93528e26cf9c5c18f1cb56b280b6189..93f8e685daabc9cd856d1c19942679921ba8803f 100644
--- a/src/plugins/variadic/extends.mli
+++ b/src/plugins/variadic/extends.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_parser.ml b/src/plugins/variadic/format_parser.ml
index 048715ddd26b008501a989780b7e6c44db8a4b93..aa4d1471117bab1bfa394c5466a3f280426c8263 100644
--- a/src/plugins/variadic/format_parser.ml
+++ b/src/plugins/variadic/format_parser.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_parser.mli b/src/plugins/variadic/format_parser.mli
index b9b1182f69899e6995425417b19ef9a5c43e54bd..6c19d691ab107d3f376f450bbbbe333f84a3835d 100644
--- a/src/plugins/variadic/format_parser.mli
+++ b/src/plugins/variadic/format_parser.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_pprint.ml b/src/plugins/variadic/format_pprint.ml
index ed339e9acda5d726d0ba080c12ec6c64d2a13060..7951ada686cc750a931ec160a75b68739e1f567e 100644
--- a/src/plugins/variadic/format_pprint.ml
+++ b/src/plugins/variadic/format_pprint.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_pprint.mli b/src/plugins/variadic/format_pprint.mli
index 2dc8254848ed0666cf836c92142b94503e94e1a7..3dfcd1483c8c9df96c3b07ae37def0548a0ef976 100644
--- a/src/plugins/variadic/format_pprint.mli
+++ b/src/plugins/variadic/format_pprint.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_string.ml b/src/plugins/variadic/format_string.ml
index 41cd255bf813695945dc72bc8bf47e386c51c700..ee76a55cf2462f3da676d17dc45fa076f77789ff 100644
--- a/src/plugins/variadic/format_string.ml
+++ b/src/plugins/variadic/format_string.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_typer.ml b/src/plugins/variadic/format_typer.ml
index 16000ca2b965766a9ff9020d11e8db2e5db6a218..810347030ce58256d854ef8edd2f79e4949a7c6d 100644
--- a/src/plugins/variadic/format_typer.ml
+++ b/src/plugins/variadic/format_typer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_typer.mli b/src/plugins/variadic/format_typer.mli
index 62fc72874d6054ffca5a75ea2755f7227eb3275b..ab2b84d48f4746e842ee01a24d0aaf5a3128b1d7 100644
--- a/src/plugins/variadic/format_typer.mli
+++ b/src/plugins/variadic/format_typer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/format_types.mli b/src/plugins/variadic/format_types.mli
index ff41ed84f31dbf1796a22aede49ecb709ac5c2b8..c2e4b6fcc73afed182321ed85312d774673f0b05 100644
--- a/src/plugins/variadic/format_types.mli
+++ b/src/plugins/variadic/format_types.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/generic.ml b/src/plugins/variadic/generic.ml
index 19f5876a5766ddb286dea0f7f1bd20161c47e10b..ace7d6b5d8b31e3f93c60628c24609cec8fff14d 100644
--- a/src/plugins/variadic/generic.ml
+++ b/src/plugins/variadic/generic.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/options.ml b/src/plugins/variadic/options.ml
index 7a9c04df07a9c29390e99b2e755306ce166c39e9..c58347df44409c70f9ab5f686fc021329845fb04 100644
--- a/src/plugins/variadic/options.ml
+++ b/src/plugins/variadic/options.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/options.mli b/src/plugins/variadic/options.mli
index d73262bb0e7f0224964b4128d25421eb3750eb92..56f1a7fc9dd04733b326671120037cb9882edcf2 100644
--- a/src/plugins/variadic/options.mli
+++ b/src/plugins/variadic/options.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/register.ml b/src/plugins/variadic/register.ml
index 75443abd7d03cbe6d477a2284f9955b1fbf04b52..78be5dac81892b56a864f9f96d2161fe0725bec3 100644
--- a/src/plugins/variadic/register.ml
+++ b/src/plugins/variadic/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/standard.ml b/src/plugins/variadic/standard.ml
index 47d3b3efaec5c22acdc9544754ab4c35ed745748..af4fefa77c6ff1afd14bbe039b0a338210481b10 100644
--- a/src/plugins/variadic/standard.ml
+++ b/src/plugins/variadic/standard.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/translate.ml b/src/plugins/variadic/translate.ml
index 9936b75b5b6dddd779b642cda5a5120f040b37d1..0dbf07862c4da167cad784fc1e547b6b06f098f9 100644
--- a/src/plugins/variadic/translate.ml
+++ b/src/plugins/variadic/translate.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/va_build.ml b/src/plugins/variadic/va_build.ml
index 98fbeaf7a9e740016f987bdff765ecc955591dec..77f3bbaf0475a97369a8dfdd005d54874ffa7cd4 100644
--- a/src/plugins/variadic/va_build.ml
+++ b/src/plugins/variadic/va_build.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/variadic/va_types.mli b/src/plugins/variadic/va_types.mli
index 2b886a87cb4a200bccdae35ab414720dc1ad0558..407dcbfcc805290b39d7935327cef1d44829612a 100644
--- a/src/plugins/variadic/va_types.mli
+++ b/src/plugins/variadic/va_types.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Auto.ml b/src/plugins/wp/Auto.ml
index 7d851adddcc420f1e7d5eb65aa072ee0005db5c3..c06565117dbefde36dc23a426b09aedadfb82cc5 100644
--- a/src/plugins/wp/Auto.ml
+++ b/src/plugins/wp/Auto.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Auto.mli b/src/plugins/wp/Auto.mli
index 4c8b2eabb74a10fa906f3d3f92d10d6ff98dc704..cd8447405dc1e8073b28c84f85b632c7592faa50 100644
--- a/src/plugins/wp/Auto.mli
+++ b/src/plugins/wp/Auto.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/CfgCompiler.ml b/src/plugins/wp/CfgCompiler.ml
index 8d45608209ab17381973d9f43006f61c3ab21b79..88e5892d9bd0b61e6faa5341bb51aeaba0c6621a 100644
--- a/src/plugins/wp/CfgCompiler.ml
+++ b/src/plugins/wp/CfgCompiler.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/CfgCompiler.mli b/src/plugins/wp/CfgCompiler.mli
index 9263f60dd378eb7d20ec0f27e35df06f75fcd6eb..5f9ed192ea937bbbade66e9e1a7f05b881fb2f1f 100644
--- a/src/plugins/wp/CfgCompiler.mli
+++ b/src/plugins/wp/CfgCompiler.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cfloat.ml b/src/plugins/wp/Cfloat.ml
index a16ae09a683fb50335392583fecb16e621f87a42..3ed3c866fe394ec15a07f840495937eeb709eaec 100644
--- a/src/plugins/wp/Cfloat.ml
+++ b/src/plugins/wp/Cfloat.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -35,24 +35,29 @@ open Lang.F
let library = "cfloat"
-let result = Logic.Real
-let params = [Logic.Sreal;Logic.Sreal] (* We can provide more parameters *)
-let link f = Lang.infoprover (Qed.Engine.F_call f)
+let f32 = datatype ~library "f32"
+let f64 = datatype ~library "f64"
-let make_fun_float name f =
- extern_f ~library ~result ~params "%s_%a" name Ctypes.pp_float f
+let t32 = Lang.(t_datatype f32 [])
+let t64 = Lang.(t_datatype f64 [])
-let make_pred_float name f =
- extern_f ~library ~result:Logic.Prop ~params "%s_%a" name Ctypes.pp_float f
+let ftau = function
+ | Float32 -> t32
+ | Float64 -> t64
-let f_model =
- extern_f ~library ~result ~params ~link:(link "model") "\\model"
+let suffix fmt = function
+ | Float32 -> Format.pp_print_string fmt "f32"
+ | Float64 -> Format.pp_print_string fmt "f64"
-let f_delta =
- extern_f ~library ~result ~params ~link:(link "delta") "\\delta"
+let link phi = Lang.infoprover (Qed.Engine.F_call phi)
-let f_epsilon =
- extern_f ~library ~result ~params ~link:(link "epsilon") "\\epsilon"
+(* Qed exact representations, linked to f32/f64 *)
+let fq32 = extern_f ~library ~result:t32 ~link:(link "to_f32") "q32"
+let fq64 = extern_f ~library ~result:t64 ~link:(link "to_f64") "q64"
+
+let f_model ft = extern_f ~library ~result:(ftau ft) "model_%a" suffix ft
+let f_delta ft = extern_f ~library ~result:(ftau ft) "delta_%a" suffix ft
+let f_epsilon ft = extern_f ~library ~result:(ftau ft) "epsilon_%a" suffix ft
(* -------------------------------------------------------------------------- *)
(* --- Model Setting --- *)
@@ -60,12 +65,76 @@ let f_epsilon =
type model = Real | Float
-let model = Context.create ~default:Real "Cfloat.model"
+let model = Context.create ~default:Float "Cfloat.model"
+
+let tau_of_float f =
+ match Context.get model with
+ | Real -> Logic.Real
+ | Float -> ftau f
(* -------------------------------------------------------------------------- *)
-(* --- Literals --- *)
+(* --- Operators --- *)
(* -------------------------------------------------------------------------- *)
+type op =
+ | LT
+ | EQ
+ | LE
+ | NE
+ | NEG
+ | ADD
+ | MUL
+ | DIV
+ | REAL
+ | ROUND
+ | EXACT
+
+[@@@ warning "-32"]
+let op_name = function
+ | LT -> "flt"
+ | EQ -> "feq"
+ | LE -> "fle"
+ | NE -> "fne"
+ | NEG -> "fneg"
+ | ADD -> "fadd"
+ | MUL -> "fmul"
+ | DIV -> "fdiv"
+ | REAL -> "freal"
+ | ROUND -> "fround"
+ | EXACT -> "fexact"
+[@@@ warning "+32"]
+
+(* -------------------------------------------------------------------------- *)
+(* --- Registry --- *)
+(* -------------------------------------------------------------------------- *)
+
+module REGISTRY = Model.Static
+ (struct
+ type key = lfun
+ type data = op * c_float
+ let name = "Wp.Cfloat.REGISTRY"
+ include Lang.Fun
+ end)
+
+let find = REGISTRY.find
+
+let () = Context.register
+ begin fun () ->
+ REGISTRY.define fq32 (EXACT,Float32) ;
+ REGISTRY.define fq64 (EXACT,Float64) ;
+ end
+
+(* -------------------------------------------------------------------------- *)
+(* --- Literals --- *)
+(* -------------------------------------------------------------------------- *)
+
+let rfloat = Floating_point.round_to_single_precision_float
+
+let fmake ulp value = match ulp with
+ | Float32 -> F.e_fun fq32 [F.e_float (rfloat value)]
+ | Float64 -> F.e_fun fq64 [F.e_float value]
+
+let qmake ulp q = fmake ulp (Transitioning.Q.to_float q)
let mantissa = "\\([-+]?[0-9]*\\)"
let comma = "\\(.\\(\\(0*[1-9]\\)*\\)0*\\)?"
let exponent = "\\([eE]\\([-+]?[0-9]*\\)\\)?"
@@ -86,125 +155,106 @@ let parse_literal v r =
if n > 0 then Q.mul m (d n) else m
else Q.of_float v
with Failure _ ->
- Warning.error ~source:"acsl" "Unexpected real literal %S" r
+ Warning.error "Unexpected constant literal %S" r
let acsl_lit l =
let open Cil_types in
F.e_real (parse_literal l.r_nearest l.r_literal)
-let code_lit v s =
- match Context.get model , s with
- | Float , _ | _ , None -> F.e_float v
- | Real , Some r -> F.e_real (parse_literal v r)
+let code_lit ulp value original =
+ match Context.get model , ulp , original with
+ | Float , Float32 , _ -> F.e_fun fq32 [F.e_float value]
+ | Float , Float64 , _ -> F.e_fun fq64 [F.e_float value]
+ | Real , _ , None -> F.e_float value
+ | Real , _ , Some r -> F.e_real (parse_literal value r)
(* -------------------------------------------------------------------------- *)
-(* --- Operators --- *)
+(* --- Computations --- *)
(* -------------------------------------------------------------------------- *)
-let flt_rnd = Ctypes.f_memo (make_fun_float "to")
-let flt_add = Ctypes.f_memo (make_fun_float "add")
-let flt_mul = Ctypes.f_memo (make_fun_float "mul")
-let flt_div = Ctypes.f_memo (make_fun_float "div")
+let rec exact e =
+ match F.repr e with
+ | Qed.Logic.Kreal r -> r
+ | Qed.Logic.Kint z -> Q.of_bigint z
+ | Qed.Logic.Fun( f , [ q ] ) when f == fq32 || f == fq64 -> exact q
+ | _ -> raise Not_found
-let () =
- begin
- let open LogicBuiltins in
- add_builtin "\\model" [F Float32] f_model ;
- add_builtin "\\model" [F Float64] f_model ;
- add_builtin "\\delta" [F Float32] f_delta ;
- add_builtin "\\delta" [F Float64] f_delta ;
- add_builtin "\\epsilon" [F Float32] f_epsilon ;
- add_builtin "\\epsilon" [F Float64] f_epsilon ;
- end
+let compute op ulp xs =
+ match op , xs with
+ | NEG , [ x ] -> qmake ulp (Q.neg (exact x))
+ | ADD , [ x ; y ] -> qmake ulp (Q.add (exact x) (exact y))
+ | MUL , [ x ; y ] -> qmake ulp (Q.mul (exact x) (exact y))
+ | DIV , [ x ; y ] -> qmake ulp (Q.div (exact x) (exact y))
+ | ROUND , [ x ] -> qmake ulp (exact x)
+ | REAL , [ x ] -> F.e_real (exact x)
+ | LE , [ x ; y ] -> F.e_bool (Q.leq (exact x) (exact y))
+ | LT , [ x ; y ] -> F.e_bool (Q.lt (exact x) (exact y))
+ | EQ , [ x ; y ] -> F.e_bool (Q.equal (exact x) (exact y))
+ | NE , [ x ; y ] -> F.e_bool (not (Q.equal (exact x) (exact y)))
+ | _ -> raise Not_found
(* -------------------------------------------------------------------------- *)
-(* --- Floating Point Predicate --- *)
+(* --- Operations --- *)
(* -------------------------------------------------------------------------- *)
-let fle _ = F.p_leq
-let flt _ = F.p_lt
-let feq _ = F.p_equal
-let fneq _ = F.p_neq
+let make_fun_float ?result name op ft =
+ let result = match result with None -> ftau ft | Some r -> r in
+ let phi = extern_f ~library ~result "%s_%a" name suffix ft in
+ Lang.F.set_builtin phi (compute op ft) ;
+ REGISTRY.define phi (op,ft) ; phi
+
+let make_pred_float name op ft =
+ let prop = Pretty_utils.sfprintf "%s_%a" name suffix ft in
+ let bool = Pretty_utils.sfprintf "%s_%ab" name suffix ft in
+ let phi = extern_p ~library ~bool ~prop () in
+ Lang.F.set_builtin phi (compute op ft) ;
+ REGISTRY.define phi (op,ft) ; phi
+
+let register = Ctypes.f_memo
+
+let real_of_flt = register (make_fun_float ~result:Logic.Real "of" REAL)
+let flt_of_real = register (make_fun_float "to" ROUND)
+let flt_add = register (make_fun_float "add" ADD)
+let flt_mul = register (make_fun_float "mul" MUL)
+let flt_div = register (make_fun_float "div" DIV)
+let flt_neg = register (make_fun_float "neg" NEG)
+
+let flt_lt = register (make_pred_float "lt" LT)
+let flt_eq = register (make_pred_float "eq" EQ)
+let flt_le = register (make_pred_float "le" LE)
+let flt_neq = register (make_pred_float "ne" NE)
(* -------------------------------------------------------------------------- *)
-(* --- Precision --- *)
+(* --- Models --- *)
(* -------------------------------------------------------------------------- *)
-module OP = Model.Static
- (struct
- type key = Lang.lfun
- type data = (term list -> term)
- let name = "Wp.Cfloat.OP"
- let compare = Lang.Fun.compare
- let pretty = Lang.Fun.pretty
- end)
-
-let define_fmodel_of fop op =
+let () =
begin
- OP.define (fop Float32) op ;
- OP.define (fop Float64) op ;
+ let open LogicBuiltins in
+ let register ft =
+ add_builtin "\\model" [F ft] (f_model ft) ;
+ add_builtin "\\delta" [F ft] (f_delta ft) ;
+ add_builtin "\\epsilon" [F ft] (f_epsilon ft) ;
+ in
+ register Float32 ;
+ register Float64 ;
end
-let builtin_model = function
- | [e] ->
- let open Qed.Logic in
- begin match F.repr e with
- | Fun(f,_) when f == f_model -> e
- | Fun(f,_) when f == f_delta -> e_zero_real
- | Fun(f,_) when f == f_epsilon -> e_zero_real
- | Fun(op,xs) ->
- let phi = OP.find op in
- (* find phi before computing arguments *)
- phi (List.map (fun e -> e_fun f_model [e]) xs)
- | Kreal _ -> e
- | _ -> raise Not_found
- end
- | _ -> raise Not_found
-
-let builtin_round ulp = function
- | [e] ->
- let open Qed.Logic in
- begin match F.repr e with
- | Div(x,y) -> e_fun (flt_div ulp) [x;y]
- | Add ([_;_] as xs) -> e_fun (flt_add ulp) xs
- | Mul ([_;_] as xs) -> e_fun (flt_mul ulp) xs
- | Kreal r when Q.equal r Q.zero -> e
- | Kreal r when Q.equal r Q.one -> e
- | Kreal r ->
- let flt = Transitioning.Q.to_float r in
- let rnd =
- match ulp with
- | Float32 -> Floating_point.round_to_single_precision_float flt
- | Float64 -> flt
- in F.e_float rnd
- | _ -> raise Not_found
- end
- | _ -> raise Not_found
-
-let builtin_error = function
- | [e] ->
- let open Qed.Logic in
- begin match F.repr e with
- | Fun(f,_) when f == f_model -> e_zero_real
- | _ -> raise Not_found
- end
- | _ -> raise Not_found
-
(* -------------------------------------------------------------------------- *)
(* --- Conversion Symbols --- *)
(* -------------------------------------------------------------------------- *)
+let real_of_float f a =
+ match Context.get model with
+ | Real -> a
+ | Float -> e_fun (real_of_flt f) [a]
+
let float_of_real f a =
match Context.get model with
| Real -> a
- | Float -> e_fun (flt_rnd f) [a]
+ | Float -> e_fun (flt_of_real f) [a]
let float_of_int f a = float_of_real f (Cmath.real_of_int a)
-let real_of_float _f a = a
-
-let range =
- let is_float = Ctypes.f_memo (make_pred_float "is") in
- fun f a -> p_call (is_float f) [a]
(* -------------------------------------------------------------------------- *)
(* --- Float Arithmetics --- *)
@@ -215,32 +265,35 @@ let fbinop rop fop f x y =
| Real -> rop x y
| Float -> e_fun (fop f) [x;y]
+let fcmp rop fop f x y =
+ match Context.get model with
+ | Real -> rop x y
+ | Float -> p_call (fop f) [x;y]
+
let fadd = fbinop e_add flt_add
let fmul = fbinop e_mul flt_mul
let fdiv = fbinop e_div flt_div
-let fopp _ = e_opp (* sign change is exact in floats *)
-let fsub f x y = fadd f x (e_opp y)
+let fopp f x =
+ match Context.get model with
+ | Real -> e_opp x
+ | Float -> e_fun (flt_neg f) [x]
+
+let fsub f x y = fadd f x (fopp f y)
+
+let flt = fcmp p_lt flt_lt
+let fle = fcmp p_leq flt_le
+let feq = fcmp p_equal flt_eq
+let fneq = fcmp p_neq flt_neq
(* -------------------------------------------------------------------------- *)
(* --- Registry --- *)
(* -------------------------------------------------------------------------- *)
-let () = Context.register
- begin fun () ->
-
- F.set_builtin f_model builtin_model ;
- F.set_builtin f_delta builtin_error ;
- F.set_builtin f_epsilon builtin_error ;
- F.set_builtin (flt_rnd Float32) (builtin_round Float32) ;
- F.set_builtin (flt_rnd Float64) (builtin_round Float64) ;
-
- define_fmodel_of flt_rnd (function [x] -> x | _ -> raise Not_found) ;
- define_fmodel_of flt_add e_sum ; (* only 2 params in flt_add *)
- define_fmodel_of flt_mul e_prod ; (* only 2 params in flt_mul *)
- define_fmodel_of flt_div (function [x;y] -> e_div x y | _ -> raise Not_found) ;
- end
-
-let configure m = Context.set model m
+let configure m =
+ begin
+ Context.set model m ;
+ Context.set Lang.floats tau_of_float ;
+ end
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/wp/Cfloat.mli b/src/plugins/wp/Cfloat.mli
index d8011c5d6257201f54ea8a18e756a412fc803eb4..f1f46e5950f89fe509e97f6015f2dbf0c5906338 100644
--- a/src/plugins/wp/Cfloat.mli
+++ b/src/plugins/wp/Cfloat.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -28,16 +28,39 @@ open Ctypes
open Lang
open Lang.F
+val f32 : adt
+val f64 : adt
+
+val t32 : tau
+val t64 : tau
+
type model = Real | Float
val configure : model -> unit
-val code_lit : float -> string option -> term
+val ftau : c_float -> tau (** model independant *)
+val tau_of_float : c_float -> tau (** with respect to model *)
+
+type op =
+ | LT
+ | EQ
+ | LE
+ | NE
+ | NEG
+ | ADD
+ | MUL
+ | DIV
+ | REAL
+ | ROUND
+ | EXACT (** same as round, but argument is exact representation *)
+
+val find : lfun -> op * c_float
+
+val code_lit : c_float -> float -> string option -> term
val acsl_lit : Cil_types.logic_real -> term
val float_of_int : c_float -> unop
val float_of_real : c_float -> unop
val real_of_float : c_float -> unop
-val range : c_float -> term -> pred
val fopp : c_float -> unop
val fadd : c_float -> binop
@@ -50,11 +73,14 @@ val fle : c_float -> cmp
val feq : c_float -> cmp
val fneq : c_float -> cmp
-val f_model : lfun
-val f_delta : lfun
-val f_epsilon : lfun
+val f_model : c_float -> lfun
+val f_delta : c_float -> lfun
+val f_epsilon : c_float -> lfun
+
+val flt_of_real : c_float -> lfun
+val real_of_flt : c_float -> lfun
-val flt_rnd : c_float -> lfun
val flt_add : c_float -> lfun
val flt_mul : c_float -> lfun
val flt_div : c_float -> lfun
+val flt_neg : c_float -> lfun
diff --git a/src/plugins/wp/Changelog b/src/plugins/wp/Changelog
index 47a4723a06e6d9e8cacb26deaa4c134440bb595b..d74c1dd6a12fe80978a2fc8ec7e91116622ff1fe 100644
--- a/src/plugins/wp/Changelog
+++ b/src/plugins/wp/Changelog
@@ -100,6 +100,8 @@ Plugin WP Sulfur-20171101
- Wp [2017/03/12] Reduction of equalities with logic functions
- Wp [2017/03/12] More simplifications wrt integer domains
+- Wp [2019/01/28] New floating-point model
+
######################
Plugin WP 18.0 (Argon)
######################
diff --git a/src/plugins/wp/Cint.ml b/src/plugins/wp/Cint.ml
index aa259053ceb8dc98d580f31033fde0ab680b39ce..a4c3d080764c24e54f4eb4e71a9e4981d951774a 100644
--- a/src/plugins/wp/Cint.ml
+++ b/src/plugins/wp/Cint.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cint.mli b/src/plugins/wp/Cint.mli
index 72a86838ff4feee8085d9f38a480be2fffff88c1..263c43e16af4d329a7578bcb4d3890451ccd90be 100644
--- a/src/plugins/wp/Cint.mli
+++ b/src/plugins/wp/Cint.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cleaning.ml b/src/plugins/wp/Cleaning.ml
index 0f084445a1d695287936aecb5dcbe4e538df2658..852694ddb73c35df6a80f840292c36547d1a3748 100644
--- a/src/plugins/wp/Cleaning.ml
+++ b/src/plugins/wp/Cleaning.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cleaning.mli b/src/plugins/wp/Cleaning.mli
index 1e4ec67190398e74339451d52f405814e89f3a2c..36bdfe91a2d787aabb3c50f3ab4570758e9d9776 100644
--- a/src/plugins/wp/Cleaning.mli
+++ b/src/plugins/wp/Cleaning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cmath.ml b/src/plugins/wp/Cmath.ml
index c607be8a5d7e8acbd0cf6384ccba307f33040026..73f81d6118262bce0d8ca3dd8dc02befcbab9597 100644
--- a/src/plugins/wp/Cmath.ml
+++ b/src/plugins/wp/Cmath.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cmath.mli b/src/plugins/wp/Cmath.mli
index a5b431075358a30a0e70625033b4332926103c90..e27a286e076c264de3d18f930b477a3019700f5c 100644
--- a/src/plugins/wp/Cmath.mli
+++ b/src/plugins/wp/Cmath.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/CodeSemantics.ml b/src/plugins/wp/CodeSemantics.ml
index eaf5063d82c11316ba3980706ddc0b4dedaf17c9..e7dacab67bf5ee7a8fb910ca905891cea21f3ce2 100644
--- a/src/plugins/wp/CodeSemantics.ml
+++ b/src/plugins/wp/CodeSemantics.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/CodeSemantics.mli b/src/plugins/wp/CodeSemantics.mli
index 4f00c12f9fa347c7d26fa1242b2a0251ccc7138b..e138cd94c5c631e40408a7c748d106b8aafbf3cb 100644
--- a/src/plugins/wp/CodeSemantics.mli
+++ b/src/plugins/wp/CodeSemantics.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Conditions.ml b/src/plugins/wp/Conditions.ml
index 1924b4baef3fe90208c7269b1480e7091bbea6f6..aa3a1478d52da357018dc3b254a78f684a5f0fbf 100644
--- a/src/plugins/wp/Conditions.ml
+++ b/src/plugins/wp/Conditions.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Conditions.mli b/src/plugins/wp/Conditions.mli
index 55e1671f282b914ad709543b683a10f5a2fa9b81..46607fa5871173d89b7e1b914b7de19f670f60cb 100644
--- a/src/plugins/wp/Conditions.mli
+++ b/src/plugins/wp/Conditions.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Context.ml b/src/plugins/wp/Context.ml
index 318e88c322d3e809db2856db3d5f0d510208f4ea..a63b62de007a6630c618303133df4af009460118 100644
--- a/src/plugins/wp/Context.ml
+++ b/src/plugins/wp/Context.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Context.mli b/src/plugins/wp/Context.mli
index d3f1f68da919bc00fd6eaf4c1045c896fae62630..160b1782f9c904c193f0345a367babc00c080ce2 100644
--- a/src/plugins/wp/Context.mli
+++ b/src/plugins/wp/Context.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cstring.ml b/src/plugins/wp/Cstring.ml
index c135322e91923ebbebc25b55f3e6346e284f0951..66f3ab3afb6e32672107fa09484c648640827026 100644
--- a/src/plugins/wp/Cstring.ml
+++ b/src/plugins/wp/Cstring.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cstring.mli b/src/plugins/wp/Cstring.mli
index 8bddad4a5a0a0b65db6ee7743d0e3d2962dcc514..65dd792f0b8b6f2f0072ab78b5b08723cfc207b8 100644
--- a/src/plugins/wp/Cstring.mli
+++ b/src/plugins/wp/Cstring.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Cvalues.ml b/src/plugins/wp/Cvalues.ml
index 3fc8f77bbfaef721d9b3e0a832099dc54728426d..f952969897624f89bcd5642823903d87a23adfb4 100644
--- a/src/plugins/wp/Cvalues.ml
+++ b/src/plugins/wp/Cvalues.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -47,7 +47,7 @@ let equation = function
let rec constant = function
| CInt64(z,_,_) -> e_bigint z
| CChr c -> e_int64 (Ctypes.char c)
- | CReal(f,_,s) -> Cfloat.code_lit f s
+ | CReal(f,fk,s) -> Cfloat.code_lit (Ctypes.c_float fk) f s
| CEnum e -> constant_exp e.eival
| CStr _ | CWStr _ -> Warning.error "String constants not yet implemented"
@@ -193,7 +193,7 @@ module TYPE = STRUCTURAL
let prefix = "Is"
let natural = false
let is_int = Cint.range
- let is_float = Cfloat.range
+ let is_float _ _ = p_true
let is_pointer _ = p_true
end)
diff --git a/src/plugins/wp/Cvalues.mli b/src/plugins/wp/Cvalues.mli
index 6072a98ee4646f255ede84ed36cb55cc80a2f801..e7a09ec5b78fa01ef642bb1fe717cff19ffddfa1 100644
--- a/src/plugins/wp/Cvalues.mli
+++ b/src/plugins/wp/Cvalues.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Definitions.ml b/src/plugins/wp/Definitions.ml
index e6fa54c7037c1fb7cede23ee5e8879ace611199c..7769f37de54a3e829cb3ce2effe381e771632b6b 100644
--- a/src/plugins/wp/Definitions.ml
+++ b/src/plugins/wp/Definitions.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Definitions.mli b/src/plugins/wp/Definitions.mli
index 587b3add5e890654b1b677e4fad76137eea831b6..f4a0d98b31b64e56f0021c970df0e97089d44c2a 100644
--- a/src/plugins/wp/Definitions.mli
+++ b/src/plugins/wp/Definitions.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Factory.ml b/src/plugins/wp/Factory.ml
index a4f06c8dee9df498dd9ce5b048a01b3ca300e138..bc0f3667d600ba5553a818df622c507c70a01f48 100644
--- a/src/plugins/wp/Factory.ml
+++ b/src/plugins/wp/Factory.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Factory.mli b/src/plugins/wp/Factory.mli
index aea6adcb7b5d7efddb705fd459859ddfcba225dd..9d416b4a0ed9bc71b5b564c3ee019a301964b4e1 100644
--- a/src/plugins/wp/Factory.mli
+++ b/src/plugins/wp/Factory.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Filtering.ml b/src/plugins/wp/Filtering.ml
index ae163c270a93b8e62862a5e4830852cc02073f93..a74546d4d09099ff3e3c7f25d99d70cd631f4468 100644
--- a/src/plugins/wp/Filtering.ml
+++ b/src/plugins/wp/Filtering.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Filtering.mli b/src/plugins/wp/Filtering.mli
index 2bc50c6969ab49ceba66a89e392d6fdd42b6036d..7a0944c37bc7ff689e70e5703a565121d655e275 100644
--- a/src/plugins/wp/Filtering.mli
+++ b/src/plugins/wp/Filtering.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Footprint.ml b/src/plugins/wp/Footprint.ml
index dd036fcd8f9b46c4c43c4e763e1ed3660730108f..60245a5aa1eeed737fd4218823948b30e12ba69d 100644
--- a/src/plugins/wp/Footprint.ml
+++ b/src/plugins/wp/Footprint.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Footprint.mli b/src/plugins/wp/Footprint.mli
index cf30f499dbffa5c1b32c7d01c4b46c7b4a75a97a..2054c4d776d4032001d4e5b6f1a3061307599f2c 100644
--- a/src/plugins/wp/Footprint.mli
+++ b/src/plugins/wp/Footprint.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Generator.ml b/src/plugins/wp/Generator.ml
index f97165ae9e133e71b5d2328a3c73084a3ec7783f..0bab01bf8b94a9543a6b53524d0793cb68fcb25b 100644
--- a/src/plugins/wp/Generator.ml
+++ b/src/plugins/wp/Generator.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Generator.mli b/src/plugins/wp/Generator.mli
index 141bd268ad7290fc8958e628d3ea9fc439fe81d4..466834a6541e5e1573824fa772d1416d254c2279 100644
--- a/src/plugins/wp/Generator.mli
+++ b/src/plugins/wp/Generator.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiComposer.ml b/src/plugins/wp/GuiComposer.ml
index 7ece4ba2936280f9478d1dac25c11f8ffce5eb40..c550f764282a454e18e65b476a82f4ac97150148 100644
--- a/src/plugins/wp/GuiComposer.ml
+++ b/src/plugins/wp/GuiComposer.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiComposer.mli b/src/plugins/wp/GuiComposer.mli
index ca31943be1cf53c7697323fe7a81f9756fdec4db..37d21d8ab93efb11d4dee24feb08de5a5bc36c15 100644
--- a/src/plugins/wp/GuiComposer.mli
+++ b/src/plugins/wp/GuiComposer.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiConfig.ml b/src/plugins/wp/GuiConfig.ml
index 9ef8e8f6e880c8a5cb2bea221593072511bdb493..3b3a7c4f43e4201cfa2543e4e12f47581fd2f4d8 100644
--- a/src/plugins/wp/GuiConfig.ml
+++ b/src/plugins/wp/GuiConfig.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiConfig.mli b/src/plugins/wp/GuiConfig.mli
index bf0464c09ee200a675ccfe81ee10785e95af84d1..4bbb3b11ad16d4626299896161542ac9f2b5c524 100644
--- a/src/plugins/wp/GuiConfig.mli
+++ b/src/plugins/wp/GuiConfig.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiGoal.ml b/src/plugins/wp/GuiGoal.ml
index 2e27c3ff1d7745cfa342fb27430929b75273387c..5b8539b2c9085ede840a8c805c957d1834529ab5 100644
--- a/src/plugins/wp/GuiGoal.ml
+++ b/src/plugins/wp/GuiGoal.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -82,7 +82,12 @@ class pane (proverpane : GuiConfig.provers) =
let composer = new GuiComposer.composer printer in
let browser = new GuiComposer.browser printer in
let layout = new Wutil.layout in
+ let scroll_palette =
+ GBin.scrolled_window ~vpolicy:`AUTOMATIC ~hpolicy:`NEVER ()
+ in
+ let scroll_palette_widget = new Wutil.gobj_widget scroll_palette in
let palette = new Wpalette.panel () in
+ let () = scroll_palette#add palette#coerce in
let help = new Widget.button
~label:"Tactics" ~border:false ~tooltip:"List Available Tactics" () in
let delete = new Widget.button
@@ -117,7 +122,7 @@ class pane (proverpane : GuiConfig.provers) =
w play_script ; w save_script ;
w ~padding:6 icon ; h ~padding:6 status ]
[ w help ; w delete ]) in
- layout#populate (Wbox.panel ~top:toolbar ~right:palette#widget text) ;
+ layout#populate (Wbox.panel ~top:toolbar ~right:scroll_palette_widget text) ;
provers <-
VCS.([ new GuiProver.prover ~console:text ~prover:AltErgo ] @
List.map
diff --git a/src/plugins/wp/GuiGoal.mli b/src/plugins/wp/GuiGoal.mli
index 090a744a23ea8a7eda8fe8c25a278fe7a6c48732..fd60b80fa866f48cc812eca08b1de154985a3bad 100644
--- a/src/plugins/wp/GuiGoal.mli
+++ b/src/plugins/wp/GuiGoal.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiList.ml b/src/plugins/wp/GuiList.ml
index 7c391c70811ae10467298ead5057375d06e28e32..9fa9f6a98f4fd53c58649ca20bdf3472eb0df248 100644
--- a/src/plugins/wp/GuiList.ml
+++ b/src/plugins/wp/GuiList.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiList.mli b/src/plugins/wp/GuiList.mli
index 17c7ea2e7346358d40852b394e3ab73edb275be1..7b34f43d5db14f6cc3080193182ca80fbc2ea9e9 100644
--- a/src/plugins/wp/GuiList.mli
+++ b/src/plugins/wp/GuiList.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiNavigator.ml b/src/plugins/wp/GuiNavigator.ml
index 345667e8b32195be0d0700cf28620654314ad3b2..7da1c5d3d9f9a6dc365f93b24f5c4d18001792ee 100644
--- a/src/plugins/wp/GuiNavigator.ml
+++ b/src/plugins/wp/GuiNavigator.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiNavigator.mli b/src/plugins/wp/GuiNavigator.mli
index ef490a0e946f843f5b00ca2a7638cc86fb348aef..6604b2d739453754c513ba0fc0c63d2600e923d4 100644
--- a/src/plugins/wp/GuiNavigator.mli
+++ b/src/plugins/wp/GuiNavigator.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiPanel.ml b/src/plugins/wp/GuiPanel.ml
index e9e2f4c1a6b64e522db79493239668fb11ece380..d9ee8c78e5e31502ce01a27098e6d9e0c137a41c 100644
--- a/src/plugins/wp/GuiPanel.ml
+++ b/src/plugins/wp/GuiPanel.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -167,7 +167,7 @@ class model_selector (main : Design.main_window_extension_points) =
let wp_dir = ref (Sys.getcwd())
let wp_script () =
- let file = GToolbox.select_file
+ let file = Gtk_helper.select_file
~title:"Script File for Coq proofs"
~dir:wp_dir ~filename:"wp.script" ()
in
diff --git a/src/plugins/wp/GuiPanel.mli b/src/plugins/wp/GuiPanel.mli
index 630d5cd1f6fba173fba803d1c67e5cf6fc8dbb11..b5fe2af514a1af179b7f13cfedf2d38d03606829 100644
--- a/src/plugins/wp/GuiPanel.mli
+++ b/src/plugins/wp/GuiPanel.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiProof.ml b/src/plugins/wp/GuiProof.ml
index fef695c3b98db203ef4f1cfd8cbf3dd06651067d..58acb6cefb502103b10fc79c45905b722d9e932e 100644
--- a/src/plugins/wp/GuiProof.ml
+++ b/src/plugins/wp/GuiProof.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiProof.mli b/src/plugins/wp/GuiProof.mli
index 758b76cd8f4c8b6c4b68eb06711ae0ab57499e3f..50b09ebbefccc1975fc94651d928fab67e68bee9 100644
--- a/src/plugins/wp/GuiProof.mli
+++ b/src/plugins/wp/GuiProof.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiProver.ml b/src/plugins/wp/GuiProver.ml
index 56d70305d93b57b3f6d2c6ee8e966e9e7e8c786e..1ed614ee5f2eab4fb5e7a1d5813a17ac5a3caf8c 100644
--- a/src/plugins/wp/GuiProver.ml
+++ b/src/plugins/wp/GuiProver.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiProver.mli b/src/plugins/wp/GuiProver.mli
index 697c8c598be4a62576d8c482ad7cdb08c48bb8c6..ab5562587b26392e4c7770a39aeabd899276ea70 100644
--- a/src/plugins/wp/GuiProver.mli
+++ b/src/plugins/wp/GuiProver.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiSequent.ml b/src/plugins/wp/GuiSequent.ml
index ffb52d7a5ebfcadcf791c0a73deaad690829824f..9caaecce6659ed64c2dac555ff2f1c4a7aa17375 100644
--- a/src/plugins/wp/GuiSequent.ml
+++ b/src/plugins/wp/GuiSequent.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiSequent.mli b/src/plugins/wp/GuiSequent.mli
index 0dc19cbde0348f3af385a01a08a98d5765957b44..b11d583cdf96a71bb0e8379df39f930610c2de04 100644
--- a/src/plugins/wp/GuiSequent.mli
+++ b/src/plugins/wp/GuiSequent.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiSource.ml b/src/plugins/wp/GuiSource.ml
index 2adc52d31b56ec6e11b78ca7922cb4f06c134cdb..a47a570c5e8b4a1d5f55009509fb53cf9c23f1e1 100644
--- a/src/plugins/wp/GuiSource.ml
+++ b/src/plugins/wp/GuiSource.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiSource.mli b/src/plugins/wp/GuiSource.mli
index 6259bab54fed44818c91277294b09008bbe079a3..c459b1eb40f57055266d5b397cc0b58ad3f29c0a 100644
--- a/src/plugins/wp/GuiSource.mli
+++ b/src/plugins/wp/GuiSource.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiTactic.ml b/src/plugins/wp/GuiTactic.ml
index 27f6d123ee7c7130e54aaf8147a7fd4ed13f49bf..40c8cf7256f05158a0364caaaad11889f2107349 100644
--- a/src/plugins/wp/GuiTactic.ml
+++ b/src/plugins/wp/GuiTactic.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/GuiTactic.mli b/src/plugins/wp/GuiTactic.mli
index 85cf4e3ca7a633e235072ee3d6f663b132aeeda8..9d777188182b05a2fc6ef19a4c5d64de17b974af 100644
--- a/src/plugins/wp/GuiTactic.mli
+++ b/src/plugins/wp/GuiTactic.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Lang.ml b/src/plugins/wp/Lang.ml
index 48ecfdbc7c2cf4c80404c1257840c73cf5e8e922..fdcb24f90acfb8076919647c8c0e87985d746fff 100644
--- a/src/plugins/wp/Lang.ml
+++ b/src/plugins/wp/Lang.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -142,6 +142,7 @@ and field =
and tau = (field,adt) Logic.datatype
let pointer = Context.create "Lang.pointer"
+let floats = Context.create "Lang.floats"
let new_extern_id = ref (-1)
let new_extern ~debug ~library ~link =
@@ -182,7 +183,7 @@ let t_datatype adt ts = Logic.Data(adt,ts)
let rec tau_of_object = function
| C_int _ -> Logic.Int
- | C_float _ -> Logic.Real
+ | C_float f -> Context.get floats f
| C_pointer t -> Context.get pointer t
| C_comp c -> tau_of_comp c
| C_array { arr_element = typ } -> t_array (tau_of_ctype typ)
diff --git a/src/plugins/wp/Lang.mli b/src/plugins/wp/Lang.mli
index 3433f5db56993fc3487bbfcdeef923411f1d5dfe..4644a22391f0473387a54a6fad9ed2871a6d5e0a 100644
--- a/src/plugins/wp/Lang.mli
+++ b/src/plugins/wp/Lang.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -167,6 +167,7 @@ val t_farray : tau -> tau -> tau
val t_datatype : adt -> tau list -> tau
val pointer : (typ -> tau) Context.value (** type of pointers *)
+val floats : (c_float -> tau) Context.value (** type of floats *)
val poly : string list Context.value (** polymorphism *)
val parameters : (lfun -> sort list) -> unit (** definitions *)
diff --git a/src/plugins/wp/Letify.ml b/src/plugins/wp/Letify.ml
index a6d1257b1a476ddbc3eaf439f88adfd94b891441..e9dbaabf9892365985f4579693f361d3e365bd96 100644
--- a/src/plugins/wp/Letify.ml
+++ b/src/plugins/wp/Letify.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Letify.mli b/src/plugins/wp/Letify.mli
index 2007c5994f7fa21a4f773ba19680294c74665c62..4ae9d7b4ce9a8a812aa475ad5e995f3f78fa69bb 100644
--- a/src/plugins/wp/Letify.mli
+++ b/src/plugins/wp/Letify.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicAssigns.ml b/src/plugins/wp/LogicAssigns.ml
index f3739d5f0193058592a351f51d9c881b3449b78a..024797e31770826ea1a2ef947e00793690f57e50 100644
--- a/src/plugins/wp/LogicAssigns.ml
+++ b/src/plugins/wp/LogicAssigns.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicAssigns.mli b/src/plugins/wp/LogicAssigns.mli
index 72a0985b9f89cfad80b217dad5d8224b6b6c4254..92cd1d2006bb61cfbbe5f75ab8966db08f01d1c2 100644
--- a/src/plugins/wp/LogicAssigns.mli
+++ b/src/plugins/wp/LogicAssigns.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicBuiltins.ml b/src/plugins/wp/LogicBuiltins.ml
index afc8e9bdb4ffd61a650ec9ec297fa26511206637..1e20d51a4afe8ec605a214a06beb1a050d16bfce 100644
--- a/src/plugins/wp/LogicBuiltins.ml
+++ b/src/plugins/wp/LogicBuiltins.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicBuiltins.mli b/src/plugins/wp/LogicBuiltins.mli
index 4f5d992935c604896d449f51308eb119e342c9fb..41a530ff77b0ece0f423052649aa5795b3dc7803 100644
--- a/src/plugins/wp/LogicBuiltins.mli
+++ b/src/plugins/wp/LogicBuiltins.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicCompiler.ml b/src/plugins/wp/LogicCompiler.ml
index 11bcfaec17cee8d0d0f4842fe093f13120f084d8..216df75f16769a7a8b4a5968c78c54af63729cc4 100644
--- a/src/plugins/wp/LogicCompiler.ml
+++ b/src/plugins/wp/LogicCompiler.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicCompiler.mli b/src/plugins/wp/LogicCompiler.mli
index 9e45c3ad7ec33a1c9f5eec6a74f823b254f0b5ba..a34f3a35511f0f8ecd7a8f06270419e251ec7c9c 100644
--- a/src/plugins/wp/LogicCompiler.mli
+++ b/src/plugins/wp/LogicCompiler.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicSemantics.ml b/src/plugins/wp/LogicSemantics.ml
index 98494b13ec6a4bd52009caad9a5bfd1c5ee01f45..60c0efae3922f9f7c5b7ae12876965847cd93b65 100644
--- a/src/plugins/wp/LogicSemantics.ml
+++ b/src/plugins/wp/LogicSemantics.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -510,8 +510,10 @@ struct
L.map (Cint.convert i) (C.logic env t)
| C_int i , L_pointer _ ->
L.map_l2t (M.int_of_loc i) (C.logic env t)
- | C_int i , (L_cfloat _ | L_real) ->
+ | C_int i , L_real ->
L.map (Cint.of_real i) (C.logic env t)
+ | C_int i , L_cfloat f ->
+ L.map (fun v -> Cint.of_real i (Cfloat.real_of_float f v)) (C.logic env t)
| C_int _, L_array _ ->
Warning.error "@[Logic cast to sized integer (%a) from (%a) not implemented yet@]"
Printer.pp_typ dst_ctype Printer.pp_logic_type t.term_type
diff --git a/src/plugins/wp/LogicSemantics.mli b/src/plugins/wp/LogicSemantics.mli
index 7ccf8ee676ea24469e2faeca178bf8e387ec1f59..fb23bab846388e687dfac32ca04a932e7ab08b09 100644
--- a/src/plugins/wp/LogicSemantics.mli
+++ b/src/plugins/wp/LogicSemantics.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicUsage.ml b/src/plugins/wp/LogicUsage.ml
index ed2e54b9d0ba7cb82ad7cb1b733c8fdbbe887562..f3e9b63d653ae29eff374583cbd62728ab5a7584 100644
--- a/src/plugins/wp/LogicUsage.ml
+++ b/src/plugins/wp/LogicUsage.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/LogicUsage.mli b/src/plugins/wp/LogicUsage.mli
index b2a8f1ca475d0c456ff63c80502b361cbd8cc1ea..a2efdc07b7c42f8600e061a4395d2cabf4ad62e8 100644
--- a/src/plugins/wp/LogicUsage.mli
+++ b/src/plugins/wp/LogicUsage.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Makefile.in b/src/plugins/wp/Makefile.in
index 81575977d66bab822094aaa11fcd3d1be5e5ba8e..2a924fd195d13dade963059d5cacda597be774d4 100644
--- a/src/plugins/wp/Makefile.in
+++ b/src/plugins/wp/Makefile.in
@@ -2,7 +2,7 @@
# #
# This file is part of WP plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat a l'energie atomique et aux energies #
# alternatives) #
# #
@@ -40,7 +40,7 @@ include $(PLUGIN_DIR)/share/Makefile.resources
# Extension of the GUI for wp is compilable
# only if gnomecanvas is available
-ifeq ($(HAS_GNOMECANVAS),yes)
+#ifeq ($(HAS_GNOMECANVAS),yes)
PLUGIN_GUI_CMO:= \
GuiConfig \
GuiList \
@@ -53,7 +53,7 @@ PLUGIN_GUI_CMO:= \
GuiSource \
GuiPanel \
GuiNavigator
-endif
+#endif
PLUGIN_ENABLE:=@ENABLE_WP@
PLUGIN_NAME:=Wp
diff --git a/src/plugins/wp/Matrix.ml b/src/plugins/wp/Matrix.ml
index 3e1e87778423922d130919717086aa74f40f15ef..9a3aadbb39831d0732ae0c1fd3b346109d2ffe79 100644
--- a/src/plugins/wp/Matrix.ml
+++ b/src/plugins/wp/Matrix.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Matrix.mli b/src/plugins/wp/Matrix.mli
index d0620674280f00a28c2dbd808279006d7d7d2848..10f6e6f9b573061d464e010c942b12a920203dca 100644
--- a/src/plugins/wp/Matrix.mli
+++ b/src/plugins/wp/Matrix.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemEmpty.ml b/src/plugins/wp/MemEmpty.ml
index a29a2014e35a2e2fa7380f224c095dc3d2505f7b..a9999cc1990b2e2b24909ac5926e788623bbc9e2 100644
--- a/src/plugins/wp/MemEmpty.ml
+++ b/src/plugins/wp/MemEmpty.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemEmpty.mli b/src/plugins/wp/MemEmpty.mli
index 7e5e49fc9f560f0b15309824694f6f1319ccde85..6191649db155bbd608cd6adb2fc67907cc03e8a0 100644
--- a/src/plugins/wp/MemEmpty.mli
+++ b/src/plugins/wp/MemEmpty.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemTyped.ml b/src/plugins/wp/MemTyped.ml
index daaac67fe85c81ac4b5487d874867ccbc44b224b..e33f109589f266bbe386af45f0b0ac66cd01b370 100644
--- a/src/plugins/wp/MemTyped.ml
+++ b/src/plugins/wp/MemTyped.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -402,7 +402,8 @@ let pointer = Context.create "MemTyped.pointer"
type chunk =
| M_int
| M_char
- | M_float
+ | M_f32
+ | M_f64
| M_pointer
| T_alloc
@@ -413,33 +414,36 @@ struct
let rank = function
| M_int -> 0
| M_char -> 1
- | M_float -> 2
- | M_pointer -> 3
- | T_alloc -> 4
+ | M_f32 -> 2
+ | M_f64 -> 3
+ | M_pointer -> 4
+ | T_alloc -> 5
let hash = rank
let name = function
| M_int -> "Mint"
| M_char -> "Mchar"
- | M_float -> "Mflt"
+ | M_f32 -> "Mf32"
+ | M_f64 -> "Mf64"
| M_pointer -> "Mptr"
| T_alloc -> "Malloc"
let compare a b = rank a - rank b
let equal = (=)
let pretty fmt c = Format.pp_print_string fmt (name c)
let key_of_chunk = function
- | M_int | M_char | M_float | M_pointer -> t_addr
+ | M_int | M_char | M_f32 | M_f64 | M_pointer -> t_addr
| T_alloc -> L.Int
let val_of_chunk = function
| M_int | M_char -> L.Int
- | M_float -> L.Real
+ | M_f32 -> Cfloat.tau_of_float Ctypes.Float32
+ | M_f64 -> Cfloat.tau_of_float Ctypes.Float64
| M_pointer -> t_addr
| T_alloc -> L.Int
- let tau_of_chunk =
- let m = Array.make 5 L.Int in
- List.iter
- (fun c -> m.(rank c) <- L.Array(key_of_chunk c,val_of_chunk c))
- [M_int;M_char;M_float;M_pointer;T_alloc] ;
- fun c -> m.(rank c)
+ let tau_of_chunk = function
+ | M_int | M_char -> L.Array(t_addr,L.Int)
+ | M_pointer -> L.Array(t_addr,t_addr)
+ | M_f32 -> L.Array(t_addr,Cfloat.tau_of_float Ctypes.Float32)
+ | M_f64 -> L.Array(t_addr,Cfloat.tau_of_float Ctypes.Float64)
+ | T_alloc -> L.Array(L.Int,L.Int)
let basename_of_chunk = name
let is_framed _ = false
end
@@ -454,10 +458,11 @@ type loc = term (* of type addr *)
(* -------------------------------------------------------------------------- *)
let m_int i = if Ctypes.is_char i then M_char else M_int
+let m_float = function Float32 -> M_f32 | Float64 -> M_f64
let rec footprint = function
| C_int i -> Heap.Set.singleton (m_int i)
- | C_float _ -> Heap.Set.singleton M_float
+ | C_float f -> Heap.Set.singleton (m_float f)
| C_pointer _ -> Heap.Set.singleton M_pointer
| C_array a -> footprint (object_of a.arr_element)
| C_comp c -> footprint_comp c
@@ -1005,7 +1010,7 @@ module ARRAY = Model.Generator(Matrix.NATURAL)
let loadvalue sigma obj l = match obj with
| C_int i -> F.e_get (Sigma.value sigma (m_int i)) l
- | C_float _ -> F.e_get (Sigma.value sigma M_float) l
+ | C_float f -> F.e_get (Sigma.value sigma (m_float f)) l
| C_pointer _ -> F.e_get (Sigma.value sigma M_pointer) l
| C_comp c ->
let phi,cs = COMP.get c in
@@ -1271,7 +1276,7 @@ let eqmem s obj l =
let stored s obj l v =
match obj with
| C_int i -> updated s (m_int i) l v
- | C_float _ -> updated s M_float l v
+ | C_float f -> updated s (m_float f) l v
| C_pointer _ -> updated s M_pointer l v
| C_comp _ | C_array _ ->
Set(loadvalue s.post obj l, v) ::
diff --git a/src/plugins/wp/MemTyped.mli b/src/plugins/wp/MemTyped.mli
index 17488a1f3a064d70634f3d0bfd205b568ade922a..6c23647b4fe25faa6e81b96584cbae0f23199dae 100644
--- a/src/plugins/wp/MemTyped.mli
+++ b/src/plugins/wp/MemTyped.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemVar.ml b/src/plugins/wp/MemVar.ml
index 417845558f72153c98aab7b1309b63e45604f4f1..cd5dcfd28d4f04fee81807c9d5604dea8bb52d43 100644
--- a/src/plugins/wp/MemVar.ml
+++ b/src/plugins/wp/MemVar.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemVar.mli b/src/plugins/wp/MemVar.mli
index e84b525cdca9faad3722529cf57b5a80663acc52..440155a4434e46fad298916793e992e77b2e1f03 100644
--- a/src/plugins/wp/MemVar.mli
+++ b/src/plugins/wp/MemVar.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemZeroAlias.ml b/src/plugins/wp/MemZeroAlias.ml
index e0386d60131474730280e52095bafae9bb4fe8f6..1983f2361f498823fd38afb9fccaa19e372d77e6 100644
--- a/src/plugins/wp/MemZeroAlias.ml
+++ b/src/plugins/wp/MemZeroAlias.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemZeroAlias.mli b/src/plugins/wp/MemZeroAlias.mli
index 7e5e49fc9f560f0b15309824694f6f1319ccde85..6191649db155bbd608cd6adb2fc67907cc03e8a0 100644
--- a/src/plugins/wp/MemZeroAlias.mli
+++ b/src/plugins/wp/MemZeroAlias.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemoryContext.ml b/src/plugins/wp/MemoryContext.ml
index 0d2686fee45dce9271b3240fd7792ffe46b8c1e2..6779dba0fc23987dd8b23f62448bc411b1a93fa8 100644
--- a/src/plugins/wp/MemoryContext.ml
+++ b/src/plugins/wp/MemoryContext.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/MemoryContext.mli b/src/plugins/wp/MemoryContext.mli
index 27168e496e6741c4cc36bc9ecb97d1f069b8e80b..4b1cb73ae2dd0c2bef2a28986d3cf1cbe50943b3 100644
--- a/src/plugins/wp/MemoryContext.mli
+++ b/src/plugins/wp/MemoryContext.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Model.ml b/src/plugins/wp/Model.ml
index 041f5ec4acc8ab5c446848c86c62a12118eff499..a69ac68fabd0e5f415491a0310c9752eb5ef3791 100644
--- a/src/plugins/wp/Model.ml
+++ b/src/plugins/wp/Model.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Model.mli b/src/plugins/wp/Model.mli
index 303c20707fe0c2289b50c814d649e10e3872c8c8..948e6e08ea68419eeef685e9dda8bdca2c18d143 100644
--- a/src/plugins/wp/Model.mli
+++ b/src/plugins/wp/Model.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Mstate.ml b/src/plugins/wp/Mstate.ml
index 8a2a6229a34de3532d9337bb2761a3c8716df62d..a8a5cebc6dcf29c1afe1b747ae3a6028ec9f4ee7 100644
--- a/src/plugins/wp/Mstate.ml
+++ b/src/plugins/wp/Mstate.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Mstate.mli b/src/plugins/wp/Mstate.mli
index 962e55630786722275edf590588410368df64120..517b57efb245f980c5271a71b6fc590fa57173eb 100644
--- a/src/plugins/wp/Mstate.mli
+++ b/src/plugins/wp/Mstate.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Partitioning.ml b/src/plugins/wp/Partitioning.ml
index 7a53e3519e16767385577fdd9608ac4e10222bb4..d8490466d97760335742e961c84e7c13a06b27ee 100644
--- a/src/plugins/wp/Partitioning.ml
+++ b/src/plugins/wp/Partitioning.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Partitioning.mli b/src/plugins/wp/Partitioning.mli
index 9f3193ce8db53dd6e51170ce8b6244d22cacea86..ae3501d929342b216bc7b9f4d68c3213ecf6706b 100644
--- a/src/plugins/wp/Partitioning.mli
+++ b/src/plugins/wp/Partitioning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Passive.ml b/src/plugins/wp/Passive.ml
index f1fe090ee96bb606d1f8cf758f8b5c54185fca84..0788b826e1358703fb1d7c408697c94454ba4ba8 100644
--- a/src/plugins/wp/Passive.ml
+++ b/src/plugins/wp/Passive.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Passive.mli b/src/plugins/wp/Passive.mli
index 5a730291439c7486a97190c307614d7da19e660a..2dc9000fc06a8c661714e03644de65638201e6e7 100644
--- a/src/plugins/wp/Passive.mli
+++ b/src/plugins/wp/Passive.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Pcfg.ml b/src/plugins/wp/Pcfg.ml
index 70edd6ba7121117ad6a4fcf1a7f8e1a3b7d9dd5e..34a886762d2e4cfc4ad475a419cbc9e6c2e9c607 100644
--- a/src/plugins/wp/Pcfg.ml
+++ b/src/plugins/wp/Pcfg.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Pcfg.mli b/src/plugins/wp/Pcfg.mli
index de876597ba152f1f589e9ab3d6843e9174a18732..7e2a61dfd935661731b3dc85eb1b5d12c6eb10bd 100644
--- a/src/plugins/wp/Pcfg.mli
+++ b/src/plugins/wp/Pcfg.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Pcond.ml b/src/plugins/wp/Pcond.ml
index 670f4171b09ae43e67c40a5e67ed35dcf6d1aa54..4f7d7f313c9e87d143496774a632407e655814f8 100644
--- a/src/plugins/wp/Pcond.ml
+++ b/src/plugins/wp/Pcond.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Pcond.mli b/src/plugins/wp/Pcond.mli
index b27e080ead5147df62eb96fc5627b669165cfbec..b56695f7fe66b75b3054816aa563f016f3964408 100644
--- a/src/plugins/wp/Pcond.mli
+++ b/src/plugins/wp/Pcond.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Plang.ml b/src/plugins/wp/Plang.ml
index 6b50f33ff855629fdb442b66c938a5867fb16a57..f30029ce0903908836e42493a77898f6631bbc9e 100644
--- a/src/plugins/wp/Plang.ml
+++ b/src/plugins/wp/Plang.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Plang.mli b/src/plugins/wp/Plang.mli
index b0e5137de07d37ef3d655d6e7b981f10dc133cf3..3dd2bf095125c2c298443944d4eb8e32aeedd74f 100644
--- a/src/plugins/wp/Plang.mli
+++ b/src/plugins/wp/Plang.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/PrecisionLoss.mli b/src/plugins/wp/PrecisionLoss.mli
index 31d3b148f6f60d0d2f895f6001ce9a1b1b99e92a..791197b43d9f8b4689339fa56331635712fe1820 100644
--- a/src/plugins/wp/PrecisionLoss.mli
+++ b/src/plugins/wp/PrecisionLoss.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProofEngine.ml b/src/plugins/wp/ProofEngine.ml
index ab793ef9c15d2add3480c04557693cca5b1585ca..6d2bca1144d0184eea2d63679675fa643615cccc 100644
--- a/src/plugins/wp/ProofEngine.ml
+++ b/src/plugins/wp/ProofEngine.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProofEngine.mli b/src/plugins/wp/ProofEngine.mli
index fb6f88aa0b4871cc3fa33033bcea4597e4aee0d0..5d6e1f26afcc9628b824c27f09dea0659fce7bb8 100644
--- a/src/plugins/wp/ProofEngine.mli
+++ b/src/plugins/wp/ProofEngine.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProofScript.ml b/src/plugins/wp/ProofScript.ml
index eb5eee7e63986ee107b10d10eb7d03d4be5d65eb..2f5b986d29a6a3c94ff0e8905df5e92eb10cd5ef 100644
--- a/src/plugins/wp/ProofScript.ml
+++ b/src/plugins/wp/ProofScript.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -91,7 +91,7 @@ let pattern p =
let occur p t =
Footprint.locate ~inside:(Lang.F.e_prop p) ~select:t
-let j_select s = "select" , Json.String s
+let j_select s = "select" , `String s
let j_goal = j_select "clause-goal"
let j_step = j_select "clause-step"
let j_ingoal = j_select "inside-goal"
@@ -99,51 +99,51 @@ let j_instep = j_select "inside-step"
let j_compose = j_select "compose"
let j_kint = j_select "kint"
let j_range = j_select "range"
-let j_id a = "id" , Json.String a
-let j_at s = "at" , Json.Int s.id
-let j_int z = "val" , Json.String (Integer.to_string z)
-let j_min a = "min" , Json.Int a
-let j_max b = "max" , Json.Int b
-let j_kind s = "kind" , Json.String (s_kind s)
-let j_pattern p = "pattern" , Json.String p
+let j_id a = "id" , `String a
+let j_at s = "at" , `Int s.id
+let j_int z = "val" , `String (Integer.to_string z)
+let j_min a = "min" , `Int a
+let j_max b = "max" , `Int b
+let j_kind s = "kind" , `String (s_kind s)
+let j_pattern p = "pattern" , `String p
let j_ppattern p = j_pattern (pattern p)
-let j_occur k = "occur" , Json.Int k
+let j_occur k = "occur" , `Int k
let j_pred p =
let tgt = Pretty_utils.to_string Lang.F.pp_pred p in
- "target" , Json.String tgt
+ "target" , `String tgt
let j_term e =
let tgt = Pretty_utils.to_string Lang.F.pp_term e in
- "target" , Json.String tgt
+ "target" , `String tgt
let rec json_of_selection = function
- | Empty -> Json.Null
+ | Empty -> `Null
| Compose code -> json_of_compose code
| Clause (Goal p) ->
- Json.(Assoc[ j_goal ; j_pred p ; j_ppattern p ])
+ `Assoc[ j_goal ; j_pred p ; j_ppattern p ]
| Clause (Step s) ->
let p = Conditions.head s in
- Json.(Assoc[ j_step ; j_at s ; j_kind s ; j_pred p ; j_ppattern p ])
+ `Assoc[ j_step ; j_at s ; j_kind s ; j_pred p ; j_ppattern p ]
| Inside(Goal p,e) ->
let n,m = occur p e in
- Json.(Assoc [ j_ingoal ; j_occur n ; j_term e ; j_pattern m ])
+ `Assoc [ j_ingoal ; j_occur n ; j_term e ; j_pattern m ]
| Inside(Step s,e) ->
let n,m = occur (Conditions.head s) e in
- Json.(Assoc [ j_instep ; j_at s ; j_kind s ; j_occur n ;
- j_term e ; j_pattern m ])
+ `Assoc [ j_instep ; j_at s ; j_kind s ; j_occur n ;
+ j_term e ; j_pattern m ]
and j_args = function
| [] -> []
- | es -> ["args" , Json.Array (List.map json_of_selection es)]
+ | es -> ["args" , `List (List.map json_of_selection es)]
and json_of_compose = function
- | Cint a -> Json.(Assoc [j_kint ; j_int a])
- | Range(a,b) -> Json.(Assoc [j_range ; j_min a ; j_max b])
- | Code(_,id,es) -> Json.(Assoc (j_compose :: j_id id :: j_args es))
+ | Cint a -> `Assoc [j_kint ; j_int a]
+ | Range(a,b) -> `Assoc [j_range ; j_min a ; j_max b]
+ | Code(_,id,es) -> `Assoc (j_compose :: j_id id :: j_args es)
(* -------------------------------------------------------------------------- *)
(* --- Json to Selection --- *)
@@ -193,12 +193,12 @@ let rec selection_of_json ((hs,g) as s : sequent) js =
let selection_target js = js >? "target" |> Json.string
let json_of_named = function
- | None -> Json.Null
+ | None -> `Null
| Some a ->
- Json.Assoc Tactical.[
- "id" , Json.String a.vid ;
- "title" , Json.String a.title ;
- "descr" , Json.String a.descr ;
+ `Assoc Tactical.[
+ "id" , `String a.vid ;
+ "title" , `String a.title ;
+ "descr" , `String a.descr ;
]
let named_of_json find js =
@@ -219,7 +219,7 @@ let json_of_param (tac : tactical) = function
| Spinner(fd,_) -> ident fd , Json.of_int (tac#get_field fd)
| Composer(fd,_) -> ident fd , json_of_selection (tac#get_field fd)
| Selector(fd,options,equal) ->
- ident fd , Json.String
+ ident fd , `String
begin
try
let a = tac#get_field fd in
@@ -260,7 +260,7 @@ let param_of_json (tac : tactical) seq js = function
end
let json_of_parameters (tac : tactical) =
- Json.Assoc (List.map (json_of_param tac) tac#params)
+ `Assoc (List.map (json_of_param tac) tac#params)
let parameters_of_json (tac : tactical) sequent js =
List.iter (param_of_json tac sequent js) tac#params
@@ -285,28 +285,28 @@ let jtactic ~title (tac : tactical) (sel : selection) =
}
let json_of_tactic t js =
- Json.(Assoc [
- "header" , Json.String t.header ;
- "tactic" , Json.String t.tactic ;
- "params" , t.params ;
- "select" , t.select ;
- "children" , Json.Assoc js ;
- ])
+ `Assoc [
+ "header" , `String t.header ;
+ "tactic" , `String t.tactic ;
+ "params" , t.params ;
+ "select" , t.select ;
+ "children" , `Assoc js ;
+ ]
let children_of_json = function
- | Json.Array js ->
+ | `List js ->
Wp_parameters.warning ~current:false ~once:true
"Deprecated script(s) found ; consider using prover 'tip'" ;
List.map (fun j -> "",j) js
- | Json.Assoc fs -> fs
+ | `Assoc fs -> fs
| _ -> []
let tactic_of_json js =
try
let header = js >? "header" |> Json.string in
let tactic = js >? "tactic" |> Json.string in
- let params = try js >? "params" with Not_found -> Json.Null in
- let select = try js >? "select" with Not_found -> Json.Null in
+ let params = try js >? "params" with Not_found -> `Null in
+ let select = try js >? "select" with Not_found -> `Null in
let children = try js >? "children" |> children_of_json with Not_found -> [] in
Some( { header ; tactic ; params ; select } , children )
with _ -> None
@@ -316,31 +316,31 @@ let tactic_of_json js =
(* -------------------------------------------------------------------------- *)
let json_of_verdict = function
- | VCS.NoResult | VCS.Checked | VCS.Computing _ -> Json.String "none"
- | VCS.Valid -> Json.String "valid"
- | VCS.Unknown -> Json.String "unknown"
- | VCS.Timeout -> Json.String "timeout"
- | VCS.Stepout -> Json.String "stepout"
- | VCS.Invalid -> Json.String "invalid"
- | VCS.Failed -> Json.String "failed"
+ | VCS.NoResult | VCS.Checked | VCS.Computing _ -> `String "none"
+ | VCS.Valid -> `String "valid"
+ | VCS.Unknown -> `String "unknown"
+ | VCS.Timeout -> `String "timeout"
+ | VCS.Stepout -> `String "stepout"
+ | VCS.Invalid -> `String "invalid"
+ | VCS.Failed -> `String "failed"
let verdict_of_json = function
- | Json.String "valid" -> VCS.Valid
- | Json.String "unknown" -> VCS.Unknown
- | Json.String "timeout" -> VCS.Timeout
- | Json.String "stepout" -> VCS.Stepout
- | Json.String "invalid" -> VCS.Invalid
- | Json.String "failed" -> VCS.Failed
+ | `String "valid" -> VCS.Valid
+ | `String "unknown" -> VCS.Unknown
+ | `String "timeout" -> VCS.Timeout
+ | `String "stepout" -> VCS.Stepout
+ | `String "invalid" -> VCS.Invalid
+ | `String "failed" -> VCS.Failed
| _ -> VCS.NoResult
let json_of_result (p : VCS.prover) (r : VCS.result) =
let open VCS in
- let name = "prover" , Json.String (VCS.name_of_prover p) in
+ let name = "prover" , `String (VCS.name_of_prover p) in
let verdict = "verdict" , json_of_verdict r.verdict in
- let time = if r.prover_time > 0.0 then [ "time" , Json.Float r.prover_time ] else [] in
- let steps = if r.prover_steps > 0 then [ "steps" , Json.Int r.prover_steps ] else [] in
- let depth = if r.prover_depth > 0 then [ "depth" , Json.Int r.prover_depth ] else [] in
- Json.Assoc (name :: verdict :: (time @ steps @ depth))
+ let time = if r.prover_time > 0.0 then [ "time" , `Float r.prover_time ] else [] in
+ let steps = if r.prover_steps > 0 then [ "steps" , `Int r.prover_steps ] else [] in
+ let depth = if r.prover_depth > 0 then [ "depth" , `Int r.prover_depth ] else [] in
+ `Assoc (name :: verdict :: (time @ steps @ depth))
let prover_of_json js =
try VCS.prover_of_name (js >? "prover" |> Json.string)
@@ -390,8 +390,8 @@ let a_tactic tac children = Tactic(subgoals 0 children,tac,children)
(* -------------------------------------------------------------------------- *)
let rec decode = function
- | Json.Null -> []
- | Json.Array alts -> List.map alternative alts
+ | `Null -> []
+ | `List alts -> List.map alternative alts
| js -> [Error("Invalid Script",js)]
and subscript (key,js) = key , decode js
@@ -405,7 +405,7 @@ and alternative js =
a_tactic tactic (List.map subscript children)
| None -> Error("Invalid Tactic",js)
-let rec encode script = Json.Array (alternatives script)
+let rec encode script = `List (alternatives script)
and subgoal (k,alt) = k , encode alt
diff --git a/src/plugins/wp/ProofScript.mli b/src/plugins/wp/ProofScript.mli
index 40e193974f68eaab8d30b4d118cd4c6c34f142e0..3d82fbe6cada5d69e5eeeed88bff6889ffd1b59e 100644
--- a/src/plugins/wp/ProofScript.mli
+++ b/src/plugins/wp/ProofScript.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProofSession.ml b/src/plugins/wp/ProofSession.ml
index 716cf6a89721be64454fe002971acf09acd34153..e79a9491ca5cac9e75d54e7b49b80bfd8ec60e94 100644
--- a/src/plugins/wp/ProofSession.ml
+++ b/src/plugins/wp/ProofSession.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -55,8 +55,9 @@ let exists wpo =
let load wpo =
match status wpo with
- | NoScript -> Json.Null
- | Script f | Deprecated f -> Json.load_file f
+ | NoScript -> `Null
+ | Script f | Deprecated f ->
+ if Sys.file_exists f then Json.load_file f else `Null
let remove wpo =
match status wpo with
@@ -77,7 +78,7 @@ let remove wpo =
let save wpo js =
let empty =
match js with
- | Json.Null | Json.Array [] | Json.Assoc [] -> true
+ | `Null | `List [] | `Assoc [] -> true
| _ -> false in
if empty then remove wpo else
match status wpo with
diff --git a/src/plugins/wp/ProofSession.mli b/src/plugins/wp/ProofSession.mli
index 0d4fc495bee829cc0dcd75501452f94b59b99c2b..1387357f27ae30e98cd0b8da4f52d81bf22f022d 100644
--- a/src/plugins/wp/ProofSession.mli
+++ b/src/plugins/wp/ProofSession.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverCoq.ml b/src/plugins/wp/ProverCoq.ml
index a3616857cfb66b3ebf4926a0a32230d827bb4ec8..7f07fdfe2587d78255717aa24699c2fec2bcd482 100644
--- a/src/plugins/wp/ProverCoq.ml
+++ b/src/plugins/wp/ProverCoq.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverCoq.mli b/src/plugins/wp/ProverCoq.mli
index 717096886f2ef60a5c7c577ec99fb042dc589ac2..d34debd31a41638c55677c2587fd6b7180cfc5cf 100644
--- a/src/plugins/wp/ProverCoq.mli
+++ b/src/plugins/wp/ProverCoq.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverErgo.ml b/src/plugins/wp/ProverErgo.ml
index 1700574ccac638588a4346bf485518d3d00d577c..cd1dab60a3bfd292dd297f033da95bbafb695967 100644
--- a/src/plugins/wp/ProverErgo.ml
+++ b/src/plugins/wp/ProverErgo.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverErgo.mli b/src/plugins/wp/ProverErgo.mli
index 619b62a2fcf0ae19954dafb1e5b8fb0f3e7bcc91..9813d0c76cec4ea97bb9abe3ce1cdb47525d67ef 100644
--- a/src/plugins/wp/ProverErgo.mli
+++ b/src/plugins/wp/ProverErgo.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverScript.ml b/src/plugins/wp/ProverScript.ml
index b253a78e79031689580a1a8253ce6b93874de9ed..199f8180f9e0678a76630cebc3c578bc76a4401c 100644
--- a/src/plugins/wp/ProverScript.ml
+++ b/src/plugins/wp/ProverScript.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverScript.mli b/src/plugins/wp/ProverScript.mli
index 7b5d1d33e15800629d57f3f5064d64222fe88a8a..b11248551cce6c8b7aeaa917557d8c5f67f4077c 100644
--- a/src/plugins/wp/ProverScript.mli
+++ b/src/plugins/wp/ProverScript.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverSearch.ml b/src/plugins/wp/ProverSearch.ml
index f9b7bb718eb7787e4835fa9701d6b1aaa4fef6eb..d64e003cc1b4a06f50e3e9fe72c445f47aaa3036 100644
--- a/src/plugins/wp/ProverSearch.ml
+++ b/src/plugins/wp/ProverSearch.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverSearch.mli b/src/plugins/wp/ProverSearch.mli
index 40fa69dc15d713055b3d901ab20b3ec8994dcb22..b676f64053737308a38f1cf4f773832704a629b2 100644
--- a/src/plugins/wp/ProverSearch.mli
+++ b/src/plugins/wp/ProverSearch.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverTask.ml b/src/plugins/wp/ProverTask.ml
index 6d8713e3ec8b00aa1f56b700a35505b9aa4bc985..69aa5ea1cd391c6ac1dbbae0653f96a040f495bb 100644
--- a/src/plugins/wp/ProverTask.ml
+++ b/src/plugins/wp/ProverTask.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverTask.mli b/src/plugins/wp/ProverTask.mli
index d6ed40de78f109f05a8e4613bcc80aa8c39d9d43..e3a567f91212221236f292dfc94a84c68dbf91bf 100644
--- a/src/plugins/wp/ProverTask.mli
+++ b/src/plugins/wp/ProverTask.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverWhy3.ml b/src/plugins/wp/ProverWhy3.ml
index 8ef36dceb89fef288894fab01853fd4c976ae8c7..4480ea68e99f8fb138ab27deed9f3208e2ce5a04 100644
--- a/src/plugins/wp/ProverWhy3.ml
+++ b/src/plugins/wp/ProverWhy3.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverWhy3.mli b/src/plugins/wp/ProverWhy3.mli
index 9aec91ec09c4e8329bb17c68fcacd26fa1f78aba..bab64eec2e2a1e150f9c44b5e766031f49c3408f 100644
--- a/src/plugins/wp/ProverWhy3.mli
+++ b/src/plugins/wp/ProverWhy3.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverWhy3ide.ml b/src/plugins/wp/ProverWhy3ide.ml
index 43d88028dd1fc67a776569bc8e3366e9b6becece..1a39a76e959913e04f5434c8a1603ca0fef2a5d9 100644
--- a/src/plugins/wp/ProverWhy3ide.ml
+++ b/src/plugins/wp/ProverWhy3ide.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ProverWhy3ide.mli b/src/plugins/wp/ProverWhy3ide.mli
index b24ae6931a03ee6f1c47ae58e66a3e9c3a55bbfc..04144226000fe0c14c17942edd512adb605b08b7 100644
--- a/src/plugins/wp/ProverWhy3ide.mli
+++ b/src/plugins/wp/ProverWhy3ide.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/RefUsage.ml b/src/plugins/wp/RefUsage.ml
index baf1635677625eda34dd5acd8b975e4cc31683f3..b8781dce07e38ae0dec39ff8f93a169c0d40e891 100644
--- a/src/plugins/wp/RefUsage.ml
+++ b/src/plugins/wp/RefUsage.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/RefUsage.mli b/src/plugins/wp/RefUsage.mli
index 59208b07c41d717d59337fa657ea63a67077f290..7a50bebcd53f2583d69fbabd16f295037295320e 100644
--- a/src/plugins/wp/RefUsage.mli
+++ b/src/plugins/wp/RefUsage.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Region.ml b/src/plugins/wp/Region.ml
index 36c8d006275d1eb7ef5be50259f63fc29d945e2f..22813de5c12093676432f308fbce7fec0de96961 100644
--- a/src/plugins/wp/Region.ml
+++ b/src/plugins/wp/Region.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Region.mli b/src/plugins/wp/Region.mli
index 60f91992634bc5fc29b11716e1ba97f1c44e103f..f7a5eba2289224f8072eb1b563eae5d56859b1c3 100644
--- a/src/plugins/wp/Region.mli
+++ b/src/plugins/wp/Region.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Repr.ml b/src/plugins/wp/Repr.ml
index 07994f7d6c93ec03a95748cb4be6869f795fc281..e10b247a8389fad67e374541ce5a8084011ce5cc 100644
--- a/src/plugins/wp/Repr.ml
+++ b/src/plugins/wp/Repr.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Repr.mli b/src/plugins/wp/Repr.mli
index 3684d5a9c617831d81f0a4a1cf533ec6d9af8f55..2719bc5d1e0de0d798bc5aa75af55cdf70cef4ed 100644
--- a/src/plugins/wp/Repr.mli
+++ b/src/plugins/wp/Repr.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Sigma.ml b/src/plugins/wp/Sigma.ml
index baa5036369a9f8665c7de7107236203efb929ba4..08e6a595ad964ff8820e01ffa6bfa5736e51e6ad 100644
--- a/src/plugins/wp/Sigma.ml
+++ b/src/plugins/wp/Sigma.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Sigma.mli b/src/plugins/wp/Sigma.mli
index d40b74ac52ded7b667dbf645419aa8b51fb0d326..8d8742b4ce1dd27f5de80eecea4d11982fc7c16f 100644
--- a/src/plugins/wp/Sigma.mli
+++ b/src/plugins/wp/Sigma.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Sigs.ml b/src/plugins/wp/Sigs.ml
index 13b0d563d5680e5351ade772a77dfe280703f6b1..aa49e4f9d21b6052dbb868d93dfa3573905c5624 100644
--- a/src/plugins/wp/Sigs.ml
+++ b/src/plugins/wp/Sigs.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Splitter.ml b/src/plugins/wp/Splitter.ml
index a2d1c4e4f5c99afb82679be828377f18e9146bb8..9ac78de77206ef6f1c7f1dc2d95e54cb5865706c 100644
--- a/src/plugins/wp/Splitter.ml
+++ b/src/plugins/wp/Splitter.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Splitter.mli b/src/plugins/wp/Splitter.mli
index 13210d09cdb36ad5c4f6b54c1430600cde3dcd90..d59800cb138ff4eaa6fb9aca294612e7bc73ea2f 100644
--- a/src/plugins/wp/Splitter.mli
+++ b/src/plugins/wp/Splitter.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/StmtSemantics.ml b/src/plugins/wp/StmtSemantics.ml
index b4fb518b70ec30ec154bd222b573e2de5a149780..dcfe6882c457142db1f40bb156ea742e8f894c3e 100644
--- a/src/plugins/wp/StmtSemantics.ml
+++ b/src/plugins/wp/StmtSemantics.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/StmtSemantics.mli b/src/plugins/wp/StmtSemantics.mli
index f3491ffbc32a9a3eb64ed589cdb218348ee72343..13229d3eca7cc5f8316725f0158305a3d3c45c2f 100644
--- a/src/plugins/wp/StmtSemantics.mli
+++ b/src/plugins/wp/StmtSemantics.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Strategy.ml b/src/plugins/wp/Strategy.ml
index 735d4d57f6bb1dab8025e86670aafe6a4d100f82..b6073824dd1f12a63fc3e91e3d40f4575334e0c1 100644
--- a/src/plugins/wp/Strategy.ml
+++ b/src/plugins/wp/Strategy.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Strategy.mli b/src/plugins/wp/Strategy.mli
index 3c0269e9599d9c50ed1d0ecf2bb7d2e8ab988a3c..2a300ed788ecf9051c6323e53e759262116aa6bd 100644
--- a/src/plugins/wp/Strategy.mli
+++ b/src/plugins/wp/Strategy.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacArray.ml b/src/plugins/wp/TacArray.ml
index b83e81117819b1f8d593d87940dea3499fddc5b0..75afbd5a1fd4ac38f87955c3e0e0682bb7115286 100644
--- a/src/plugins/wp/TacArray.ml
+++ b/src/plugins/wp/TacArray.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacArray.mli b/src/plugins/wp/TacArray.mli
index a850b51846ad23c6f5964ff787860a0491ee96e6..c52954283c763abd95e81d7ed88aecdbe6c3116c 100644
--- a/src/plugins/wp/TacArray.mli
+++ b/src/plugins/wp/TacArray.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacBitrange.ml b/src/plugins/wp/TacBitrange.ml
index 00e380b61c663a8aef459a88e0e9290b26863b90..5457327db1e555ac1cbdf6e57504dae280ca5e3f 100644
--- a/src/plugins/wp/TacBitrange.ml
+++ b/src/plugins/wp/TacBitrange.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacBitrange.mli b/src/plugins/wp/TacBitrange.mli
index 79b9f82284e2e6c614c921fec87e7765ac8877ad..a4fa439a552f24e965b62239ecce4962709f578c 100644
--- a/src/plugins/wp/TacBitrange.mli
+++ b/src/plugins/wp/TacBitrange.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacBitwised.ml b/src/plugins/wp/TacBitwised.ml
index d1bc1e447e431b55d53a021b29511e538d4c05c9..bf9604878cc9858d958d7d8fde96ac300cfd9983 100644
--- a/src/plugins/wp/TacBitwised.ml
+++ b/src/plugins/wp/TacBitwised.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacBitwised.mli b/src/plugins/wp/TacBitwised.mli
index 4ebd459e6137d2c2f3b412f650a666f3b9b9b046..d29a1f41eb6a645a0d2fe13e7b78383034e966ae 100644
--- a/src/plugins/wp/TacBitwised.mli
+++ b/src/plugins/wp/TacBitwised.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacChoice.ml b/src/plugins/wp/TacChoice.ml
index 4caf660d5d40ffca455d9e6e3231849d507dab58..3830bf76446d3bb1ef4dfe1ad3c208d963d634ae 100644
--- a/src/plugins/wp/TacChoice.ml
+++ b/src/plugins/wp/TacChoice.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacChoice.mli b/src/plugins/wp/TacChoice.mli
index c9e12fb84af58b9914bfae15a8966d8f8db4ceba..8fc397543632c83a5bc4f0f1e1df2d2ed366d329 100644
--- a/src/plugins/wp/TacChoice.mli
+++ b/src/plugins/wp/TacChoice.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacCompound.ml b/src/plugins/wp/TacCompound.ml
index c05be6ffc4fd0de28de90d4e30bcadd4ab33d259..09df4884d9a6f336b4fb2dcbaf03c87d402593bd 100644
--- a/src/plugins/wp/TacCompound.ml
+++ b/src/plugins/wp/TacCompound.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacCompound.mli b/src/plugins/wp/TacCompound.mli
index 696dd3e6e484282d186e2cbe343913351f25b8f8..3fe87bcac185a0f305007b34c43899843cd362fe 100644
--- a/src/plugins/wp/TacCompound.mli
+++ b/src/plugins/wp/TacCompound.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacCongruence.ml b/src/plugins/wp/TacCongruence.ml
index fbe1ba9475dfcff66ad0d0d2069413bbf6272bc4..b59a7a2812042e786ec62ab27703787c46789d1b 100644
--- a/src/plugins/wp/TacCongruence.ml
+++ b/src/plugins/wp/TacCongruence.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacCongruence.mli b/src/plugins/wp/TacCongruence.mli
index 5ac37e0ae6f273878b93fe3fd9d90fd0420381e9..f1c7d0590ce7fa3046efe3ddd3bfc8eda9068fbb 100644
--- a/src/plugins/wp/TacCongruence.mli
+++ b/src/plugins/wp/TacCongruence.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacCut.ml b/src/plugins/wp/TacCut.ml
index 774f04d8a143e71e1db05747bf9084cf6b12556a..6981c8c72d41faf7184e41bf3483a49938d321cf 100644
--- a/src/plugins/wp/TacCut.ml
+++ b/src/plugins/wp/TacCut.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacCut.mli b/src/plugins/wp/TacCut.mli
index 093381d6b62dd55bc75de3c0ba793247816f57bd..84cb92ec1560107af8f61f91348f08413bf3cb2d 100644
--- a/src/plugins/wp/TacCut.mli
+++ b/src/plugins/wp/TacCut.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacFilter.ml b/src/plugins/wp/TacFilter.ml
index f2391b7f0a56a6f38667ecab39c5cbae49acd0a7..cf3ecd9b02ee747e73d53df18b22191fb940b64e 100644
--- a/src/plugins/wp/TacFilter.ml
+++ b/src/plugins/wp/TacFilter.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacFilter.mli b/src/plugins/wp/TacFilter.mli
index 1b3733a4e79a744ed9bb1fa89ff56c7be99b1347..57bda703c1e6b1a50da822431a2f7ebf6ff18b93 100644
--- a/src/plugins/wp/TacFilter.mli
+++ b/src/plugins/wp/TacFilter.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacHavoc.ml b/src/plugins/wp/TacHavoc.ml
index af07cc83ba3b30ad9640692ab661fbb06c1d2d48..ee2bbd7b4f0a68a8dc0ef47e36276d0cc8c58161 100644
--- a/src/plugins/wp/TacHavoc.ml
+++ b/src/plugins/wp/TacHavoc.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacHavoc.mli b/src/plugins/wp/TacHavoc.mli
index ff68b31046e7139c524926b53e8a717813c20e46..2ed3b403e084164a16fa9ea0f55a31c736348048 100644
--- a/src/plugins/wp/TacHavoc.mli
+++ b/src/plugins/wp/TacHavoc.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacInstance.ml b/src/plugins/wp/TacInstance.ml
index c1ed93ede6fbaacb4fd30a4417314f823a00ff29..ea227ab18ef8b10f42a02a49126f5baadf28f2cd 100644
--- a/src/plugins/wp/TacInstance.ml
+++ b/src/plugins/wp/TacInstance.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacInstance.mli b/src/plugins/wp/TacInstance.mli
index 6aff0c31237849e8a5c5b98e663ff1f22de328ff..46e523c1676e82d938b9e0bea9b1c5ba6871127b 100644
--- a/src/plugins/wp/TacInstance.mli
+++ b/src/plugins/wp/TacInstance.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacLemma.ml b/src/plugins/wp/TacLemma.ml
index be006412677d7e6a0ef4cfdb2cc10820813ec43f..25c018cb37beb7307df465f618bae90e8ec4de3f 100644
--- a/src/plugins/wp/TacLemma.ml
+++ b/src/plugins/wp/TacLemma.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacLemma.mli b/src/plugins/wp/TacLemma.mli
index ad94c79f3c9b2fc0c957d20e7f718d15114a28f1..b49efe7d0b9ad9a62df159b6dd4e6ce0c5c8dcbb 100644
--- a/src/plugins/wp/TacLemma.mli
+++ b/src/plugins/wp/TacLemma.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacNormalForm.ml b/src/plugins/wp/TacNormalForm.ml
index 8c60273928e830e80a9da4f161d4e74f2d7d189b..dcf50b0c272ba4e9e084b19fc5b2740a01b53b4b 100644
--- a/src/plugins/wp/TacNormalForm.ml
+++ b/src/plugins/wp/TacNormalForm.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacNormalForm.mli b/src/plugins/wp/TacNormalForm.mli
index 1974e0a08183d836e5cf61d7bfa350e313af95c2..a39885aba9ef120deba3fa0e960a6fa5f0b0b960 100644
--- a/src/plugins/wp/TacNormalForm.mli
+++ b/src/plugins/wp/TacNormalForm.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacOverflow.ml b/src/plugins/wp/TacOverflow.ml
index 2211c01d0a997662094a5350bd5049b824ecd64c..381d65d4b6c19362fd87c6d9543e78724cacde37 100644
--- a/src/plugins/wp/TacOverflow.ml
+++ b/src/plugins/wp/TacOverflow.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacOverflow.mli b/src/plugins/wp/TacOverflow.mli
index e0715ce030e50498b6e85206a655ce0e7b84be05..5de988d118ab85db58a65364d81c7fa1966894bc 100644
--- a/src/plugins/wp/TacOverflow.mli
+++ b/src/plugins/wp/TacOverflow.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacRange.ml b/src/plugins/wp/TacRange.ml
index 7d3bf33b2f9ff2cd945b92f06dcf91080fe84484..2a81ad9e22dbf580626632864f638669ab40f358 100644
--- a/src/plugins/wp/TacRange.ml
+++ b/src/plugins/wp/TacRange.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacRange.mli b/src/plugins/wp/TacRange.mli
index b7fb2ab4d382007b9167b15da83d736cfeb09103..f80ff64b08f13910b8c60a8884047ff34ce010d3 100644
--- a/src/plugins/wp/TacRange.mli
+++ b/src/plugins/wp/TacRange.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacRewrite.ml b/src/plugins/wp/TacRewrite.ml
index fcc85c76041223e01df08bd0bd047413d44c087b..d4c6f6f5b506d9ccdc4d82739d23661c249a0b68 100644
--- a/src/plugins/wp/TacRewrite.ml
+++ b/src/plugins/wp/TacRewrite.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacRewrite.mli b/src/plugins/wp/TacRewrite.mli
index d2c8573f1cfcbc81b89bf20767fc8f3ef9107711..20ec07370356d8384ff57d82d05d12e5ad3e1a84 100644
--- a/src/plugins/wp/TacRewrite.mli
+++ b/src/plugins/wp/TacRewrite.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacShift.ml b/src/plugins/wp/TacShift.ml
index 02b770be1592705fb18ba8d5636c5616214da24a..3da39d9bc4894348efa696e89c69ffc11a0fe336 100644
--- a/src/plugins/wp/TacShift.ml
+++ b/src/plugins/wp/TacShift.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacShift.mli b/src/plugins/wp/TacShift.mli
index ad2ae98d235695b190ce7ed6487f7b378d4b90e2..79777a96c95bfc76ca437f679345797019d940d9 100644
--- a/src/plugins/wp/TacShift.mli
+++ b/src/plugins/wp/TacShift.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacSplit.ml b/src/plugins/wp/TacSplit.ml
index afb0697cc5fee18c304eb17e0b01d8fd6b03321a..88f3a2ba4ea3185fb46ef4a3e3ef311d597566cb 100644
--- a/src/plugins/wp/TacSplit.ml
+++ b/src/plugins/wp/TacSplit.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacSplit.mli b/src/plugins/wp/TacSplit.mli
index cc70aa16e992e42e93b42422207c017f746fb465..642b454f55dea80217d2bb00d13c4975b420a330 100644
--- a/src/plugins/wp/TacSplit.mli
+++ b/src/plugins/wp/TacSplit.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacUnfold.ml b/src/plugins/wp/TacUnfold.ml
index 8ba5d658865f37736c72867d6ca86c0b9e4f3647..bff1208655630614a4bee6cb0adebf08c1c5f037 100644
--- a/src/plugins/wp/TacUnfold.ml
+++ b/src/plugins/wp/TacUnfold.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/TacUnfold.mli b/src/plugins/wp/TacUnfold.mli
index d2bbcfd2475a1ef7db4a15998df2428525e69a42..f00c8c327de1f3a16b2c97b1f9aa52e1be2cf602 100644
--- a/src/plugins/wp/TacUnfold.mli
+++ b/src/plugins/wp/TacUnfold.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Tactical.ml b/src/plugins/wp/Tactical.ml
index 54aed6080ac3b95377757e892568ee899420fc4e..d49794b6cb54b829f016cc0e45db5cb5c43fc9d8 100644
--- a/src/plugins/wp/Tactical.ml
+++ b/src/plugins/wp/Tactical.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Tactical.mli b/src/plugins/wp/Tactical.mli
index 1f4fe17e789224f84ae291cb76785e8d3ad340d2..f501602f64a148c810dcb1e447c33a779389a02c 100644
--- a/src/plugins/wp/Tactical.mli
+++ b/src/plugins/wp/Tactical.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/VC.ml b/src/plugins/wp/VC.ml
index fc32d897af54e154b8480aa757d115ffc51b7df2..eb42ed0d9e5fdadf978ca356b6884831224686ee 100644
--- a/src/plugins/wp/VC.ml
+++ b/src/plugins/wp/VC.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/VC.mli b/src/plugins/wp/VC.mli
index 68ee287b46d1441d11e6c4f5a622e783d83252ed..dc66384d1e015e323db4342fd4da7eb3c3642a99 100644
--- a/src/plugins/wp/VC.mli
+++ b/src/plugins/wp/VC.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/VCS.ml b/src/plugins/wp/VCS.ml
index da9e92384a7d1976425b0d19a79fbea6abe64a48..b343e24d20cc2adf85d9ac0559431dece966b38b 100644
--- a/src/plugins/wp/VCS.ml
+++ b/src/plugins/wp/VCS.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/VCS.mli b/src/plugins/wp/VCS.mli
index ec57f1c28e7e7729116643e924d77d7396790151..31bf3423feb10d9348c935eec2ebb1da760a911a 100644
--- a/src/plugins/wp/VCS.mli
+++ b/src/plugins/wp/VCS.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Vlist.ml b/src/plugins/wp/Vlist.ml
index be22ca3c670d9c900f280bffd3a599e8af39bf54..0f41386b7f696ae9ad8e59a6b8b908a7511ab2b0 100644
--- a/src/plugins/wp/Vlist.ml
+++ b/src/plugins/wp/Vlist.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Vlist.mli b/src/plugins/wp/Vlist.mli
index ad916e58c5fb7e1582cd35015e05096fffcfdecb..9034e2f51b679eedd41afa67da67a65b37d91a30 100644
--- a/src/plugins/wp/Vlist.mli
+++ b/src/plugins/wp/Vlist.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Vset.ml b/src/plugins/wp/Vset.ml
index 7e548639d0c22910ba4c9c37959fcbad17e32364..332d21564053f8d74466439c5f87463ba5bf6ccc 100644
--- a/src/plugins/wp/Vset.ml
+++ b/src/plugins/wp/Vset.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Vset.mli b/src/plugins/wp/Vset.mli
index 754ad413e111f4e7e1bc88172724c81e354abac6..24adee5e358e313e16234b89849af7dc3395ba9b 100644
--- a/src/plugins/wp/Vset.mli
+++ b/src/plugins/wp/Vset.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Warning.ml b/src/plugins/wp/Warning.ml
index 3463365aef5d3bcb470a1944c4024d98aabce5c6..56ea8e88b484eef4da87686ebfc3bd2894cf8b5d 100644
--- a/src/plugins/wp/Warning.ml
+++ b/src/plugins/wp/Warning.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/Warning.mli b/src/plugins/wp/Warning.mli
index b94a35fedfaab90265758650910ea2182e7b0c12..aab4aaf2381a10625db3d2e7679cf1cb5edbc2bf 100644
--- a/src/plugins/wp/Warning.mli
+++ b/src/plugins/wp/Warning.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/WpTac.ml b/src/plugins/wp/WpTac.ml
index e67b277f40d974414aaa76b6861b3f7abc01f7fe..b72f973b95c97bd72e4a14297262435664bd6321 100644
--- a/src/plugins/wp/WpTac.ml
+++ b/src/plugins/wp/WpTac.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/WpTac.mli b/src/plugins/wp/WpTac.mli
index 936a8b2b760627a12691725e26fb0ebc367273a3..8682944ddd37df4ebfbbc34a4d4e8727a123215c 100644
--- a/src/plugins/wp/WpTac.mli
+++ b/src/plugins/wp/WpTac.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/calculus.ml b/src/plugins/wp/calculus.ml
index 39dce31afc86afa3d3804a8d4eb07d2770d35bda..230dace2e5727c80212687e0b926520736b3ab67 100644
--- a/src/plugins/wp/calculus.ml
+++ b/src/plugins/wp/calculus.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/calculus.mli b/src/plugins/wp/calculus.mli
index deb69fb15b89b81fb6a7a817dd1bc46bdd64a1c0..77c10a0f39dd8bbb5c5595be87d6eed949e498aa 100644
--- a/src/plugins/wp/calculus.mli
+++ b/src/plugins/wp/calculus.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/cfgDump.ml b/src/plugins/wp/cfgDump.ml
index 897bce00902c16bfccc297786554e18b42945c23..371cb90b21a129cca4479c366fd8e26d0eee0a5b 100644
--- a/src/plugins/wp/cfgDump.ml
+++ b/src/plugins/wp/cfgDump.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/cfgDump.mli b/src/plugins/wp/cfgDump.mli
index af6037cdbfc3788f6156a5b56ed12729938b26c8..04f9097647d755639d46cc3edbf1635fe9fd0768 100644
--- a/src/plugins/wp/cfgDump.mli
+++ b/src/plugins/wp/cfgDump.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/cfgWP.ml b/src/plugins/wp/cfgWP.ml
index c04c528aeedf8f0bd2be16753a811431c4db8c37..604c97700aac03d1b923e498ff741cd4dd0383fb 100644
--- a/src/plugins/wp/cfgWP.ml
+++ b/src/plugins/wp/cfgWP.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/cfgWP.mli b/src/plugins/wp/cfgWP.mli
index 5f3ed7721dff82edb34aac4648435fb824d9d19a..c603d0a40b1b3f937a0a60fc5d1106da30824daa 100644
--- a/src/plugins/wp/cfgWP.mli
+++ b/src/plugins/wp/cfgWP.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/cil2cfg.ml b/src/plugins/wp/cil2cfg.ml
index 19876997077b748688806a8a1b19218097353187..3129f58100673b091f21bd77f6bcfd127b4f18e3 100644
--- a/src/plugins/wp/cil2cfg.ml
+++ b/src/plugins/wp/cil2cfg.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/cil2cfg.mli b/src/plugins/wp/cil2cfg.mli
index 63bf154358b85de2a30183b2b05b388bb9487ec0..b4745c1b54092f55f775d6e9bc6683fe996e07e8 100644
--- a/src/plugins/wp/cil2cfg.mli
+++ b/src/plugins/wp/cil2cfg.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/clabels.ml b/src/plugins/wp/clabels.ml
index 67535e8a548acbcbd839cda72ca782823fd0fe11..6f206491c3910172c486f10b3c0ea58a3618b13f 100644
--- a/src/plugins/wp/clabels.ml
+++ b/src/plugins/wp/clabels.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/clabels.mli b/src/plugins/wp/clabels.mli
index 0e2f8aaa9fb802a69c31da12fd6b187857541d49..0a8ada54b2b7fecf420d36976a4a71d84d48a040 100644
--- a/src/plugins/wp/clabels.mli
+++ b/src/plugins/wp/clabels.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/configure.ac b/src/plugins/wp/configure.ac
index 6d2ab918c450efc9aadbec402442e493a3167fde..34e1e4f5c31bd0867370339e34434154a520a7ae 100644
--- a/src/plugins/wp/configure.ac
+++ b/src/plugins/wp/configure.ac
@@ -2,7 +2,7 @@
# #
# This file is part of WP plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat a l'energie atomique et aux energies #
# alternatives) #
# #
diff --git a/src/plugins/wp/ctypes.ml b/src/plugins/wp/ctypes.ml
index e69adacd6d6ca11a6ef1981ea1356744a44ea62f..34c76d1ff2e5b49184aab55d7def49df1df0ab4d 100644
--- a/src/plugins/wp/ctypes.ml
+++ b/src/plugins/wp/ctypes.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/ctypes.mli b/src/plugins/wp/ctypes.mli
index 74ef9d6c733501004663be7f226c5f941f9b39c9..234bd3119eb79ed5bc5344a58d82893f6c5927a5 100644
--- a/src/plugins/wp/ctypes.mli
+++ b/src/plugins/wp/ctypes.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/doc/manual/wp_intro.tex b/src/plugins/wp/doc/manual/wp_intro.tex
index da74357a7b980d3af92104006171c1c51d367aa9..1e3c5e076a67cc3e3d8a823eceda35a8c64bcd7d 100644
--- a/src/plugins/wp/doc/manual/wp_intro.tex
+++ b/src/plugins/wp/doc/manual/wp_intro.tex
@@ -340,12 +340,15 @@ For tackling this complexity, the \textsf{WP} plug-in relies on several
or \texttt{-wp-rte} will generate a warning if some annotation might be not
generated.
-\item[Float Model:] floating-point operations are \emph{defined} to be
- the mathematical ones \emph{with} a rounding operation. This is fully
- consistent with the \textsf{IEEE} semantics. Most automated provers
- are not able to discharge the generated proof obligations. Special
- support for the \textsf{Gappa} theorem prover is available through
- \textsf{Why3}.
+\item[Float Model:] floating-point values are represent in a special
+ theory with dedicated operations over \texttt{float} and \texttt{double}
+ values and conversion from and to their \texttt{real} representation \emph{via}
+ rounding, as defined by the \textsc{C/ACSL} semantics.
+
+ Although correct with respect to the \textsc{IEEE} specifications, this
+ model still provides very little support for proving properties with automated
+ provers. You may add additional properties using \emph{drivers}
+ as explained later.
\item[Real Model:] floating-point operations are \emph{transformed} on
reals, with \emph{no} rounding. This is completely unsound with
diff --git a/src/plugins/wp/driver.mli b/src/plugins/wp/driver.mli
index bc8b58117c3287489c233f81f696570d1f30e11a..b705e56ba7484b88e32c26414ef12d2760748edd 100644
--- a/src/plugins/wp/driver.mli
+++ b/src/plugins/wp/driver.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/driver.mll b/src/plugins/wp/driver.mll
index 5d9945e79d03917902c6ab8df305b359c4323b31..e606dddb652c89d0862d82e3129d8df454ab9b61 100644
--- a/src/plugins/wp/driver.mll
+++ b/src/plugins/wp/driver.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/dyncall.ml b/src/plugins/wp/dyncall.ml
index f57519b8a90a040bf015dd752be2a55db8fe54cd..9abd9d6a833d8f352692f06832fe3eae47ee0ef5 100644
--- a/src/plugins/wp/dyncall.ml
+++ b/src/plugins/wp/dyncall.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/dyncall.mli b/src/plugins/wp/dyncall.mli
index 823c5c331becabe26776c2f75cf3ed3127ae7890..497ee779a18d1d20888416b69fd33fae4161988e 100644
--- a/src/plugins/wp/dyncall.mli
+++ b/src/plugins/wp/dyncall.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/intro_wp.txt b/src/plugins/wp/intro_wp.txt
index 8377d437fcc8157571186bb98a01de36af1da2b6..4c26d7bdb6bc9ab4d67e39d2d6303a13ddf6ec7c 100644
--- a/src/plugins/wp/intro_wp.txt
+++ b/src/plugins/wp/intro_wp.txt
@@ -2,7 +2,7 @@
#* #
#* This file is part of WP plug-in of Frama-C. #
#* #
-#* Copyright (C) 2007-2018 #
+#* Copyright (C) 2007-2019 #
#* CEA (Commissariat a l'energie atomique et aux energies #
#* alternatives) #
#* #
diff --git a/src/plugins/wp/mcfg.ml b/src/plugins/wp/mcfg.ml
index 9886e5dbacd97e2304ab5fa079b8fd4484ea019c..164dbe527ed68523d513576da8f808b9e06e4aab 100644
--- a/src/plugins/wp/mcfg.ml
+++ b/src/plugins/wp/mcfg.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/normAtLabels.ml b/src/plugins/wp/normAtLabels.ml
index 7ac3524fb985f798a72e3e52c7ecabe304b428b4..1cdc9f56cb6bab7402b7a4c9827a77fa0ed8766e 100644
--- a/src/plugins/wp/normAtLabels.ml
+++ b/src/plugins/wp/normAtLabels.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/normAtLabels.mli b/src/plugins/wp/normAtLabels.mli
index 17f1fc5c6e7d0e3334e6aafb0b45dd48bc133edf..aa179c41644f6f36800e17a706218496fa4c482f 100644
--- a/src/plugins/wp/normAtLabels.mli
+++ b/src/plugins/wp/normAtLabels.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/proof.ml b/src/plugins/wp/proof.ml
index 66f5ca87aa9c780b73a4a6476825ad4e004dc7cb..129c0aad1eef0dae724859a24e95067287cecfc3 100644
--- a/src/plugins/wp/proof.ml
+++ b/src/plugins/wp/proof.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/proof.mli b/src/plugins/wp/proof.mli
index 73093ed6f3ff5b0efa9df9694780f5cf395672fc..14a0f7e97e1ea091a97106c3e712184d0fbe1285 100644
--- a/src/plugins/wp/proof.mli
+++ b/src/plugins/wp/proof.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/prover.ml b/src/plugins/wp/prover.ml
index 09b4b33fa8a10f1d205e47fd8de40a152fb20ffe..4de85cbcd9ab13a9ffdbc5ed2c8f883adcdd26d3 100644
--- a/src/plugins/wp/prover.ml
+++ b/src/plugins/wp/prover.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/prover.mli b/src/plugins/wp/prover.mli
index 9408e8c098567cd72c5bfc1b1e9e068946954b42..1caf0d7975fd98d1e175ba185e00e0650ee751d9 100644
--- a/src/plugins/wp/prover.mli
+++ b/src/plugins/wp/prover.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/register.ml b/src/plugins/wp/register.ml
index ec3d2dba16251de491624feb6e7d9ab67bc7e73e..ae5dcd02429cb933efa456d8861aebe6664703c3 100644
--- a/src/plugins/wp/register.ml
+++ b/src/plugins/wp/register.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/rformat.mli b/src/plugins/wp/rformat.mli
index 4e118c046e7e5242f81175c23ae1b7a4dc90e3f8..331f337aa566077a45835579da01ad884d66439e 100644
--- a/src/plugins/wp/rformat.mli
+++ b/src/plugins/wp/rformat.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/rformat.mll b/src/plugins/wp/rformat.mll
index 0bd4bd6119effb10c9a63568d95326a9091e0a25..93f6b07b87a0c534fcdc7830a703bcdd454a031c 100644
--- a/src/plugins/wp/rformat.mll
+++ b/src/plugins/wp/rformat.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/script.mli b/src/plugins/wp/script.mli
index a3a612b0589d9a0534a425594a01f736b8f188bb..aad82526be04e2d64ae2817e2121fb0eb0032a3a 100644
--- a/src/plugins/wp/script.mli
+++ b/src/plugins/wp/script.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/script.mll b/src/plugins/wp/script.mll
index f46ed4a4bee38cdce4a7dd10c0c9502c31286082..eb43bce3b04c7bacb77452896f62df0872e919c4 100644
--- a/src/plugins/wp/script.mll
+++ b/src/plugins/wp/script.mll
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/Makefile b/src/plugins/wp/share/Makefile
index 90206716171f741f9aa4acf2d4abb5f51e0f86c4..c4adc837f46a4ccf1f637fef636155f891c86489 100644
--- a/src/plugins/wp/share/Makefile
+++ b/src/plugins/wp/share/Makefile
@@ -2,7 +2,7 @@
# #
# This file is part of WP plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat a l'energie atomique et aux energies #
# alternatives) #
# #
diff --git a/src/plugins/wp/share/Makefile.headers b/src/plugins/wp/share/Makefile.headers
index 15b5a15fbdda51d097df9914d81d9baac49278a1..e48d5f78831683203dcfc6075d1f7536394c2f0a 100644
--- a/src/plugins/wp/share/Makefile.headers
+++ b/src/plugins/wp/share/Makefile.headers
@@ -2,7 +2,7 @@
# #
# This file is part of WP plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat a l'energie atomique et aux energies #
# alternatives) #
# #
diff --git a/src/plugins/wp/share/Makefile.resources b/src/plugins/wp/share/Makefile.resources
index 01873c5711b1b2a1519b1f38665d54f9d72872cf..ea63e1e894360f056b5fc4133a0d97cf40ab1b01 100644
--- a/src/plugins/wp/share/Makefile.resources
+++ b/src/plugins/wp/share/Makefile.resources
@@ -2,7 +2,7 @@
# #
# This file is part of WP plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat a l'energie atomique et aux energies #
# alternatives) #
# #
diff --git a/src/plugins/wp/share/coqwp/ArcTrigo.v b/src/plugins/wp/share/coqwp/ArcTrigo.v
index 06792c17090829913a7658625e115732bfbb9ea2..b5236fbe98fafbb335f2966090b9959e8f925d2c 100644
--- a/src/plugins/wp/share/coqwp/ArcTrigo.v
+++ b/src/plugins/wp/share/coqwp/ArcTrigo.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Bits.v b/src/plugins/wp/share/coqwp/Bits.v
index 8bb865ae80dc06f2768968656b18f3dc8414aa79..0381e15181d8c41bcc35734f624d9fe24be8dfa4 100644
--- a/src/plugins/wp/share/coqwp/Bits.v
+++ b/src/plugins/wp/share/coqwp/Bits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Cbits.v b/src/plugins/wp/share/coqwp/Cbits.v
index a1378bbcb7c6f9d6278f627febb551a94f818820..aff75e9b1e9667a2d0cf74393c4fae83a97721f2 100644
--- a/src/plugins/wp/share/coqwp/Cbits.v
+++ b/src/plugins/wp/share/coqwp/Cbits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Cfloat.v b/src/plugins/wp/share/coqwp/Cfloat.v
index 0fa6eb71434b824a0132603a485376df50d6175f..f25c72b7027de53cfb3377ab0f3d139ac51f6538 100644
--- a/src/plugins/wp/share/coqwp/Cfloat.v
+++ b/src/plugins/wp/share/coqwp/Cfloat.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -26,6 +26,7 @@ Require Import BuiltIn.
Require Reals.Rbasic_fun.
Require Reals.R_sqrt.
Require BuiltIn.
+Require bool.Bool.
Require int.Int.
Require real.Real.
Require real.RealInfix.
@@ -34,33 +35,43 @@ Require real.FromInt.
Require real.Square.
(* Why3 goal *)
-Definition to_float32: R -> R.
+Definition f32 : Type.
Admitted.
(* Why3 goal *)
-Definition to_float64: R -> R.
+Definition f64 : Type.
Admitted.
-(* Why3 assumption *)
-Definition is_float32 (x:R): Prop := ((to_float32 x) = x).
+(* Why3 goal *)
+Definition to_f32: R -> f32.
+Admitted.
-(* Why3 assumption *)
-Definition is_float64 (x:R): Prop := ((to_float64 x) = x).
+(* Why3 goal *)
+Definition of_f32: f32 -> R.
+Admitted.
+
+(* Why3 goal *)
+Definition to_f64: R -> f64.
+Admitted.
(* Why3 goal *)
-Lemma to_float32_zero : ((to_float32 0%R) = 0%R).
+Definition of_f64: f64 -> R.
Admitted.
(* Why3 goal *)
-Lemma to_float32_one : ((to_float32 1%R) = 1%R).
+Lemma to_f32_zero : ((of_f32 (to_f32 0%R)) = 0%R).
Admitted.
(* Why3 goal *)
-Lemma to_float64_zero : ((to_float64 0%R) = 0%R).
+Lemma to_f32_one : ((of_f32 (to_f32 1%R)) = 1%R).
Admitted.
(* Why3 goal *)
-Lemma to_float64_one : ((to_float64 1%R) = 1%R).
+Lemma to_f64_zero : ((of_f64 (to_f64 0%R)) = 0%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma to_f64_one : ((of_f64 (to_f64 1%R)) = 1%R).
Admitted.
(* Why3 assumption *)
@@ -74,28 +85,26 @@ Axiom rounding_mode_WhyType : WhyType rounding_mode.
Existing Instance rounding_mode_WhyType.
(* Why3 goal *)
-Definition round_double: rounding_mode -> R -> R.
+Definition round_float: rounding_mode -> R -> f32.
Admitted.
(* Why3 goal *)
-Definition round_float: rounding_mode -> R -> R.
+Definition round_double: rounding_mode -> R -> f64.
Admitted.
(* Why3 goal *)
-Lemma float_32 : forall (x:R),
- ((to_float32 x) = (round_float NearestTiesToEven x)).
+Lemma float_32 : forall (x:R), ((to_f32 x) = (round_float NearestTiesToEven
+ x)).
Admitted.
(* Why3 goal *)
-Lemma float_64 : forall (x:R),
- ((to_float64 x) = (round_double NearestTiesToEven x)).
+Lemma float_64 : forall (x:R), ((to_f64 x) = (round_double NearestTiesToEven
+ x)).
Admitted.
(* Why3 assumption *)
Inductive float_kind :=
- | Real : float_kind
- | Float32 : float_kind
- | Float64 : float_kind
+ | Finite : float_kind
| NaN : float_kind
| Inf_pos : float_kind
| Inf_neg : float_kind.
@@ -103,112 +112,310 @@ Axiom float_kind_WhyType : WhyType float_kind.
Existing Instance float_kind_WhyType.
(* Why3 goal *)
-Definition classify_float: R -> float_kind.
+Definition classify_f32: f32 -> float_kind.
+Admitted.
+
+(* Why3 goal *)
+Definition classify_f64: f64 -> float_kind.
Admitted.
(* Why3 assumption *)
-Definition is_finite32 (x:R): Prop := ((classify_float x) = Float32).
+Definition is_finite_f32 (f:f32): Prop := ((classify_f32 f) = Finite).
+
+(* Why3 assumption *)
+Definition is_finite_f64 (d:f64): Prop := ((classify_f64 d) = Finite).
(* Why3 assumption *)
-Definition is_finite64 (x:R): Prop := ((classify_float x) = Float32) \/
- ((classify_float x) = Float64).
+Definition is_NaN_f32 (f:f32): Prop := ((classify_f32 f) = NaN).
(* Why3 assumption *)
-Definition is_NaN (x:R): Prop := ((classify_float x) = NaN).
+Definition is_NaN_f64 (d:f64): Prop := ((classify_f64 d) = NaN).
(* Why3 assumption *)
-Definition is_infinite (x:R): Prop := ((classify_float x) = Inf_pos) \/
- ((classify_float x) = Inf_neg).
+Definition is_infinite_f32 (f:f32): Prop := ((classify_f32 f) = Inf_pos) \/
+ ((classify_f32 f) = Inf_neg).
(* Why3 assumption *)
-Definition is_positive_infinite (x:R): Prop :=
- ((classify_float x) = Inf_pos).
+Definition is_infinite_f64 (d:f64): Prop := ((classify_f64 d) = Inf_pos) \/
+ ((classify_f64 d) = Inf_neg).
(* Why3 assumption *)
-Definition is_negative_infinite (x:R): Prop :=
- ((classify_float x) = Inf_neg).
+Definition is_positive_infinite_f32 (f:f32): Prop :=
+ ((classify_f32 f) = Inf_pos).
+
+(* Why3 assumption *)
+Definition is_positive_infinite_f64 (d:f64): Prop :=
+ ((classify_f64 d) = Inf_pos).
+
+(* Why3 assumption *)
+Definition is_negative_infinite_f32 (f:f32): Prop :=
+ ((classify_f32 f) = Inf_neg).
+
+(* Why3 assumption *)
+Definition is_negative_infinite_f64 (d:f64): Prop :=
+ ((classify_f64 d) = Inf_neg).
(* Why3 goal *)
-Lemma is_finite_to_float_32 : forall (x:R), (is_finite32 (to_float32 x)).
+Lemma is_finite_to_float_32 : forall (x:R), (is_finite_f32 (to_f32 x)).
Admitted.
(* Why3 goal *)
-Lemma is_finite_to_float_64 : forall (x:R), (is_finite64 (to_float64 x)).
+Lemma is_finite_to_float_64 : forall (x:R), (is_finite_f64 (to_f64 x)).
Admitted.
(* Why3 goal *)
-Lemma float32_of_int : forall (k:Z), (((-16777216%Z)%Z <= k)%Z /\
- (k <= 16777216%Z)%Z) -> ((to_float32 (BuiltIn.IZR k)) = (BuiltIn.IZR k)).
-intros k (h1,h2).
+Lemma to_float_is_finite_32 : forall (f:f32), (is_finite_f32 f) ->
+ ((to_f32 (of_f32 f)) = f).
Admitted.
(* Why3 goal *)
-Lemma float64_of_int : forall (k:Z), (((-9007199254740992%Z)%Z <= k)%Z /\
- (k <= 9007199254740992%Z)%Z) ->
- ((to_float64 (BuiltIn.IZR k)) = (BuiltIn.IZR k)).
-intros k (h1,h2).
+Lemma to_float_is_finite_64 : forall (d:f64), (is_finite_f64 d) ->
+ ((to_f64 (of_f64 d)) = d).
Admitted.
(* Why3 assumption *)
-Definition add_float32 (x:R) (y:R): R := (to_float32 (x + y)%R).
+Definition finite (x:R): Prop := (is_finite_f32 (to_f32 x)) /\ (is_finite_f64
+ (to_f64 x)).
-(* Why3 assumption *)
-Definition add_float64 (x:R) (y:R): R := (to_float64 (x + y)%R).
+(* Why3 goal *)
+Lemma finite_small_f32 : forall (x:R),
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= x)%R /\
+ (x <= 340282346600000016151267322115014000640%R)%R) -> (is_finite_f32
+ (to_f32 x)).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_small_f64 : forall (x:R),
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= x)%R /\
+ (x <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R) ->
+ (is_finite_f64 (to_f64 x)).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_range_f32 : forall (f:f32), (is_finite_f32 f) <->
+ (((-340282346600000016151267322115014000640%R)%R <= (of_f32 f))%R /\
+ ((of_f32 f) <= 340282346600000016151267322115014000640%R)%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_range_f64 : forall (d:f64), (is_finite_f64 d) <->
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= (of_f64 d))%R /\
+ ((of_f64 d) <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R).
+Admitted.
+
+(* Why3 goal *)
+Definition eq_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition eq_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition mul_float32 (x:R) (y:R): R := (to_float32 (x * y)%R).
+Definition eq_f32 (x:f32) (y:f32): Prop := ((eq_f32b x y) = true).
(* Why3 assumption *)
-Definition mul_float64 (x:R) (y:R): R := (to_float64 (x * y)%R).
+Definition eq_f64 (x:f64) (y:f64): Prop := ((eq_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma eq_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((eq_f32 x y) <-> ((of_f32 x) = (of_f32 y)))).
+Admitted.
+
+(* Why3 goal *)
+Lemma eq_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((eq_f64 x y) <-> ((of_f64 x) = (of_f64 y)))).
+Admitted.
+
+(* Why3 goal *)
+Definition ne_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition ne_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition div_float32 (x:R) (y:R): R := (to_float32 (x / y)%R).
+Definition ne_f32 (x:f32) (y:f32): Prop := ((ne_f32b x y) = true).
(* Why3 assumption *)
-Definition div_float64 (x:R) (y:R): R := (to_float64 (x / y)%R).
+Definition ne_f64 (x:f64) (y:f64): Prop := ((ne_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma ne_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((ne_f32 x y) <-> ~ ((of_f32 x) = (of_f32 y)))).
+Admitted.
+
+(* Why3 goal *)
+Lemma ne_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((ne_f64 x y) <-> ~ ((of_f64 x) = (of_f64 y)))).
+Admitted.
+
+(* Why3 goal *)
+Definition le_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition le_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition sqrt_float32 (x:R): R := (to_float32 (Reals.R_sqrt.sqrt x)).
+Definition le_f32 (x:f32) (y:f32): Prop := ((le_f32b x y) = true).
(* Why3 assumption *)
-Definition sqrt_float64 (x:R): R := (to_float64 (Reals.R_sqrt.sqrt x)).
+Definition le_f64 (x:f64) (y:f64): Prop := ((le_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma le_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((le_f32 x y) <-> ((of_f32 x) <= (of_f32 y))%R)).
+Admitted.
(* Why3 goal *)
-Definition model: R -> R.
+Lemma le_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((le_f64 x y) <-> ((of_f64 x) <= (of_f64 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Definition lt_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition lt_f64b: f64 -> f64 -> bool.
Admitted.
(* Why3 assumption *)
-Definition delta (x:R): R := (Reals.Rbasic_fun.Rabs (x - (model x))%R).
+Definition lt_f32 (x:f32) (y:f32): Prop := ((lt_f32b x y) = true).
(* Why3 assumption *)
-Definition error (x:R): R :=
- ((delta x) / (Reals.Rbasic_fun.Rabs (model x)))%R.
+Definition lt_f64 (x:f64) (y:f64): Prop := ((lt_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma lt_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((lt_f32 x y) <-> ((of_f32 x) < (of_f32 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Lemma lt_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((lt_f64 x y) <-> ((of_f64 x) < (of_f64 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Definition neg_f32: f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition neg_f64: f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma neg_finite_f32 : forall (x:f32), (is_finite_f32 x) ->
+ ((of_f32 (neg_f32 x)) = (-(of_f32 x))%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma neg_finite_f64 : forall (x:f64), (is_finite_f64 x) ->
+ ((of_f64 (neg_f64 x)) = (-(of_f64 x))%R).
+Admitted.
+
+(* Why3 goal *)
+Definition add_f32: f32 -> f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition add_f64: f64 -> f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma add_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((add_f32 x
+ y) = (to_f32 ((of_f32 x) + (of_f32 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Lemma add_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((add_f64 x
+ y) = (to_f64 ((of_f64 x) + (of_f64 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Definition mul_f32: f32 -> f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition mul_f64: f64 -> f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma mul_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((mul_f32 x
+ y) = (to_f32 ((of_f32 x) * (of_f32 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Lemma mul_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((mul_f64 x
+ y) = (to_f64 ((of_f64 x) * (of_f64 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Definition div_f32: f32 -> f32 -> f32.
+Admitted.
(* Why3 goal *)
-Lemma model_float_32 : forall (x:R), ((model (to_float32 x)) = (model x)).
+Definition div_f64: f64 -> f64 -> f64.
Admitted.
(* Why3 goal *)
-Lemma model_float_64 : forall (x:R), ((model (to_float64 x)) = (model x)).
+Lemma div_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((div_f32 x
+ y) = (to_f32 ((of_f32 x) / (of_f32 y))%R))).
Admitted.
(* Why3 goal *)
-Lemma model_add : forall (x:R) (y:R),
- ((model (x + y)%R) = ((model x) + (model y))%R).
+Lemma div_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((div_f64 x
+ y) = (to_f64 ((of_f64 x) / (of_f64 y))%R))).
Admitted.
(* Why3 goal *)
-Lemma model_mul : forall (x:R) (y:R),
- ((model (x * y)%R) = ((model x) * (model y))%R).
+Definition sqrt_f32: f32 -> f32.
Admitted.
(* Why3 goal *)
-Lemma model_div : forall (x:R) (y:R),
- ((model (x / y)%R) = ((model x) / (model y))%R).
+Definition sqrt_f64: f64 -> f64.
Admitted.
(* Why3 goal *)
-Lemma model_sqrt : forall (x:R),
- ((model (Reals.R_sqrt.sqrt x)) = (Reals.R_sqrt.sqrt (model x))).
+Lemma sqrt_finite_f32 : forall (x:f32), (is_finite_f32 x) ->
+ ((sqrt_f32 x) = (to_f32 (Reals.R_sqrt.sqrt (of_f32 x)))).
Admitted.
+(* Why3 goal *)
+Lemma sqrt_finite_f64 : forall (x:f64), (is_finite_f64 x) ->
+ ((sqrt_f64 x) = (to_f64 (Reals.R_sqrt.sqrt (of_f64 x)))).
+Admitted.
+
+(* Why3 goal *)
+Definition model_f32: f32 -> R.
+Admitted.
+
+(* Why3 assumption *)
+Definition delta_f32 (f:f32): R :=
+ (Reals.Rbasic_fun.Rabs ((of_f32 f) - (model_f32 f))%R).
+
+(* Why3 assumption *)
+Definition error_f32 (f:f32): R :=
+ ((delta_f32 f) / (Reals.Rbasic_fun.Rabs (model_f32 f)))%R.
+
+(* Why3 goal *)
+Definition model_f64: f64 -> R.
+Admitted.
+
+(* Why3 assumption *)
+Definition delta_f64 (f:f64): R :=
+ (Reals.Rbasic_fun.Rabs ((of_f64 f) - (model_f64 f))%R).
+
+(* Why3 assumption *)
+Definition error_f64 (f:f64): R :=
+ ((delta_f64 f) / (Reals.Rbasic_fun.Rabs (model_f64 f)))%R.
+
diff --git a/src/plugins/wp/share/coqwp/Cint.v b/src/plugins/wp/share/coqwp/Cint.v
index 2bad1d8070ac6b9d7ffb984138dc11f336dc0bcc..3a7c0ab7042f7c00f5b022ea1231af44ac2904d5 100644
--- a/src/plugins/wp/share/coqwp/Cint.v
+++ b/src/plugins/wp/share/coqwp/Cint.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Cmath.v b/src/plugins/wp/share/coqwp/Cmath.v
index 4efcb87b1b9264d9f52d9c12758b4850cb13770b..8b144c5879ec906937e70a01f4ef4ab3c5baa734 100644
--- a/src/plugins/wp/share/coqwp/Cmath.v
+++ b/src/plugins/wp/share/coqwp/Cmath.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/ExpLog.v b/src/plugins/wp/share/coqwp/ExpLog.v
index 779b1a653739a5820ebf1b0b811408c0967378bb..e7d71a0cc1a2573cd578615a2f318899335e550a 100644
--- a/src/plugins/wp/share/coqwp/ExpLog.v
+++ b/src/plugins/wp/share/coqwp/ExpLog.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Memory.v b/src/plugins/wp/share/coqwp/Memory.v
index 8eb50c59d0fff97f19e099585dec3714fb7ddbc3..a8aa1ff53a88bac2c385d7bc61603d29ac53173f 100644
--- a/src/plugins/wp/share/coqwp/Memory.v
+++ b/src/plugins/wp/share/coqwp/Memory.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Qed.v b/src/plugins/wp/share/coqwp/Qed.v
index d23df6821818a97c97a01b9753ae60a27b0887a9..c991afd7c10498054025aa3472c3c03e275a84ca 100644
--- a/src/plugins/wp/share/coqwp/Qed.v
+++ b/src/plugins/wp/share/coqwp/Qed.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Qedlib.v b/src/plugins/wp/share/coqwp/Qedlib.v
index f28d445be2423f565ef34acc49ee52da5b6776f8..4156a9e32907453de88b7494189f01dd8ce715ea 100644
--- a/src/plugins/wp/share/coqwp/Qedlib.v
+++ b/src/plugins/wp/share/coqwp/Qedlib.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Square.v b/src/plugins/wp/share/coqwp/Square.v
index d439d0b4129a61868f7f013ade3be3f87fda89fd..865ce9f87edbb37ef7f20f339d605b153365a0d1 100644
--- a/src/plugins/wp/share/coqwp/Square.v
+++ b/src/plugins/wp/share/coqwp/Square.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Vlist.v b/src/plugins/wp/share/coqwp/Vlist.v
index c3ed9289289ef8a8069331e5ad09208520db36ab..182898718639ae466b39a16277bcd32445f8be76 100644
--- a/src/plugins/wp/share/coqwp/Vlist.v
+++ b/src/plugins/wp/share/coqwp/Vlist.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Vset.v b/src/plugins/wp/share/coqwp/Vset.v
index 42b12b4f2dfe43bdfac7da32c0fbc77e0be7553a..1262034a104de88566275e9a6b86b606ea000ba1 100644
--- a/src/plugins/wp/share/coqwp/Vset.v
+++ b/src/plugins/wp/share/coqwp/Vset.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/coqwp/Zbits.v b/src/plugins/wp/share/coqwp/Zbits.v
index f5e3c171e35645583e98ff21fbefcfe98011cfa0..e168e835e820688d375580f4521ecd7911399972 100644
--- a/src/plugins/wp/share/coqwp/Zbits.v
+++ b/src/plugins/wp/share/coqwp/Zbits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/ArcTrigo.mlw b/src/plugins/wp/share/ergo/ArcTrigo.mlw
index b91ffe291245f68b72f32368d56ecf855a8ef9c1..80853dc37d2fb86a38ac87a358a8e42e2031e57b 100644
--- a/src/plugins/wp/share/ergo/ArcTrigo.mlw
+++ b/src/plugins/wp/share/ergo/ArcTrigo.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Cbits.mlw b/src/plugins/wp/share/ergo/Cbits.mlw
index 848421a65448a5eae280391b807f27549866f2f3..4ef1f5423f5ec258c1f30c8bb781a34769815a24 100644
--- a/src/plugins/wp/share/ergo/Cbits.mlw
+++ b/src/plugins/wp/share/ergo/Cbits.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Cfloat.mlw b/src/plugins/wp/share/ergo/Cfloat.mlw
index 8a4c64c700fabad393ed6c44245415c9084a4404..3c0e03b4c0baa4c6eae2075a10ba292df73c66c2 100644
--- a/src/plugins/wp/share/ergo/Cfloat.mlw
+++ b/src/plugins/wp/share/ergo/Cfloat.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -23,27 +23,32 @@
(* this is the prelude for Alt-Ergo, version >= 0.95.2 *)
(** The theory BuiltIn_ must be appended to this file*)
(** The theory Bool_ must be appended to this file*)
+(** The theory bool_Bool_ must be appended to this file*)
(** The theory int_Int_ must be appended to this file*)
(** The theory real_Real_ must be appended to this file*)
(** The theory real_RealInfix_ must be appended to this file*)
(** The theory real_Abs_ must be appended to this file*)
(** The theory real_FromInt_ must be appended to this file*)
(** The theory real_Square_ must be appended to this file*)
-logic to_float32 : real -> real
+type f32
-logic to_float64 : real -> real
+type f64
-predicate is_float32(x: real) = (to_float32(x) = x)
+logic to_f32 : real -> f32
-predicate is_float64(x: real) = (to_float64(x) = x)
+logic of_f32 : f32 -> real
-axiom to_float32_zero : (to_float32(0.0) = 0.0)
+logic to_f64 : real -> f64
-axiom to_float32_one : (to_float32(1.0) = 1.0)
+logic of_f64 : f64 -> real
-axiom to_float64_zero : (to_float64(0.0) = 0.0)
+axiom to_f32_zero : (of_f32(to_f32(0.0)) = 0.0)
-axiom to_float64_one : (to_float64(1.0) = 1.0)
+axiom to_f32_one : (of_f32(to_f32(1.0)) = 1.0)
+
+axiom to_f64_zero : (of_f64(to_f64(0.0)) = 0.0)
+
+axiom to_f64_one : (of_f64(to_f64(1.0)) = 1.0)
type rounding_mode = Up | Down | ToZero | NearestTiesToAway
| NearestTiesToEven
@@ -70,110 +75,286 @@ axiom match_rounding_mode_NearestTiesToEven :
(forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a. forall z4:'a.
(match_rounding_mode(NearestTiesToEven, z, z1, z2, z3, z4) = z4))
-logic round_double : rounding_mode, real -> real
+logic round_float : rounding_mode, real -> f32
-logic round_float : rounding_mode, real -> real
+logic round_double : rounding_mode, real -> f64
axiom float_32 :
(forall x:real [round_float(NearestTiesToEven, x)].
- (to_float32(x) = round_float(NearestTiesToEven, x)))
+ (to_f32(x) = round_float(NearestTiesToEven, x)))
axiom float_64 :
(forall x:real [round_double(NearestTiesToEven, x)].
- (to_float64(x) = round_double(NearestTiesToEven, x)))
+ (to_f64(x) = round_double(NearestTiesToEven, x)))
-type float_kind = Real | Float32 | Float64 | NaN | Inf_pos | Inf_neg
+type float_kind = Finite | NaN | Inf_pos | Inf_neg
-logic match_float_kind : float_kind, 'a, 'a, 'a, 'a, 'a, 'a -> 'a
+logic match_float_kind : float_kind, 'a, 'a, 'a, 'a -> 'a
-axiom match_float_kind_Real :
- (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a. forall z4:'a.
- forall z5:'a. (match_float_kind(Real, z, z1, z2, z3, z4, z5) = z))
-
-axiom match_float_kind_Float32 :
- (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a. forall z4:'a.
- forall z5:'a. (match_float_kind(Float32, z, z1, z2, z3, z4, z5) = z1))
-
-axiom match_float_kind_Float64 :
- (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a. forall z4:'a.
- forall z5:'a. (match_float_kind(Float64, z, z1, z2, z3, z4, z5) = z2))
+axiom match_float_kind_Finite :
+ (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a.
+ (match_float_kind(Finite, z, z1, z2, z3) = z))
axiom match_float_kind_NaN :
- (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a. forall z4:'a.
- forall z5:'a. (match_float_kind(NaN, z, z1, z2, z3, z4, z5) = z3))
+ (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a.
+ (match_float_kind(NaN, z, z1, z2, z3) = z1))
axiom match_float_kind_Inf_pos :
- (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a. forall z4:'a.
- forall z5:'a. (match_float_kind(Inf_pos, z, z1, z2, z3, z4, z5) = z4))
+ (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a.
+ (match_float_kind(Inf_pos, z, z1, z2, z3) = z2))
axiom match_float_kind_Inf_neg :
- (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a. forall z4:'a.
- forall z5:'a. (match_float_kind(Inf_neg, z, z1, z2, z3, z4, z5) = z5))
+ (forall z:'a. forall z1:'a. forall z2:'a. forall z3:'a.
+ (match_float_kind(Inf_neg, z, z1, z2, z3) = z3))
+
+logic classify_f32 : f32 -> float_kind
+
+logic classify_f64 : f64 -> float_kind
+
+predicate is_finite_f32(f: f32) = (classify_f32(f) = Finite)
-logic classify_float : real -> float_kind
+predicate is_finite_f64(d: f64) = (classify_f64(d) = Finite)
-predicate is_finite32(x: real) = (classify_float(x) = Float32)
+predicate is_NaN_f32(f: f32) = (classify_f32(f) = NaN)
-predicate is_finite64(x: real) = ((classify_float(x) = Float32) or
- (classify_float(x) = Float64))
+predicate is_NaN_f64(d: f64) = (classify_f64(d) = NaN)
-predicate is_NaN(x: real) = (classify_float(x) = NaN)
+predicate is_infinite_f32(f: f32) = ((classify_f32(f) = Inf_pos) or
+ (classify_f32(f) = Inf_neg))
-predicate is_infinite(x: real) = ((classify_float(x) = Inf_pos) or
- (classify_float(x) = Inf_neg))
+predicate is_infinite_f64(d: f64) = ((classify_f64(d) = Inf_pos) or
+ (classify_f64(d) = Inf_neg))
-predicate is_positive_infinite(x: real) = (classify_float(x) = Inf_pos)
+predicate is_positive_infinite_f32(f: f32) = (classify_f32(f) = Inf_pos)
-predicate is_negative_infinite(x: real) = (classify_float(x) = Inf_neg)
+predicate is_positive_infinite_f64(d: f64) = (classify_f64(d) = Inf_pos)
+
+predicate is_negative_infinite_f32(f: f32) = (classify_f32(f) = Inf_neg)
+
+predicate is_negative_infinite_f64(d: f64) = (classify_f64(d) = Inf_neg)
axiom is_finite_to_float_32 :
- (forall x:real [is_finite32(to_float32(x))]. is_finite32(to_float32(x)))
+ (forall x:real [is_finite_f32(to_f32(x))]. is_finite_f32(to_f32(x)))
axiom is_finite_to_float_64 :
- (forall x:real [is_finite64(to_float64(x))]. is_finite64(to_float64(x)))
+ (forall x:real [is_finite_f64(to_f64(x))]. is_finite_f64(to_f64(x)))
+
+axiom to_float_is_finite_32 :
+ (forall f:f32 [to_f32(of_f32(f))| is_finite_f32(f)]. (is_finite_f32(f) ->
+ (to_f32(of_f32(f)) = f)))
+
+axiom to_float_is_finite_64 :
+ (forall d:f64 [to_f64(of_f64(d))| is_finite_f64(d)]. (is_finite_f64(d) ->
+ (to_f64(of_f64(d)) = d)))
+
+predicate finite(x: real) = (is_finite_f32(to_f32(x)) and
+ is_finite_f64(to_f64(x)))
+
+axiom finite_small_f32 :
+ (forall x:real.
+ ((((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0) <= x) and
+ (x <= 340282346600000016151267322115014000640.0)) ->
+ is_finite_f32(to_f32(x))))
+
+axiom finite_small_f64 :
+ (forall x:real.
+ ((((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0) <= x) and
+ (x <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0)) ->
+ is_finite_f64(to_f64(x))))
+
+axiom finite_range_f32 :
+ (forall f:f32. (is_finite_f32(f) ->
+ ((-340282346600000016151267322115014000640.0) <= of_f32(f))))
+
+axiom finite_range_f321 :
+ (forall f:f32. (is_finite_f32(f) ->
+ (of_f32(f) <= 340282346600000016151267322115014000640.0)))
+
+axiom finite_range_f322 :
+ (forall f:f32.
+ ((((-340282346600000016151267322115014000640.0) <= of_f32(f)) and
+ (of_f32(f) <= 340282346600000016151267322115014000640.0)) ->
+ is_finite_f32(f)))
+
+axiom finite_range_f64 :
+ (forall d:f64. (is_finite_f64(d) ->
+ ((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0) <= of_f64(d))))
+
+axiom finite_range_f641 :
+ (forall d:f64. (is_finite_f64(d) ->
+ (of_f64(d) <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0)))
+
+axiom finite_range_f642 :
+ (forall d:f64.
+ ((((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0) <= of_f64(d)) and
+ (of_f64(d) <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0)) ->
+ is_finite_f64(d)))
+
+logic eq_f32b : f32, f32 -> bool
+
+logic eq_f64b : f64, f64 -> bool
+
+predicate eq_f32(x: f32, y: f32) = (eq_f32b(x, y) = true)
+
+predicate eq_f64(x: f64, y: f64) = (eq_f64b(x, y) = true)
+
+axiom eq_finite_f32 :
+ (forall x:f32. forall y:f32 [eq_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> (eq_f32(x, y) -> (of_f32(x) = of_f32(y))))))
+
+axiom eq_finite_f321 :
+ (forall x:f32. forall y:f32 [eq_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> ((of_f32(x) = of_f32(y)) -> eq_f32(x, y)))))
+
+axiom eq_finite_f64 :
+ (forall x:f64. forall y:f64 [eq_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> (eq_f64(x, y) -> (of_f64(x) = of_f64(y))))))
+
+axiom eq_finite_f641 :
+ (forall x:f64. forall y:f64 [eq_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> ((of_f64(x) = of_f64(y)) -> eq_f64(x, y)))))
+
+logic ne_f32b : f32, f32 -> bool
+
+logic ne_f64b : f64, f64 -> bool
+
+predicate ne_f32(x: f32, y: f32) = (ne_f32b(x, y) = true)
+
+predicate ne_f64(x: f64, y: f64) = (ne_f64b(x, y) = true)
+
+axiom ne_finite_f32 :
+ (forall x:f32. forall y:f32 [ne_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> (ne_f32(x, y) -> (not (of_f32(x) = of_f32(y)))))))
+
+axiom ne_finite_f321 :
+ (forall x:f32. forall y:f32 [ne_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> ((not (of_f32(x) = of_f32(y))) -> ne_f32(x, y)))))
+
+axiom ne_finite_f64 :
+ (forall x:f64. forall y:f64 [ne_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> (ne_f64(x, y) -> (not (of_f64(x) = of_f64(y)))))))
+
+axiom ne_finite_f641 :
+ (forall x:f64. forall y:f64 [ne_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> ((not (of_f64(x) = of_f64(y))) -> ne_f64(x, y)))))
+
+logic le_f32b : f32, f32 -> bool
+
+logic le_f64b : f64, f64 -> bool
+
+predicate le_f32(x: f32, y: f32) = (le_f32b(x, y) = true)
+
+predicate le_f64(x: f64, y: f64) = (le_f64b(x, y) = true)
+
+axiom le_finite_f32 :
+ (forall x:f32. forall y:f32 [le_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> (le_f32(x, y) -> (of_f32(x) <= of_f32(y))))))
+
+axiom le_finite_f321 :
+ (forall x:f32. forall y:f32 [le_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> ((of_f32(x) <= of_f32(y)) -> le_f32(x, y)))))
+
+axiom le_finite_f64 :
+ (forall x:f64. forall y:f64 [le_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> (le_f64(x, y) -> (of_f64(x) <= of_f64(y))))))
+
+axiom le_finite_f641 :
+ (forall x:f64. forall y:f64 [le_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> ((of_f64(x) <= of_f64(y)) -> le_f64(x, y)))))
+
+logic lt_f32b : f32, f32 -> bool
+
+logic lt_f64b : f64, f64 -> bool
+
+predicate lt_f32(x: f32, y: f32) = (lt_f32b(x, y) = true)
+
+predicate lt_f64(x: f64, y: f64) = (lt_f64b(x, y) = true)
+
+axiom lt_finite_f32 :
+ (forall x:f32. forall y:f32 [lt_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> (lt_f32(x, y) -> (of_f32(x) < of_f32(y))))))
+
+axiom lt_finite_f321 :
+ (forall x:f32. forall y:f32 [lt_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> ((of_f32(x) < of_f32(y)) -> lt_f32(x, y)))))
+
+axiom lt_finite_f64 :
+ (forall x:f64. forall y:f64 [lt_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> (lt_f64(x, y) -> (of_f64(x) < of_f64(y))))))
+
+axiom lt_finite_f641 :
+ (forall x:f64. forall y:f64 [lt_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> ((of_f64(x) < of_f64(y)) -> lt_f64(x, y)))))
+
+logic neg_f32 : f32 -> f32
+
+logic neg_f64 : f64 -> f64
+
+axiom neg_finite_f32 :
+ (forall x:f32 [neg_f32(x)]. (is_finite_f32(x) ->
+ (of_f32(neg_f32(x)) = (-of_f32(x)))))
+
+axiom neg_finite_f64 :
+ (forall x:f64 [neg_f64(x)]. (is_finite_f64(x) ->
+ (of_f64(neg_f64(x)) = (-of_f64(x)))))
+
+logic add_f32 : f32, f32 -> f32
+
+logic add_f64 : f64, f64 -> f64
+
+axiom add_finite_f32 :
+ (forall x:f32. forall y:f32 [add_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> (add_f32(x, y) = to_f32((of_f32(x) + of_f32(y)))))))
-axiom float32_of_int :
- (forall k:int. ((((-16777216) <= k) and (k <= 16777216)) ->
- (to_float32(from_int(k)) = from_int(k))))
+axiom add_finite_f64 :
+ (forall x:f64. forall y:f64 [add_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> (add_f64(x, y) = to_f64((of_f64(x) + of_f64(y)))))))
-axiom float64_of_int :
- (forall k:int. ((((-9007199254740992) <= k) and (k <= 9007199254740992)) ->
- (to_float64(from_int(k)) = from_int(k))))
+logic mul_f32 : f32, f32 -> f32
-function add_float32(x: real, y: real) : real = to_float32((x + y))
+logic mul_f64 : f64, f64 -> f64
-function add_float64(x: real, y: real) : real = to_float64((x + y))
+axiom mul_finite_f32 :
+ (forall x:f32. forall y:f32 [mul_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> (mul_f32(x, y) = to_f32((of_f32(x) * of_f32(y)))))))
-function mul_float32(x: real, y: real) : real = to_float32((x * y))
+axiom mul_finite_f64 :
+ (forall x:f64. forall y:f64 [mul_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> (mul_f64(x, y) = to_f64((of_f64(x) * of_f64(y)))))))
-function mul_float64(x: real, y: real) : real = to_float64((x * y))
+logic div_f32 : f32, f32 -> f32
-function div_float32(x: real, y: real) : real = to_float32((x / y))
+logic div_f64 : f64, f64 -> f64
-function div_float64(x: real, y: real) : real = to_float64((x / y))
+axiom div_finite_f32 :
+ (forall x:f32. forall y:f32 [div_f32(x, y)]. (is_finite_f32(x) ->
+ (is_finite_f32(y) -> (div_f32(x, y) = to_f32((of_f32(x) / of_f32(y)))))))
-function sqrt_float32(x: real) : real = to_float32(sqrt(x))
+axiom div_finite_f64 :
+ (forall x:f64. forall y:f64 [div_f64(x, y)]. (is_finite_f64(x) ->
+ (is_finite_f64(y) -> (div_f64(x, y) = to_f64((of_f64(x) / of_f64(y)))))))
-function sqrt_float64(x: real) : real = to_float64(sqrt(x))
+logic sqrt_f32 : f32 -> f32
-logic model : real -> real
+logic sqrt_f64 : f64 -> f64
-function delta(x: real) : real = abs_real((x - model(x)))
+axiom sqrt_finite_f32 :
+ (forall x:f32 [sqrt_f32(x)]. (is_finite_f32(x) ->
+ (sqrt_f32(x) = to_f32(sqrt(of_f32(x))))))
-function error(x: real) : real = (delta(x) / abs_real(model(x)))
+axiom sqrt_finite_f64 :
+ (forall x:f64 [sqrt_f64(x)]. (is_finite_f64(x) ->
+ (sqrt_f64(x) = to_f64(sqrt(of_f64(x))))))
-axiom model_float_32 : (forall x:real. (model(to_float32(x)) = model(x)))
+logic model_f32 : f32 -> real
-axiom model_float_64 : (forall x:real. (model(to_float64(x)) = model(x)))
+function delta_f32(f: f32) : real = abs_real((of_f32(f) - model_f32(f)))
-axiom model_add :
- (forall x:real. forall y:real. (model((x + y)) = (model(x) + model(y))))
+function error_f32(f: f32) : real = (delta_f32(f) / abs_real(model_f32(f)))
-axiom model_mul :
- (forall x:real. forall y:real. (model((x * y)) = (model(x) * model(y))))
+logic model_f64 : f64 -> real
-axiom model_div :
- (forall x:real. forall y:real. (model((x / y)) = (model(x) / model(y))))
+function delta_f64(f: f64) : real = abs_real((of_f64(f) - model_f64(f)))
-axiom model_sqrt : (forall x:real. (model(sqrt(x)) = sqrt(model(x))))
+function error_f64(f: f64) : real = (delta_f64(f) / abs_real(model_f64(f)))
diff --git a/src/plugins/wp/share/ergo/Cint.mlw b/src/plugins/wp/share/ergo/Cint.mlw
index a2857141c03c8a3ea5643675e45594408556bd1c..efa4917c8ef46502f3f4e6b9ee732f1f0fa1e5c5 100644
--- a/src/plugins/wp/share/ergo/Cint.mlw
+++ b/src/plugins/wp/share/ergo/Cint.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Cmath.mlw b/src/plugins/wp/share/ergo/Cmath.mlw
index 1d7a6143fc3e5d69dc002e612371663900442610..bba0d57f650f7826d5cc443ecad51986f5e9864b 100644
--- a/src/plugins/wp/share/ergo/Cmath.mlw
+++ b/src/plugins/wp/share/ergo/Cmath.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/ExpLog.mlw b/src/plugins/wp/share/ergo/ExpLog.mlw
index 0434bfff44efdcc182e423b3b47a21c91f1a8107..04a6648d140ee2cff01b4d8e2bc1fdb1fa71ec9c 100644
--- a/src/plugins/wp/share/ergo/ExpLog.mlw
+++ b/src/plugins/wp/share/ergo/ExpLog.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Memory.mlw b/src/plugins/wp/share/ergo/Memory.mlw
index 611a2e92f4ef5938feee083b42817a6cb33941b6..e313cd7106dc184b461e8945601f2fbc2a8d98ea 100644
--- a/src/plugins/wp/share/ergo/Memory.mlw
+++ b/src/plugins/wp/share/ergo/Memory.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Qed.mlw b/src/plugins/wp/share/ergo/Qed.mlw
index 5ef47e95b2c8cb65573065135f3f8fbced30bc9a..ab140625bf0126b176c14a756ba919cb89e65801 100644
--- a/src/plugins/wp/share/ergo/Qed.mlw
+++ b/src/plugins/wp/share/ergo/Qed.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Square.mlw b/src/plugins/wp/share/ergo/Square.mlw
index 5f1376c503851f812985f7f4f5ccc900f6111cdc..8bef3ca2cb02068098b700bd4e34b470e5498c99 100644
--- a/src/plugins/wp/share/ergo/Square.mlw
+++ b/src/plugins/wp/share/ergo/Square.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Vlist.mlw b/src/plugins/wp/share/ergo/Vlist.mlw
index bb9c7a04ea0d9e09765a59d3d17e01be85df0b40..7d688623e03861f1b16e872b4907dcd261b3a935 100644
--- a/src/plugins/wp/share/ergo/Vlist.mlw
+++ b/src/plugins/wp/share/ergo/Vlist.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/ergo/Vset.mlw b/src/plugins/wp/share/ergo/Vset.mlw
index 8d634361d993b72572b2a300e0fd412017e2ebff..9e8c6d9c5af93fc77411753f397ae031b0e2bc86 100644
--- a/src/plugins/wp/share/ergo/Vset.mlw
+++ b/src/plugins/wp/share/ergo/Vset.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/install.ml b/src/plugins/wp/share/install.ml
index 7f444247af254731d8874dca8a1a5ae6781a429a..334e78760b39c685fd9e32b3ce9abe9e40e9de56 100644
--- a/src/plugins/wp/share/install.ml
+++ b/src/plugins/wp/share/install.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/Bits.v b/src/plugins/wp/share/src/Bits.v
index 8bb865ae80dc06f2768968656b18f3dc8414aa79..0381e15181d8c41bcc35734f624d9fe24be8dfa4 100644
--- a/src/plugins/wp/share/src/Bits.v
+++ b/src/plugins/wp/share/src/Bits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/BuiltIn/bool.mlw b/src/plugins/wp/share/src/BuiltIn/bool.mlw
index b1541594019b1112adb20f33d8c7de5d1db6e552..bc353e7c972a7510ab01195264c01812eb51017d 100644
--- a/src/plugins/wp/share/src/BuiltIn/bool.mlw
+++ b/src/plugins/wp/share/src/BuiltIn/bool.mlw
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/Cfloat.v b/src/plugins/wp/share/src/Cfloat.v
index 1c3a833659451f29a9a8854dfac186ab462eff75..722da22037a3075a09cbcae763e225ebb9d371a1 100644
--- a/src/plugins/wp/share/src/Cfloat.v
+++ b/src/plugins/wp/share/src/Cfloat.v
@@ -4,6 +4,7 @@ Require Import BuiltIn.
Require Reals.Rbasic_fun.
Require Reals.R_sqrt.
Require BuiltIn.
+Require bool.Bool.
Require int.Int.
Require real.Real.
Require real.RealInfix.
@@ -12,33 +13,43 @@ Require real.FromInt.
Require real.Square.
(* Why3 goal *)
-Definition to_float32: R -> R.
+Definition f32 : Type.
Admitted.
(* Why3 goal *)
-Definition to_float64: R -> R.
+Definition f64 : Type.
Admitted.
-(* Why3 assumption *)
-Definition is_float32 (x:R): Prop := ((to_float32 x) = x).
+(* Why3 goal *)
+Definition to_f32: R -> f32.
+Admitted.
-(* Why3 assumption *)
-Definition is_float64 (x:R): Prop := ((to_float64 x) = x).
+(* Why3 goal *)
+Definition of_f32: f32 -> R.
+Admitted.
+
+(* Why3 goal *)
+Definition to_f64: R -> f64.
+Admitted.
(* Why3 goal *)
-Lemma to_float32_zero : ((to_float32 0%R) = 0%R).
+Definition of_f64: f64 -> R.
Admitted.
(* Why3 goal *)
-Lemma to_float32_one : ((to_float32 1%R) = 1%R).
+Lemma to_f32_zero : ((of_f32 (to_f32 0%R)) = 0%R).
Admitted.
(* Why3 goal *)
-Lemma to_float64_zero : ((to_float64 0%R) = 0%R).
+Lemma to_f32_one : ((of_f32 (to_f32 1%R)) = 1%R).
Admitted.
(* Why3 goal *)
-Lemma to_float64_one : ((to_float64 1%R) = 1%R).
+Lemma to_f64_zero : ((of_f64 (to_f64 0%R)) = 0%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma to_f64_one : ((of_f64 (to_f64 1%R)) = 1%R).
Admitted.
(* Why3 assumption *)
@@ -52,28 +63,26 @@ Axiom rounding_mode_WhyType : WhyType rounding_mode.
Existing Instance rounding_mode_WhyType.
(* Why3 goal *)
-Definition round_double: rounding_mode -> R -> R.
+Definition round_float: rounding_mode -> R -> f32.
Admitted.
(* Why3 goal *)
-Definition round_float: rounding_mode -> R -> R.
+Definition round_double: rounding_mode -> R -> f64.
Admitted.
(* Why3 goal *)
-Lemma float_32 : forall (x:R),
- ((to_float32 x) = (round_float NearestTiesToEven x)).
+Lemma float_32 : forall (x:R), ((to_f32 x) = (round_float NearestTiesToEven
+ x)).
Admitted.
(* Why3 goal *)
-Lemma float_64 : forall (x:R),
- ((to_float64 x) = (round_double NearestTiesToEven x)).
+Lemma float_64 : forall (x:R), ((to_f64 x) = (round_double NearestTiesToEven
+ x)).
Admitted.
(* Why3 assumption *)
Inductive float_kind :=
- | Real : float_kind
- | Float32 : float_kind
- | Float64 : float_kind
+ | Finite : float_kind
| NaN : float_kind
| Inf_pos : float_kind
| Inf_neg : float_kind.
@@ -81,112 +90,310 @@ Axiom float_kind_WhyType : WhyType float_kind.
Existing Instance float_kind_WhyType.
(* Why3 goal *)
-Definition classify_float: R -> float_kind.
+Definition classify_f32: f32 -> float_kind.
+Admitted.
+
+(* Why3 goal *)
+Definition classify_f64: f64 -> float_kind.
Admitted.
(* Why3 assumption *)
-Definition is_finite32 (x:R): Prop := ((classify_float x) = Float32).
+Definition is_finite_f32 (f:f32): Prop := ((classify_f32 f) = Finite).
+
+(* Why3 assumption *)
+Definition is_finite_f64 (d:f64): Prop := ((classify_f64 d) = Finite).
(* Why3 assumption *)
-Definition is_finite64 (x:R): Prop := ((classify_float x) = Float32) \/
- ((classify_float x) = Float64).
+Definition is_NaN_f32 (f:f32): Prop := ((classify_f32 f) = NaN).
(* Why3 assumption *)
-Definition is_NaN (x:R): Prop := ((classify_float x) = NaN).
+Definition is_NaN_f64 (d:f64): Prop := ((classify_f64 d) = NaN).
(* Why3 assumption *)
-Definition is_infinite (x:R): Prop := ((classify_float x) = Inf_pos) \/
- ((classify_float x) = Inf_neg).
+Definition is_infinite_f32 (f:f32): Prop := ((classify_f32 f) = Inf_pos) \/
+ ((classify_f32 f) = Inf_neg).
(* Why3 assumption *)
-Definition is_positive_infinite (x:R): Prop :=
- ((classify_float x) = Inf_pos).
+Definition is_infinite_f64 (d:f64): Prop := ((classify_f64 d) = Inf_pos) \/
+ ((classify_f64 d) = Inf_neg).
(* Why3 assumption *)
-Definition is_negative_infinite (x:R): Prop :=
- ((classify_float x) = Inf_neg).
+Definition is_positive_infinite_f32 (f:f32): Prop :=
+ ((classify_f32 f) = Inf_pos).
+
+(* Why3 assumption *)
+Definition is_positive_infinite_f64 (d:f64): Prop :=
+ ((classify_f64 d) = Inf_pos).
+
+(* Why3 assumption *)
+Definition is_negative_infinite_f32 (f:f32): Prop :=
+ ((classify_f32 f) = Inf_neg).
+
+(* Why3 assumption *)
+Definition is_negative_infinite_f64 (d:f64): Prop :=
+ ((classify_f64 d) = Inf_neg).
(* Why3 goal *)
-Lemma is_finite_to_float_32 : forall (x:R), (is_finite32 (to_float32 x)).
+Lemma is_finite_to_float_32 : forall (x:R), (is_finite_f32 (to_f32 x)).
Admitted.
(* Why3 goal *)
-Lemma is_finite_to_float_64 : forall (x:R), (is_finite64 (to_float64 x)).
+Lemma is_finite_to_float_64 : forall (x:R), (is_finite_f64 (to_f64 x)).
Admitted.
(* Why3 goal *)
-Lemma float32_of_int : forall (k:Z), (((-16777216%Z)%Z <= k)%Z /\
- (k <= 16777216%Z)%Z) -> ((to_float32 (BuiltIn.IZR k)) = (BuiltIn.IZR k)).
-intros k (h1,h2).
+Lemma to_float_is_finite_32 : forall (f:f32), (is_finite_f32 f) ->
+ ((to_f32 (of_f32 f)) = f).
Admitted.
(* Why3 goal *)
-Lemma float64_of_int : forall (k:Z), (((-9007199254740992%Z)%Z <= k)%Z /\
- (k <= 9007199254740992%Z)%Z) ->
- ((to_float64 (BuiltIn.IZR k)) = (BuiltIn.IZR k)).
-intros k (h1,h2).
+Lemma to_float_is_finite_64 : forall (d:f64), (is_finite_f64 d) ->
+ ((to_f64 (of_f64 d)) = d).
Admitted.
(* Why3 assumption *)
-Definition add_float32 (x:R) (y:R): R := (to_float32 (x + y)%R).
+Definition finite (x:R): Prop := (is_finite_f32 (to_f32 x)) /\ (is_finite_f64
+ (to_f64 x)).
-(* Why3 assumption *)
-Definition add_float64 (x:R) (y:R): R := (to_float64 (x + y)%R).
+(* Why3 goal *)
+Lemma finite_small_f32 : forall (x:R),
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= x)%R /\
+ (x <= 340282346600000016151267322115014000640%R)%R) -> (is_finite_f32
+ (to_f32 x)).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_small_f64 : forall (x:R),
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= x)%R /\
+ (x <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R) ->
+ (is_finite_f64 (to_f64 x)).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_range_f32 : forall (f:f32), (is_finite_f32 f) <->
+ (((-340282346600000016151267322115014000640%R)%R <= (of_f32 f))%R /\
+ ((of_f32 f) <= 340282346600000016151267322115014000640%R)%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_range_f64 : forall (d:f64), (is_finite_f64 d) <->
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= (of_f64 d))%R /\
+ ((of_f64 d) <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R).
+Admitted.
+
+(* Why3 goal *)
+Definition eq_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition eq_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition mul_float32 (x:R) (y:R): R := (to_float32 (x * y)%R).
+Definition eq_f32 (x:f32) (y:f32): Prop := ((eq_f32b x y) = true).
(* Why3 assumption *)
-Definition mul_float64 (x:R) (y:R): R := (to_float64 (x * y)%R).
+Definition eq_f64 (x:f64) (y:f64): Prop := ((eq_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma eq_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((eq_f32 x y) <-> ((of_f32 x) = (of_f32 y)))).
+Admitted.
+
+(* Why3 goal *)
+Lemma eq_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((eq_f64 x y) <-> ((of_f64 x) = (of_f64 y)))).
+Admitted.
+
+(* Why3 goal *)
+Definition ne_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition ne_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition div_float32 (x:R) (y:R): R := (to_float32 (x / y)%R).
+Definition ne_f32 (x:f32) (y:f32): Prop := ((ne_f32b x y) = true).
(* Why3 assumption *)
-Definition div_float64 (x:R) (y:R): R := (to_float64 (x / y)%R).
+Definition ne_f64 (x:f64) (y:f64): Prop := ((ne_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma ne_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((ne_f32 x y) <-> ~ ((of_f32 x) = (of_f32 y)))).
+Admitted.
+
+(* Why3 goal *)
+Lemma ne_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((ne_f64 x y) <-> ~ ((of_f64 x) = (of_f64 y)))).
+Admitted.
+
+(* Why3 goal *)
+Definition le_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition le_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition sqrt_float32 (x:R): R := (to_float32 (Reals.R_sqrt.sqrt x)).
+Definition le_f32 (x:f32) (y:f32): Prop := ((le_f32b x y) = true).
(* Why3 assumption *)
-Definition sqrt_float64 (x:R): R := (to_float64 (Reals.R_sqrt.sqrt x)).
+Definition le_f64 (x:f64) (y:f64): Prop := ((le_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma le_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((le_f32 x y) <-> ((of_f32 x) <= (of_f32 y))%R)).
+Admitted.
(* Why3 goal *)
-Definition model: R -> R.
+Lemma le_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((le_f64 x y) <-> ((of_f64 x) <= (of_f64 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Definition lt_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition lt_f64b: f64 -> f64 -> bool.
Admitted.
(* Why3 assumption *)
-Definition delta (x:R): R := (Reals.Rbasic_fun.Rabs (x - (model x))%R).
+Definition lt_f32 (x:f32) (y:f32): Prop := ((lt_f32b x y) = true).
(* Why3 assumption *)
-Definition error (x:R): R :=
- ((delta x) / (Reals.Rbasic_fun.Rabs (model x)))%R.
+Definition lt_f64 (x:f64) (y:f64): Prop := ((lt_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma lt_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((lt_f32 x y) <-> ((of_f32 x) < (of_f32 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Lemma lt_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((lt_f64 x y) <-> ((of_f64 x) < (of_f64 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Definition neg_f32: f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition neg_f64: f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma neg_finite_f32 : forall (x:f32), (is_finite_f32 x) ->
+ ((of_f32 (neg_f32 x)) = (-(of_f32 x))%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma neg_finite_f64 : forall (x:f64), (is_finite_f64 x) ->
+ ((of_f64 (neg_f64 x)) = (-(of_f64 x))%R).
+Admitted.
+
+(* Why3 goal *)
+Definition add_f32: f32 -> f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition add_f64: f64 -> f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma add_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((add_f32 x
+ y) = (to_f32 ((of_f32 x) + (of_f32 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Lemma add_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((add_f64 x
+ y) = (to_f64 ((of_f64 x) + (of_f64 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Definition mul_f32: f32 -> f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition mul_f64: f64 -> f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma mul_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((mul_f32 x
+ y) = (to_f32 ((of_f32 x) * (of_f32 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Lemma mul_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((mul_f64 x
+ y) = (to_f64 ((of_f64 x) * (of_f64 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Definition div_f32: f32 -> f32 -> f32.
+Admitted.
(* Why3 goal *)
-Lemma model_float_32 : forall (x:R), ((model (to_float32 x)) = (model x)).
+Definition div_f64: f64 -> f64 -> f64.
Admitted.
(* Why3 goal *)
-Lemma model_float_64 : forall (x:R), ((model (to_float64 x)) = (model x)).
+Lemma div_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((div_f32 x
+ y) = (to_f32 ((of_f32 x) / (of_f32 y))%R))).
Admitted.
(* Why3 goal *)
-Lemma model_add : forall (x:R) (y:R),
- ((model (x + y)%R) = ((model x) + (model y))%R).
+Lemma div_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((div_f64 x
+ y) = (to_f64 ((of_f64 x) / (of_f64 y))%R))).
Admitted.
(* Why3 goal *)
-Lemma model_mul : forall (x:R) (y:R),
- ((model (x * y)%R) = ((model x) * (model y))%R).
+Definition sqrt_f32: f32 -> f32.
Admitted.
(* Why3 goal *)
-Lemma model_div : forall (x:R) (y:R),
- ((model (x / y)%R) = ((model x) / (model y))%R).
+Definition sqrt_f64: f64 -> f64.
Admitted.
(* Why3 goal *)
-Lemma model_sqrt : forall (x:R),
- ((model (Reals.R_sqrt.sqrt x)) = (Reals.R_sqrt.sqrt (model x))).
+Lemma sqrt_finite_f32 : forall (x:f32), (is_finite_f32 x) ->
+ ((sqrt_f32 x) = (to_f32 (Reals.R_sqrt.sqrt (of_f32 x)))).
Admitted.
+(* Why3 goal *)
+Lemma sqrt_finite_f64 : forall (x:f64), (is_finite_f64 x) ->
+ ((sqrt_f64 x) = (to_f64 (Reals.R_sqrt.sqrt (of_f64 x)))).
+Admitted.
+
+(* Why3 goal *)
+Definition model_f32: f32 -> R.
+Admitted.
+
+(* Why3 assumption *)
+Definition delta_f32 (f:f32): R :=
+ (Reals.Rbasic_fun.Rabs ((of_f32 f) - (model_f32 f))%R).
+
+(* Why3 assumption *)
+Definition error_f32 (f:f32): R :=
+ ((delta_f32 f) / (Reals.Rbasic_fun.Rabs (model_f32 f)))%R.
+
+(* Why3 goal *)
+Definition model_f64: f64 -> R.
+Admitted.
+
+(* Why3 assumption *)
+Definition delta_f64 (f:f64): R :=
+ (Reals.Rbasic_fun.Rabs ((of_f64 f) - (model_f64 f))%R).
+
+(* Why3 assumption *)
+Definition error_f64 (f:f64): R :=
+ ((delta_f64 f) / (Reals.Rbasic_fun.Rabs (model_f64 f)))%R.
+
diff --git a/src/plugins/wp/share/src/Makefile b/src/plugins/wp/share/src/Makefile
index f441f4e9401964a0ceb71eb284bf1d3d2c6a5d57..fb38c4d2cbcd2a79a9847d42c55082c34865fba2 100644
--- a/src/plugins/wp/share/src/Makefile
+++ b/src/plugins/wp/share/src/Makefile
@@ -2,7 +2,7 @@
# #
# This file is part of WP plug-in of Frama-C. #
# #
-# Copyright (C) 2007-2018 #
+# Copyright (C) 2007-2019 #
# CEA (Commissariat a l'energie atomique et aux energies #
# alternatives) #
# #
diff --git a/src/plugins/wp/share/src/Qedlib.v b/src/plugins/wp/share/src/Qedlib.v
index f28d445be2423f565ef34acc49ee52da5b6776f8..4156a9e32907453de88b7494189f01dd8ce715ea 100644
--- a/src/plugins/wp/share/src/Qedlib.v
+++ b/src/plugins/wp/share/src/Qedlib.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/Zbits.v b/src/plugins/wp/share/src/Zbits.v
index f5e3c171e35645583e98ff21fbefcfe98011cfa0..e168e835e820688d375580f4521ecd7911399972 100644
--- a/src/plugins/wp/share/src/Zbits.v
+++ b/src/plugins/wp/share/src/Zbits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/alt_ergo_why3_stdlib.drv b/src/plugins/wp/share/src/alt_ergo_why3_stdlib.drv
index 7c4a33a0ed1ad6d838182698615e0cfeefc0d83f..c913ef7afd438b8c45c5d8c3fdb321452a272de9 100644
--- a/src/plugins/wp/share/src/alt_ergo_why3_stdlib.drv
+++ b/src/plugins/wp/share/src/alt_ergo_why3_stdlib.drv
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/cbits.why b/src/plugins/wp/share/src/cbits.why
index 79a40e3783e1178b6e4d40e6634bbbe27057a5e9..390b7b202663e7637674bdbd335da9dbb16966fc 100644
--- a/src/plugins/wp/share/src/cbits.why
+++ b/src/plugins/wp/share/src/cbits.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/cfloat.why b/src/plugins/wp/share/src/cfloat.why
index 8d8085992ff3bd384cad245411597195253e8563..f8bc5732032cd50db77121543f388a9ec3c721f0 100644
--- a/src/plugins/wp/share/src/cfloat.why
+++ b/src/plugins/wp/share/src/cfloat.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -26,7 +26,7 @@
theory Cfloat
- use import int.Int
+ use import bool.Bool
use import real.RealInfix
use import real.Abs
use import real.Square
@@ -36,155 +36,188 @@ theory Cfloat
(* --- C-Integer Arithmetics for Alt-Ergo --- *)
(* -------------------------------------------------------------------------- *)
+ type f32 (* single precision IEEE *)
+ type f64 (* double precision IEEE *)
+
(* C-Float Conversion *)
- function to_float32 real : real
- function to_float64 real : real
- predicate is_float32 (x : real) = to_float32(x)=x
- predicate is_float64 (x : real) = to_float64(x)=x
+ function to_f32 real : f32
+ function of_f32 f32 : real
+
+ function to_f64 real : f64
+ function of_f64 f64 : real
- axiom to_float32_zero: to_float32(0.0) = 0.0
- axiom to_float32_one: to_float32(1.0) = 1.0
- axiom to_float64_zero: to_float64(0.0) = 0.0
- axiom to_float64_one: to_float64(1.0) = 1.0
+ axiom to_f32_zero: of_f32 (to_f32 0.0) = 0.0
+ axiom to_f32_one: of_f32 (to_f32 1.0) = 1.0
+ axiom to_f64_zero: of_f64 (to_f64 0.0) = 0.0
+ axiom to_f64_one: of_f64 (to_f64 1.0) = 1.0
(* C-Float Rounding Modes *)
type rounding_mode = Up | Down | ToZero | NearestTiesToAway | NearestTiesToEven
- function round_double rounding_mode real : real
- function round_float rounding_mode real : real
+
+ function round_float rounding_mode real : f32
+ function round_double rounding_mode real : f64
axiom float_32:
forall x:real [ round_float NearestTiesToEven x ].
- to_float32 x = round_float NearestTiesToEven x
+ to_f32 x = round_float NearestTiesToEven x
axiom float_64:
forall x:real [ round_double NearestTiesToEven x ].
- to_float64 x = round_double NearestTiesToEven x
+ to_f64 x = round_double NearestTiesToEven x
(* C-Float Classification *)
- type float_kind = Real | Float32 | Float64 | NaN | Inf_pos | Inf_neg
+ type float_kind = Finite | NaN | Inf_pos | Inf_neg
+
+ function classify_f32 f32 : float_kind
+ function classify_f64 f64 : float_kind
+
+ predicate is_finite_f32 (f:f32) = (classify_f32 f = Finite)
+ predicate is_finite_f64 (d:f64) = (classify_f64 d = Finite)
- function classify_float real : float_kind
- predicate is_finite32(x:real) = classify_float x = Float32
- predicate is_finite64(x:real) = classify_float(x) = Float32 ||
- classify_float(x) = Float64
- predicate is_NaN(x:real) = classify_float(x) = NaN
- predicate is_infinite(x:real) = classify_float(x) = Inf_pos ||
- classify_float(x) = Inf_neg
- predicate is_positive_infinite(x:real) = classify_float(x) = Inf_pos
- predicate is_negative_infinite(x:real) = classify_float(x) = Inf_neg
+ predicate is_NaN_f32 (f:f32) = (classify_f32 f = NaN)
+ predicate is_NaN_f64 (d:f64) = (classify_f64 d = NaN)
+
+ predicate is_infinite_f32 (f:f32) = (classify_f32 f = Inf_pos || classify_f32 f = Inf_neg)
+ predicate is_infinite_f64 (d:f64) = (classify_f64 d = Inf_pos || classify_f64 d = Inf_neg)
+
+ predicate is_positive_infinite_f32 (f:f32) = (classify_f32 f = Inf_pos)
+ predicate is_positive_infinite_f64 (d:f64) = (classify_f64 d = Inf_pos)
+
+ predicate is_negative_infinite_f32 (f:f32) = (classify_f32 f = Inf_neg)
+ predicate is_negative_infinite_f64 (d:f64) = (classify_f64 d = Inf_neg)
axiom is_finite_to_float_32 :
- forall x:real [is_finite32(to_float32 x)]. is_finite32(to_float32 x)
+ forall x:real [is_finite_f32(to_f32 x)]. is_finite_f32 (to_f32 x)
axiom is_finite_to_float_64 :
- forall x:real [is_finite64(to_float64 x)]. is_finite64(to_float64 x)
+ forall x:real [is_finite_f64(to_f64 x)]. is_finite_f64 (to_f64 x)
- (* C-Float and Integers *)
+ axiom to_float_is_finite_32 :
+ forall f:f32 [ to_f32( of_f32 f ) | is_finite_f32(f) ]. is_finite_f32(f) -> to_f32( of_f32 f ) = f
- constant max_int_float32 : int = 16777216 (* 2^24 *)
- constant max_int_float64 : int = 9007199254740992 (* 2^53 *)
+ axiom to_float_is_finite_64 :
+ forall d:f64 [ to_f64( of_f64 d ) | is_finite_f64(d) ]. is_finite_f64(d) -> to_f64( of_f64 d ) = d
- axiom float32_of_int: forall k:int.
- -max_int_float32 <= k <= max_int_float32 -> to_float32(from_int k) = from_int k
+ (* Finite Constants *)
- axiom float64_of_int: forall k:int.
- -max_int_float64 <= k <= max_int_float64 -> to_float64(from_int k) = from_int k
+ predicate finite (x:real) = (is_finite_f32 (to_f32 x)) /\ (is_finite_f64 (to_f64 x))
- (* C-Float Rounded Arithmetics *)
+ constant max_f32 : real = 340282346600000016151267322115014000640.0
+ constant max_f64 : real = 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0
- function add_float32 (x:real)(y:real) : real = to_float32 (x +. y)
- function add_float64 (x:real)(y:real) : real = to_float64 (x +. y)
+ axiom finite_small_f32 : forall x:real. -. max_f64 <=. x <=. max_f32 -> is_finite_f32(to_f32 x)
+ axiom finite_small_f64 : forall x:real. -. max_f64 <=. x <=. max_f64 -> is_finite_f64(to_f64 x)
+ axiom finite_range_f32 : forall f:f32. is_finite_f32(f) <-> -. max_f32 <=. of_f32 f <=. max_f32
+ axiom finite_range_f64 : forall d:f64. is_finite_f64(d) <-> -. max_f64 <=. of_f64 d <=. max_f64
- function mul_float32 (x:real)(y:real) : real = to_float32 (x *. y)
- function mul_float64 (x:real)(y:real) : real = to_float64 (x *. y)
+ (* Equal *)
- function div_float32 (x:real)(y:real) : real = to_float32 (x /. y)
- function div_float64 (x:real)(y:real) : real = to_float64 (x /. y)
+ function eq_f32b (x:f32) (y:f32) : bool
+ function eq_f64b (x:f64) (y:f64) : bool
+ predicate eq_f32 (x:f32) (y:f32) = (eq_f32b x y = true)
+ predicate eq_f64 (x:f64) (y:f64) = (eq_f64b x y = true)
+ axiom eq_finite_f32 : forall x,y:f32 [eq_f32 x y]. is_finite_f32 x -> is_finite_f32 y ->
+ eq_f32 x y <-> of_f32 x = of_f32 y
- function sqrt_float32 (x:real) : real = to_float32(sqrt x)
- function sqrt_float64 (x:real) : real = to_float64(sqrt x)
+ axiom eq_finite_f64 : forall x,y:f64 [eq_f64 x y]. is_finite_f64 x -> is_finite_f64 y ->
+ eq_f64 x y <-> of_f64 x = of_f64 y
- function model real : real
- function delta(x:real) : real = abs( x -. model x )
- function error(x:real) : real = delta(x) /. abs(model x)
+ (* Not Equal *)
- axiom model_float_32: forall x:real. model(to_float32 x) = model x
- axiom model_float_64: forall x:real. model(to_float64 x) = model x
- axiom model_add: forall x y:real. model (x +. y) = model x +. model y
- axiom model_mul: forall x y:real. model (x *. y) = model x *. model y
- axiom model_div: forall x y:real. model (x /. y) = model x /. model y
- axiom model_sqrt: forall x:real. model (sqrt x) = sqrt(model(x))
+ function ne_f32b (x:f32) (y:f32) : bool
+ function ne_f64b (x:f64) (y:f64) : bool
+ predicate ne_f32 (x:f32) (y:f32) = (ne_f32b x y = true)
+ predicate ne_f64 (x:f64) (y:f64) = (ne_f64b x y = true)
-end
+ axiom ne_finite_f32 : forall x,y:f32 [ne_f32 x y]. is_finite_f32 x -> is_finite_f32 y ->
+ ne_f32 x y <-> of_f32 x <> of_f32 y
-(** Realization using why3 floats *)
+ axiom ne_finite_f64 : forall x,y:f64 [ne_f64 x y]. is_finite_f64 x -> is_finite_f64 y ->
+ ne_f64 x y <-> of_f64 x <> of_f64 y
+ (* Comparison (<=) *)
-(*
- (* C-Float IEEE-754 *)
+ function le_f32b (x:f32) (y:f32) : bool
+ function le_f64b (x:f64) (y:f64) : bool
+ predicate le_f32 (x:f32) (y:f32) = (le_f32b x y = true)
+ predicate le_f64 (x:f64) (y:f64) = (le_f64b x y = true)
- use export floating_point.Rounding
- use import floating_point.Single
- use import floating_point.Double
+ axiom le_finite_f32 : forall x,y:f32 [le_f32 x y]. is_finite_f32 x -> is_finite_f32 y ->
+ le_f32 x y <-> of_f32 x <=. of_f32 y
- type rounding_mode = Rounding.mode
+ axiom le_finite_f64 : forall x,y:f64 [le_f64 x y]. is_finite_f64 x -> is_finite_f64 y ->
+ le_f64 x y <-> of_f64 x <=. of_f64 y
+ (* Comparison (<) *)
- function round_float (m:rounding_mode) (x:real) : real = Single.round m x
- function round_double (m:rounding_mode) (x:real) : real = Double.round m x
+ function lt_f32b (x:f32) (y:f32) : bool
+ function lt_f64b (x:f64) (y:f64) : bool
+ predicate lt_f32 (x:f32) (y:f32) = (lt_f32b x y = true)
+ predicate lt_f64 (x:f64) (y:f64) = (lt_f64b x y = true)
- (* C-Float Conversion *)
+ axiom lt_finite_f32 : forall x,y:f32 [lt_f32 x y]. is_finite_f32 x -> is_finite_f32 y ->
+ lt_f32 x y <-> of_f32 x <. of_f32 y
- function to_float32 (x:real) : real = Single.round NearestTiesToEven x
- function to_float64 (x:real) : real = Double.round NearestTiesToEven x
+ axiom lt_finite_f64 : forall x,y:f64 [lt_f64 x y]. is_finite_f64 x -> is_finite_f64 y ->
+ lt_f64 x y <-> of_f64 x <. of_f64 y
- predicate is_float32 real
- predicate is_float64 real
+ (* Negation *)
- axiom def_float32: forall x:real [ is_float32(x) ]. is_float32 x -> to_float32 x = x
- axiom def_float64: forall x:real [ is_float64(x) ]. is_float64 x -> to_float64 x = x
- predicate is_finite32 (x:real) = abs(x) <=. Single.max_single
- predicate is_finite64 (x:real) = abs(x) <=. Double.max_double
+ function neg_f32 (x:f32) : f32
+ function neg_f64 (x:f64) : f64
- axiom is_finite_to_float_32 :
- forall x:real [is_finite32(to_float32 x)]. is_finite32(to_float32 x)
+ axiom neg_finite_f32 : forall x:f32 [neg_f32 x]. is_finite_f32 x -> of_f32 (neg_f32 x) = -. (of_f32 x)
+ axiom neg_finite_f64 : forall x:f64 [neg_f64 x]. is_finite_f64 x -> of_f64 (neg_f64 x) = -. (of_f64 x)
- axiom is_finite_to_float_64 :
- forall x:real [is_finite64(to_float64 x)]. is_finite64(to_float64 x)
+ (* Addition *)
+
+ function add_f32 (x:f32) (y:f32) : f32
+ function add_f64 (x:f64) (y:f64) : f64
- (* C-Float Conversions are projections *)
+ axiom add_finite_f32 : forall x,y:f32 [add_f32 x y]. is_finite_f32 x -> is_finite_f32 y ->
+ add_f32 x y = to_f32 (of_f32 x +. of_f32 y)
- axiom proj_float32 : forall x:real [ to_float32(to_float32 x) ]. to_float32(to_float32 x)=to_float32 x
- axiom proj_float64 : forall x:real [ to_float64(to_float64 x) ]. to_float64(to_float64 x)=to_float64 x
+ axiom add_finite_f64 : forall x,y:f64 [add_f64 x y]. is_finite_f64 x -> is_finite_f64 y ->
+ add_f64 x y = to_f64 (of_f64 x +. of_f64 y)
+ (* Multiplication *)
- (* C-Float Arithemtics *)
+ function mul_f32 (x:f32) (y:f32) : f32
+ function mul_f64 (x:f64) (y:f64) : f64
- function add_float32(x:real)(y:real):real = to_float32(x +. y)
- function add_float64(x:real)(y:real):real = to_float64(x +. y)
+ axiom mul_finite_f32 : forall x,y:f32 [mul_f32 x y]. is_finite_f32 x -> is_finite_f32 y ->
+ mul_f32 x y = to_f32 (of_f32 x *. of_f32 y)
- function mul_float32(x:real)(y:real):real = to_float32(x *. y)
- function mul_float64(x:real)(y:real):real = to_float64(x *. y)
+ axiom mul_finite_f64 : forall x,y:f64 [mul_f64 x y]. is_finite_f64 x -> is_finite_f64 y ->
+ mul_f64 x y = to_f64 (of_f64 x *. of_f64 y)
+ (* Division *)
- function div_float32(x:real)(y:real):real = to_float32(x /. y)
- function div_float64(x:real)(y:real):real = to_float64(x /. y)
+ function div_f32 (x:f32) (y:f32) : f32
+ function div_f64 (x:f64) (y:f64) : f64
- function sqrt_float32(x:real):real = to_float32(sqrt x)
- function sqrt_float64(x:real):real = to_float64(sqrt x)
+ axiom div_finite_f32 : forall x,y:f32 [div_f32 x y]. is_finite_f32 x -> is_finite_f32 y ->
+ div_f32 x y = to_f32 (of_f32 x /. of_f32 y)
- (* C-Float Precision *)
+ axiom div_finite_f64 : forall x,y:f64 [div_f64 x y]. is_finite_f64 x -> is_finite_f64 y ->
+ div_f64 x y = to_f64 (of_f64 x /. of_f64 y)
- function model real : real
- function delta (x:real) : real = abs ( x -. (model x) )
- function error (x:real) : real = (delta x) /. (abs (model x))
+ (* Square Root *)
- axiom model_float_32: forall x:real. model(to_float32 x) = model x
- axiom model_float_64: forall x:real. model(to_float64 x) = model x
- axiom model_add: forall x y:real. model(x +. y) = model x +. model y
- axiom model_mul: forall x y:real. model(x *. y) = model x *. model y
- axiom model_div: forall x y:real. model(x /. y) = model x /. model y
- axiom model_sqrt: forall x:real. model(sqrt(x)) = sqrt(model x)
+ function sqrt_f32 f32 : f32
+ function sqrt_f64 f64 : f64
+ axiom sqrt_finite_f32 : forall x:f32 [sqrt_f32 x]. is_finite_f32 x -> sqrt_f32 x = to_f32 (sqrt (of_f32 x))
+ axiom sqrt_finite_f64 : forall x:f64 [sqrt_f64 x]. is_finite_f64 x -> sqrt_f64 x = to_f64 (sqrt (of_f64 x))
-*)
+ (* Models *)
+
+ function model_f32 (f:f32) : real
+ function delta_f32 (f:f32) : real = abs( of_f32 f -. model_f32 f )
+ function error_f32 (f:f32) : real = (delta_f32 f) /. (abs (model_f32 f))
+
+ function model_f64 (f:f64) : real
+ function delta_f64 (f:f64) : real = abs( of_f64 f -. model_f64 f )
+ function error_f64 (f:f64) : real = (delta_f64 f) /. (abs (model_f64 f))
+
+end
diff --git a/src/plugins/wp/share/src/cint.why b/src/plugins/wp/share/src/cint.why
index 5d02b12672fc518596e3289dd19a9888c3daafed..b725bf2d3ec32838b1117a7852cb098e39b43835 100644
--- a/src/plugins/wp/share/src/cint.why
+++ b/src/plugins/wp/share/src/cint.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/cmath.why b/src/plugins/wp/share/src/cmath.why
index a548531c86b5601578863bf27935796b3c210ccb..f5650834c9039ea7ab0207ef5f7b9c75f4f5e764 100644
--- a/src/plugins/wp/share/src/cmath.why
+++ b/src/plugins/wp/share/src/cmath.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/coq-own-realization.drv b/src/plugins/wp/share/src/coq-own-realization.drv
index c40d3c896df48e9d9316b90906be9c7d10e42ef1..bba87c6fafc12b9fea860971125354ea88582a7f 100644
--- a/src/plugins/wp/share/src/coq-own-realization.drv
+++ b/src/plugins/wp/share/src/coq-own-realization.drv
@@ -2,7 +2,7 @@
(* *)
(* This file is part of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat à l'énergie atomique et aux énergies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/filter_axioms.ml b/src/plugins/wp/share/src/filter_axioms.ml
index 3b4adeb2a213ecf5a8a54977827769dd9c9d8eec..6a339539ec76744e96480d45007eda3f832085c9 100644
--- a/src/plugins/wp/share/src/filter_axioms.ml
+++ b/src/plugins/wp/share/src/filter_axioms.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/memory.why b/src/plugins/wp/share/src/memory.why
index 8a95d910ec87608a506e4cc17ecd843e39c73754..54b1238496a130e08f9fca622bb5aabcbefba213 100644
--- a/src/plugins/wp/share/src/memory.why
+++ b/src/plugins/wp/share/src/memory.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/qed.why b/src/plugins/wp/share/src/qed.why
index 2f74ae6d94da0a4f1c6a7a757974ebf702fcfbda..bd87796feaa702e6c04d807925cefbc421c451de 100644
--- a/src/plugins/wp/share/src/qed.why
+++ b/src/plugins/wp/share/src/qed.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/vlist.why b/src/plugins/wp/share/src/vlist.why
index 012a7bde4e3a847cc9398aeab656ecbc9a9fa8c8..885127e7f8da91f5f7a69478644c3b70ecefc736 100644
--- a/src/plugins/wp/share/src/vlist.why
+++ b/src/plugins/wp/share/src/vlist.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/src/vset.why b/src/plugins/wp/share/src/vset.why
index 24c322bbb317291263df8094b1a168e0150bb5d3..35da72053b115a8c785dce77897205f98bf2150d 100644
--- a/src/plugins/wp/share/src/vset.why
+++ b/src/plugins/wp/share/src/vset.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/ArcTrigo.v b/src/plugins/wp/share/why3/ArcTrigo.v
index 06792c17090829913a7658625e115732bfbb9ea2..b5236fbe98fafbb335f2966090b9959e8f925d2c 100644
--- a/src/plugins/wp/share/why3/ArcTrigo.v
+++ b/src/plugins/wp/share/why3/ArcTrigo.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/ArcTrigo.why b/src/plugins/wp/share/why3/ArcTrigo.why
index acbc8c3a4581c5f5045b0a732ec4af6b05b7f6c7..bf76b70b1fd9bbae8ffdcb49f748faf8030f2583 100644
--- a/src/plugins/wp/share/why3/ArcTrigo.why
+++ b/src/plugins/wp/share/why3/ArcTrigo.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Bits.v b/src/plugins/wp/share/why3/Bits.v
index 8bb865ae80dc06f2768968656b18f3dc8414aa79..0381e15181d8c41bcc35734f624d9fe24be8dfa4 100644
--- a/src/plugins/wp/share/why3/Bits.v
+++ b/src/plugins/wp/share/why3/Bits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Cbits.v b/src/plugins/wp/share/why3/Cbits.v
index a1378bbcb7c6f9d6278f627febb551a94f818820..aff75e9b1e9667a2d0cf74393c4fae83a97721f2 100644
--- a/src/plugins/wp/share/why3/Cbits.v
+++ b/src/plugins/wp/share/why3/Cbits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Cbits.why b/src/plugins/wp/share/why3/Cbits.why
index 06cae224a81d588d62d0304803e6b8cb73634a51..d5867717def38b38001d60f5893e73fdec699609 100644
--- a/src/plugins/wp/share/why3/Cbits.why
+++ b/src/plugins/wp/share/why3/Cbits.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Cfloat.v b/src/plugins/wp/share/why3/Cfloat.v
index 0fa6eb71434b824a0132603a485376df50d6175f..f25c72b7027de53cfb3377ab0f3d139ac51f6538 100644
--- a/src/plugins/wp/share/why3/Cfloat.v
+++ b/src/plugins/wp/share/why3/Cfloat.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -26,6 +26,7 @@ Require Import BuiltIn.
Require Reals.Rbasic_fun.
Require Reals.R_sqrt.
Require BuiltIn.
+Require bool.Bool.
Require int.Int.
Require real.Real.
Require real.RealInfix.
@@ -34,33 +35,43 @@ Require real.FromInt.
Require real.Square.
(* Why3 goal *)
-Definition to_float32: R -> R.
+Definition f32 : Type.
Admitted.
(* Why3 goal *)
-Definition to_float64: R -> R.
+Definition f64 : Type.
Admitted.
-(* Why3 assumption *)
-Definition is_float32 (x:R): Prop := ((to_float32 x) = x).
+(* Why3 goal *)
+Definition to_f32: R -> f32.
+Admitted.
-(* Why3 assumption *)
-Definition is_float64 (x:R): Prop := ((to_float64 x) = x).
+(* Why3 goal *)
+Definition of_f32: f32 -> R.
+Admitted.
+
+(* Why3 goal *)
+Definition to_f64: R -> f64.
+Admitted.
(* Why3 goal *)
-Lemma to_float32_zero : ((to_float32 0%R) = 0%R).
+Definition of_f64: f64 -> R.
Admitted.
(* Why3 goal *)
-Lemma to_float32_one : ((to_float32 1%R) = 1%R).
+Lemma to_f32_zero : ((of_f32 (to_f32 0%R)) = 0%R).
Admitted.
(* Why3 goal *)
-Lemma to_float64_zero : ((to_float64 0%R) = 0%R).
+Lemma to_f32_one : ((of_f32 (to_f32 1%R)) = 1%R).
Admitted.
(* Why3 goal *)
-Lemma to_float64_one : ((to_float64 1%R) = 1%R).
+Lemma to_f64_zero : ((of_f64 (to_f64 0%R)) = 0%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma to_f64_one : ((of_f64 (to_f64 1%R)) = 1%R).
Admitted.
(* Why3 assumption *)
@@ -74,28 +85,26 @@ Axiom rounding_mode_WhyType : WhyType rounding_mode.
Existing Instance rounding_mode_WhyType.
(* Why3 goal *)
-Definition round_double: rounding_mode -> R -> R.
+Definition round_float: rounding_mode -> R -> f32.
Admitted.
(* Why3 goal *)
-Definition round_float: rounding_mode -> R -> R.
+Definition round_double: rounding_mode -> R -> f64.
Admitted.
(* Why3 goal *)
-Lemma float_32 : forall (x:R),
- ((to_float32 x) = (round_float NearestTiesToEven x)).
+Lemma float_32 : forall (x:R), ((to_f32 x) = (round_float NearestTiesToEven
+ x)).
Admitted.
(* Why3 goal *)
-Lemma float_64 : forall (x:R),
- ((to_float64 x) = (round_double NearestTiesToEven x)).
+Lemma float_64 : forall (x:R), ((to_f64 x) = (round_double NearestTiesToEven
+ x)).
Admitted.
(* Why3 assumption *)
Inductive float_kind :=
- | Real : float_kind
- | Float32 : float_kind
- | Float64 : float_kind
+ | Finite : float_kind
| NaN : float_kind
| Inf_pos : float_kind
| Inf_neg : float_kind.
@@ -103,112 +112,310 @@ Axiom float_kind_WhyType : WhyType float_kind.
Existing Instance float_kind_WhyType.
(* Why3 goal *)
-Definition classify_float: R -> float_kind.
+Definition classify_f32: f32 -> float_kind.
+Admitted.
+
+(* Why3 goal *)
+Definition classify_f64: f64 -> float_kind.
Admitted.
(* Why3 assumption *)
-Definition is_finite32 (x:R): Prop := ((classify_float x) = Float32).
+Definition is_finite_f32 (f:f32): Prop := ((classify_f32 f) = Finite).
+
+(* Why3 assumption *)
+Definition is_finite_f64 (d:f64): Prop := ((classify_f64 d) = Finite).
(* Why3 assumption *)
-Definition is_finite64 (x:R): Prop := ((classify_float x) = Float32) \/
- ((classify_float x) = Float64).
+Definition is_NaN_f32 (f:f32): Prop := ((classify_f32 f) = NaN).
(* Why3 assumption *)
-Definition is_NaN (x:R): Prop := ((classify_float x) = NaN).
+Definition is_NaN_f64 (d:f64): Prop := ((classify_f64 d) = NaN).
(* Why3 assumption *)
-Definition is_infinite (x:R): Prop := ((classify_float x) = Inf_pos) \/
- ((classify_float x) = Inf_neg).
+Definition is_infinite_f32 (f:f32): Prop := ((classify_f32 f) = Inf_pos) \/
+ ((classify_f32 f) = Inf_neg).
(* Why3 assumption *)
-Definition is_positive_infinite (x:R): Prop :=
- ((classify_float x) = Inf_pos).
+Definition is_infinite_f64 (d:f64): Prop := ((classify_f64 d) = Inf_pos) \/
+ ((classify_f64 d) = Inf_neg).
(* Why3 assumption *)
-Definition is_negative_infinite (x:R): Prop :=
- ((classify_float x) = Inf_neg).
+Definition is_positive_infinite_f32 (f:f32): Prop :=
+ ((classify_f32 f) = Inf_pos).
+
+(* Why3 assumption *)
+Definition is_positive_infinite_f64 (d:f64): Prop :=
+ ((classify_f64 d) = Inf_pos).
+
+(* Why3 assumption *)
+Definition is_negative_infinite_f32 (f:f32): Prop :=
+ ((classify_f32 f) = Inf_neg).
+
+(* Why3 assumption *)
+Definition is_negative_infinite_f64 (d:f64): Prop :=
+ ((classify_f64 d) = Inf_neg).
(* Why3 goal *)
-Lemma is_finite_to_float_32 : forall (x:R), (is_finite32 (to_float32 x)).
+Lemma is_finite_to_float_32 : forall (x:R), (is_finite_f32 (to_f32 x)).
Admitted.
(* Why3 goal *)
-Lemma is_finite_to_float_64 : forall (x:R), (is_finite64 (to_float64 x)).
+Lemma is_finite_to_float_64 : forall (x:R), (is_finite_f64 (to_f64 x)).
Admitted.
(* Why3 goal *)
-Lemma float32_of_int : forall (k:Z), (((-16777216%Z)%Z <= k)%Z /\
- (k <= 16777216%Z)%Z) -> ((to_float32 (BuiltIn.IZR k)) = (BuiltIn.IZR k)).
-intros k (h1,h2).
+Lemma to_float_is_finite_32 : forall (f:f32), (is_finite_f32 f) ->
+ ((to_f32 (of_f32 f)) = f).
Admitted.
(* Why3 goal *)
-Lemma float64_of_int : forall (k:Z), (((-9007199254740992%Z)%Z <= k)%Z /\
- (k <= 9007199254740992%Z)%Z) ->
- ((to_float64 (BuiltIn.IZR k)) = (BuiltIn.IZR k)).
-intros k (h1,h2).
+Lemma to_float_is_finite_64 : forall (d:f64), (is_finite_f64 d) ->
+ ((to_f64 (of_f64 d)) = d).
Admitted.
(* Why3 assumption *)
-Definition add_float32 (x:R) (y:R): R := (to_float32 (x + y)%R).
+Definition finite (x:R): Prop := (is_finite_f32 (to_f32 x)) /\ (is_finite_f64
+ (to_f64 x)).
-(* Why3 assumption *)
-Definition add_float64 (x:R) (y:R): R := (to_float64 (x + y)%R).
+(* Why3 goal *)
+Lemma finite_small_f32 : forall (x:R),
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= x)%R /\
+ (x <= 340282346600000016151267322115014000640%R)%R) -> (is_finite_f32
+ (to_f32 x)).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_small_f64 : forall (x:R),
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= x)%R /\
+ (x <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R) ->
+ (is_finite_f64 (to_f64 x)).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_range_f32 : forall (f:f32), (is_finite_f32 f) <->
+ (((-340282346600000016151267322115014000640%R)%R <= (of_f32 f))%R /\
+ ((of_f32 f) <= 340282346600000016151267322115014000640%R)%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma finite_range_f64 : forall (d:f64), (is_finite_f64 d) <->
+ (((-179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R <= (of_f64 d))%R /\
+ ((of_f64 d) <= 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368%R)%R).
+Admitted.
+
+(* Why3 goal *)
+Definition eq_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition eq_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition mul_float32 (x:R) (y:R): R := (to_float32 (x * y)%R).
+Definition eq_f32 (x:f32) (y:f32): Prop := ((eq_f32b x y) = true).
(* Why3 assumption *)
-Definition mul_float64 (x:R) (y:R): R := (to_float64 (x * y)%R).
+Definition eq_f64 (x:f64) (y:f64): Prop := ((eq_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma eq_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((eq_f32 x y) <-> ((of_f32 x) = (of_f32 y)))).
+Admitted.
+
+(* Why3 goal *)
+Lemma eq_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((eq_f64 x y) <-> ((of_f64 x) = (of_f64 y)))).
+Admitted.
+
+(* Why3 goal *)
+Definition ne_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition ne_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition div_float32 (x:R) (y:R): R := (to_float32 (x / y)%R).
+Definition ne_f32 (x:f32) (y:f32): Prop := ((ne_f32b x y) = true).
(* Why3 assumption *)
-Definition div_float64 (x:R) (y:R): R := (to_float64 (x / y)%R).
+Definition ne_f64 (x:f64) (y:f64): Prop := ((ne_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma ne_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((ne_f32 x y) <-> ~ ((of_f32 x) = (of_f32 y)))).
+Admitted.
+
+(* Why3 goal *)
+Lemma ne_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((ne_f64 x y) <-> ~ ((of_f64 x) = (of_f64 y)))).
+Admitted.
+
+(* Why3 goal *)
+Definition le_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition le_f64b: f64 -> f64 -> bool.
+Admitted.
(* Why3 assumption *)
-Definition sqrt_float32 (x:R): R := (to_float32 (Reals.R_sqrt.sqrt x)).
+Definition le_f32 (x:f32) (y:f32): Prop := ((le_f32b x y) = true).
(* Why3 assumption *)
-Definition sqrt_float64 (x:R): R := (to_float64 (Reals.R_sqrt.sqrt x)).
+Definition le_f64 (x:f64) (y:f64): Prop := ((le_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma le_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((le_f32 x y) <-> ((of_f32 x) <= (of_f32 y))%R)).
+Admitted.
(* Why3 goal *)
-Definition model: R -> R.
+Lemma le_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((le_f64 x y) <-> ((of_f64 x) <= (of_f64 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Definition lt_f32b: f32 -> f32 -> bool.
+Admitted.
+
+(* Why3 goal *)
+Definition lt_f64b: f64 -> f64 -> bool.
Admitted.
(* Why3 assumption *)
-Definition delta (x:R): R := (Reals.Rbasic_fun.Rabs (x - (model x))%R).
+Definition lt_f32 (x:f32) (y:f32): Prop := ((lt_f32b x y) = true).
(* Why3 assumption *)
-Definition error (x:R): R :=
- ((delta x) / (Reals.Rbasic_fun.Rabs (model x)))%R.
+Definition lt_f64 (x:f64) (y:f64): Prop := ((lt_f64b x y) = true).
+
+(* Why3 goal *)
+Lemma lt_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((lt_f32 x y) <-> ((of_f32 x) < (of_f32 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Lemma lt_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((lt_f64 x y) <-> ((of_f64 x) < (of_f64 y))%R)).
+Admitted.
+
+(* Why3 goal *)
+Definition neg_f32: f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition neg_f64: f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma neg_finite_f32 : forall (x:f32), (is_finite_f32 x) ->
+ ((of_f32 (neg_f32 x)) = (-(of_f32 x))%R).
+Admitted.
+
+(* Why3 goal *)
+Lemma neg_finite_f64 : forall (x:f64), (is_finite_f64 x) ->
+ ((of_f64 (neg_f64 x)) = (-(of_f64 x))%R).
+Admitted.
+
+(* Why3 goal *)
+Definition add_f32: f32 -> f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition add_f64: f64 -> f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma add_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((add_f32 x
+ y) = (to_f32 ((of_f32 x) + (of_f32 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Lemma add_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((add_f64 x
+ y) = (to_f64 ((of_f64 x) + (of_f64 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Definition mul_f32: f32 -> f32 -> f32.
+Admitted.
+
+(* Why3 goal *)
+Definition mul_f64: f64 -> f64 -> f64.
+Admitted.
+
+(* Why3 goal *)
+Lemma mul_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((mul_f32 x
+ y) = (to_f32 ((of_f32 x) * (of_f32 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Lemma mul_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((mul_f64 x
+ y) = (to_f64 ((of_f64 x) * (of_f64 y))%R))).
+Admitted.
+
+(* Why3 goal *)
+Definition div_f32: f32 -> f32 -> f32.
+Admitted.
(* Why3 goal *)
-Lemma model_float_32 : forall (x:R), ((model (to_float32 x)) = (model x)).
+Definition div_f64: f64 -> f64 -> f64.
Admitted.
(* Why3 goal *)
-Lemma model_float_64 : forall (x:R), ((model (to_float64 x)) = (model x)).
+Lemma div_finite_f32 : forall (x:f32) (y:f32), (is_finite_f32 x) ->
+ ((is_finite_f32 y) -> ((div_f32 x
+ y) = (to_f32 ((of_f32 x) / (of_f32 y))%R))).
Admitted.
(* Why3 goal *)
-Lemma model_add : forall (x:R) (y:R),
- ((model (x + y)%R) = ((model x) + (model y))%R).
+Lemma div_finite_f64 : forall (x:f64) (y:f64), (is_finite_f64 x) ->
+ ((is_finite_f64 y) -> ((div_f64 x
+ y) = (to_f64 ((of_f64 x) / (of_f64 y))%R))).
Admitted.
(* Why3 goal *)
-Lemma model_mul : forall (x:R) (y:R),
- ((model (x * y)%R) = ((model x) * (model y))%R).
+Definition sqrt_f32: f32 -> f32.
Admitted.
(* Why3 goal *)
-Lemma model_div : forall (x:R) (y:R),
- ((model (x / y)%R) = ((model x) / (model y))%R).
+Definition sqrt_f64: f64 -> f64.
Admitted.
(* Why3 goal *)
-Lemma model_sqrt : forall (x:R),
- ((model (Reals.R_sqrt.sqrt x)) = (Reals.R_sqrt.sqrt (model x))).
+Lemma sqrt_finite_f32 : forall (x:f32), (is_finite_f32 x) ->
+ ((sqrt_f32 x) = (to_f32 (Reals.R_sqrt.sqrt (of_f32 x)))).
Admitted.
+(* Why3 goal *)
+Lemma sqrt_finite_f64 : forall (x:f64), (is_finite_f64 x) ->
+ ((sqrt_f64 x) = (to_f64 (Reals.R_sqrt.sqrt (of_f64 x)))).
+Admitted.
+
+(* Why3 goal *)
+Definition model_f32: f32 -> R.
+Admitted.
+
+(* Why3 assumption *)
+Definition delta_f32 (f:f32): R :=
+ (Reals.Rbasic_fun.Rabs ((of_f32 f) - (model_f32 f))%R).
+
+(* Why3 assumption *)
+Definition error_f32 (f:f32): R :=
+ ((delta_f32 f) / (Reals.Rbasic_fun.Rabs (model_f32 f)))%R.
+
+(* Why3 goal *)
+Definition model_f64: f64 -> R.
+Admitted.
+
+(* Why3 assumption *)
+Definition delta_f64 (f:f64): R :=
+ (Reals.Rbasic_fun.Rabs ((of_f64 f) - (model_f64 f))%R).
+
+(* Why3 assumption *)
+Definition error_f64 (f:f64): R :=
+ ((delta_f64 f) / (Reals.Rbasic_fun.Rabs (model_f64 f)))%R.
+
diff --git a/src/plugins/wp/share/why3/Cfloat.why b/src/plugins/wp/share/why3/Cfloat.why
index 8e77995c1669266b21ef95a240c90f685368c641..f6493d5b5818307c2d411d8b064a0469d17e4a2f 100644
--- a/src/plugins/wp/share/why3/Cfloat.why
+++ b/src/plugins/wp/share/why3/Cfloat.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -21,27 +21,32 @@
(**************************************************************************)
theory Cfloat
+use bool.Bool as Bool
use int.Int as Int
use real.Real as Real
use real.Abs as Abs
use real.FromInt as FromInt
use real.Square as Square
-function to_float32 real : real
+type f32
-function to_float64 real : real
+type f64
-predicate is_float32 (x:real) = ((to_float32 x) = (x))
+function to_f32 real : f32
-predicate is_float64 (x:real) = ((to_float64 x) = (x))
+function of_f32 f32 : real
-axiom to_float32_zero : ((to_float32 0.0) = (0.0))
+function to_f64 real : f64
-axiom to_float32_one : ((to_float32 1.0) = (1.0))
+function of_f64 f64 : real
-axiom to_float64_zero : ((to_float64 0.0) = (0.0))
+axiom to_f32_zero : ((of_f32 (to_f32 0.0)) = (0.0))
-axiom to_float64_one : ((to_float64 1.0) = (1.0))
+axiom to_f32_one : ((of_f32 (to_f32 1.0)) = (1.0))
+
+axiom to_f64_zero : ((of_f64 (to_f64 0.0)) = (0.0))
+
+axiom to_f64_one : ((of_f64 (to_f64 1.0)) = (1.0))
type rounding_mode =
| Up
@@ -50,96 +55,210 @@ type rounding_mode =
| NearestTiesToAway
| NearestTiesToEven
-function round_double rounding_mode real : real
+function round_float rounding_mode real : f32
-function round_float rounding_mode real : real
+function round_double rounding_mode real : f64
-axiom float_32 : forall x:real [round_float NearestTiesToEven x].
- ((to_float32 x) = (round_float NearestTiesToEven x))
+axiom float_32 : forall x:real [round_float NearestTiesToEven x]. ((to_f32
+ x) = (round_float NearestTiesToEven x))
-axiom float_64 : forall x:real [round_double NearestTiesToEven x].
- ((to_float64 x) = (round_double NearestTiesToEven x))
+axiom float_64 : forall x:real [round_double NearestTiesToEven x]. ((to_f64
+ x) = (round_double NearestTiesToEven x))
type float_kind =
- | Real
- | Float32
- | Float64
+ | Finite
| NaN
| Inf_pos
| Inf_neg
-function classify_float real : float_kind
+function classify_f32 f32 : float_kind
+
+function classify_f64 f64 : float_kind
+
+predicate is_finite_f32 (f:f32) = ((classify_f32 f) = (Finite))
+
+predicate is_finite_f64 (d:f64) = ((classify_f64 d) = (Finite))
+
+predicate is_NaN_f32 (f:f32) = ((classify_f32 f) = (NaN))
+
+predicate is_NaN_f64 (d:f64) = ((classify_f64 d) = (NaN))
+
+predicate is_infinite_f32 (f:f32) = ("asym_split" ((classify_f32
+ f) = (Inf_pos))) || ((classify_f32 f) = (Inf_neg))
+
+predicate is_infinite_f64 (d:f64) = ("asym_split" ((classify_f64
+ d) = (Inf_pos))) || ((classify_f64 d) = (Inf_neg))
+
+predicate is_positive_infinite_f32 (f:f32) = ((classify_f32 f) = (Inf_pos))
+
+predicate is_positive_infinite_f64 (d:f64) = ((classify_f64 d) = (Inf_pos))
+
+predicate is_negative_infinite_f32 (f:f32) = ((classify_f32 f) = (Inf_neg))
+
+predicate is_negative_infinite_f64 (d:f64) = ((classify_f64 d) = (Inf_neg))
+
+axiom is_finite_to_float_32 : forall x:real [is_finite_f32 (to_f32 x)].
+ is_finite_f32 (to_f32 x)
+
+axiom is_finite_to_float_64 : forall x:real [is_finite_f64 (to_f64 x)].
+ is_finite_f64 (to_f64 x)
+
+axiom to_float_is_finite_32 : forall f:f32 [to_f32 (of_f32 f)| is_finite_f32
+ f]. is_finite_f32 f -> ((to_f32 (of_f32 f)) = (f))
+
+axiom to_float_is_finite_64 : forall d:f64 [to_f64 (of_f64 d)| is_finite_f64
+ d]. is_finite_f64 d -> ((to_f64 (of_f64 d)) = (d))
+
+predicate finite (x:real) = is_finite_f32 (to_f32 x) /\ is_finite_f64 (to_f64
+ x)
+
+function max_f32 : real = 340282346600000016151267322115014000640.0
+
+function max_f64 : real =
+ 179769313486231570814527423731704356798070567525844996598917476803157260780028538760589558632766878171540458953514382464234321326889464182768467546703537516986049910576551282076245490090389328944075868508455133942304583236903222948165808559332123348274797826204144723168738177180919299881250404026184124858368.0
+
+axiom finite_small_f32 : forall x:real.
+ (Real.(<=) ((Real.(-_) (max_f64))) (x)) /\ (Real.(<=) (x) (max_f32)) ->
+ is_finite_f32 (to_f32 x)
+
+axiom finite_small_f64 : forall x:real.
+ (Real.(<=) ((Real.(-_) (max_f64))) (x)) /\ (Real.(<=) (x) (max_f64)) ->
+ is_finite_f64 (to_f64 x)
+
+axiom finite_range_f32 : forall f:f32. is_finite_f32 f <->
+ (Real.(<=) ((Real.(-_) (max_f32))) (of_f32 f)) /\ (Real.(<=) (of_f32
+ f) (max_f32))
+
+axiom finite_range_f64 : forall d:f64. is_finite_f64 d <->
+ (Real.(<=) ((Real.(-_) (max_f64))) (of_f64 d)) /\ (Real.(<=) (of_f64
+ d) (max_f64))
+
+function eq_f32b f32 f32 : Bool.bool
+
+function eq_f64b f64 f64 : Bool.bool
+
+predicate eq_f32 (x:f32) (y:f32) = ((eq_f32b x y) = (Bool.True))
+
+predicate eq_f64 (x:f64) (y:f64) = ((eq_f64b x y) = (Bool.True))
+
+axiom eq_finite_f32 : forall x:f32, y:f32 [eq_f32 x y]. is_finite_f32 x ->
+ is_finite_f32 y -> eq_f32 x y <-> ((of_f32 x) = (of_f32 y))
+
+axiom eq_finite_f64 : forall x:f64, y:f64 [eq_f64 x y]. is_finite_f64 x ->
+ is_finite_f64 y -> eq_f64 x y <-> ((of_f64 x) = (of_f64 y))
+
+function ne_f32b f32 f32 : Bool.bool
+
+function ne_f64b f64 f64 : Bool.bool
+
+predicate ne_f32 (x:f32) (y:f32) = ((ne_f32b x y) = (Bool.True))
+
+predicate ne_f64 (x:f64) (y:f64) = ((ne_f64b x y) = (Bool.True))
+
+axiom ne_finite_f32 : forall x:f32, y:f32 [ne_f32 x y]. is_finite_f32 x ->
+ is_finite_f32 y -> ne_f32 x y <-> not ((of_f32 x) = (of_f32 y))
+
+axiom ne_finite_f64 : forall x:f64, y:f64 [ne_f64 x y]. is_finite_f64 x ->
+ is_finite_f64 y -> ne_f64 x y <-> not ((of_f64 x) = (of_f64 y))
+
+function le_f32b f32 f32 : Bool.bool
+
+function le_f64b f64 f64 : Bool.bool
+
+predicate le_f32 (x:f32) (y:f32) = ((le_f32b x y) = (Bool.True))
+
+predicate le_f64 (x:f64) (y:f64) = ((le_f64b x y) = (Bool.True))
+
+axiom le_finite_f32 : forall x:f32, y:f32 [le_f32 x y]. is_finite_f32 x ->
+ is_finite_f32 y -> le_f32 x y <-> (Real.(<=) (of_f32 x) (of_f32 y))
+
+axiom le_finite_f64 : forall x:f64, y:f64 [le_f64 x y]. is_finite_f64 x ->
+ is_finite_f64 y -> le_f64 x y <-> (Real.(<=) (of_f64 x) (of_f64 y))
+
+function lt_f32b f32 f32 : Bool.bool
+
+function lt_f64b f64 f64 : Bool.bool
+
+predicate lt_f32 (x:f32) (y:f32) = ((lt_f32b x y) = (Bool.True))
-predicate is_finite32 (x:real) = ((classify_float x) = (Float32))
+predicate lt_f64 (x:f64) (y:f64) = ((lt_f64b x y) = (Bool.True))
-predicate is_finite64 (x:real) = ("asym_split" ((classify_float
- x) = (Float32))) || ((classify_float x) = (Float64))
+axiom lt_finite_f32 : forall x:f32, y:f32 [lt_f32 x y]. is_finite_f32 x ->
+ is_finite_f32 y -> lt_f32 x y <-> (Real.(<) (of_f32 x) (of_f32 y))
-predicate is_NaN (x:real) = ((classify_float x) = (NaN))
+axiom lt_finite_f64 : forall x:f64, y:f64 [lt_f64 x y]. is_finite_f64 x ->
+ is_finite_f64 y -> lt_f64 x y <-> (Real.(<) (of_f64 x) (of_f64 y))
-predicate is_infinite (x:real) = ("asym_split" ((classify_float
- x) = (Inf_pos))) || ((classify_float x) = (Inf_neg))
+function neg_f32 f32 : f32
-predicate is_positive_infinite (x:real) = ((classify_float x) = (Inf_pos))
+function neg_f64 f64 : f64
-predicate is_negative_infinite (x:real) = ((classify_float x) = (Inf_neg))
+axiom neg_finite_f32 : forall x:f32 [neg_f32 x]. is_finite_f32 x -> ((of_f32
+ (neg_f32 x)) = ((Real.(-_) (of_f32 x))))
-axiom is_finite_to_float_32 : forall x:real [is_finite32 (to_float32 x)].
- is_finite32 (to_float32 x)
+axiom neg_finite_f64 : forall x:f64 [neg_f64 x]. is_finite_f64 x -> ((of_f64
+ (neg_f64 x)) = ((Real.(-_) (of_f64 x))))
-axiom is_finite_to_float_64 : forall x:real [is_finite64 (to_float64 x)].
- is_finite64 (to_float64 x)
+function add_f32 f32 f32 : f32
-function max_int_float32 : int = 16777216
+function add_f64 f64 f64 : f64
-function max_int_float64 : int = 9007199254740992
+axiom add_finite_f32 : forall x:f32, y:f32 [add_f32 x y]. is_finite_f32 x ->
+ is_finite_f32 y -> ((add_f32 x y) = (to_f32 (Real.(+) (of_f32 x) (of_f32
+ y))))
-axiom float32_of_int : forall k:int.
- (Int.(<=) ((Int.(-_) (max_int_float32))) (k)) /\
- (Int.(<=) (k) (max_int_float32)) -> ((to_float32 (FromInt.from_int
- k)) = (FromInt.from_int k))
+axiom add_finite_f64 : forall x:f64, y:f64 [add_f64 x y]. is_finite_f64 x ->
+ is_finite_f64 y -> ((add_f64 x y) = (to_f64 (Real.(+) (of_f64 x) (of_f64
+ y))))
-axiom float64_of_int : forall k:int.
- (Int.(<=) ((Int.(-_) (max_int_float64))) (k)) /\
- (Int.(<=) (k) (max_int_float64)) -> ((to_float64 (FromInt.from_int
- k)) = (FromInt.from_int k))
+function mul_f32 f32 f32 : f32
-function add_float32 (x:real) (y:real) : real = to_float32 (Real.(+) (x) (y))
+function mul_f64 f64 f64 : f64
-function add_float64 (x:real) (y:real) : real = to_float64 (Real.(+) (x) (y))
+axiom mul_finite_f32 : forall x:f32, y:f32 [mul_f32 x y]. is_finite_f32 x ->
+ is_finite_f32 y -> ((mul_f32 x y) = (to_f32 (Real.(*) (of_f32 x) (of_f32
+ y))))
-function mul_float32 (x:real) (y:real) : real = to_float32 (Real.(*) (x) (y))
+axiom mul_finite_f64 : forall x:f64, y:f64 [mul_f64 x y]. is_finite_f64 x ->
+ is_finite_f64 y -> ((mul_f64 x y) = (to_f64 (Real.(*) (of_f64 x) (of_f64
+ y))))
-function mul_float64 (x:real) (y:real) : real = to_float64 (Real.(*) (x) (y))
+function div_f32 f32 f32 : f32
-function div_float32 (x:real) (y:real) : real = to_float32 (Real.(/) (x) (y))
+function div_f64 f64 f64 : f64
-function div_float64 (x:real) (y:real) : real = to_float64 (Real.(/) (x) (y))
+axiom div_finite_f32 : forall x:f32, y:f32 [div_f32 x y]. is_finite_f32 x ->
+ is_finite_f32 y -> ((div_f32 x y) = (to_f32 (Real.(/) (of_f32 x) (of_f32
+ y))))
-function sqrt_float32 (x:real) : real = to_float32 (Square.sqrt x)
+axiom div_finite_f64 : forall x:f64, y:f64 [div_f64 x y]. is_finite_f64 x ->
+ is_finite_f64 y -> ((div_f64 x y) = (to_f64 (Real.(/) (of_f64 x) (of_f64
+ y))))
-function sqrt_float64 (x:real) : real = to_float64 (Square.sqrt x)
+function sqrt_f32 f32 : f32
-function model real : real
+function sqrt_f64 f64 : f64
-function delta (x:real) : real = Abs.abs (Real.(-) (x) (model x))
+axiom sqrt_finite_f32 : forall x:f32 [sqrt_f32 x]. is_finite_f32 x ->
+ ((sqrt_f32 x) = (to_f32 (Square.sqrt (of_f32 x))))
-function error (x:real) : real = (Real.(/) (delta x) (Abs.abs (model x)))
+axiom sqrt_finite_f64 : forall x:f64 [sqrt_f64 x]. is_finite_f64 x ->
+ ((sqrt_f64 x) = (to_f64 (Square.sqrt (of_f64 x))))
-axiom model_float_32 : forall x:real. ((model (to_float32 x)) = (model x))
+function model_f32 f32 : real
-axiom model_float_64 : forall x:real. ((model (to_float64 x)) = (model x))
+function delta_f32 (f:f32) : real = Abs.abs (Real.(-) (of_f32 f) (model_f32
+ f))
-axiom model_add : forall x:real, y:real. ((model
- (Real.(+) (x) (y))) = ((Real.(+) (model x) (model y))))
+function error_f32 (f:f32) : real = (Real.(/) (delta_f32 f) (Abs.abs
+ (model_f32 f)))
-axiom model_mul : forall x:real, y:real. ((model
- (Real.(*) (x) (y))) = ((Real.(*) (model x) (model y))))
+function model_f64 f64 : real
-axiom model_div : forall x:real, y:real. ((model
- (Real.(/) (x) (y))) = ((Real.(/) (model x) (model y))))
+function delta_f64 (f:f64) : real = Abs.abs (Real.(-) (of_f64 f) (model_f64
+ f))
-axiom model_sqrt : forall x:real. ((model (Square.sqrt x)) = (Square.sqrt
- (model x)))
+function error_f64 (f:f64) : real = (Real.(/) (delta_f64 f) (Abs.abs
+ (model_f64 f)))
end
diff --git a/src/plugins/wp/share/why3/Cint.v b/src/plugins/wp/share/why3/Cint.v
index 2bad1d8070ac6b9d7ffb984138dc11f336dc0bcc..3a7c0ab7042f7c00f5b022ea1231af44ac2904d5 100644
--- a/src/plugins/wp/share/why3/Cint.v
+++ b/src/plugins/wp/share/why3/Cint.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Cint.why b/src/plugins/wp/share/why3/Cint.why
index 69eb7f2a0940c29b9b83c8f8cf7d2d4306b1602c..d6e03e7ef025d2738190ea8fef06e64baed2b19b 100644
--- a/src/plugins/wp/share/why3/Cint.why
+++ b/src/plugins/wp/share/why3/Cint.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Cmath.v b/src/plugins/wp/share/why3/Cmath.v
index 4efcb87b1b9264d9f52d9c12758b4850cb13770b..8b144c5879ec906937e70a01f4ef4ab3c5baa734 100644
--- a/src/plugins/wp/share/why3/Cmath.v
+++ b/src/plugins/wp/share/why3/Cmath.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Cmath.why b/src/plugins/wp/share/why3/Cmath.why
index 30e75129a29e0fed831c29d53f01803f90ba65f6..6f2c1bd8be2c33ed9cfc6bced08af88528a2ab26 100644
--- a/src/plugins/wp/share/why3/Cmath.why
+++ b/src/plugins/wp/share/why3/Cmath.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/ExpLog.v b/src/plugins/wp/share/why3/ExpLog.v
index 779b1a653739a5820ebf1b0b811408c0967378bb..e7d71a0cc1a2573cd578615a2f318899335e550a 100644
--- a/src/plugins/wp/share/why3/ExpLog.v
+++ b/src/plugins/wp/share/why3/ExpLog.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/ExpLog.why b/src/plugins/wp/share/why3/ExpLog.why
index ca7eccc70ea215ba56c701a71c4b43d250857154..f88c5a35ee20ad82604c90f3830dd9da46e7df09 100644
--- a/src/plugins/wp/share/why3/ExpLog.why
+++ b/src/plugins/wp/share/why3/ExpLog.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Memory.v b/src/plugins/wp/share/why3/Memory.v
index 8eb50c59d0fff97f19e099585dec3714fb7ddbc3..a8aa1ff53a88bac2c385d7bc61603d29ac53173f 100644
--- a/src/plugins/wp/share/why3/Memory.v
+++ b/src/plugins/wp/share/why3/Memory.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Memory.why b/src/plugins/wp/share/why3/Memory.why
index bad2772da57773e9512d4e0f9c6bd8ff5e1a694e..ada62e589807c78d2d0230a07b199c7ff77bd83f 100644
--- a/src/plugins/wp/share/why3/Memory.why
+++ b/src/plugins/wp/share/why3/Memory.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Qed.v b/src/plugins/wp/share/why3/Qed.v
index d23df6821818a97c97a01b9753ae60a27b0887a9..c991afd7c10498054025aa3472c3c03e275a84ca 100644
--- a/src/plugins/wp/share/why3/Qed.v
+++ b/src/plugins/wp/share/why3/Qed.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Qed.why b/src/plugins/wp/share/why3/Qed.why
index d90c48867b525bb1860d33345b576e1a97c20917..68ede436243dbb4cf6e02964b6e5e86f6abd5242 100644
--- a/src/plugins/wp/share/why3/Qed.why
+++ b/src/plugins/wp/share/why3/Qed.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Qedlib.v b/src/plugins/wp/share/why3/Qedlib.v
index f28d445be2423f565ef34acc49ee52da5b6776f8..4156a9e32907453de88b7494189f01dd8ce715ea 100644
--- a/src/plugins/wp/share/why3/Qedlib.v
+++ b/src/plugins/wp/share/why3/Qedlib.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Square.v b/src/plugins/wp/share/why3/Square.v
index d439d0b4129a61868f7f013ade3be3f87fda89fd..865ce9f87edbb37ef7f20f339d605b153365a0d1 100644
--- a/src/plugins/wp/share/why3/Square.v
+++ b/src/plugins/wp/share/why3/Square.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Square.why b/src/plugins/wp/share/why3/Square.why
index 93594492535a8c2ecb93853d85d3b5863a2e25bb..9e26a7d9db570c4bf01a75914088f03ee49179ea 100644
--- a/src/plugins/wp/share/why3/Square.why
+++ b/src/plugins/wp/share/why3/Square.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Vlist.v b/src/plugins/wp/share/why3/Vlist.v
index c3ed9289289ef8a8069331e5ad09208520db36ab..182898718639ae466b39a16277bcd32445f8be76 100644
--- a/src/plugins/wp/share/why3/Vlist.v
+++ b/src/plugins/wp/share/why3/Vlist.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Vlist.why b/src/plugins/wp/share/why3/Vlist.why
index 4961486c00e0298aa78cd12c58d3ed29101f0660..6f4c199bbae48041e7125bbed0bb5bce2654dfd5 100644
--- a/src/plugins/wp/share/why3/Vlist.why
+++ b/src/plugins/wp/share/why3/Vlist.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Vset.v b/src/plugins/wp/share/why3/Vset.v
index 42b12b4f2dfe43bdfac7da32c0fbc77e0be7553a..1262034a104de88566275e9a6b86b606ea000ba1 100644
--- a/src/plugins/wp/share/why3/Vset.v
+++ b/src/plugins/wp/share/why3/Vset.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Vset.why b/src/plugins/wp/share/why3/Vset.why
index 32c3966a828ca56292266c97b602d5d698587038..d0664f99585e45b7cbd6640c465bf25b120aabf4 100644
--- a/src/plugins/wp/share/why3/Vset.why
+++ b/src/plugins/wp/share/why3/Vset.why
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/Zbits.v b/src/plugins/wp/share/why3/Zbits.v
index f5e3c171e35645583e98ff21fbefcfe98011cfa0..e168e835e820688d375580f4521ecd7911399972 100644
--- a/src/plugins/wp/share/why3/Zbits.v
+++ b/src/plugins/wp/share/why3/Zbits.v
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/why3/coq.drv b/src/plugins/wp/share/why3/coq.drv
index 6622f35030d9906a9e79d47561fae9d149261b3f..68d8626d5864e11e06e2d81f2ceb516169a366f8 100644
--- a/src/plugins/wp/share/why3/coq.drv
+++ b/src/plugins/wp/share/why3/coq.drv
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/share/wp.driver b/src/plugins/wp/share/wp.driver
index 2d6554468b8c4298956b5f15d5e74577492b2150..7dd358acc6900842611fed12bc90a0c096eaa60c 100644
--- a/src/plugins/wp/share/wp.driver
+++ b/src/plugins/wp/share/wp.driver
@@ -2,7 +2,7 @@
/* */
/* This file is part of WP plug-in of Frama-C. */
/* */
-/* Copyright (C) 2007-2018 */
+/* Copyright (C) 2007-2019 */
/* CEA (Commissariat a l'energie atomique et aux energies */
/* alternatives) */
/* */
@@ -95,16 +95,16 @@ ctor "\\Down"() = "Down";
ctor "\\ToZero"() = "ToZero";
ctor "\\NearestAway"() = "NearestTiesToAway";
ctor "\\NearestEven"() = "NearestTiesToEven";
-predicate "\\is_finite"(float32) = "is_finite32";
-predicate "\\is_finite"(float64) = "is_finite64";
-predicate "\\is_NaN"(float32) = "is_NaN";
-predicate "\\is_NaN"(float64) = "is_NaN";
-predicate "\\is_infinite"(float32) = "is_infinite" ;
-predicate "\\is_infinite"(float64) = "is_infinite" ;
-predicate "\\is_plus_infinity"(float32) = "is_positive_infinite";
-predicate "\\is_plus_infinity"(float64) = "is_positive_infinite";
-predicate "\\is_minus_infinity"(float32) = "is_negative_infinite";
-predicate "\\is_minus_infinity"(float64) = "is_negative_infinite";
+predicate "\\is_finite"(float32) = "is_finite_f32";
+predicate "\\is_finite"(float64) = "is_finite_f64";
+predicate "\\is_NaN"(float32) = "is_NaN_f32";
+predicate "\\is_NaN"(float64) = "is_NaN_f64";
+predicate "\\is_infinite"(float32) = "is_infinite_f32" ;
+predicate "\\is_infinite"(float64) = "is_infinite_f64" ;
+predicate "\\is_plus_infinity"(float32) = "is_positive_infinite_f32";
+predicate "\\is_plus_infinity"(float64) = "is_positive_infinite_f64";
+predicate "\\is_minus_infinity"(float32) = "is_negative_infinite_f32";
+predicate "\\is_minus_infinity"(float64) = "is_negative_infinite_f64";
logic bool "\\round_float"(rounding_mode,real) = "round_float";
logic bool "\\round_double"(rounding_mode,real) = "round_double";
diff --git a/src/plugins/wp/tests/wp/stmtcompiler_test.ml b/src/plugins/wp/tests/wp/stmtcompiler_test.ml
index 30c119abcb17d9ab042a7902af00f917914e0f43..320ad154cdac77a26b1768685510442f460ebc05 100644
--- a/src/plugins/wp/tests/wp/stmtcompiler_test.ml
+++ b/src/plugins/wp/tests/wp/stmtcompiler_test.ml
@@ -111,7 +111,8 @@ let run () =
Model.on_scope (Some kf) (fun () ->
let paths,start = Compiler.compute_kf kf in
let cfg, goals = paths.Compiler.paths_cfg, paths.Compiler.paths_goals in
- let cout = open_out (Format.sprintf "/tmp/cfg_pre_%s.dot" (Kernel_function.get_name kf)) in
+ let fname = Filename.temp_file "cfg_pre_" (Kernel_function.get_name kf) in
+ let cout = open_out fname in
Compiler.Cfg.output_dot cout ~checks:(Bag.map (fun g -> g.Compiler.goal_pred) goals) cfg;
close_out cout;
Format.printf "new way@.";
diff --git a/src/plugins/wp/tests/wp_acsl/classify_float.c.0.report.json b/src/plugins/wp/tests/wp_acsl/classify_float.c.0.report.json
index 95c7528aa2dae314d6638eafd9815d97d1f48e77..3414144c5e1e515b56db8688cc0889b23bb25493 100644
--- a/src/plugins/wp/tests/wp_acsl/classify_float.c.0.report.json
+++ b/src/plugins/wp/tests/wp_acsl/classify_float.c.0.report.json
@@ -1,26 +1,26 @@
-{ "wp:global": { "alt-ergo": { "total": 3, "valid": 3, "rank": 3 },
- "wp:main": { "total": 3, "valid": 3, "rank": 3 } },
+{ "wp:global": { "alt-ergo": { "total": 3, "valid": 3, "rank": 1 },
+ "wp:main": { "total": 3, "valid": 3, "rank": 1 } },
"wp:axiomatics": { "": { "lemma_NaN_not_finite": { "alt-ergo": { "total": 1,
"valid": 1,
- "rank": 3 },
+ "rank": 1 },
"wp:main": { "total": 1,
"valid": 1,
- "rank": 3 } },
+ "rank": 1 } },
"lemma_InfP_not_finite": { "alt-ergo": { "total": 1,
"valid": 1,
- "rank": 3 },
+ "rank": 1 },
"wp:main": { "total": 1,
"valid": 1,
- "rank": 3 } },
+ "rank": 1 } },
"lemma_InfN_not_finite": { "alt-ergo": { "total": 1,
"valid": 1,
- "rank": 3 },
+ "rank": 1 },
"wp:main": { "total": 1,
"valid": 1,
- "rank": 3 } },
+ "rank": 1 } },
"wp:section": { "alt-ergo": { "total": 3,
"valid": 3,
- "rank": 3 },
+ "rank": 1 },
"wp:main": { "total": 3,
"valid": 3,
- "rank": 3 } } } } }
+ "rank": 1 } } } } }
diff --git a/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle
index ff906a4045f1c9ecf8984a16e62378e90f510786..c376b86e98ce5ec321a21c7b88f978e7d29d847d 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle/classify_float.res.oracle
@@ -8,19 +8,17 @@
Lemma InfN_not_finite:
Assume: 'InfP_not_finite' 'NaN_not_finite'
-Prove: (is_float64 x_0)
- -> ((not (\is_finite x_0)) \/ (not (\is_minus_infinity x_0)))
+Prove: (not (\is_finite x_0)) \/ (not (\is_minus_infinity x_0))
------------------------------------------------------------
Lemma InfP_not_finite:
Assume: 'NaN_not_finite'
-Prove: (is_float64 x_0)
- -> ((not (\is_finite x_0)) \/ (not (\is_plus_infinity x_0)))
+Prove: (not (\is_finite x_0)) \/ (not (\is_plus_infinity x_0))
------------------------------------------------------------
Lemma NaN_not_finite:
-Prove: (is_float64 x_0) -> ((not (\is_finite x_0)) \/ (not (\is_NaN x_0)))
+Prove: (not (\is_finite x_0)) \/ (not (\is_NaN x_0))
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
index 04ed6e9c757e4dfdd8fece4c14aa37ce6ca54772..354a7ea0d71689e221ef9fc4f3deda3e53b09e2c 100644
--- a/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
+++ b/src/plugins/wp/tests/wp_acsl/oracle_qualif/classify_float.0.res.oracle
@@ -12,5 +12,5 @@
[wp] Report 'tests/wp_acsl/classify_float.c.0.report.json'
-------------------------------------------------------------
Axiomatics WP Alt-Ergo Total Success
-Lemma - 3 (8..20) 3 100%
+Lemma - 3 (1..12) 3 100%
-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/bts_1174.s b/src/plugins/wp/tests/wp_bts/bts_1174.s
index cf366f0bf18e1d2d827a4187f0e84f1536afbbad..c1d443b3b02a23d7bd40478f0e9968e91bae2842 100644
--- a/src/plugins/wp/tests/wp_bts/bts_1174.s
+++ b/src/plugins/wp/tests/wp_bts/bts_1174.s
@@ -41,7 +41,6 @@ Hint job,property,qed_ok.
Proof.
intros.
Require Import Fourier.
- unfold r_1.
fourier.
Qed.
diff --git a/src/plugins/wp/tests/wp_bts/bts_1601.c.0.report.json b/src/plugins/wp/tests/wp_bts/bts_1601.c.0.report.json
index d0ce516506beeaad2343e8fb80b3566156b9b1f2..406e1c61d89ad35e2df5c92b839eec586460153d 100644
--- a/src/plugins/wp/tests/wp_bts/bts_1601.c.0.report.json
+++ b/src/plugins/wp/tests/wp_bts/bts_1601.c.0.report.json
@@ -1,5 +1,6 @@
-{ "wp:global": { "qed": { "total": 8, "valid": 8 },
- "wp:main": { "total": 8, "valid": 8 } },
+{ "wp:global": { "alt-ergo": { "total": 1, "valid": 1, "rank": 5 },
+ "qed": { "total": 7, "valid": 7 },
+ "wp:main": { "total": 8, "valid": 8, "rank": 5 } },
"wp:functions": { "foo": { "foo_assert_7": { "qed": { "total": 1,
"valid": 1 },
"wp:main": { "total": 1,
@@ -24,15 +25,21 @@
"valid": 1 },
"wp:main": { "total": 1,
"valid": 1 } },
- "foo_assert": { "qed": { "total": 1,
- "valid": 1 },
+ "foo_assert": { "alt-ergo": { "total": 1,
+ "valid": 1,
+ "rank": 5 },
"wp:main": { "total": 1,
- "valid": 1 } },
+ "valid": 1,
+ "rank": 5 } },
"foo_basic_ensures": { "qed": { "total": 1,
"valid": 1 },
"wp:main": { "total": 1,
"valid": 1 } },
- "wp:section": { "qed": { "total": 8,
- "valid": 8 },
+ "wp:section": { "alt-ergo": { "total": 1,
+ "valid": 1,
+ "rank": 5 },
+ "qed": { "total": 7,
+ "valid": 7 },
"wp:main": { "total": 8,
- "valid": 8 } } } } }
+ "valid": 8,
+ "rank": 5 } } } } }
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle
index d98a6cfde684e9c5a8b8e86fce83dde1af255301..0f15882a71638c4b6817b680fb0d30129b4f6887 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1174.res.oracle
@@ -8,16 +8,16 @@
------------------------------------------------------------
Goal Assertion 'qed_ok' (file tests/wp_bts/bts_1174.i, line 11):
-Let r = mul_float64(x, 2.0).
+Let r = of_f64(x).
Assume {
- Type: is_sint32(a) /\ is_float64(x) /\ is_float64(r).
+ Type: is_sint32(a).
(* Goal *)
- When: .0 <= x.
+ When: .0 <= r.
(* Pre-condition *)
- Have: (x <= 10.0) /\ (-10.0 <= x).
+ Have: (r <= 10.0) /\ (-10.0 <= r).
(* Then *)
Have: a != 0.
}
-Prove: .0 <= r.
+Prove: .0 <= of_f64(mul_f64(x, to_f64(2.0))).
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle b/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle
index 1dcb038b3f130200fa0166f389d513578b8eddb8..897003473316c3a94c56e22d00d8626c152a9aa4 100644
--- a/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle/bts_1601.res.oracle
@@ -8,7 +8,14 @@
------------------------------------------------------------
Goal Assertion (file tests/wp_bts/bts_1601.c, line 72):
-Prove: true.
+Assume {
+ Type: is_uint32(tenumRMode_0).
+ (* Residual *)
+ When: ne_f32(fRrValue_0, to_f32(.0)).
+ (* Goal *)
+ When: of_f32(fRrValue_0) = .0.
+}
+Prove: tenumRMode_0 = 1.
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
index 05f5b3589dee9714717c28c26af2110583741864..8ab82c08dc1961b269d2d78d86397a7c496ce66f 100644
--- a/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
+++ b/src/plugins/wp/tests/wp_bts/oracle_qualif/bts_1601.res.oracle
@@ -4,7 +4,7 @@
[wp] Loading driver 'share/wp.driver'
[wp] Warning: Missing RTE guards
[wp] 8 goals scheduled
-[wp] [Qed] Goal typed_foo_assert : Valid
+[wp] [Alt-Ergo] Goal typed_foo_assert : Valid
[wp] [Qed] Goal typed_foo_assert_2 : Valid
[wp] [Qed] Goal typed_foo_assert_3 : Valid
[wp] [Qed] Goal typed_foo_assert_4 : Valid
@@ -13,9 +13,10 @@
[wp] [Qed] Goal typed_foo_assert_7 : Valid
[wp] [Qed] Goal typed_foo_basic_ensures : Valid
[wp] Proved goals: 8 / 8
- Qed: 8
+ Qed: 7
+ Alt-Ergo: 1
[wp] Report 'tests/wp_bts/bts_1601.c.0.report.json'
-------------------------------------------------------------
Functions WP Alt-Ergo Total Success
-foo 8 - 8 100%
+foo 7 1 (16..28) 8 100%
-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/combined.c b/src/plugins/wp/tests/wp_plugin/combined.c
index e698ae498d812c5788580c80ab143b62567331da..33a5d1e193a283f4649865cca1511645456121ac 100644
--- a/src/plugins/wp/tests/wp_plugin/combined.c
+++ b/src/plugins/wp/tests/wp_plugin/combined.c
@@ -3,7 +3,8 @@
*/
/* run.config_qualif
- OPT: -wp-par 1 -load-script tests/wp_plugin/combined.ml
+ EXECNOW: @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -wp-par 1 -load-module @PTEST_DIR@/@PTEST_NAME@
*/
/* ZD : this should not be here such as it cannot be tested by all frama-c
diff --git a/src/plugins/wp/tests/wp_plugin/combined.ml b/src/plugins/wp/tests/wp_plugin/combined.ml
deleted file mode 100644
index 6b9da9a310774ff2577df057db2234f367d9d1b2..0000000000000000000000000000000000000000
--- a/src/plugins/wp/tests/wp_plugin/combined.ml
+++ /dev/null
@@ -1,22 +0,0 @@
-let main () =
- Ast.compute ();
- let module OLS = Datatype.List(Datatype.String) in
- let module OKF = Datatype.Option(Kernel_function) in
- let module OP = Datatype.Option(Property) in
- Dynamic.get
- ~plugin:"Wp" "wp_compute"
- (Datatype.func3 OKF.ty OLS.ty OP.ty Datatype.unit)
- (Some
- (try Globals.Functions.find_by_name "job"
- with Not_found -> assert false))
- []
- None;
- let report =
- Dynamic.get
- ~plugin:"Report" "print" (Datatype.func Datatype.unit Datatype.unit)
- in
- report ();
- !Db.Value.compute ();
- report ()
-
-let () = Db.Main.extend main
diff --git a/src/plugins/wp/tests/wp_plugin/float_real.i.0.report.json b/src/plugins/wp/tests/wp_plugin/float_real.i.0.report.json
index e8f04e504403a2f4368ba53d7fd6c018b738de41..78c912e04623b9511f9b989807c956e0e777b0ba 100644
--- a/src/plugins/wp/tests/wp_plugin/float_real.i.0.report.json
+++ b/src/plugins/wp/tests/wp_plugin/float_real.i.0.report.json
@@ -1,14 +1,14 @@
-{ "wp:global": { "alt-ergo": { "total": 1, "valid": 1, "rank": 8 },
- "wp:main": { "total": 1, "valid": 1, "rank": 8 } },
+{ "wp:global": { "alt-ergo": { "total": 1, "valid": 1, "rank": 4 },
+ "wp:main": { "total": 1, "valid": 1, "rank": 4 } },
"wp:functions": { "dequal": { "dequal_ensures": { "alt-ergo": { "total": 1,
"valid": 1,
- "rank": 8 },
+ "rank": 4 },
"wp:main": { "total": 1,
"valid": 1,
- "rank": 8 } },
+ "rank": 4 } },
"wp:section": { "alt-ergo": { "total": 1,
"valid": 1,
- "rank": 8 },
+ "rank": 4 },
"wp:main": { "total": 1,
"valid": 1,
- "rank": 8 } } } } }
+ "rank": 4 } } } } }
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle
index 299e5c4b1a5a9d3ef52579e0104f2e788c80b53b..c8a980291364c79ed27ab5f1a70676174e4b91f0 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/combined.res.oracle
@@ -7,7 +7,7 @@
Function job
------------------------------------------------------------
-Goal Assertion (file tests/wp_plugin/combined.c, line 26):
+Goal Assertion (file tests/wp_plugin/combined.c, line 27):
Assume {
Type: is_sint32(A).
(* Heap *)
@@ -17,7 +17,7 @@ Prove: (50 <= A) /\ (A <= 100).
------------------------------------------------------------
-Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 28):
+Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 29):
Assume {
Type: is_sint32(A) /\ is_sint32(i) /\ is_sint32(v) /\ is_sint32(1 + i).
(* Heap *)
@@ -39,12 +39,12 @@ Prove: (-1) <= i.
------------------------------------------------------------
-Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 28):
+Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 29):
Prove: true.
------------------------------------------------------------
-Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 29):
+Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 30):
Let a = havoc(Mint_undef_0, Mint_0, shift_sint32(t, 0), 50).
Assume {
Type: is_sint32(A) /\ is_sint32(i) /\ is_sint32(v) /\ is_sint32(1 + i).
@@ -68,12 +68,12 @@ Prove: P_P(a[shift_sint32(t, i) <- v][shift_sint32(t, i_1)]).
------------------------------------------------------------
-Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 29):
+Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 30):
Prove: true.
------------------------------------------------------------
-Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 34):
+Goal Preservation of Invariant (file tests/wp_plugin/combined.c, line 35):
Let x = 1 + j.
Assume {
Type: is_sint32(A) /\ is_sint32(i) /\ is_sint32(j) /\ is_sint32(x).
@@ -98,12 +98,12 @@ Prove: A <= x.
------------------------------------------------------------
-Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 34):
+Goal Establishment of Invariant (file tests/wp_plugin/combined.c, line 35):
Prove: true.
------------------------------------------------------------
-Goal Assertion (file tests/wp_plugin/combined.c, line 39):
+Goal Assertion (file tests/wp_plugin/combined.c, line 40):
Let a = havoc(Mint_undef_1, Mint_0, shift_sint32(t, 0), 50).
Assume {
Type: is_sint32(A) /\ is_sint32(i_1) /\ is_sint32(j).
@@ -130,36 +130,36 @@ Prove: P_P(havoc(Mint_undef_0, a, shift_sint32(t, A), 100 - A)
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 30) (1/3):
+Goal Loop assigns (file tests/wp_plugin/combined.c, line 31) (1/3):
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 30) (2/3):
-Effect at line 32
+Goal Loop assigns (file tests/wp_plugin/combined.c, line 31) (2/3):
+Effect at line 33
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 30) (3/3):
-Call Result at line 32
+Goal Loop assigns (file tests/wp_plugin/combined.c, line 31) (3/3):
+Call Result at line 33
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 35) (1/3):
+Goal Loop assigns (file tests/wp_plugin/combined.c, line 36) (1/3):
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 35) (2/3):
-Effect at line 37
+Goal Loop assigns (file tests/wp_plugin/combined.c, line 36) (2/3):
+Effect at line 38
Prove: true.
------------------------------------------------------------
-Goal Loop assigns (file tests/wp_plugin/combined.c, line 35) (3/3):
-Call Result at line 37
+Goal Loop assigns (file tests/wp_plugin/combined.c, line 36) (3/3):
+Call Result at line 38
Let a = shift_sint32(t, j).
Assume {
Type: is_sint32(A) /\ is_sint32(i) /\ is_sint32(j).
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle
index a1eef7741a054dfba2b25b6e86bd265a8f2ec84c..85e995df2796c0b54545c3d7c1c66198eb899050 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_format.res.oracle
@@ -11,9 +11,9 @@
------------------------------------------------------------
Goal Post-condition 'KO' in 'output':
-Let r = to_float32(add_float64((3602879701896397.0/18014398509481984),
- to_float64(x))).
-Assume { Type: is_float32(x) /\ is_float32(r). }
-Prove: ((1.0/5) + x) = r.
+Let r = of_f32(x).
+Prove: ((1.0/5) + r)
+ = of_f32(to_f32(of_f64(add_f64(to_f64((3602879701896397.0/18014398509481984)),
+ to_f64(r))))).
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle
index 9f7a0dbadc0018ba96f516816112b7ecc48c0732..7e9d87ee00d3dd9b55bebc69d8dca822bcc85c19 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.res.oracle
@@ -11,10 +11,8 @@
------------------------------------------------------------
Goal Post-condition (file tests/wp_plugin/float_real.i, line 14) in 'dequal':
-Let r = x - y.
Assume {
- Type: is_sint32(dequal_0) /\ is_float64(x) /\ is_float64(y) /\
- is_float64(r).
+ Type: is_sint32(dequal_0).
If x < ((1.0/100000) + y)
Then {
If y < ((1.0/100000) + x)
@@ -23,6 +21,6 @@ Assume {
}
Else { (* Return *) Have: dequal_0 = 0. }
}
-Prove: (abs_real(r) < (1.0/100000)) <-> (dequal_0 != 0).
+Prove: (abs_real(x - y) < (1.0/100000)) <-> (dequal_0 != 0).
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle
index d22cc7e963808086fc0fe33209523f879067cbbc..bd279cccc874f2274d8dfb05d4b76eb7d82e8dac 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.res.oracle
@@ -11,19 +11,18 @@
------------------------------------------------------------
Goal Post-condition (file tests/wp_plugin/float_real.i, line 14) in 'dequal':
-Let r = -y.
-Let r_1 = add_float64(x, r).
Assume {
- Type: is_sint32(dequal_0) /\ is_float64(x) /\ is_float64(y) /\
- is_float64(r_1).
- If r_1 < (5902958103587057.0/590295810358705651712)
+ Type: is_sint32(dequal_0).
+ If lt_f64(add_f64(x, neg_f64(y)),
+ to_f64((5902958103587057.0/590295810358705651712)))
Then {
- If (-5902958103587057.0/590295810358705651712) < r_1
+ If lt_f64(to_f64((-5902958103587057.0/590295810358705651712)),
+ add_f64(x, neg_f64(y)))
Then { (* Return *) Have: dequal_0 = 1. }
Else { (* Return *) Have: dequal_0 = 0. }
}
Else { (* Return *) Have: dequal_0 = 0. }
}
-Prove: (abs_real(x - y) < (1.0/100000)) <-> (dequal_0 != 0).
+Prove: (abs_real(of_f64(x) - of_f64(y)) < (1.0/100000)) <-> (dequal_0 != 0).
------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
index d357167c4f7b728abe945858687833a62b8185cb..8cb90407b8481e547d466676fa75085b4b54361f 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/dynamic.res.oracle
@@ -26,7 +26,7 @@
-------------------------------------------------------------
Functions WP Alt-Ergo Total Success
call 2 2 (52..64) 4 100%
-guarded_call 4 1 (8..20) 5 100%
+guarded_call 4 1 (12..24) 5 100%
no_call 4 - 4 100%
-------------------------------------------------------------
[wp] Warning: Memory model hypotheses for function 'guarded_call':
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle
index 780f135fb5304d51af6296a5624ea990e68ce078..97b86f838a739b903ae5c37ab8f562360e1d342d 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_format.1.res.oracle
@@ -7,9 +7,9 @@
[wp] Loading driver 'share/wp.driver'
[wp] Warning: Missing RTE guards
[wp] 1 goal scheduled
-[wp] [Alt-Ergo] Goal typed_output_ensures_KO : Unknown
+[wp] [Alt-Ergo] Goal typed_output_ensures_KO : Step limit
[wp] Proved goals: 0 / 1
- Alt-Ergo: 0 (unknown: 1)
+ Alt-Ergo: 0 (interrupted: 1)
[wp] Report 'tests/wp_plugin/float_format.i.1.report.json'
-------------------------------------------------------------
Functions WP Alt-Ergo Total Success
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.err.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.err.oracle
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
index 4bea036c0217138af9eab63d143d4335e709cf8a..374012968858e66f768f7d9849c4718d417c7403 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.0.res.oracle
@@ -1,6 +1,6 @@
-# frama-c -wp -wp-model 'Typed (Real)' [...]
+# frama-c -wp -wp-model 'Typed (Real)' -wp-timeout 90 -wp-steps 1500 [...]
[kernel] Parsing tests/wp_plugin/float_real.i (no preprocessing)
-[kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning:
+[kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning:
Floating-point constant 1e-5 is not represented exactly. Will use 0x1.4f8b588e368f1p-17.
(warn-once: no further messages from category 'parser:decimal-float' will be emitted)
[wp] Running WP plugin...
@@ -9,10 +9,10 @@
[wp] 1 goal scheduled
[wp] [Alt-Ergo] Goal typed_real_dequal_ensures : Valid
[wp] Proved goals: 1 / 1
- Qed: 0
+ Qed: 0
Alt-Ergo: 1
[wp] Report 'tests/wp_plugin/float_real.i.0.report.json'
-------------------------------------------------------------
Functions WP Alt-Ergo Total Success
-dequal - 1 (24..36) 1 100%
+dequal - 1 (12..24) 1 100%
-------------------------------------------------------------
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.err.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.err.oracle
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
index 805af61f166fa3c600f8fad42f14400089f718a2..9d641a24aef9385bf3e0db628e475248c80f9187 100644
--- a/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
+++ b/src/plugins/wp/tests/wp_plugin/oracle_qualif/float_real.1.res.oracle
@@ -1,6 +1,6 @@
# frama-c -wp -wp-model 'Typed' -wp-timeout 90 -wp-steps 1500 [...]
[kernel] Parsing tests/wp_plugin/float_real.i (no preprocessing)
-[kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning:
+[kernel:parser:decimal-float] tests/wp_plugin/float_real.i:19: Warning:
Floating-point constant 1e-5 is not represented exactly. Will use 0x1.4f8b588e368f1p-17.
(warn-once: no further messages from category 'parser:decimal-float' will be emitted)
[wp] Running WP plugin...
diff --git a/src/plugins/wp/wpAnnot.ml b/src/plugins/wp/wpAnnot.ml
index d09c0a11e908ba5e4720c8183cd8a78f49afff83..cffa1268c684c66beb4e9161aeb2a7aa346c7982 100644
--- a/src/plugins/wp/wpAnnot.ml
+++ b/src/plugins/wp/wpAnnot.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpAnnot.mli b/src/plugins/wp/wpAnnot.mli
index 3c152f8630b039115226775fd8ef2252b58e67d2..66cc5693d72c7781b525eab9b6c134368b081061 100644
--- a/src/plugins/wp/wpAnnot.mli
+++ b/src/plugins/wp/wpAnnot.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpPropId.ml b/src/plugins/wp/wpPropId.ml
index 71796b10c047ed9719dfb659239d2c92a090983e..e72b718a4211b5a6395149dcdfe8751e7ce2b1d8 100644
--- a/src/plugins/wp/wpPropId.ml
+++ b/src/plugins/wp/wpPropId.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpPropId.mli b/src/plugins/wp/wpPropId.mli
index b17e19c315b0bac0f08ffed866715b52d5c70a3b..16b42ff8adc916777fbc0510f968b4f8d83a58eb 100644
--- a/src/plugins/wp/wpPropId.mli
+++ b/src/plugins/wp/wpPropId.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpRTE.ml b/src/plugins/wp/wpRTE.ml
index fbf1124230b483b3af0e0f266ece63acf0cd672c..30974a1edba460c7bed8feb8f91a76105ffb5afc 100644
--- a/src/plugins/wp/wpRTE.ml
+++ b/src/plugins/wp/wpRTE.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpRTE.mli b/src/plugins/wp/wpRTE.mli
index 456c177c7013ff50f81d7134bd99c650023e711a..59fb39aed5bf2925bf55d9efa10d94a3a59ff3e0 100644
--- a/src/plugins/wp/wpRTE.mli
+++ b/src/plugins/wp/wpRTE.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpReport.ml b/src/plugins/wp/wpReport.ml
index a53ad90325a31a4002910915182b9d32ea53c4de..a14264c93f022b9360b6bdfc88902d1c4aade27a 100644
--- a/src/plugins/wp/wpReport.ml
+++ b/src/plugins/wp/wpReport.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
@@ -133,21 +133,21 @@ let add_qedstat (ts:float) (s:stats) =
if ts > s.time then s.time <- ts
let get_field js fd =
- try Json.field fd js with Not_found | Invalid_argument _ -> Json.Null
+ try Json.field fd js with Not_found | Invalid_argument _ -> `Null
let json_assoc fields =
- let fields = List.filter (fun (_,d) -> d<>Json.Null) fields in
- if fields = [] then Json.Null else Json.Assoc fields
+ let fields = List.filter (fun (_,d) -> d<>`Null) fields in
+ if fields = [] then `Null else `Assoc fields
let json_of_stats s =
- let add fd v w = if v > 0 then (fd , Json.Int v)::w else w in
+ let add fd v w = if v > 0 then (fd , `Int v)::w else w in
json_assoc
begin
add "total" s.total @@
add "valid" s.valid @@
add "failed" s.inconclusive @@
add "unknown" s.unsuccess @@
- (if s.rank >= 0 then [ "rank" , Json.Int s.rank ] else [])
+ (if s.rank >= 0 then [ "rank" , `Int s.rank ] else [])
end
let rankify_stats s js =
@@ -870,11 +870,11 @@ let export_json gstat jfile =
let js =
try
if Sys.file_exists jfile
- then Json.load_file jfile else Json.Null
+ then Json.load_file jfile else `Null
with Json.Error(file,line,msg) ->
let source = Log.source ~file ~line in
Wp_parameters.error ~source "Incorrect json file: %s" msg ;
- Json.Null
+ `Null
in
rankify_fcstat gstat js ;
Json.save_file jfile (json_of_fcstat gstat) ;
diff --git a/src/plugins/wp/wpReport.mli b/src/plugins/wp/wpReport.mli
index e53f9b82ae506de69fbedaae913038347beec1f4..6d3563ff35c4b3b8f93e5b5da9b30c53eff01906 100644
--- a/src/plugins/wp/wpReport.mli
+++ b/src/plugins/wp/wpReport.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpStrategy.ml b/src/plugins/wp/wpStrategy.ml
index 87be3aa4cedee46dd8866f2b313cfb7f9b29c77e..250b33fb3df18a539a465aed423a2473ceb190c1 100644
--- a/src/plugins/wp/wpStrategy.ml
+++ b/src/plugins/wp/wpStrategy.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpStrategy.mli b/src/plugins/wp/wpStrategy.mli
index 2a661aef4fa247922736f66208f5edf7be8474de..92b56332f031f2bbe583ff5a468dc2c1bbafbff8 100644
--- a/src/plugins/wp/wpStrategy.mli
+++ b/src/plugins/wp/wpStrategy.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wp_error.ml b/src/plugins/wp/wp_error.ml
index fa5edf283f3db4d8839bfbc57baafbc99bb95ce7..68166fe572e3a24a89951f742c4d2a78687b0297 100644
--- a/src/plugins/wp/wp_error.ml
+++ b/src/plugins/wp/wp_error.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wp_error.mli b/src/plugins/wp/wp_error.mli
index ea55d2278c0954eb4f150d29b0f28d341b4a2d8a..bddef521743852e292a6e713c851f2edebc1dfd3 100644
--- a/src/plugins/wp/wp_error.mli
+++ b/src/plugins/wp/wp_error.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wp_parameters.ml b/src/plugins/wp/wp_parameters.ml
index 72ad554679b1e41f7c712bf32669984fa1cc3936..db7b65a2d0d3f2dc532fa69c090a12c3634c0657 100644
--- a/src/plugins/wp/wp_parameters.ml
+++ b/src/plugins/wp/wp_parameters.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wp_parameters.mli b/src/plugins/wp/wp_parameters.mli
index 7e7ba7934173f760e02f6e98acbd73de078344ad..724fc39ae5178e2b2c0bd50017e97b01e84adf47 100644
--- a/src/plugins/wp/wp_parameters.mli
+++ b/src/plugins/wp/wp_parameters.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpo.ml b/src/plugins/wp/wpo.ml
index e00f325d945dcccfee955e407b3e7ee5f4fb74bb..8a20407e53338db5485ec741ba9092b980ec6bbe 100644
--- a/src/plugins/wp/wpo.ml
+++ b/src/plugins/wp/wpo.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wpo.mli b/src/plugins/wp/wpo.mli
index ed0ecc909c81aa6ae32e6afa16b885727bb96418..9413c844b02e32eb94e06c950d0af43196378001 100644
--- a/src/plugins/wp/wpo.mli
+++ b/src/plugins/wp/wpo.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wprop.ml b/src/plugins/wp/wprop.ml
index 7e4e7d74c1f34e2cd7e6319268a659a19b160247..f7a56c2f027923c73f28ddcd101c26d4b5e49361 100644
--- a/src/plugins/wp/wprop.ml
+++ b/src/plugins/wp/wprop.ml
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/src/plugins/wp/wprop.mli b/src/plugins/wp/wprop.mli
index 1bd4e06e160a1e910d3107f69733261518051ffc..cc7423aa5ee1fb1011cd44262363f5694c98030d 100644
--- a/src/plugins/wp/wprop.mli
+++ b/src/plugins/wp/wprop.mli
@@ -2,7 +2,7 @@
(* *)
(* This file is part of WP plug-in of Frama-C. *)
(* *)
-(* Copyright (C) 2007-2018 *)
+(* Copyright (C) 2007-2019 *)
(* CEA (Commissariat a l'energie atomique et aux energies *)
(* alternatives) *)
(* *)
diff --git a/tests/builtins/Longinit_sequencer.i b/tests/builtins/Longinit_sequencer.i
index 2998da18c7d5bfa4f9e0d48f067fde4c44a6b860..4d9b50cd565baedf36d4ebb071a2915ff4527216 100644
--- a/tests/builtins/Longinit_sequencer.i
+++ b/tests/builtins/Longinit_sequencer.i
@@ -1,4 +1,4 @@
/* run.config*
-EXECNOW: make tests/builtins/Longinit_sequencer.cmxs
-OPT: -load-module tests/builtins/Longinit_sequencer.cmxs -eva-show-progress -res-file @PTEST_RESULT@
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress -res-file @PTEST_RESULT@
*/
diff --git a/tests/builtins/big_local_array.i b/tests/builtins/big_local_array.i
index ccf98764fd086b47e1a139aa5743a4fee0a9b313..d6e1f53181467a2ec7876261086d4a39869f7d19 100644
--- a/tests/builtins/big_local_array.i
+++ b/tests/builtins/big_local_array.i
@@ -1,6 +1,7 @@
/* run.config*
+EXECNOW: make -s @PTEST_DIR@/big_local_array_script.cmxs
OPT: -eva-show-progress -print -journal-disable -eva -report
-OPT: -load-script tests/builtins/big_local_array_script.ml -then-on prj -print -report
+OPT: -load-module @PTEST_DIR@/big_local_array_script -then-on prj -print -report
OPT: -eva-show-progress -print -journal-disable -no-initialized-padding-locals -eva
*/
diff --git a/tests/callgraph/function_pointer.i b/tests/callgraph/function_pointer.i
index be249adbd33ce25d7fd82f7a52247bcc42cf0f7f..b28287119069e61b95d7115a89eeb8592e7e8412 100644
--- a/tests/callgraph/function_pointer.i
+++ b/tests/callgraph/function_pointer.i
@@ -1,10 +1,10 @@
/* run.config
COMMENT: Test option -cg-function-pointers
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -cg-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
- OPT: -cg-no-services -cg-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
- OPT: -cg-no-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
- OPT: -cg-no-services -cg-no-function-pointers -load-module @PTEST_DIR@/@PTEST_NAME@
+ OPT: -cg-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -cg-no-services -cg-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -cg-no-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -cg-no-services -cg-no-function-pointers -no-autoload-plugins -load-module eva,@PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int (*fptr)(int);
diff --git a/tests/cil/mkBinOp.i b/tests/cil/mkBinOp.i
index caa9dd0c396370d25700c25ca86ae605882e0348..1bab30cf83cef46281180438db232f21b9d1224b 100644
--- a/tests/cil/mkBinOp.i
+++ b/tests/cil/mkBinOp.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -print -constfold
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print -constfold
*/
int main(void) {
diff --git a/tests/constant_propagation/introduction_of_non_explicit_cast.c b/tests/constant_propagation/introduction_of_non_explicit_cast.c
index 2d99b7676d0c061844695bf90822e6ed0fe5a68c..9e95b6e88db2c472e56cd47ad852b696c28e2a8b 100644
--- a/tests/constant_propagation/introduction_of_non_explicit_cast.c
+++ b/tests/constant_propagation/introduction_of_non_explicit_cast.c
@@ -1,8 +1,8 @@
/* run.config
- OPT: -load-script tests/constant_propagation/introduction_of_non_explicit_cast.ml -eva -eva-show-progress -deps -journal-disable
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva -eva-show-progress -deps -journal-disable
*/
-
int x,y,z;
int TAB[10];
struct st { int a, b ; } s1, s2;
diff --git a/tests/crowbar/integer_bb_pretty.ml b/tests/crowbar/integer_bb_pretty.ml
new file mode 100644
index 0000000000000000000000000000000000000000..2c6ec812e2968f282f1efb3e3cb19a7c45c9ef0a
--- /dev/null
+++ b/tests/crowbar/integer_bb_pretty.ml
@@ -0,0 +1,59 @@
+open Crowbar
+
+let reparse v s =
+ let failure info =
+ Crowbar.fail
+ ("Pretty-printing '" ^ (Z.to_string v) ^ "' returns '" ^ s ^ "'" ^ info)
+ in
+ if String.length s <= 2 then failure "";
+ let is_neg = s.[0] = '1' in
+ let is_hex = s.[1] = 'x' in
+ let s = String.(concat "" (split_on_char '_' s)) in
+ let v' =
+ if is_neg then begin
+ let chr = if is_hex then 'F' else '1' in
+ let module M = struct exception Found of int end in
+ let check i c = if i > 1 && c <> chr then raise (M.Found i) in
+ try String.iteri check s; Z.minus_one
+ with M.Found idx ->
+ let len, v' =
+ if is_hex then begin
+ let remains = String.sub s idx (String.length s - idx) in
+ let v' = Z.of_string ("0x" ^ remains) in
+ 4 * (String.length remains), v'
+ end else begin
+ let remains = String.sub s idx (String.length s - idx) in
+ let v' = Z.of_string ("0b" ^ remains) in
+ String.length remains, v'
+ end
+ in
+ let m = Z.(one lsl len) in
+ let m = Z.pred m in
+ let v' = Z.logxor m v' in
+ Z.pred (Z.lognot (Z.pred v'))
+ end else
+ Z.of_string s
+ in
+ if not (Z.equal v v') then
+ failure (" reparsed as '" ^ Z.format "%b" v' ^ "' (" ^ Z.to_string v' ^ ")")
+
+let test z is_hex nbits has_sep =
+ guard (nbits >= 0 && nbits <= 1024);
+ let sep = if has_sep then Some "_" else None in
+ let pp z = if is_hex then
+ Integer.pp_hex ~nbits ?sep z
+ else
+ Integer.pp_bin ~nbits ?sep z
+ in
+ let s = Format.asprintf "%a" pp z in
+ reparse z s
+
+let zarith =
+ let open Crowbar in
+ fix (fun zarith ->
+ choose
+ [ map [int64] Z.of_int64;
+ map [zarith; int64] (fun z i -> Z.((z lsl 64) + of_int64 i)) ])
+
+let () = Crowbar.add_test ~name:"pp_bin_hex"
+ [ zarith; Crowbar.bool; Crowbar.int; Crowbar.bool ] test
diff --git a/tests/fc_script/for-find-fun.c b/tests/fc_script/for-find-fun.c
new file mode 100644
index 0000000000000000000000000000000000000000..c8c3a67560fb5a5f321117bedacb256b8884decb
--- /dev/null
+++ b/tests/fc_script/for-find-fun.c
@@ -0,0 +1,17 @@
+/* run.config
+ DONTRUN: test run by main.c
+*/
+
+int
+main2
+(char *c, int i);
+
+struct s {
+ char c;
+};
+
+struct s **main3(
+ struct s *p1, struct s s2
+ ) {
+
+}
diff --git a/tests/fc_script/for-find-fun2.c b/tests/fc_script/for-find-fun2.c
new file mode 100644
index 0000000000000000000000000000000000000000..3cef634fc5b462b9892fc5f66510594e8a81ed58
--- /dev/null
+++ b/tests/fc_script/for-find-fun2.c
@@ -0,0 +1,26 @@
+/* run.config
+ DONTRUN: test run by main.c
+*/
+
+struct s ** main3(
+ struct s *p1, struct s s2
+ ) ;
+
+// tests to avoid false positives
+void f() {
+ int (*false_positive)();
+}
+
+void g() {
+ int i = 0;
+ false_positive(i);
+}
+
+void h() {
+ (void)false_positive((int)42);
+}
+
+//void false_positive();
+
+ void false_positive(); // this is a "voluntary" false negative (space before):
+ // it allows us to avoid false positives more easily
diff --git a/tests/fc_script/main.c b/tests/fc_script/main.c
index 34b9b7c79ac1e3cbca1c44cd4696cbee7d47618a..176bf1c3e843ae5c5e9967c7c2607ec6006562d3 100644
--- a/tests/fc_script/main.c
+++ b/tests/fc_script/main.c
@@ -3,6 +3,9 @@
EXECNOW: LOG GNUmakefile LOG make_template.res LOG make_template.err bin/frama-c-script make-template @PTEST_DIR@/result < @PTEST_DIR@/make_template.input > @PTEST_DIR@/result/make_template.res 2> @PTEST_DIR@/result/make_template.err
EXECNOW: LOG list_files.res LOG list_files.err bin/frama-c-script list-files @PTEST_DIR@/list_files.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
EXECNOW: LOG flamegraph.html LOG flamegraph.res LOG flamegraph.err NOGUI=1 bin/frama-c-script flamegraph @PTEST_DIR@/flamegraph.txt @PTEST_DIR@/result > @PTEST_DIR@/result/flamegraph.res 2> @PTEST_DIR@/result/flamegraph.err && rm -f @PTEST_DIR@/result/flamegraph.svg
+ EXECNOW: LOG find_fun1.res LOG find_fun1.err bin/frama-c-script find-fun main2 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun1.res 2> @PTEST_DIR@/result/find_fun1.err
+ EXECNOW: LOG find_fun2.res LOG find_fun2.err bin/frama-c-script find-fun main3 @PTEST_DIR@ > @PTEST_DIR@/result/find_fun2.res 2> @PTEST_DIR@/result/find_fun2.err
+ EXECNOW: LOG find_fun3.res LOG find_fun3.err bin/frama-c-script find-fun false_positive @PTEST_DIR@ > @PTEST_DIR@/result/find_fun3.res 2> @PTEST_DIR@/result/find_fun3.err
*/
void main() {
diff --git a/src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.err.oracle b/tests/fc_script/oracle/find_fun1.err
similarity index 100%
rename from src/plugins/wp/tests/wp_acsl/oracle_qualif/bitwise2.err.oracle
rename to tests/fc_script/oracle/find_fun1.err
diff --git a/tests/fc_script/oracle/find_fun1.res b/tests/fc_script/oracle/find_fun1.res
new file mode 100644
index 0000000000000000000000000000000000000000..a846b6beb54f9a0245507e35df7567e3d48e9245
--- /dev/null
+++ b/tests/fc_script/oracle/find_fun1.res
@@ -0,0 +1,5 @@
+Looking for 'main2' inside 5 file(s)...
+Possible declarations for function 'main2' in the following file(s):
+ tests/fc_script/for-find-fun.c
+Possible definitions for function 'main2' in the following file(s):
+ tests/fc_script/main2.c
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_real.0.err.oracle b/tests/fc_script/oracle/find_fun2.err
similarity index 100%
rename from src/plugins/wp/tests/wp_plugin/oracle/float_real.0.err.oracle
rename to tests/fc_script/oracle/find_fun2.err
diff --git a/tests/fc_script/oracle/find_fun2.res b/tests/fc_script/oracle/find_fun2.res
new file mode 100644
index 0000000000000000000000000000000000000000..273cc015b4ef5f5ef497533511f083c50c2c63fe
--- /dev/null
+++ b/tests/fc_script/oracle/find_fun2.res
@@ -0,0 +1,5 @@
+Looking for 'main3' inside 5 file(s)...
+Possible declarations for function 'main3' in the following file(s):
+ tests/fc_script/for-find-fun2.c
+Possible definitions for function 'main3' in the following file(s):
+ tests/fc_script/for-find-fun.c
diff --git a/src/plugins/wp/tests/wp_plugin/oracle/float_real.1.err.oracle b/tests/fc_script/oracle/find_fun3.err
similarity index 100%
rename from src/plugins/wp/tests/wp_plugin/oracle/float_real.1.err.oracle
rename to tests/fc_script/oracle/find_fun3.err
diff --git a/tests/fc_script/oracle/find_fun3.res b/tests/fc_script/oracle/find_fun3.res
new file mode 100644
index 0000000000000000000000000000000000000000..a7059bd1c963ad064b030a17ef9782873c397b0d
--- /dev/null
+++ b/tests/fc_script/oracle/find_fun3.res
@@ -0,0 +1,2 @@
+Looking for 'false_positive' inside 5 file(s)...
+No declaration/definition found for function 'false_positive'
diff --git a/tests/float/fval_test.i b/tests/float/fval_test.i
index eda0e94bd4445ca7c827ff7600569fe3d5518e1d..cabb28768924493f9964d6329934d0356b2e5143 100644
--- a/tests/float/fval_test.i
+++ b/tests/float/fval_test.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/float/fval_test.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@
*/
/* run.config*
DONTRUN:
diff --git a/tests/jcdb/jcdb.c b/tests/jcdb/jcdb.c
index e065ddbec3380d2ffa6ebb902d1b3838a631422c..ddf00afcd0acb406597062b30cab1a821f769faf 100644
--- a/tests/jcdb/jcdb.c
+++ b/tests/jcdb/jcdb.c
@@ -2,7 +2,7 @@
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -json-compilation-database @PTEST_DIR@ -print
OPT: -json-compilation-database @PTEST_DIR@/with_arguments.json -print
-OPT: -json-compilation-database @PTEST_DIR@/with_arguments.json -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -json-compilation-database @PTEST_DIR@/with_arguments.json -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
EXECNOW: LOG list_files.res LOG list_files.err share/analysis-scripts/list_files.py @PTEST_DIR@/compile_commands_working.json > @PTEST_DIR@/result/list_files.res 2> @PTEST_DIR@/result/list_files.err
*/
#include <stdio.h>
diff --git a/tests/journal/control.i b/tests/journal/control.i
index 03c9193098e1b927237577588f973faaeb7a6e45..8a7acc8e682ff542811632ac5f9436e3a9a0f4f9 100644
--- a/tests/journal/control.i
+++ b/tests/journal/control.i
@@ -5,10 +5,10 @@
OPT: -load-script tests/journal/result/control_journal -journal-disable
CMD: FRAMAC_LIB=lib/fc ./bin/toplevel.byte
OPT: -load-script tests/journal/result/control_journal_bis -calldeps -journal-disable
- EXECNOW: BIN abstract_cpt_journal.ml FRAMAC_LIB=lib/fc ./bin/toplevel.byte -journal-enable -load-script tests/journal/abstract_cpt.ml -load-script tests/journal/use_cpt.ml -journal-name tests/journal/result/abstract_cpt_journal.ml > /dev/null 2> /dev/null
+ EXECNOW: make -s @PTEST_DIR@/abstract_cpt.cmxs
+ EXECNOW: BIN abstract_cpt_journal.ml FRAMAC_LIB=lib/fc ./bin/toplevel.byte -journal-enable -load-module @PTEST_DIR@/abstract_cpt -load-script tests/journal/use_cpt.ml -journal-name tests/journal/result/abstract_cpt_journal.ml > /dev/null 2> /dev/null
CMD: FRAMAC_LIB=lib/fc ./bin/toplevel.byte
- OPT: -load-script tests/journal/result/abstract_cpt_journal.ml -load-script tests/journal/abstract_cpt.ml -load-script tests/journal/use_cpt.ml
-
+ OPT: -load-script tests/journal/result/abstract_cpt_journal.ml -load-module @PTEST_DIR@/abstract_cpt -load-script tests/journal/use_cpt.ml
*/
int x,y,c,d;
diff --git a/tests/journal/intra.i b/tests/journal/intra.i
index e5d5ab003425ddf34ceee667dbe4ede23b9338cd..dea5fdbface5e49569a2d52996e69ac8b4d52f06 100644
--- a/tests/journal/intra.i
+++ b/tests/journal/intra.i
@@ -1,7 +1,7 @@
/* run.config
- EXECNOW: make -s tests/journal/intra.cmxs
- EXECNOW: BIN intra_journal.ml @frama-c@ -eva-show-progress -load-module ./tests/journal/intra -journal-enable -journal-name tests/journal/result/intra_journal.ml tests/journal/intra.i > /dev/null 2> /dev/null
- CMD: @frama-c@ -load-module ./tests/journal/intra
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ EXECNOW: BIN intra_journal.ml @frama-c@ -eva-show-progress -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -journal-enable -journal-name tests/journal/result/intra_journal.ml @PTEST_DIR@/@PTEST_NAME@.i > /dev/null 2> /dev/null
+ CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -load-script tests/journal/result/intra_journal -journal-disable
*/
diff --git a/tests/libc/fc_libc.c b/tests/libc/fc_libc.c
index 5b85156aea37ea5d264a52c07910e37b9eb1d4cd..298bc1b03740873f4764513b51d10747b6869bd3 100644
--- a/tests/libc/fc_libc.c
+++ b/tests/libc/fc_libc.c
@@ -1,7 +1,10 @@
/* run.config*
- OPT: -load-script tests/libc/check_libc_naming_conventions.ml -print -cpp-extra-args='-nostdinc -Ishare/libc' -metrics -metrics-libc -load-script tests/libc/check_const.ml -load-module metrics -eva @VALUECONFIG@ -then -lib-entry -no-print -metrics-no-libc
+ EXECNOW: make -s @PTEST_DIR@/check_libc_naming_conventions.cmxs
+ EXECNOW: make -s @PTEST_DIR@/check_const.cmxs
+ EXECNOW: make -s @PTEST_DIR@/check_parsing_individual_headers.cmxs
+ OPT: -load-module @PTEST_DIR@/check_libc_naming_conventions -print -cpp-extra-args='-nostdinc -Ishare/libc' -metrics -metrics-libc -load-module @PTEST_DIR@/check_const -load-module metrics -eva @VALUECONFIG@ -then -lib-entry -no-print -metrics-no-libc
OPT: -print -print-libc
- OPT: -load-script tests/libc/check_parsing_individual_headers.ml
+ OPT: -load-module @PTEST_DIR@/check_parsing_individual_headers
CMD: ./tests/libc/check_full_libc.sh
OPT:
**/
diff --git a/tests/libc/oracle/fc_libc.0.res.oracle b/tests/libc/oracle/fc_libc.0.res.oracle
index ffa163ed517ced7ae131d1bd9f87f61300909256..c1ea9b1264b8f540555594d7684ce6cc084d13d7 100644
--- a/tests/libc/oracle/fc_libc.0.res.oracle
+++ b/tests/libc/oracle/fc_libc.0.res.oracle
@@ -4,10 +4,10 @@
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
-[eva] tests/libc/fc_libc.c:157: assertion got status valid.
-[eva] tests/libc/fc_libc.c:158: assertion got status valid.
-[eva] tests/libc/fc_libc.c:159: assertion got status valid.
[eva] tests/libc/fc_libc.c:160: assertion got status valid.
+[eva] tests/libc/fc_libc.c:161: assertion got status valid.
+[eva] tests/libc/fc_libc.c:162: assertion got status valid.
+[eva] tests/libc/fc_libc.c:163: assertion got status valid.
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
diff --git a/tests/misc/add_assigns.i b/tests/misc/add_assigns.i
index 5b2b95af84a9f8b267b95b237093296b438f8229..a6a820ecce977ef9f528f95bcb149fe3df18001a 100644
--- a/tests/misc/add_assigns.i
+++ b/tests/misc/add_assigns.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -then -report -then -print
+OPT: -no-autoload-plugins -load-module report,@PTEST_DIR@/@PTEST_NAME@.cmxs -then -report -then -print
*/
/*@ assigns *x; */
diff --git a/tests/misc/behavior_names.i b/tests/misc/behavior_names.i
index 969831729e947a8c410642c19d50fbd01730a3f1..d4e48cb5bf64a0462aa4b9196b3d1dd23f533b9a 100644
--- a/tests/misc/behavior_names.i
+++ b/tests/misc/behavior_names.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/behavior_names.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@ behavior foo: ensures \true; */
diff --git a/tests/misc/bts0452.i b/tests/misc/bts0452.i
index 98005844997d596e37329504f7abdabeaf175f76..1f3fc795582b79b21aad809bf852bfb655ce3cd7 100644
--- a/tests/misc/bts0452.i
+++ b/tests/misc/bts0452.i
@@ -1,7 +1,7 @@
/* run.config
- OPT: -typecheck -load-script tests/misc/bts0452.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -typecheck -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
-
/* must emit falls-through warning. */
int f (int foo, char** args) {
switch(foo) {
diff --git a/tests/misc/bts0489.i b/tests/misc/bts0489.i
index db94a185c42a8f4948e11331ceed034f854b9a1f..c33db7d4c1a3f7b4d29d0fc48a0aeaf37101775b 100644
--- a/tests/misc/bts0489.i
+++ b/tests/misc/bts0489.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/bts0489.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
typedef unsigned char uint8_t;
diff --git a/tests/misc/bts1201.i b/tests/misc/bts1201.i
index 7e59976a1ab11f91a4cde0c78ed7630c66fa5c14..cbaf4a4e3d114ba17709f3f7fc7bfe0c6f8f5d27 100644
--- a/tests/misc/bts1201.i
+++ b/tests/misc/bts1201.i
@@ -1,8 +1,8 @@
/* run.config
- OPT: -eva-verbose 2 -load-script tests/misc/bts1201.ml -print
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -eva-verbose 2 -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
*/
-void main() {
- //@ assert \true;
+void main() { //@ assert \true;
}
void main2() {
diff --git a/tests/misc/bts1347.i b/tests/misc/bts1347.i
index 4351b7a05c365f721926ec2916c2d8b9ba6c7e54..54f633c7beacbf0a298590ec7bd5efb20003b577 100644
--- a/tests/misc/bts1347.i
+++ b/tests/misc/bts1347.i
@@ -1,6 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/bts1347.ml -eva-show-progress -then -report
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress -then -report
*/
-
int f(int *x) { return *x; }
int g(int *x) { return *(x++); }
diff --git a/tests/misc/bug_0209.c b/tests/misc/bug_0209.c
index e1c584267f93d9cbebcfba033d9ae35f99eec16f..a345a39f3b0ce1c51d4d918965de6620914abbde 100644
--- a/tests/misc/bug_0209.c
+++ b/tests/misc/bug_0209.c
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/bug_0209.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
// Everything is done by the script
diff --git a/tests/misc/callsite.i b/tests/misc/callsite.i
index cb222eb5e95aa3ea93f1f110a8eb5e8b88bca06e..7dcfc493a8c89c38f1bb6189b0c562cccb8841e9 100644
--- a/tests/misc/callsite.i
+++ b/tests/misc/callsite.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/callsite.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
// Don't use -debug 1 option in the test command.
diff --git a/tests/misc/change_main.i b/tests/misc/change_main.i
index 9239d7f51bb663bc2a4d62f841a4887970a04919..c6f70943352c91f4348680131c67bb9e27329040 100644
--- a/tests/misc/change_main.i
+++ b/tests/misc/change_main.i
@@ -1,5 +1,6 @@
/* run.config*
-OPT: -eva -main f -load-script tests/misc/change_main.ml -then-on change_main -main g -eva
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -eva -main f -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -then-on change_main -main g -eva
*/
int f(int x) { return x; }
diff --git a/tests/misc/cli_string_multiple_map.i b/tests/misc/cli_string_multiple_map.i
index 35a34f02c7751c7f8f58cc91af0f557d408f1c04..b4a7c3bc23730ae8b09c9d851046c6b3e300b520 100644
--- a/tests/misc/cli_string_multiple_map.i
+++ b/tests/misc/cli_string_multiple_map.i
@@ -1,3 +1,4 @@
/* run.config
- OPT: -load-script tests/misc/cli_string_multiple_map.ml -multiple-map a:1,b:2,a:3
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -multiple-map a:1,b:2,a:3
*/
diff --git a/tests/misc/copy_kf.i b/tests/misc/copy_kf.i
index 029cbd00d67d6d1580476a8703c235814ecc057c..15fe7d6bc47b3ae91e25275f2bc159cebaeca86d 100644
--- a/tests/misc/copy_kf.i
+++ b/tests/misc/copy_kf.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@ requires \valid(p); assigns *p; ensures *p == x; */
diff --git a/tests/misc/copy_machdep.i b/tests/misc/copy_machdep.i
index 3c150a094ff67a252ea8c3875e854a75b839b327..0b6f32f439f5a76fcda2d18135977d049f386d84 100644
--- a/tests/misc/copy_machdep.i
+++ b/tests/misc/copy_machdep.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -machdep x86_64 -enums int -no-unicode
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -machdep x86_64 -enums int -no-unicode
*/
int main () { return 0; }
diff --git a/tests/misc/custom_machdep.c b/tests/misc/custom_machdep.c
index e92b67f2a8e902f76929347cdee85a7b35688149..f7a377dc16250f21911dbc5f014d7a50b33bac3f 100644
--- a/tests/misc/custom_machdep.c
+++ b/tests/misc/custom_machdep.c
@@ -1,5 +1,6 @@
/* run.config*
-OPT: -cpp-extra-args="-I@PTEST_DIR@/@PTEST_NAME@ -D__FC_MACHDEP_CUSTOM" -load-script @PTEST_DIR@/@PTEST_NAME@/@PTEST_NAME@.ml -machdep custom -print -then -print
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@/@PTEST_NAME@.cmxs
+OPT: -cpp-extra-args="-I@PTEST_DIR@/@PTEST_NAME@ -D__FC_MACHDEP_CUSTOM" -load-module @PTEST_DIR@/@PTEST_NAME@/@PTEST_NAME@ -machdep custom -print -then -print
COMMENT: we need a -then to test double registering of a machdep
*/
diff --git a/tests/misc/ensures.i b/tests/misc/ensures.i
index 140bf8122f031aa574e460218275fceb1fb3112b..ae04e6fb897e157311e2131e8c00117972aaa048 100644
--- a/tests/misc/ensures.i
+++ b/tests/misc/ensures.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/ensures.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
//@ ensures *p==1;
void main(int * p){ *p = 0; }
diff --git a/tests/misc/exception.i b/tests/misc/exception.i
index 4b73ec776649d824fae164bf23655cd6ab7c26c1..a6e5006eb7dbab9286b39fbeaf6ea28e5c22be19 100644
--- a/tests/misc/exception.i
+++ b/tests/misc/exception.i
@@ -1,7 +1,7 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -print
- OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -remove-exn -print
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -remove-exn -print
*/
struct my_exn { int e; };
diff --git a/tests/misc/filepath.i b/tests/misc/filepath.i
index eb178f8224607c8dce90532cc9b037ff562b16f4..f5c0183704fb0f14aba28d804eb133137365c870 100644
--- a/tests/misc/filepath.i
+++ b/tests/misc/filepath.i
@@ -1,3 +1,4 @@
/* run.config
- OPT: -no-autoload-plugins -load-module @PTEST_DIR@/filepath_test.ml
+ EXECNOW: make -s @PTEST_DIR@/filepath_test.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/filepath_test
*/
diff --git a/tests/misc/find_enclosing_loop.c b/tests/misc/find_enclosing_loop.c
index 0a46b537168e8095a426f03541433800664ae563..76cc35a53187fc9e58ea906527669b5a9482e117 100644
--- a/tests/misc/find_enclosing_loop.c
+++ b/tests/misc/find_enclosing_loop.c
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script tests/misc/find_enclosing_loop.ml
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
void f () {
diff --git a/tests/misc/global_decl_loc.i b/tests/misc/global_decl_loc.i
index 3da30326dde49e4dacd4027a5ac9515fe448b0b5..d13cbce847364dbce968f270f47d9cae11260cd8 100644
--- a/tests/misc/global_decl_loc.i
+++ b/tests/misc/global_decl_loc.i
@@ -1,4 +1,4 @@
/* run.config
- OPT: @PTEST_DIR@/global_decl_loc2.i -load-module @PTEST_DIR@/global_decl_loc.cmxs
+ OPT: @PTEST_DIR@/global_decl_loc2.i -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int g;
diff --git a/tests/misc/init_from_cil.i b/tests/misc/init_from_cil.i
index 276161982d21dae400626a206eca75b7064b3b44..7d767032b7e6c7ef1acc8f6a4a7e1ff655cab5f7 100644
--- a/tests/misc/init_from_cil.i
+++ b/tests/misc/init_from_cil.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/init_from_cil.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int f(int x);
diff --git a/tests/misc/issue109.i b/tests/misc/issue109.i
index 5d51ec4b48a0d12becb70887d913d3b9527781cd..51c709c227b1c61c905901b787e50e87c0825216 100644
--- a/tests/misc/issue109.i
+++ b/tests/misc/issue109.i
@@ -1,7 +1,7 @@
/* run.config
- OPT: -eva -eva-show-progress -slevel-function main:10 -load-script tests/misc/issue109.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -eva -eva-show-progress -slevel-function main:10 -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
-
void main() {
int i, j = 0;
for (i=0; i<10; i++) {
diff --git a/tests/misc/issue_191.c b/tests/misc/issue_191.c
index bbba9a680d785fa60685908e9b32322d466639ec..a345a39f3b0ce1c51d4d918965de6620914abbde 100644
--- a/tests/misc/issue_191.c
+++ b/tests/misc/issue_191.c
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/issue_191.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
// Everything is done by the script
diff --git a/tests/misc/justcopy.i b/tests/misc/justcopy.i
index 1045df89354df37d9bb6936a454ceedadd769c85..8cfd1982b8925ce6626f5d9b9d91594011759c5a 100644
--- a/tests/misc/justcopy.i
+++ b/tests/misc/justcopy.i
@@ -1,3 +1,4 @@
/* run.config
- OPT: -load-script tests/misc/justcopy.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
diff --git a/tests/misc/keep_entry_point.i b/tests/misc/keep_entry_point.i
index 48746aabe0562d04934b6bf12ea7d704afc45169..6ade640dbb8933cb359dac79d608f7acf33fc4d3 100644
--- a/tests/misc/keep_entry_point.i
+++ b/tests/misc/keep_entry_point.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -main f -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
+OPT: -main f -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
*/
static int f(void);
diff --git a/tests/misc/log-file.i b/tests/misc/log-file.i
index e017b52fb8b56ebba6ef12e0af66442f6850bb71..833ee51da34f8228cc4ab373fe8573b430b7ca3f 100644
--- a/tests/misc/log-file.i
+++ b/tests/misc/log-file.i
@@ -1,4 +1,5 @@
/* run.config
+ EXECNOW: make -s @PTEST_DIR@/plugin_log.cmxs
LOG: log-file-kernel-warnings.txt
LOG: log-file-kernel-results.txt
LOG: log-file-feedback.txt
@@ -7,7 +8,8 @@
LOG: plugin-log-all.txt
FILTER: sed 's|Your Frama-C version is.*|Your Frama-C version is VERSION|'
STDOPT: #"-kernel-log w:@PTEST_RESULT@/log-file-kernel-warnings.txt,r:@PTEST_RESULT@/log-file-kernel-results.txt -eva-log f:@PTEST_RESULT@/log-file-feedback.txt,afewr:@PTEST_RESULT@/log-file-value-all.txt -eva-log :@PTEST_RESULT@/log-file-value-default.txt -then -kernel-log f:@PTEST_RESULT@/log-file-feedback.txt"
- OPT: -load-module tests/misc/plugin_log.ml -kernel-msg-key foo-category -kernel-log=a:@PTEST_RESULT@/plugin-log-all.txt
+ OPT: -load-module tests/misc/plugin_log -kernel-msg-key foo-category -kernel-log=a:@PTEST_RESULT@/plugin-log-all.txt
+ DONTRUN: test disabled due to non-deterministic errors in CI
*/
int f(void); // generates kernel warning (missing spec)
diff --git a/tests/misc/log_twice.i b/tests/misc/log_twice.i
index 4d912840dfc75a6f69c357e731f420a3b333ed44..e5c6f3a5f23f1f5e9fbe1a0f713c81101ead221d 100644
--- a/tests/misc/log_twice.i
+++ b/tests/misc/log_twice.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/log_twice -eva-show-progress
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -eva-show-progress
*/
int* f() {
diff --git a/tests/misc/my_visitor.c b/tests/misc/my_visitor.c
index 921a82c24c416653c44b705dedb7d86cb431dd12..29355fd152e80c899adebc677eb1abba062d46d5 100644
--- a/tests/misc/my_visitor.c
+++ b/tests/misc/my_visitor.c
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav FRAMAC_PLUGIN=./lib/plugins @frama-c@ @PTEST_FILE@ -load-module @PTEST_DIR@/@PTEST_NAME@ -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
+EXECNOW: LOG my_visitor_sav.res LOG my_visitor_sav.err BIN my_visitor.sav FRAMAC_PLUGIN=./lib/plugins @frama-c@ @PTEST_FILE@ -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -main f -save @PTEST_DIR@/@PTEST_NAME@.sav > @PTEST_DIR@/result/@PTEST_NAME@_sav.res 2> @PTEST_DIR@/result/@PTEST_NAME@_sav.err
OPT: -load @PTEST_DIR@/@PTEST_NAME@.sav -print
*/
int f() {
diff --git a/tests/misc/oracle/ensures.res.oracle b/tests/misc/oracle/ensures.res.oracle
index 7648b92dd837a79640186839b0e38b1770b249e8..7acf87d61616ae7b517495ee6013e35bbdeaf2a7 100644
--- a/tests/misc/oracle/ensures.res.oracle
+++ b/tests/misc/oracle/ensures.res.oracle
@@ -4,7 +4,7 @@
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
-[eva:alarm] tests/misc/ensures.i:4: Warning:
+[eva:alarm] tests/misc/ensures.i:5: Warning:
function main: postcondition got status invalid.
[eva] done for function main
[kernel] main: behavior default!
diff --git a/tests/misc/oracle/log-file-feedback.txt b/tests/misc/oracle/log-file-feedback.txt
index 36ffb1f22e57f630e6be7ebd23b2467ab31370ea..941d344dc0af8f47c2ec0f194933b87cdb04c53a 100644
--- a/tests/misc/oracle/log-file-feedback.txt
+++ b/tests/misc/oracle/log-file-feedback.txt
@@ -3,13 +3,13 @@
[eva] Computing initial state
[eva] Initial state computed
[eva] computing for function f <- main.
-Called from tests/misc/log-file.i:18.
+Called from tests/misc/log-file.i:20.
[eva] using specification for function f
[eva] Done for function f
[eva] computing for function g <- main.
-Called from tests/misc/log-file.i:19.
+Called from tests/misc/log-file.i:21.
[eva] using specification for function g
[eva] Done for function g
-tests/misc/log-file.i:20:[eva] starting to merge loop iterations
+tests/misc/log-file.i:22:[eva] starting to merge loop iterations
[eva] Recording results for main
[eva] done for function main
diff --git a/tests/misc/oracle/log-file-kernel-warnings.txt b/tests/misc/oracle/log-file-kernel-warnings.txt
index 3ab2fc7cdc3e703ae681512fcc3dfe307c4e2042..4e35b1c74cec91a3ba4e36c94232ff1ccbbf3e6e 100644
--- a/tests/misc/oracle/log-file-kernel-warnings.txt
+++ b/tests/misc/oracle/log-file-kernel-warnings.txt
@@ -1 +1 @@
-tests/misc/log-file.i:18:[kernel:annot:missing-spec] warning: Neither code nor specification for function f, generating default assigns from the prototype
+tests/misc/log-file.i:20:[kernel:annot:missing-spec] warning: Neither code nor specification for function f, generating default assigns from the prototype
diff --git a/tests/misc/oracle/log-file-value-all.txt b/tests/misc/oracle/log-file-value-all.txt
index 258754c1f7f836687e390ddb4e262f18960c866d..c19d8ff15faac9301d00a3f1878c008f2c7ef9fe 100644
--- a/tests/misc/oracle/log-file-value-all.txt
+++ b/tests/misc/oracle/log-file-value-all.txt
@@ -2,15 +2,15 @@
[eva] Computing initial state
[eva] Initial state computed
[eva] computing for function f <- main.
-Called from tests/misc/log-file.i:18.
+Called from tests/misc/log-file.i:20.
[eva] using specification for function f
[eva] Done for function f
[eva] computing for function g <- main.
-Called from tests/misc/log-file.i:19.
+Called from tests/misc/log-file.i:21.
[eva] using specification for function g
-tests/misc/log-file.i:15:[eva] warning: no 'assigns \result \from ...' clause specified for function g
+tests/misc/log-file.i:17:[eva] warning: no 'assigns \result \from ...' clause specified for function g
[eva] Done for function g
-tests/misc/log-file.i:20:[eva] starting to merge loop iterations
+tests/misc/log-file.i:22:[eva] starting to merge loop iterations
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
diff --git a/tests/misc/oracle/log-file-value-default.txt b/tests/misc/oracle/log-file-value-default.txt
index 9d4908aa0b45d572c09498784aaebc250f71a300..93553049c30efa17102275ef8c4b8187d04efeea 100644
--- a/tests/misc/oracle/log-file-value-default.txt
+++ b/tests/misc/oracle/log-file-value-default.txt
@@ -1,2 +1,2 @@
-tests/misc/log-file.i:15:[eva] warning: no 'assigns \result \from ...' clause specified for function g
+tests/misc/log-file.i:17:[eva] warning: no 'assigns \result \from ...' clause specified for function g
[eva] ====== VALUES COMPUTED ======
diff --git a/tests/misc/oracle/log-file.0.res.oracle b/tests/misc/oracle/log-file.0.res.oracle
index 75c688457ba46f7f783c6fa33d20957f376a068f..83288a2ea513c05a7125a26eea8b5a4cee999871 100644
--- a/tests/misc/oracle/log-file.0.res.oracle
+++ b/tests/misc/oracle/log-file.0.res.oracle
@@ -5,18 +5,18 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f <- main.
- Called from tests/misc/log-file.i:18.
-[kernel:annot:missing-spec] tests/misc/log-file.i:18: Warning:
+ Called from tests/misc/log-file.i:20.
+[kernel:annot:missing-spec] tests/misc/log-file.i:20: Warning:
Neither code nor specification for function f, generating default assigns from the prototype
[eva] using specification for function f
[eva] Done for function f
[eva] computing for function g <- main.
- Called from tests/misc/log-file.i:19.
+ Called from tests/misc/log-file.i:21.
[eva] using specification for function g
-[eva] tests/misc/log-file.i:15: Warning:
+[eva] tests/misc/log-file.i:17: Warning:
no 'assigns \result \from ...' clause specified for function g
[eva] Done for function g
-[eva] tests/misc/log-file.i:20: starting to merge loop iterations
+[eva] tests/misc/log-file.i:22: starting to merge loop iterations
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
diff --git a/tests/misc/oracle/log_twice.res.oracle b/tests/misc/oracle/log_twice.res.oracle
index 871920c55ba2fee41bfc176a78c22e59d809ea86..30fcb6869ca0f742ade2702953dcb5493a9573e9 100644
--- a/tests/misc/oracle/log_twice.res.oracle
+++ b/tests/misc/oracle/log_twice.res.oracle
@@ -5,19 +5,19 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f <- main.
- Called from tests/misc/log_twice.i:11.
+ Called from tests/misc/log_twice.i:12.
[eva] Recording results for f
[eva] Done for function f
-[eva:locals-escaping] tests/misc/log_twice.i:11: Warning:
+[eva:locals-escaping] tests/misc/log_twice.i:12: Warning:
locals {x} escaping the scope of f through \result<f>
-[eva:alarm] tests/misc/log_twice.i:12: Warning:
+[eva:alarm] tests/misc/log_twice.i:13: Warning:
accessing left-value that contains escaping addresses.
assert ¬\dangling(&p);
-[kernel] tests/misc/log_twice.i:12: Warning:
+[kernel] tests/misc/log_twice.i:13: Warning:
all target addresses were invalid. This path is assumed to be dead.
[eva] Recording results for main
[eva] done for function main
-[eva] tests/misc/log_twice.i:12:
+[eva] tests/misc/log_twice.i:13:
assertion 'Eva,dangling_pointer' got final status invalid.
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
@@ -25,17 +25,17 @@
[eva:initial-state] Values of globals at initialization
[eva] computing for function f <- main.
- Called from tests/misc/log_twice.i:11.
+ Called from tests/misc/log_twice.i:12.
[eva] Recording results for f
[eva] Done for function f
-[eva:locals-escaping] tests/misc/log_twice.i:11: Warning:
+[eva:locals-escaping] tests/misc/log_twice.i:12: Warning:
locals {x} escaping the scope of f through \result<f>
-[eva:alarm] tests/misc/log_twice.i:12: Warning:
+[eva:alarm] tests/misc/log_twice.i:13: Warning:
accessing left-value that contains escaping addresses.
assert ¬\dangling(&p);
-[kernel] tests/misc/log_twice.i:12: Warning:
+[kernel] tests/misc/log_twice.i:13: Warning:
all target addresses were invalid. This path is assumed to be dead.
[eva] Recording results for main
[eva] done for function main
-[eva] tests/misc/log_twice.i:12:
+[eva] tests/misc/log_twice.i:13:
assertion 'Eva,dangling_pointer' got final status invalid.
diff --git a/tests/misc/oracle/pp_bin_hex.res.oracle b/tests/misc/oracle/pp_bin_hex.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..4791a522a343769216bd7ce7e105707e34f739e4
--- /dev/null
+++ b/tests/misc/oracle/pp_bin_hex.res.oracle
@@ -0,0 +1,86 @@
+--------------------------------------------------
+Dec. 0
+Hex. 0x0000
+Bin. 0b0000_0000
+--------------------------------------------------
+Dec. 1
+Hex. 0x0001
+Bin. 0b0000_0001
+--------------------------------------------------
+Dec. -1
+Hex. 1xFFFF
+Bin. 1b1111_1111
+--------------------------------------------------
+Dec. 2
+Hex. 0x0002
+Bin. 0b0000_0010
+--------------------------------------------------
+Dec. -2
+Hex. 1xFFFE
+Bin. 1b1111_1110
+--------------------------------------------------
+Dec. 5
+Hex. 0x0005
+Bin. 0b0000_0101
+--------------------------------------------------
+Dec. -5
+Hex. 1xFFFB
+Bin. 1b1111_1011
+--------------------------------------------------
+Dec. 9
+Hex. 0x0009
+Bin. 0b0000_1001
+--------------------------------------------------
+Dec. -9
+Hex. 1xFFF7
+Bin. 1b1111_0111
+--------------------------------------------------
+Dec. 16
+Hex. 0x0010
+Bin. 0b0001_0000
+--------------------------------------------------
+Dec. -16
+Hex. 1xFFF0
+Bin. 1b1111_0000
+--------------------------------------------------
+Dec. 127
+Hex. 0x007F
+Bin. 0b0111_1111
+--------------------------------------------------
+Dec. -127
+Hex. 1xFF81
+Bin. 1b1000_0001
+--------------------------------------------------
+Dec. 128
+Hex. 0x0080
+Bin. 0b1000_0000
+--------------------------------------------------
+Dec. -128
+Hex. 1xFF80
+Bin. 1b1000_0000
+--------------------------------------------------
+Dec. 255
+Hex. 0x00FF
+Bin. 0b1111_1111
+--------------------------------------------------
+Dec. -255
+Hex. 1xFF01
+Bin. 1b0000_0001
+--------------------------------------------------
+Dec. 4279173135
+Hex. 0xFF0F_000F
+Bin. 0b1111_1111_0000_1111_0000_0000_0000_1111
+--------------------------------------------------
+Dec. -4279173135
+Hex. 1x00F0_FFF1
+Bin. 1b0000_0000_1111_0000_1111_1111_1111_0001
+--------------------------------------------------
+Dec. 386334727
+Hex. 0x1707_0007
+Bin. 0b0001_0111_0000_0111_0000_0000_0000_0111
+--------------------------------------------------
+Dec. -386334727
+Hex. 1xE8F8_FFF9
+Bin. 1b1110_1000_1111_1000_1111_1111_1111_1001
+--------------------------------------------------
+[kernel] Parsing tests/misc/pp_bin_hex.i (no preprocessing)
diff --git a/tests/misc/oracle/save_comments.res.oracle b/tests/misc/oracle/save_comments.res.oracle
index fa8ecc7b92399bcdf1721529af1bad62ab343057..939609307f205e0f994526ba6ebc2ea685f0989c 100644
--- a/tests/misc/oracle/save_comments.res.oracle
+++ b/tests/misc/oracle/save_comments.res.oracle
@@ -2,7 +2,8 @@
Printing default project first time:
/* Generated by Frama-C */
/* run.config
- OPT: -load-script tests/misc/save_comments.ml -keep-comments
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -keep-comments
*/
int f(void)
{
@@ -15,7 +16,8 @@ int f(void)
Printing default project second time:
/* Generated by Frama-C */
/* run.config
- OPT: -load-script tests/misc/save_comments.ml -keep-comments
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -keep-comments
*/
int f(void)
{
@@ -34,7 +36,8 @@ End of comments
Printing saved project:
/* Generated by Frama-C */
/* run.config
- OPT: -load-script tests/misc/save_comments.ml -keep-comments
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -keep-comments
*/
int f(void)
{
diff --git a/tests/misc/oracle/unroll_annots.res.oracle b/tests/misc/oracle/unroll_annots.res.oracle
index 4c2129811bc179866cef585c0a1b34d1807ed194..0e37020e66540945660669098c29d1b237ecbb20 100644
--- a/tests/misc/oracle/unroll_annots.res.oracle
+++ b/tests/misc/oracle/unroll_annots.res.oracle
@@ -5,9 +5,9 @@
[eva:initial-state] Values of globals at initialization
a[0..9] ∈ {0}
b[0..9] ∈ {0}
-[eva:loop-unrolling] tests/misc/unroll_annots.c:8: loop not completely unrolled
+[eva:loop-unroll] tests/misc/unroll_annots.c:8: loop not completely unrolled
[eva] tests/misc/unroll_annots.c:8: starting to merge loop iterations
-[eva:loop-unrolling] tests/misc/unroll_annots.c:14: loop not completely unrolled
+[eva:loop-unroll] tests/misc/unroll_annots.c:14: loop not completely unrolled
[eva] tests/misc/unroll_annots.c:14: starting to merge loop iterations
[eva] tests/misc/unroll_annots.c:16: starting to merge loop iterations
[eva] Recording results for main
diff --git a/tests/misc/pp_bin_hex.i b/tests/misc/pp_bin_hex.i
new file mode 100644
index 0000000000000000000000000000000000000000..a53499be69922b6d91cd0d4926968829ccf22a93
--- /dev/null
+++ b/tests/misc/pp_bin_hex.i
@@ -0,0 +1,3 @@
+/* run.config
+ OPT: -no-autoload-plugins -load-script tests/misc/pp_bin_hex.ml
+*/
diff --git a/tests/misc/pp_bin_hex.ml b/tests/misc/pp_bin_hex.ml
new file mode 100644
index 0000000000000000000000000000000000000000..41ab2e6ab92ee1beef120983f3e307461ada4811
--- /dev/null
+++ b/tests/misc/pp_bin_hex.ml
@@ -0,0 +1,37 @@
+let pp_dec fmt z = Integer.pretty ~hexa:false fmt z
+let pp_hex fmt z = Integer.pp_hex ~nbits:16 ~sep:"_" fmt z
+let pp_bin fmt z = Integer.pp_bin ~nbits:8 ~sep:"_" fmt z
+
+let hrule () =
+ Format.printf "--------------------------------------------------@."
+
+let testcase z =
+ begin
+ hrule () ;
+ Format.printf "Dec. %a@." pp_dec z ;
+ Format.printf "Hex. %a@." pp_hex z ;
+ Format.printf "Bin. %a@." pp_bin z ;
+ end
+
+let () =
+ begin
+ List.iter
+ (fun z ->
+ testcase z ;
+ if not (Integer.equal z Integer.zero) then
+ testcase (Integer.neg z)
+ ) [
+ Integer.of_string "0" ;
+ Integer.of_string "1" ;
+ Integer.of_string "2" ;
+ Integer.of_string "5" ;
+ Integer.of_string "9" ;
+ Integer.of_string "16" ;
+ Integer.of_string "127" ;
+ Integer.of_string "128" ;
+ Integer.of_string "0xFF" ;
+ Integer.of_string "0xFF0F000F" ;
+ Integer.of_string "0x17070007" ;
+ ] ;
+ hrule () ;
+ end
diff --git a/tests/misc/print_machdep.i b/tests/misc/print_machdep.i
index 80afbbd20f335c72d597dbc6c45cf6e37d304c37..0762669acd646cdbd6257081b52f420d15c7e2b2 100644
--- a/tests/misc/print_machdep.i
+++ b/tests/misc/print_machdep.i
@@ -1,4 +1,3 @@
/* run.config
- CMD: @frama-c@ -no-autoload-plugins
- OPT: -print-machdep
+ OPT: -no-autoload-plugins -print-machdep
*/
diff --git a/tests/misc/remove_status_hyps.i b/tests/misc/remove_status_hyps.i
index 65348944a6d4a5ede92bee270d3aa2c8352a3070..a436356626c8169ba8c349bf26bb5d2d31c72a52 100644
--- a/tests/misc/remove_status_hyps.i
+++ b/tests/misc/remove_status_hyps.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/remove_status_hyps.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int main(void) {
diff --git a/tests/misc/save_comments.i b/tests/misc/save_comments.i
index 6ee3a950e34b306f68b62dc474d4a364156afafb..aaf7cccdef62fdaaaea56d6e6b5160163941eea4 100644
--- a/tests/misc/save_comments.i
+++ b/tests/misc/save_comments.i
@@ -1,8 +1,8 @@
/* run.config
- OPT: -load-script tests/misc/save_comments.ml -keep-comments
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -keep-comments
*/
-
int f() {
int x = 0;
/* Hello, I'm the f function */
diff --git a/tests/misc/static.i b/tests/misc/static.i
index 4c5ea035b725324d3a71332ef52c1d4e2a78a5ad..b0863c3a2b3908f34f1bfe07919867975270aa3c 100644
--- a/tests/misc/static.i
+++ b/tests/misc/static.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int x;
diff --git a/tests/misc/test_datatype.i b/tests/misc/test_datatype.i
index ffe2a11b457e9c4671e36a98bb2106a129035cd6..19405eb11ec4c3d5e608f535e9aeab5f595fb19a 100644
--- a/tests/misc/test_datatype.i
+++ b/tests/misc/test_datatype.i
@@ -1,4 +1,4 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
diff --git a/tests/misc/version.i b/tests/misc/version.i
index cd0bcd0bf8696a3febda5e79680981cf9a2aed9d..3a762af550b5fb818f962ec7d88d225747f95e50 100644
--- a/tests/misc/version.i
+++ b/tests/misc/version.i
@@ -1,3 +1,4 @@
/* run.config
- OPT: -load-script tests/misc/version.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
diff --git a/tests/misc/vis_queueInstr.i b/tests/misc/vis_queueInstr.i
index f9f32820ed0dc77562cb2d9e938ec18c823d4a97..61fd2bb820de4616e9e18edfc2cd55a5eedd711b 100644
--- a/tests/misc/vis_queueInstr.i
+++ b/tests/misc/vis_queueInstr.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print -then-on A -print
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print -then-on A -print
*/
int main(){
diff --git a/tests/misc/vis_spec.i b/tests/misc/vis_spec.i
index 9515609a61d1cc5892d2bd348a2f5ffb61f4d9cd..c40858396b4be923663a262dc97a0cdc4b187771 100644
--- a/tests/misc/vis_spec.i
+++ b/tests/misc/vis_spec.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/vis_spec.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
//@ assigns \nothing;
diff --git a/tests/misc/visitor_creates_func_bts_1349.i b/tests/misc/visitor_creates_func_bts_1349.i
index 3fc9e30144b24c39aacd54b9183f1f5617cb66e7..a03c0cd1c45050418effd185243b6dff7a1f7e3e 100644
--- a/tests/misc/visitor_creates_func_bts_1349.i
+++ b/tests/misc/visitor_creates_func_bts_1349.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/misc/Visitor_creates_func_bts_1349.ml -then-on test -print
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-script @PTEST_DIR@/@PTEST_NAME@ -then-on test -print
*/
int a = 10;
diff --git a/tests/misc/Visitor_creates_func_bts_1349.ml b/tests/misc/visitor_creates_func_bts_1349.ml
similarity index 100%
rename from tests/misc/Visitor_creates_func_bts_1349.ml
rename to tests/misc/visitor_creates_func_bts_1349.ml
diff --git a/tests/misc/well_typed_alarm.i b/tests/misc/well_typed_alarm.i
index ec5f84df44fadd1ae56dfd540851c7dc198c0794..236200877af3a87006d77bafa01de09eef090645 100644
--- a/tests/misc/well_typed_alarm.i
+++ b/tests/misc/well_typed_alarm.i
@@ -1,7 +1,7 @@
/* run.config*
-OPT: -load-script @PTEST_DIR@/@PTEST_NAME@.ml
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
-
int main(int c) {
int x = 0;
int y = 0;
diff --git a/tests/pdg/dyn_dpds.c b/tests/pdg/dyn_dpds.c
index 459bd5a60d78cfeaf7100d5e608388f1caaa6a41..20168cf1621c6ed2ae366c5dc958e353dd524c74 100644
--- a/tests/pdg/dyn_dpds.c
+++ b/tests/pdg/dyn_dpds.c
@@ -1,17 +1,17 @@
/* run.config
- OPT: -load-script tests/pdg/dyn_dpds.ml -eva-show-progress -deps -journal-disable -pdg-print -pdg-verbose 2
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress -deps -journal-disable -pdg-print -pdg-verbose 2
*/
/*
To have a look at the dot PDG :
- bin/toplevel.byte -deps -pdg-dot pdg -eva-show-progress -fct-pdg main tests/pdg/dyn_dpds.c ;
+ bin/toplevel.byte -deps -pdg-dot pdg -eva-show-progress -fct-pdg main @PTEST_DIR@/@PTEST_NAME@.c ;
zgrviewer pdg.main.dot
- or use tests/pdg/dyn_dpds.ml to test the dynamic dependencies.
+ or use @PTEST_DIR@/@PTEST_NAME@.ml to test the dynamic dependencies.
*/
-
int G;
int main (int a, int b, int c) {
diff --git a/tests/pdg/sets.c b/tests/pdg/sets.c
index 9623e013f31c3dbe56f85351cb8bb66e57864cc7..3efc61ce72bd3318339f327989bcf123587acb84 100644
--- a/tests/pdg/sets.c
+++ b/tests/pdg/sets.c
@@ -1,9 +1,9 @@
/* run.config
- OPT: -eva-show-progress -load-script tests/pdg/sets.ml -lib-entry -main f -pdg -inout -journal-disable -pdg-print -pdg-verbose 2
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -eva-show-progress -load-module @PTEST_DIR@/@PTEST_NAME@ -lib-entry -main f -pdg -inout -journal-disable -pdg-print -pdg-verbose 2
*/
-
int b, c, x, y, z, t;
void f(int a) {
y = 0; // 1, node 9
diff --git a/tests/rte/precond2.c b/tests/rte/precond2.c
index 2c3844e757435034d26935ecf9cfd2dcc952e029..72d360e0d96667335f976b60727fdeb9843b965c 100644
--- a/tests/rte/precond2.c
+++ b/tests/rte/precond2.c
@@ -1,5 +1,6 @@
/* run.config
- OPT: -warn-special-float none -load-script tests/rte/compute_annot/compute_annot.ml -journal-disable
+ EXECNOW: make -s @PTEST_DIR@/compute_annot/compute_annot.cmxs
+ OPT: -warn-special-float none -load-module @PTEST_DIR@/compute_annot/compute_annot -journal-disable
*/
int global = 15;
diff --git a/tests/rte/threefunc.c b/tests/rte/threefunc.c
index 44aa8d37cd24c7e8fbd3027e21a2ead6d43c24d6..03b2ad3b373fd5dcc26253574999f9bccfa59a30 100644
--- a/tests/rte/threefunc.c
+++ b/tests/rte/threefunc.c
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script tests/rte/my_annotation/my_annotation.ml
+EXECNOW: make -s @PTEST_DIR@/my_annotation/my_annotation.cmxs
+OPT: -load-module @PTEST_DIR@/my_annotation/my_annotation
*/
diff --git a/tests/rte/twofunc.c b/tests/rte/twofunc.c
index 38ce35dac65ffdac7071447de3145e63aa84bed7..2732ad9f1f99b79c79b2f9450870d3904a69cd71 100644
--- a/tests/rte/twofunc.c
+++ b/tests/rte/twofunc.c
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script tests/rte/my_annot_proxy/my_annot_proxy.ml
+EXECNOW: make -s @PTEST_DIR@/my_annot_proxy/my_annot_proxy.cmxs
+OPT: -load-module @PTEST_DIR@/my_annot_proxy/my_annot_proxy
*/
diff --git a/tests/rte/twofunc3.c b/tests/rte/twofunc3.c
index 8894e7cbee4a51fb176dc870a4302db5171ae2ad..b7102aaf7086db45e0bfbf0924a346a8edab1bcb 100644
--- a/tests/rte/twofunc3.c
+++ b/tests/rte/twofunc3.c
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/rte/rte_api/rte_get_annot.ml -journal-disable
+ EXECNOW: make -s @PTEST_DIR@/rte_api/rte_get_annot.cmxs
+ OPT: -load-module @PTEST_DIR@/rte_api/rte_get_annot -journal-disable
*/
diff --git a/tests/saveload/basic.i b/tests/saveload/basic.i
index d091c2203be2d30c683283c29998dddb3d416940..e0d5d8f8b74aa58031d88339800120da3fb0c659 100644
--- a/tests/saveload/basic.i
+++ b/tests/saveload/basic.i
@@ -1,13 +1,14 @@
/* run.config
- EXECNOW: make -s ./tests/saveload/basic.cmxs
- EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -load-module ./tests/saveload/basic -eva -out -input -deps -eva-show-progress ./tests/saveload/basic.i -save ./tests/saveload/result/basic.sav > ./tests/saveload/result/basic_sav.res 2> ./tests/saveload/result/basic_sav.err
- EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav ./bin/toplevel.opt -save ./tests/saveload/result/basic.1.sav ./tests/saveload/basic.i -eva -out -input -deps -eva-show-progress > ./tests/saveload/result/basic_sav.1.res 2> ./tests/saveload/result/basic_sav.1.err
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ EXECNOW: LOG basic_sav.res LOG basic_sav.err BIN basic.sav @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva -out -input -deps -eva-show-progress ./@PTEST_DIR@/@PTEST_NAME@.i -save ./tests/saveload/result/basic.sav > ./tests/saveload/result/basic_sav.res 2> ./tests/saveload/result/basic_sav.err
+ EXECNOW: LOG basic_sav.1.res LOG basic_sav.1.err BIN basic.1.sav ./bin/toplevel.opt -save ./tests/saveload/result/basic.1.sav @PTEST_DIR@/@PTEST_NAME@.i -eva -out -input -deps -eva-show-progress > ./tests/saveload/result/basic_sav.1.res 2> ./tests/saveload/result/basic_sav.1.err
OPT: -load ./tests/saveload/result/basic.sav -eva -out -input -deps -journal-disable
- CMD: @frama-c@ -load-module ./tests/saveload/basic
+ CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable -print
OPT: -load ./tests/saveload/result/basic.1.sav -eva -out -input -deps -journal-disable
- EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -load-script tests/saveload/status.ml -save ./tests/saveload/result/status.sav ./tests/saveload/basic.i > ./tests/saveload/result/status_sav.res 2> ./tests/saveload/result/status_sav.err
- OPT: -load-script tests/saveload/status.ml -load ./tests/saveload/result/status.sav
+ EXECNOW: make -s @PTEST_DIR@/status.cmxs
+ EXECNOW: LOG status_sav.res LOG status_sav.err BIN status.sav @frama-c@ -load-module @PTEST_DIR@/status -save ./tests/saveload/result/status.sav @PTEST_DIR@/@PTEST_NAME@.i > ./tests/saveload/result/status_sav.res 2> ./tests/saveload/result/status_sav.err
+ OPT: -load-module @PTEST_DIR@/status -load ./tests/saveload/result/status.sav
OPT: -load ./tests/saveload/result/status.sav
*/
diff --git a/tests/saveload/load_one.i b/tests/saveload/load_one.i
index 2c6aa23233a1a0d9baf17cbd8442b40a14c40e4f..8f58edd16793be9f8f058ad48543ab1df2132096 100644
--- a/tests/saveload/load_one.i
+++ b/tests/saveload/load_one.i
@@ -1,7 +1,7 @@
/* run.config
- OPT: -load-script tests/saveload/load_one.ml -eva-show-progress
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress
*/
-
int G;
int f (int x, int y) {
diff --git a/tests/saveload/multi_project.i b/tests/saveload/multi_project.i
index b3a6c55cc1ba9915f315ba8f5d8273e37f63a6bc..e8c3589515cd3bdca84e5679e3a52330cfbbbb50 100644
--- a/tests/saveload/multi_project.i
+++ b/tests/saveload/multi_project.i
@@ -1,8 +1,8 @@
/* run.config
- EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err ./bin/toplevel.opt -save ./tests/saveload/result/multi_project.sav -eva-show-progress -semantic-const-folding ./tests/saveload/multi_project.i > tests/saveload/result/multi_project_sav.res 2> tests/saveload/result/multi_project_sav.err
- EXECNOW: make -s ./tests/saveload/multi_project.cmxs
+ EXECNOW: BIN multi_project.sav LOG multi_project_sav.res LOG multi_project_sav.err ./bin/toplevel.opt -save ./tests/saveload/result/multi_project.sav -eva-show-progress -semantic-const-folding @PTEST_DIR@/@PTEST_NAME@.i > tests/saveload/result/multi_project_sav.res 2> tests/saveload/result/multi_project_sav.err
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -load ./tests/saveload/result/multi_project.sav -journal-disable
- CMD: @frama-c@ -load-module ./tests/saveload/multi_project
+ CMD: @frama-c@ -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva -eva-show-progress
*/
int f(int x) {
diff --git a/tests/saveload/oracle/basic_sav.1.res b/tests/saveload/oracle/basic_sav.1.res
index 985eb96467566d2d7978358d57e350538de45307..056059606204259f47c4619d6aa71f6dd14adaa0 100644
--- a/tests/saveload/oracle/basic_sav.1.res
+++ b/tests/saveload/oracle/basic_sav.1.res
@@ -4,9 +4,9 @@
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
-[eva] tests/saveload/basic.i:18: assertion got status valid.
-[eva] tests/saveload/basic.i:19: starting to merge loop iterations
-[eva:alarm] tests/saveload/basic.i:19: Warning:
+[eva] tests/saveload/basic.i:19: assertion got status valid.
+[eva] tests/saveload/basic.i:20: starting to merge loop iterations
+[eva:alarm] tests/saveload/basic.i:20: Warning:
signed overflow. assert -2147483648 ≤ i - 1;
[eva] Recording results for main
[eva] done for function main
diff --git a/tests/saveload/oracle/basic_sav.res b/tests/saveload/oracle/basic_sav.res
index 985eb96467566d2d7978358d57e350538de45307..056059606204259f47c4619d6aa71f6dd14adaa0 100644
--- a/tests/saveload/oracle/basic_sav.res
+++ b/tests/saveload/oracle/basic_sav.res
@@ -4,9 +4,9 @@
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
-[eva] tests/saveload/basic.i:18: assertion got status valid.
-[eva] tests/saveload/basic.i:19: starting to merge loop iterations
-[eva:alarm] tests/saveload/basic.i:19: Warning:
+[eva] tests/saveload/basic.i:19: assertion got status valid.
+[eva] tests/saveload/basic.i:20: starting to merge loop iterations
+[eva:alarm] tests/saveload/basic.i:20: Warning:
signed overflow. assert -2147483648 ≤ i - 1;
[eva] Recording results for main
[eva] done for function main
diff --git a/tests/saveload/serialized_queue.i b/tests/saveload/serialized_queue.i
index fe5a57bd8f72e2e63b0b2930443f942be55eecc4..3d2c450536e513b1580c0197708c6f78599e4c31 100644
--- a/tests/saveload/serialized_queue.i
+++ b/tests/saveload/serialized_queue.i
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script @PTEST_DIR@/@PTEST_NAME@.ml
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
// empty C file, we're only interested in the script itself
diff --git a/tests/scope/bts971.c b/tests/scope/bts971.c
index d23783b30da5267e2f5364fa961f46bd80ee0847..b50076a1a38082a0c1f3d15ae9b1cfa66e8fa6e0 100644
--- a/tests/scope/bts971.c
+++ b/tests/scope/bts971.c
@@ -1,7 +1,7 @@
/* run.config
- OPT: -journal-disable -load-script tests/scope/bts971.ml -then -main main2
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -journal-disable -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -then -main main2
*/
-
/* bug 971: */
volatile foo;
int v;
diff --git a/tests/scope/zones.c b/tests/scope/zones.c
index b60197f2d884c12dbf8d011b0de8cc5a5cefce94..884e57b2162c1665bbac00b98c150d5e02c6373c 100644
--- a/tests/scope/zones.c
+++ b/tests/scope/zones.c
@@ -1,10 +1,10 @@
/* run.config
- OPT: -load-script tests/scope/zones.ml -eva -eva-show-progress -journal-disable
+# EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -eva -eva-show-progress -journal-disable
*/
-
-/* bin/viewer.opt -eva tests/scope/zones.c */
+/* bin/viewer.opt -eva @PTEST_DIR@/@PTEST_NAME@.c */
int T [10];
struct Tstr { int a; int b; } S;
diff --git a/tests/slicing/adpcm.c b/tests/slicing/adpcm.c
index 3ca387a3406fa599e26887b96303c2ae4bc6f396..88dbc4dbda0d8a796d81743dfda2b7dfab5b14e1 100644
--- a/tests/slicing/adpcm.c
+++ b/tests/slicing/adpcm.c
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/adpcm.cmxs
- OPT: -eva-show-progress -load-module ./tests/slicing/libSelect.cmxs -load-module ./tests/slicing/adpcm.cmxs -ulevel -1 -deps -slicing-level 2 -journal-disable
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -eva-show-progress -load-module ./tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -ulevel -1 -deps -slicing-level 2 -journal-disable
*/
#include "tests/test/adpcm.c"
diff --git a/tests/slicing/combine.i b/tests/slicing/combine.i
index 983a97af1402259919d337a17cf10b82544f227b..16d12c1adcd6a2813d481d626b1535c4714bb64f 100644
--- a/tests/slicing/combine.i
+++ b/tests/slicing/combine.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/combine.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/combine.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
diff --git a/tests/slicing/ex_spec_interproc.i b/tests/slicing/ex_spec_interproc.i
index 9f6d8ca13606bc64e5756bdca896f27205dc580f..962dd869e61cbda26e097423225fba45df9b3713 100644
--- a/tests/slicing/ex_spec_interproc.i
+++ b/tests/slicing/ex_spec_interproc.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/ex_spec_interproc.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/ex_spec_interproc.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
diff --git a/tests/slicing/horwitz.i b/tests/slicing/horwitz.i
index 3cc83fb2dd7b2f056e084b53fc52f6c15b18ed94..0178857313f549f260b26554f05c18a927bde711 100644
--- a/tests/slicing/horwitz.i
+++ b/tests/slicing/horwitz.i
@@ -1,12 +1,12 @@
/* run.config
- EXECNOW: make -s tests/slicing/horwitz.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/horwitz.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -slicing-level 0 -journal-disable
*/
-/* bin/toplevel.opt -deps -eva tests/slicing/horwitz.c */
-/* bin/toplevel.opt -deps -pdg-debug -pdg tests/slicing/horwitz.c */
-/* cf aussi tests/slicing/horwitz.ml */
+/* bin/toplevel.opt -deps -eva @PTEST_DIR@/@PTEST_NAME@.c */
+/* bin/toplevel.opt -deps -pdg-debug -pdg @PTEST_DIR@/@PTEST_NAME@.c */
+/* cf aussi @PTEST_DIR@/@PTEST_NAME@.ml */
int add (int a, int b) {
return a+b;
diff --git a/tests/slicing/mark_all_slices.i b/tests/slicing/mark_all_slices.i
index 3454c9e2befc3c6b0162dc468a7115f5e1d2c9a8..d25812226596c855a7380ef38ddc9520f0f0c405 100644
--- a/tests/slicing/mark_all_slices.i
+++ b/tests/slicing/mark_all_slices.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/mark_all_slices.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/mark_all_slices.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -slicing-level 3 -no-slice-callers -journal-disable
*/
int A, B, C, D;
diff --git a/tests/slicing/merge.i b/tests/slicing/merge.i
index b25108129ad6606803c84d0febb9df5497bea6d5..bf0509784e30e9adfe5159b4e8cff4be9597d3b9 100644
--- a/tests/slicing/merge.i
+++ b/tests/slicing/merge.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/merge.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/libAnim.cmxs -load-module tests/slicing/merge.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/libAnim.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -slicing-level 3 -journal-disable
*/
diff --git a/tests/slicing/min_call.i b/tests/slicing/min_call.i
index bb033d1fc639504a1224b21697fc0ff03975a26d..f7cc89e6a8dd1b8e1b9b580e0a2bdc2dc0457a75 100644
--- a/tests/slicing/min_call.i
+++ b/tests/slicing/min_call.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/min_call.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/min_call.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -lib-entry -main g -journal-disable -slicing-level 3
*/
diff --git a/tests/slicing/select_by_annot.i b/tests/slicing/select_by_annot.i
index fe285f2541c43f31036a42f891208315269498bb..a0cd4471cf1e72b7b7e5ecfc74212bbc83f1bfb2 100644
--- a/tests/slicing/select_by_annot.i
+++ b/tests/slicing/select_by_annot.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/select_by_annot.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/select_by_annot.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -lib-entry -main main -journal-disable
CMD: bin/toplevel.opt
OPT: -eva-show-progress -check -deps -lib-entry -main main -slice-pragma main -journal-disable -then-on 'Slicing export' -set-project-as-default -print -check -then -print -ocode @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -then @PTEST_DIR@/result/ocode_@PTEST_NUMBER@_@PTEST_NAME@.i -check -no-deps
diff --git a/tests/slicing/select_simple.i b/tests/slicing/select_simple.i
index 9e30123cd9bd1662a26cdb7c74e287e2aaa2e79f..9883f3ff5832c4114b5d9af361e3bdc732257829 100644
--- a/tests/slicing/select_simple.i
+++ b/tests/slicing/select_simple.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/select_simple.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/select_simple.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
diff --git a/tests/slicing/simple_intra_slice.i b/tests/slicing/simple_intra_slice.i
index 065111000339285f6f469292a3d992d89d795d98..e335e824fe8810dc5832f1d524f0a9f00728b079 100644
--- a/tests/slicing/simple_intra_slice.i
+++ b/tests/slicing/simple_intra_slice.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/simple_intra_slice.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/simple_intra_slice.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -no-slice-callers -journal-disable
*/
int Unknown;
diff --git a/tests/slicing/slice_no_body.i b/tests/slicing/slice_no_body.i
index 0f261cfc5c8e0be129134359987f92540895e34e..9c249f20d9f10a391b1ad939bb7e8605473596a7 100644
--- a/tests/slicing/slice_no_body.i
+++ b/tests/slicing/slice_no_body.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/slice_no_body.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/slice_no_body.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -lib-entry -main h -journal-disable
*/
diff --git a/tests/slicing/switch.i b/tests/slicing/switch.i
index 11e453ccb719566980ce711bea9d90cdd5d820cd..0b1ca36ce07a809cf0c2cbbaec82b11bd2150ed1 100644
--- a/tests/slicing/switch.i
+++ b/tests/slicing/switch.i
@@ -1,6 +1,6 @@
/* run.config
- EXECNOW: make -s tests/slicing/switch.cmxs
- CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module tests/slicing/switch.cmxs
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ CMD: @frama-c@ -load-module tests/slicing/libSelect.cmxs -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
OPT: -eva-show-progress -deps -journal-disable
*/
int main (char choix) {
diff --git a/tests/spec/Extend.i b/tests/spec/Extend.i
index f69d26eaa2c682768fac5d5e49134f1eeee1c044..ff81bb51cab62adebb757548a563b5c5c4ac1a00 100644
--- a/tests/spec/Extend.i
+++ b/tests/spec/Extend.i
@@ -1,6 +1,6 @@
/* run.config
-EXECNOW: make @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -copy -kernel-warn-key=annot-error=active
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -copy -kernel-warn-key=annot-error=active
*/
/*@ foo x == 0;
@@ -43,9 +43,9 @@ int k(int z) {
/*@ global_foo \forall integer x; x < x + 1
; */
-
+//@ behavior ca_foo: ensures ca_foo: \true;
void loop (void) {
- //@ ca_foo \true;
+ //@ for ca_foo: ca_foo \true;
//@ ns_foo \true;
//@ baz \true;
/*@ loop invariant \true; */
diff --git a/tests/spec/add_global.i b/tests/spec/add_global.i
index 0eeae27f26ff17543f3219293e44182bc5e22337..7ed406648a9ae0f6d2d9f3d5357314714edf358c 100644
--- a/tests/spec/add_global.i
+++ b/tests/spec/add_global.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
*/
int main () { return 0; }
diff --git a/tests/spec/bts0578.i b/tests/spec/bts0578.i
index 4d3a94ab5cecf0919d35a0beeea9433f38f410c8..c94e20665e6bda514c2d2f3460c2c132504d509c 100644
--- a/tests/spec/bts0578.i
+++ b/tests/spec/bts0578.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -print -load-script ./tests/spec/bts0578.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -print -load-module ./@PTEST_DIR@/@PTEST_NAME@
*/
/*@ behavior foo: ensures \true; */
diff --git a/tests/spec/bts0655.i b/tests/spec/bts0655.i
index b994e76793c1467df1e4d2dc3af4ba9bda747209..b5947620ab99b29f05efcec6781e7549d0ff63c8 100644
--- a/tests/spec/bts0655.i
+++ b/tests/spec/bts0655.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/spec/bts0655.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@
@ ensures \result == \max( a, b );
diff --git a/tests/spec/comparison.i b/tests/spec/comparison.i
index 9fc56fc54cfb485abfc7007da7dfae3add8102e1..a62a8a65c779ed28e8b1795d4182dc1a0897c66e 100644
--- a/tests/spec/comparison.i
+++ b/tests/spec/comparison.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/spec/comparison.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@ predicate foo(boolean a, boolean b) = a == b; */
diff --git a/tests/spec/expr_to_term.i b/tests/spec/expr_to_term.i
index 74bd6f5aa8b625b8e0099467e25d85794a6b5922..12078604eca0f6f0bf50d630d939b9539203ff83 100644
--- a/tests/spec/expr_to_term.i
+++ b/tests/spec/expr_to_term.i
@@ -1,8 +1,7 @@
/* run.config
-EXECNOW: make @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
*/
-
int x[10];
struct S { int y; int z; } s;
diff --git a/tests/spec/kw.c b/tests/spec/kw.c
index 8ad24442c35f8b6f90d1732c732857310d73b295..eb7b4e0b8fb456a73b66648f3d8fbd1b4cb9fd81 100644
--- a/tests/spec/kw.c
+++ b/tests/spec/kw.c
@@ -9,6 +9,7 @@ assert behavior = 0;
ensures behavior >= 0;
*/
int main () {
+ //@ slevel 4;
behavior++;
return 0;
}
@@ -23,3 +24,18 @@ model{L}(l1,ll1) ==> model(Cons(0,l1),Cons(0,ll1));
} */
+/*@ axiomatic foo {
+ logic integer func(integer i) reads behavior;
+}
+*/
+
+volatile int assigns;
+
+int ensures(volatile int* a) { return *a; }
+int requires(volatile int*a, int v) { *a = v; return v; }
+
+/*@ volatile assigns reads ensures writes requires; */
+
+int slevel = 1000000;
+
+//@ lemma bar: slevel >= 0;
diff --git a/tests/spec/location_char.c b/tests/spec/location_char.c
index 3b9e457c7bbc26bda4de6536508d5f914e28b97a..99339a087cfd144ae6a400c10249fa9394530e4b 100644
--- a/tests/spec/location_char.c
+++ b/tests/spec/location_char.c
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@ requires x <= 0;
diff --git a/tests/spec/model.i b/tests/spec/model.i
index 0d4fe0b8b8f4672fb9ff0bc29b15e1669f8375c2..840ab0193bc7883a50f8671c43f01ad4264e3c08 100644
--- a/tests/spec/model.i
+++ b/tests/spec/model.i
@@ -1,8 +1,8 @@
/* run.config
-STDOPT: +"-load-script tests/spec/model.ml"
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+STDOPT: +"-no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs"
*/
struct S { int x; int y; };
-
typedef struct S T;
/*@ model struct S { integer z }; */
diff --git a/tests/spec/oracle/Extend.res.oracle b/tests/spec/oracle/Extend.res.oracle
index da72437c2ec75953a1a792fe19cde406a578e188..6fb85da86bac26486fff0df9fa0c8dfba1551d99 100644
--- a/tests/spec/oracle/Extend.res.oracle
+++ b/tests/spec/oracle/Extend.res.oracle
@@ -48,9 +48,11 @@ int k(int z)
/*@ global_foo ∀ ℤ x; x < x + 1;
*/
+/*@ behavior ca_foo:
+ ensures ca_foo: \true; */
void loop(void)
{
- /*@ ca_foo \true; */ ;
+ /*@ for ca_foo: ca_foo \true; */ ;
/*@ ns_foo \true; */
/*@ baz \true; */
/*@ loop invariant \true; */
diff --git a/tests/spec/oracle/behavior_names.res.oracle b/tests/spec/oracle/behavior_names.res.oracle
index 2bb78b303affead82ba4b673af4472e0bab8d6e0..f24db2ef02802cafbde4da8907ddda15be054a5c 100644
--- a/tests/spec/oracle/behavior_names.res.oracle
+++ b/tests/spec/oracle/behavior_names.res.oracle
@@ -78,7 +78,7 @@ void j(void)
behavior while:
ensures while: \true;
- behavior normal:
+ behavior ensures:
ensures ensures: \true;
behavior logic:
diff --git a/tests/spec/oracle/kw.res.oracle b/tests/spec/oracle/kw.res.oracle
index 916e6673c1c89285920152a2cb1ee4c22b6e12f1..b9d920cb849457f0161ca7ed3551f23b325e6cd8 100644
--- a/tests/spec/oracle/kw.res.oracle
+++ b/tests/spec/oracle/kw.res.oracle
@@ -12,6 +12,7 @@ assert behavior = 0;
int main(void)
{
int __retres;
+ /*@ slevel 4; */
behavior ++;
__retres = 0;
return __retres;
@@ -25,6 +26,32 @@ inductive model{L}(List<ℤ> root, List<ℤ> logic_list) {
case cons{L}: ∀ List<ℤ> l1, List<ℤ> ll1;
model(l1, ll1) ⇒ model(Cons(0, l1), Cons(0, ll1));
}
+ */
+/*@ axiomatic foo {
+ logic ℤ func{L}(ℤ i)
+ reads behavior;
+
+ }
+
+*/
+int volatile assigns;
+int ensures(int volatile *a)
+{
+ int __retres;
+ __retres = *a;
+ return __retres;
+}
+
+int requires(int volatile *a, int v)
+{
+ *a = v;
+ return v;
+}
+
+/*@ volatile assigns reads ensures writes requires;
+*/
+int slevel = 1000000;
+/*@ lemma bar{L}: slevel ≥ 0;
*/
diff --git a/tests/spec/pp_empty_spec.i b/tests/spec/pp_empty_spec.i
index 0835b8c2332205289f637c06c42bcf7597904778..6d337f8500a51c4c764145969e8ef1c73bcff1f0 100644
--- a/tests/spec/pp_empty_spec.i
+++ b/tests/spec/pp_empty_spec.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script @PTEST_DIR@/@PTEST_NAME@.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int main(void) {
int x = 0;
diff --git a/tests/spec/property_test.i b/tests/spec/property_test.i
index 07866538d3b1fcd413af495a25efa29e3c5d35c2..6f1de940f0cb8b128f6d9fefa4c635c806f5a267 100644
--- a/tests/spec/property_test.i
+++ b/tests/spec/property_test.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/spec/property_test.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int X;
diff --git a/tests/spec/type_constructors_in_env.i b/tests/spec/type_constructors_in_env.i
index f60aaadd9d224592b2297d6df9eab1cf6c096d68..636049ed329cfd848d51760fd52d2d84701261fc 100644
--- a/tests/spec/type_constructors_in_env.i
+++ b/tests/spec/type_constructors_in_env.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@ type foo = A | B; */
diff --git a/tests/syntax/Refresh_visitor.i b/tests/syntax/Refresh_visitor.i
index 07ebc38f1b1206f7404b2cb9c4aa0c4782d79e89..0786760a68f8f6abcb244f9485e74fdeac8cbee5 100644
--- a/tests/syntax/Refresh_visitor.i
+++ b/tests/syntax/Refresh_visitor.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@ -eva-show-progress
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -eva-show-progress
*/
struct S { int i; };
diff --git a/tests/syntax/add_allocates.i b/tests/syntax/add_allocates.i
index de0ffa3fe47e7ec04c07eda84e9e262a483a07c4..2153e41ea67e6f54eeaf4a2b2719f3abb359eeac 100644
--- a/tests/syntax/add_allocates.i
+++ b/tests/syntax/add_allocates.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/syntax/add_allocates.ml -print
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
*/
diff --git a/tests/syntax/ast_init.i b/tests/syntax/ast_init.i
index 77d503529616cf024179a591aa65f33bf83c04d0..1e9aad67b5d3289f2c50f423edf4697fb2fb77fa 100644
--- a/tests/syntax/ast_init.i
+++ b/tests/syntax/ast_init.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int f(int x) { return x; }
diff --git a/tests/syntax/char_is_unsigned.i b/tests/syntax/char_is_unsigned.i
index f87954814a8e3d056d969c21a0df2de678014fe9..a3fbe427e1e26c1733ff8eecd4e4bd29fa9270d3 100644
--- a/tests/syntax/char_is_unsigned.i
+++ b/tests/syntax/char_is_unsigned.i
@@ -1,5 +1,6 @@
-/* run.config
- OPT:-print -load-script tests/syntax/machdep_char_unsigned.ml -machdep unsigned_char -then -constfold -rte
+/* run.config
+ EXECNOW: make -s @PTEST_DIR@/machdep_char_unsigned.cmxs
+ OPT:-print -load-module @PTEST_DIR@/machdep_char_unsigned -machdep unsigned_char -then -constfold -rte
*/
char t[10];
diff --git a/tests/syntax/clone_test.i b/tests/syntax/clone_test.i
index e0a82386a6c8f795a3e7d70252220e76f625f0e2..7d94b47b61384b15dac0b60062acd1148947726a 100644
--- a/tests/syntax/clone_test.i
+++ b/tests/syntax/clone_test.i
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script @PTEST_DIR@/@PTEST_NAME@.ml
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
/*@
diff --git a/tests/syntax/copy_visitor_bts_1073.c b/tests/syntax/copy_visitor_bts_1073.c
index 1c03240bfff694e5541238663e80381011ac77e7..a20b81af83fc0cb5b769207afd287f77450a2a17 100644
--- a/tests/syntax/copy_visitor_bts_1073.c
+++ b/tests/syntax/copy_visitor_bts_1073.c
@@ -1,6 +1,8 @@
/* run.config
-OPT: -load-script tests/syntax/copy_visitor_bts_1073.ml
-OPT: -load-script tests/syntax/copy_visitor_bts_1073_bis.ml -test -then-on filtered -print
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@_bis.cmxs
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -load-module @PTEST_DIR@/@PTEST_NAME@_bis -test -then-on filtered -print
*/
#include "stdio.h"
diff --git a/tests/syntax/forloophook.i b/tests/syntax/forloophook.i
index 6fee07446ff502447a466480a7b40e3b9708cddb..d9e38bd7b222e52182a102421f32151e285020ec 100644
--- a/tests/syntax/forloophook.i
+++ b/tests/syntax/forloophook.i
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/syntax/forloophook.ml
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
void f() {
for (int i=0; i< 10; i++);
diff --git a/tests/syntax/formals_decl_leak.i b/tests/syntax/formals_decl_leak.i
index 6a521af4ade9356c5ed4431debc0970ff9d87596..93a7dc265a729926ce94aac380f8ec67a67198b8 100644
--- a/tests/syntax/formals_decl_leak.i
+++ b/tests/syntax/formals_decl_leak.i
@@ -1,5 +1,6 @@
/* run.config
-OPT: -print -load-script tests/syntax/formals_decl_leak.ml tests/syntax/formals_decl_leak_1.i
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -print -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs @PTEST_DIR@/@PTEST_NAME@_1.i
*/
void f(int x);
diff --git a/tests/syntax/get_astinfo_bts1136.i b/tests/syntax/get_astinfo_bts1136.i
index bbb4f115aa35e1323469e5de9abb7633af777c9b..694aacdf37979df8db7e8043f9ed6268c82efa73 100644
--- a/tests/syntax/get_astinfo_bts1136.i
+++ b/tests/syntax/get_astinfo_bts1136.i
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script tests/syntax/get_astinfo_bts1136.ml
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int f (int x) { return x; }
int g (int x) { return x; }
diff --git a/tests/syntax/inserted_casts.c b/tests/syntax/inserted_casts.c
index 62ce8c000f283dfbfa406daaa8ab0f9b59805724..805496d3d23a36a8bb973199a0e95203a72363ab 100644
--- a/tests/syntax/inserted_casts.c
+++ b/tests/syntax/inserted_casts.c
@@ -1,7 +1,7 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
- STDOPT: +"-load-module @PTEST_DIR@/@PTEST_NAME@.cmxs"
- STDOPT: +"-load-module @PTEST_DIR@/@PTEST_NAME@.cmxs" +"-machdep x86_64"
+ STDOPT: +"-no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs"
+ STDOPT: +"-no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs" +"-machdep x86_64"
*/
#include "stddef.h"
int f(int b)
diff --git a/tests/syntax/logic_env.i b/tests/syntax/logic_env.i
index 6d8082506687116f05472ed8e711b5cee580024e..9570e109382c07d8d19a57248a384cbc372b9e66 100644
--- a/tests/syntax/logic_env.i
+++ b/tests/syntax/logic_env.i
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script tests/syntax/logic_env_script.ml
+EXECNOW: make -s @PTEST_DIR@/logic_env_script.cmxs
+OPT: -load-module @PTEST_DIR@/logic_env_script
*/
//@ predicate foo(integer x) = x == 0;
diff --git a/tests/syntax/mutable_test.i b/tests/syntax/mutable_test.i
index b8ed2d45fb4ca9f14eedb77ca9b8522ad008c015..3c480aa053427eebf9bcf9ca6c5dcfd257cad058 100644
--- a/tests/syntax/mutable_test.i
+++ b/tests/syntax/mutable_test.i
@@ -1,6 +1,6 @@
/* run.config
EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
-OPT: -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -print
*/
struct R_1 {
diff --git a/tests/syntax/oracle/get_astinfo_bts1136.res.oracle b/tests/syntax/oracle/get_astinfo_bts1136.res.oracle
index cffcd6e4b73cd1290264656bf7e80aefd76fe204..6366ae5e8ee9b4b79e1ce7de9a6dc6e2d8a70370 100644
--- a/tests/syntax/oracle/get_astinfo_bts1136.res.oracle
+++ b/tests/syntax/oracle/get_astinfo_bts1136.res.oracle
@@ -1,13 +1,13 @@
[kernel] Parsing tests/syntax/get_astinfo_bts1136.i (no preprocessing)
-found variable vid:22 formal in f
-found variable vid:25 formal in g
-found variable vid:28 formal in h
-found variable vid:30 formal in i
-found variable vid:32 formal in j
-found variable vid:34 formal in k
-[do_v] vid:28 formal in h
-[do_v] vid:25 formal in g
-[do_v] vid:22 formal in f
-[do_v] vid:34 local in k
-[do_v] vid:32 local in j
-[do_v] vid:30 local in i
+found variable vid:20 formal in f
+found variable vid:23 formal in g
+found variable vid:26 formal in h
+found variable vid:28 formal in i
+found variable vid:30 formal in j
+found variable vid:32 formal in k
+[do_v] vid:26 formal in h
+[do_v] vid:23 formal in g
+[do_v] vid:20 formal in f
+[do_v] vid:32 local in k
+[do_v] vid:30 local in j
+[do_v] vid:28 local in i
diff --git a/tests/syntax/oracle/syntactic_hook.res.oracle b/tests/syntax/oracle/syntactic_hook.res.oracle
index 4d15d03a3ad3423d6b318c306cfbdfe997c2aee2..f91bf389edacd90454102c87b50ef336951d9660 100644
--- a/tests/syntax/oracle/syntactic_hook.res.oracle
+++ b/tests/syntax/oracle/syntactic_hook.res.oracle
@@ -1,22 +1,22 @@
[kernel] Parsing tests/syntax/syntactic_hook.i (no preprocessing)
[kernel] tests/syntax/syntactic_hook.i:5:
- New global node introducing identifier f(22)
+ New global node introducing identifier f(20)
[kernel] First occurrence of f
[kernel] tests/syntax/syntactic_hook.i:7:
- New global node introducing identifier k(25)
+ New global node introducing identifier k(23)
[kernel] First occurrence of k
[kernel] tests/syntax/syntactic_hook.i:9:
- New global node introducing identifier k(25)
+ New global node introducing identifier k(23)
[kernel] New occurrence of existing identifier k
[kernel] tests/syntax/syntactic_hook.i:11:
- New global node introducing identifier main(31)
+ New global node introducing identifier main(29)
[kernel] First occurrence of main
[kernel] tests/syntax/syntactic_hook.i:13:
- New global node introducing identifier t(35)
+ New global node introducing identifier t(33)
[kernel] First occurrence of t
[kernel] tests/syntax/syntactic_hook.i:13: Warning:
[SH]: definition of local function t
-[kernel] :0: New global node introducing identifier g(37)
+[kernel] :0: New global node introducing identifier g(35)
[kernel] First occurrence of g
[kernel:typing:implicit-function-declaration] tests/syntax/syntactic_hook.i:17: Warning:
Calling undeclared function g. Old style K&R code?
diff --git a/tests/syntax/reorder.i b/tests/syntax/reorder.i
index a754b95d776a02a5cbdd5bba66b7b75ab834d7be..a611137930713ae5fbb4db09a2cbefdf59513905 100644
--- a/tests/syntax/reorder.i
+++ b/tests/syntax/reorder.i
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script tests/syntax/reorder.ml
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int x;
diff --git a/tests/syntax/syntactic_hook.i b/tests/syntax/syntactic_hook.i
index e5c19d372e4d3f7ba2012a42514e35805d4e4d72..d887e89667ec5464d71f2d68e749dfe68465f196 100644
--- a/tests/syntax/syntactic_hook.i
+++ b/tests/syntax/syntactic_hook.i
@@ -1,7 +1,7 @@
/* run.config
- STDOPT: +"-load-script tests/syntax/syntactic_hook.ml"
+ EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+ STDOPT: +"-no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs"
*/
-
int f(void);
int k(int *);
diff --git a/tests/syntax/typedef_multi_1.c b/tests/syntax/typedef_multi_1.c
index fac8ea328939009b61a97e51f0f01a2d5e03c945..33a8d6c3537a3452d299e6a481c5514bbdb93022 100644
--- a/tests/syntax/typedef_multi_1.c
+++ b/tests/syntax/typedef_multi_1.c
@@ -1,5 +1,6 @@
/* run.config
- OPT: -load-script tests/syntax/typedef_multi.ml tests/syntax/typedef_multi_2.c
+ EXECNOW: make -s @PTEST_DIR@/typedef_multi.cmxs
+ OPT: -load-module @PTEST_DIR@/typedef_multi tests/syntax/typedef_multi_2.c
*/
#include "tests/syntax/typedef_multi.h"
diff --git a/tests/syntax/vdescr_bts1387.i b/tests/syntax/vdescr_bts1387.i
index 7ef2f74b3ccce4b99ef88b539449c45b24854699..b20b1226bd2c890329ecea47201df49299e8f69b 100644
--- a/tests/syntax/vdescr_bts1387.i
+++ b/tests/syntax/vdescr_bts1387.i
@@ -1,5 +1,6 @@
/* run.config
-OPT: -load-script tests/syntax/vdescr_bts1387.ml
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs
*/
int f(int);
int g(int);
diff --git a/tests/syntax/visit_create_local.i b/tests/syntax/visit_create_local.i
index 68bfe516292bfea1bbb41bc7327aa4acaf026ad1..6d9a88989bca1c8106862f9bb5dd304b6da357c0 100644
--- a/tests/syntax/visit_create_local.i
+++ b/tests/syntax/visit_create_local.i
@@ -1,4 +1,5 @@
/* run.config
-OPT: -load-script tests/syntax/visit_create_local.ml -then-on bidon -print
+EXECNOW: make -s @PTEST_DIR@/@PTEST_NAME@.cmxs
+OPT: -no-autoload-plugins -load-module @PTEST_DIR@/@PTEST_NAME@.cmxs -then-on bidon -print
*/
void main() { int x,y; x = y; }
diff --git a/tests/value/loopfun.i b/tests/value/loopfun.i
index afca12398b58e22ba8f07032f43d5496f389a541..030e2654b43ef017571f659a983d660c59ed3315 100644
--- a/tests/value/loopfun.i
+++ b/tests/value/loopfun.i
@@ -1,7 +1,7 @@
/* run.config*
STDOPT: +"-slevel 50 -no-results"
+ STDOPT: +"-eva-warn-key=missing-loop-unroll=feedback -eva-warn-key=missing-loop-unroll:for=active -main main2"
*/
-
static int a = 7;
int test()
@@ -17,3 +17,12 @@ int main()
}
return 0;
}
+
+volatile int v;
+void main2() {
+ while (v) {}
+ //@ loop unroll 1;
+ for(;v;);
+ for(;v;);
+ do {} while(v);
+}
diff --git a/tests/value/oracle/loopfun.res.oracle b/tests/value/oracle/loopfun.0.res.oracle
similarity index 91%
rename from tests/value/oracle/loopfun.res.oracle
rename to tests/value/oracle/loopfun.0.res.oracle
index 949c06bca9bffff7b2f504eeba7c281521451645..0bdd232311e43a73cfd47f9f9c9c32418786bada 100644
--- a/tests/value/oracle/loopfun.res.oracle
+++ b/tests/value/oracle/loopfun.0.res.oracle
@@ -3,6 +3,7 @@
[eva] Computing initial state
[eva] Initial state computed
[eva:initial-state] Values of globals at initialization
+ v ∈ [--..--]
a ∈ {7}
[eva] computing for function test <- main.
Called from tests/value/loopfun.i:14.
@@ -41,12 +42,16 @@
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
+[from] Computing for function main2
+[from] Done for function main2
[from] Computing for function test
[from] Done for function test
[from] Computing for function main
[from] Done for function main
[from] ====== DEPENDENCIES COMPUTED ======
These dependencies hold at termination for the executions that terminate:
+[from] Function main2:
+ FROMTOP
[from] Function test:
FROMTOP
\result FROM ANYTHING(origin:Unknown)
@@ -54,6 +59,10 @@
FROMTOP
\result FROM ANYTHING(origin:Unknown)
[from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function main2:
+ \nothing
+[inout] Inputs for function main2:
+ v
[inout] Out (internal) for function test:
tmp; a
[inout] Inputs for function test:
diff --git a/tests/value/oracle/loopfun.1.res.oracle b/tests/value/oracle/loopfun.1.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..d6802166c97a9854d3af41680bfd20dcf57d94fe
--- /dev/null
+++ b/tests/value/oracle/loopfun.1.res.oracle
@@ -0,0 +1,29 @@
+[kernel] Parsing tests/value/loopfun.i (no preprocessing)
+[eva] Analyzing a complete application starting at main2
+[eva] Computing initial state
+[eva] Initial state computed
+[eva:initial-state] Values of globals at initialization
+ v ∈ [--..--]
+ a ∈ {7}
+[eva:missing-loop-unroll] tests/value/loopfun.i:23:
+ while loop without unroll annotation
+[eva:missing-loop-unroll:for] tests/value/loopfun.i:26: Warning:
+ for loop without unroll annotation
+[eva:missing-loop-unroll] tests/value/loopfun.i:27:
+ dowhile loop without unroll annotation
+[eva] Recording results for main2
+[eva] done for function main2
+[eva] ====== VALUES COMPUTED ======
+[eva:final-states] Values at end of function main2:
+
+[from] Computing for function main2
+[from] Done for function main2
+[from] ====== DEPENDENCIES COMPUTED ======
+ These dependencies hold at termination for the executions that terminate:
+[from] Function main2:
+ NO EFFECTS
+[from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function main2:
+ \nothing
+[inout] Inputs for function main2:
+ v