Merge branch 'develop' into loc-end

Author: sim642

CHANGES

@@ -1,12 +1,17 @@
+18 November 2021: goblint-cil-1.8.2
+
+    * Add columns to locations.
+    * Add support for __int128, __int128_t and __uint128_t.
+
 18 May 2021: goblint-cil-1.8.0
 
-    * Proper support for C99, ([#9][i9]) and VLAs in particular ([#5][i5], [#7][pr7])
+    * Proper support for C99, (#9) and VLAs in particular (#5, #7)
     * It uses [Zarith][zarith] instead of the deprecated [Num][num]
     * Support for more recent OCaml versions (≥ 4.06)
     * Large integer constants that do not fit in an OCaml `int` are represented as a `string` instead of getting truncated
-    * Syntactic search extension ([#21][pr21])
+    * Syntactic search extension (#21)
     * Some warnings were made optional
-    * Unmaintained extensions ([#30][pr30]) were removed
+    * Unmaintained extensions (#30) were removed
     * Many bug fixes
 
 24 July 2013: cil-1.7.3

META.goblint-cil.template

@@ -2,10 +2,10 @@
 
 package "default-features" (
 requires="goblint-cil.dataslicing goblint-cil.liveness goblint-cil.pta goblint-cil.makecfg goblint-cil.syntacticsearch"
-version = "1.8.1"
+version = "1.8.2"
 )
 
 package "all-features" (
 requires="goblint-cil.dataslicing goblint-cil.liveness goblint-cil.pta goblint-cil.makecfg goblint-cil.zrapp goblint-cil.syntacticsearch"
-version = "1.8.1"
+version = "1.8.2"
 )

README.md

@@ -15,6 +15,7 @@ an incomplete list of some of the ways `goblint-cil` improves upon CIL:
 - Large integer constants that do not fit in an OCaml `int` are represented as a
   `string` instead of getting truncated
 - Syntactic search extension ([#21][pr21])
+- More precise locations (with columns)
 - Some warnings were made optional
 - Unmaintained extensions ([#30][pr30]) were removed
 - Many bug fixes
@@ -98,7 +99,7 @@ instance in the OCaml toplevel using [Findlib][findlib]:
     # #require "cil";;
     [...]
     # Cil.cilVersion;;
-    - : string = "1.8.1"
+    - : string = "1.8.2"
 
 [findlib]: http://projects.camlcity.org/projects/findlib.html
 

configure

@@ -2531,7 +2531,7 @@ ac_config_files="$ac_config_files stamp-h"
 # Assign here the CIL version numbers
 CIL_VERSION_MAJOR=1
 CIL_VERSION_MINOR=8
-CIL_VERSION_REV=1
+CIL_VERSION_REV=2
 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV
 
 # make sure I haven't forgotten to run autoconf

configure.ac

@@ -33,7 +33,7 @@ AC_PREREQ([2.71])
 # Assign here the CIL version numbers
 CIL_VERSION_MAJOR=1
 CIL_VERSION_MINOR=8
-CIL_VERSION_REV=1
+CIL_VERSION_REV=2
 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV
 
 # make sure I haven't forgotten to run autoconf

dune-project

@@ -2,12 +2,11 @@
 (name goblint-cil)
 (implicit_transitive_deps false)
 (generate_opam_files true)
-(version 1.8.1)
+(version 1.8.2)
 (source (github goblint/cil))
-(homepage "https://cil-project.github.io/cil/")
 ; (documentation "https://goblint.github.io/cil")
 (authors "[email protected]")
-(maintainers "Michael Schwarz <[email protected]>" "Ralf Vogler <[email protected]>")
+(maintainers "Michael Schwarz <[email protected]>" "Simmo Saan <[email protected]>" "Ralf Vogler <[email protected]>")
 (license "BSD-3-Clause")
 
 (package
@@ -16,13 +15,14 @@
   (description "\
 This is a fork of the 'cil' package needed to build 'goblint'.
 Changes:
-- Proper support for C99, (#9) and VLAs in particular (#5, #7)
+- Proper support for C99 and VLAs in particular
 - It uses Zarith instead of the deprecated Num
 - Support for more recent OCaml versions (≥ 4.06)
 - Large integer constants that do not fit in an OCaml int are represented as a string instead of getting truncated
-- Syntactic search extension (#21)
+- Syntactic search extension
+- More precise locations (with columns)
 - Some warnings were made optional
-- Unmaintained extensions (#30) were removed
+- Unmaintained extensions were removed
 - Many bug fixes")
   (depends
     (ocaml (>= 4.05.0))

goblint-cil.opam

@@ -1,26 +1,28 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "1.8.1"
+version: "1.8.2"
 synopsis:
   "A front-end for the C programming language that facilitates program analysis and transformation"
 description: """
 This is a fork of the 'cil' package needed to build 'goblint'.
 Changes:
-- Proper support for C99, (#9) and VLAs in particular (#5, #7)
+- Proper support for C99 and VLAs in particular
 - It uses Zarith instead of the deprecated Num
 - Support for more recent OCaml versions (≥ 4.06)
 - Large integer constants that do not fit in an OCaml int are represented as a string instead of getting truncated
-- Syntactic search extension (#21)
+- Syntactic search extension
+- More precise locations (with columns)
 - Some warnings were made optional
-- Unmaintained extensions (#30) were removed
+- Unmaintained extensions were removed
 - Many bug fixes"""
 maintainer: [
   "Michael Schwarz <[email protected]>"
+  "Simmo Saan <[email protected]>"
   "Ralf Vogler <[email protected]>"
 ]
 authors: ["[email protected]"]
 license: "BSD-3-Clause"
-homepage: "https://cil-project.github.io/cil/"
+homepage: "https://github.com/goblint/cil"
 bug-reports: "https://github.com/goblint/cil/issues"
 depends: [
   "ocaml" {>= "4.05.0"}