update files from goblint-http-server repository

Author: stilscher

goblint-http-server/.gitignore

@@ -1,3 +1,5 @@
+# executable
+goblint-http
 
 # Created by https://www.toptal.com/developers/gitignore/api/ocaml,emacs,vim,visualstudiocode,linux,macos,windows
 # Edit at https://www.toptal.com/developers/gitignore?templates=ocaml,emacs,vim,visualstudiocode,linux,macos,windows
@@ -74,7 +76,8 @@ flycheck_*.el
 .LSOverride
 
 # Icon must end with two \r
-Icon
+Icon
+
 
 # Thumbnails
 ._*

goblint-http-server/Makefile

@@ -0,0 +1,4 @@
+native :
+
+% :
+	@./make.sh $@

goblint-http-server/README.md

@@ -0,0 +1,12 @@
+# Http-Server for GobView
+
+## Building
+1. Install [opam](https://opam.ocaml.org/doc/Install.html).
+2. Run `make setup` to install OCaml and dependencies via opam.
+4. Run `make` to build the Goblint-Http-Server itself.
+
+## Running
+To use the Goblint Http-Server run e.g.:
+`./goblint-http -with-goblint ../analyzer/goblint -goblint --set save_run run --set files[+] "../analyzer/tests/regression/00-sanity/01-assert.c"`
+For more information on the usage of `goblint-http` run:
+`./goblint-http -help`

goblint-http-server/dune-project

@@ -11,7 +11,7 @@
 (maintainers "Kerem Çakırer <[email protected]>")
 
 (source
- (github keremc/goblint-http-server))
+ (github goblint/goblint-http-server))
 
 (generate_opam_files true)
 

goblint-http-server/goblint-http-server.opam

@@ -5,8 +5,8 @@ synopsis: "Goblint HTTP server"
 maintainer: ["Kerem Çakırer <[email protected]>"]
 authors: ["Kerem Çakırer <[email protected]>"]
 license: "ISC"
-homepage: "https://github.com/keremc/goblint-http-server"
-bug-reports: "https://github.com/keremc/goblint-http-server/issues"
+homepage: "https://github.com/goblint/goblint-http-server"
+bug-reports: "https://github.com/goblint/goblint-http-server/issues"
 depends: [
   "dune" {>= "2.9"}
   "batteries"
@@ -38,4 +38,4 @@ build: [
   ]
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
-dev-repo: "git+https://github.com/keremc/goblint-http-server.git"
+dev-repo: "git+https://github.com/goblint/goblint-http-server.git"

goblint-http-server/goblint-http-server.opam.locked

@@ -5,8 +5,8 @@ synopsis: "Goblint HTTP server"
 maintainer: "Kerem Çakırer <[email protected]>"
 authors: "Kerem Çakırer <[email protected]>"
 license: "ISC"
-homepage: "https://github.com/keremc/goblint-http-server"
-bug-reports: "https://github.com/keremc/goblint-http-server/issues"
+homepage: "https://github.com/goblint/goblint-http-server"
+bug-reports: "https://github.com/goblint/goblint-http-server/issues"
 depends: [
   "angstrom" {= "0.15.0"}
   "asn1-combinators" {= "0.2.6"}
@@ -122,4 +122,4 @@ build: [
   ]
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
-dev-repo: "git+https://github.com/keremc/goblint-http-server.git"
+dev-repo: "git+https://github.com/goblint/goblint-http-server.git"

goblint-http-server/make.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -e # exit immediately if a command fails
+set -o pipefail # or all $? in pipe instead of returning exit code of the last command only
+
+#$TARGET=src/goblint_http
+
+rule() {
+  case $1 in
+    # new rules using dune
+    clean)
+      git clean -X -f
+      dune clean
+    ;; setup)
+      # set -x
+      # opam init -y -a --bare $SANDBOXING # sandboxing is disabled in travis and docker
+      # opam update
+      opam switch -y create . --deps-only ocaml-base-compiler.4.13.1 ocaml-options-vanilla --locked
+    ;; nat*)
+      eval $(opam config env)
+      dune build #$TARGET.exe &&
+      rm -f goblint-http &&
+      cp _build/install/default/bin/goblint-http goblint-http
+    ;; dev)
+      eval $(opam env)
+      echo "Installing opam packages for development..."
+      opam install -y utop ocaml-lsp-server ocp-indent ocamlformat ounit2
+      # ocaml-lsp-server is needed for https://github.com/ocamllabs/vscode-ocaml-platform
+      echo "Be sure to adjust your vim/emacs config!"
+  esac;
+}
+
+if [ $# -eq 0 ]; then
+  rule native
+else
+  while [ $# -gt 0 ]; do
+    rule $1;
+    shift
+  done
+fi

goblint-http-server/src/goblint.ml

@@ -24,7 +24,7 @@ let with_lock goblint = Lwt_mutex.with_lock goblint.mutex
 
 let assert_ok (resp: Jsonrpc.Response.t) s = match resp.result with
   | Ok _ -> ()
-  | Error _ -> failwith s
+  | Error e -> failwith (Format.sprintf "%s (%s)" s e.message)
 
 let send goblint name params =
   let id = `Int goblint.counter in
@@ -33,6 +33,7 @@ let send goblint name params =
     Jsonrpc.Message.create ?params ~id ~method_:name ()
     |> Jsonrpc.Message.yojson_of_request
     |> Yojson.Safe.to_string in
+  Printf.printf "send jsonrpc message:\n%s\n" req;
   let%lwt () = Lwt_io.fprintl goblint.output req in
   let%lwt resp =
     Lwt_io.read_line goblint.input