From fc45cbe4a93c270d6c40f7a050adf8f410ffbeea Mon Sep 17 00:00:00 2001
From: Valentin Perrelle <valentin.perrelle@cea.fr>
Date: Mon, 26 Aug 2019 17:27:29 +0200
Subject: [PATCH] [Dive] Fix the syntax of variables in the communication
 protocol

---
 src/plugins/dive/server_interface.ml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/plugins/dive/server_interface.ml b/src/plugins/dive/server_interface.ml
index 9c4a175c2b1..07044b5697a 100644
--- a/src/plugins/dive/server_interface.ml
+++ b/src/plugins/dive/server_interface.ml
@@ -53,12 +53,25 @@ struct
 end
 
 module Variable = Data.Collection (struct
+    module Info = struct
+      let page = page
+      let name = "variable"
+      let descr = Markdown.rm "Variable from the program"
+    end
+
+    module R = Data.Record (Info)
+
     type t = Cil_types.varinfo
-    let syntax = Syntax.publish ~page ~name:"variable"
-        ~synopsis:(Syntax.record [
-            "fun", Syntax.option Syntax.string ;
-            "var", Syntax.string ])
-        ~descr:(Markdown.rm "Variable from the program") ()
+
+    let syntax = R.syntax
+
+    let fun_field = R.option "fun"
+        ~descr:(Markdown.rm "owner function for a local variable")
+        (module Data.Jstring)
+
+    let var_field = R.field "var"
+        ~descr:(Markdown.rm "variable name")
+        (module Data.Jstring)
 
     let to_json v =
       let varname = v.Cil_types.vname in
-- 
GitLab