diff --git a/ivette/src/renderer/ASTinfo.tsx b/ivette/src/renderer/ASTinfo.tsx
index f3f37d73f52de3ef08cb789be769e7eee0a12001..7d4674ede1f7752f9587c11d6355dd3962087c28 100644
--- a/ivette/src/renderer/ASTinfo.tsx
+++ b/ivette/src/renderer/ASTinfo.tsx
@@ -11,68 +11,23 @@ import { Text } from 'dome/text/editors';
import { Component } from 'frama-c/LabViews';
// --------------------------------------------------------------------------
-// --- Parsing information from the server
+// --- Information Panel
// --------------------------------------------------------------------------
-function addMarker(buffer: RichTextBuffer, fct: string) {
- buffer.openTextMarker({ id: fct, css: 'color: blue' });
- buffer.append(fct);
- buffer.closeTextMarker();
-}
-
-function parseVarinfo(buffer: RichTextBuffer, data: any) {
- buffer.append(`Variable ${data.name} has type '${data.type.name}'.`);
- buffer.flushline();
- if (data.global) {
- buffer.append('It is a global variable.');
- } else {
- const kind = data.formal ? 'formal' : 'local';
- buffer.append(`It is a ${kind} variable of function `);
- addMarker(buffer, data.defining_function);
- }
- buffer.flushline();
- if (data.temp) {
- const descr = data.descr ? ` for ${data.descr}` : '';
- buffer.append(`This is a temporary variable${descr}.`);
- buffer.flushline();
- }
- const ref = data.referenced ? '' : 'not ';
- const taken = data.addrof ? '' : 'not ';
- buffer.append(`It is ${ref}referenced and its address is ${taken}taken.`);
-}
-
-function parseInfo(buffer: RichTextBuffer, data: any) {
- switch (data.kind) {
- case 'expression':
- buffer.append(`This is a pure C expression of type '${data.type.name}'.`);
- break;
- case 'function':
- addMarker(buffer, data.varinfo.name);
- buffer.append(` is a C function of type '${data.type.name}'.`);
- break;
- case 'variable':
- parseVarinfo(buffer, data.varinfo);
- break;
- case 'lvalue':
- buffer.append(`This is an lvalue of type '${data.type.name}'.`);
- break;
- case 'declaration':
- buffer.append('This is the declaration of variable '
- + `${data.varinfo.name}.`);
- buffer.flushline(); buffer.append(' '); buffer.flushline();
- parseVarinfo(buffer, data.varinfo);
- break;
- case 'statement':
- buffer.append(`This is a statement of function ${data.function}.`);
- break;
- default:
- break;
+const printInfo = (buffer: RichTextBuffer, text: string) => {
+ if (Array.isArray(text)) {
+ const tag = text.shift();
+ if (tag !== '') {
+ buffer.openTextMarker({ id: tag, css: 'color: blue' });
+ }
+ text.forEach((txt) => printInfo(buffer, txt));
+ if (tag !== '') {
+ buffer.closeTextMarker();
+ }
+ } else if (typeof (text) === 'string') {
+ buffer.append(text);
}
-}
-
-// --------------------------------------------------------------------------
-// --- Information Panel
-// --------------------------------------------------------------------------
+};
const ASTinfo = () => {
@@ -84,7 +39,7 @@ const ASTinfo = () => {
React.useEffect(() => {
buffer.clear();
if (data) {
- parseInfo(buffer, data);
+ printInfo(buffer, data);
}
}, [buffer, data]);
diff --git a/src/plugins/server/kernel_ast.ml b/src/plugins/server/kernel_ast.ml
index 9f614e4235a949947e839b07d32463b628eeea33..bc0752aaff159691a1b06fccc3acf9c74a3614e9 100644
--- a/src/plugins/server/kernel_ast.ml
+++ b/src/plugins/server/kernel_ast.ml
@@ -226,23 +226,6 @@ module Kf = Data.Collection
with Not_found -> Data.failure "Undefined function '%s'" key
end)
-
-module TypeId =
- Data.Index (Cil_datatype.Typ.Map)
- (struct
- let page = page
- let name = "type"
- let descr = Md.plain "C Type"
- end)
-
-module VarId =
- Data.Identified (Cil_datatype.Varinfo_Id)
- (struct
- let page = page
- let name = "varinfo"
- let descr = Md.plain "Varinfo"
- end)
-
(* -------------------------------------------------------------------------- *)
(* --- Functions --- *)
(* -------------------------------------------------------------------------- *)
@@ -267,133 +250,72 @@ let () = Request.register ~page
(* --- Information --- *)
(* -------------------------------------------------------------------------- *)
-module TypeInfo = struct
- type record
-
- let record : record Record.signature =
- Record.signature ~page
- ~name:"type" ~descr:(Md.plain "Information about a C type") ()
-
- let id = Record.field record ~name:"id"
- ~descr:(Md.plain "Type id") (module Jint)
- let name = Record.field record ~name:"name"
- ~descr:(Md.plain "Type name") (module Jstring)
- let size = Record.field record ~name:"size"
- ~descr:(Md.plain "Bit size") (module Jint.Joption)
-
- module R = (val (Record.publish record) : Record.S with type r = record)
-
- type t = typ
- let syntax = R.syntax
-
- let getSize typ =
- try Some (Cil.bitsSizeOf typ)
- with Cil.SizeOfError _ -> None
-
- let to_json typ =
- R.default |>
- R.set id (TypeId.get typ) |>
- R.set name (Format.asprintf "%a" Printer.pp_typ typ) |>
- R.set size (getSize typ) |>
- R.to_json
-
- let of_json json =
- let r = R.of_json json in
- try TypeId.find (R.get id r)
- with Not_found -> Data.failure "Unknown type"
-end
+module Info = struct
+ open Printer_tag
-module VarInfo = struct
- type record
-
- let record : record Record.signature =
- Record.signature ~page
- ~name:"varinfo" ~descr:(Md.plain "Information about a variable") ()
-
- let id = Record.field record ~name:"id"
- ~descr:(Md.plain "Variable id") (module Jint)
- let name = Record.field record ~name:"name"
- ~descr:(Md.plain "Variable name") (module Jstring)
- let typ = Record.field record ~name:"type"
- ~descr:(Md.plain "Variable type") (module TypeInfo)
- let fct = Record.field record ~name:"function"
- ~descr:(Md.plain "Is the variable a function?") (module Jbool)
- let global = Record.field record ~name:"global"
- ~descr:(Md.plain "Is the variable global?") (module Jbool)
- let formal = Record.field record ~name:"formal"
- ~descr:(Md.plain "Is the variable formal?") (module Jbool)
- let kf = Record.option record ~name:"defining_function"
- ~descr:(Md.plain "Function defining the variable") (module Kf)
- let addrof = Record.field record ~name:"addrof"
- ~descr:(Md.plain "Is the variable address taken?") (module Jbool)
- let referenced = Record.field record ~name:"referenced"
- ~descr:(Md.plain "Is the variable referenced?") (module Jbool)
- let temp = Record.field record ~name:"temp"
- ~descr:(Md.plain "Is the variable temporary?") (module Jbool)
- let descr = Record.option record ~name:"descr"
- ~descr:(Md.plain "Description of temporary variable") (module Jstring)
-
- module R = (val (Record.publish record) : Record.S with type r = record)
-
- type t = varinfo
- let syntax = R.syntax
-
- let to_json vi =
- R.default |>
- R.set name vi.vname |>
- R.set typ vi.vtype |>
- R.set fct (Cil.isFunctionType vi.vtype) |>
- R.set global vi.vglob |>
- R.set formal vi.vformal |>
- R.set kf (Kernel_function.find_defining_kf vi) |>
- R.set addrof vi.vaddrof |>
- R.set referenced vi.vreferenced |>
- R.set temp vi.vtemp |>
- R.set descr vi.vdescr |>
- R.to_json
-
- let of_json json =
- let r = R.of_json json in
- try VarId.find (R.get id r)
- with Not_found -> Data.failure "Unknown varinfo"
+ let print_function fmt name =
+ let stag = Transitioning.Format.stag_of_string name in
+ Transitioning.Format.pp_open_stag fmt stag;
+ Format.pp_print_string fmt name;
+ Transitioning.Format.pp_close_stag fmt ()
+
+ let print_kf fmt kf = print_function fmt (Kernel_function.get_name kf)
+
+ let print_varinfo fmt vi =
+ Format.fprintf fmt "Variable %s has type %a.@."
+ vi.vname Printer.pp_typ vi.vtype;
+ let kf = Kernel_function.find_defining_kf vi in
+ let pp_kf fmt kf = Format.fprintf fmt " of function %a" print_kf kf in
+ Format.fprintf fmt "It is a %s variable%a.@."
+ (if vi.vglob then "global" else if vi.vformal then "formal" else "local")
+ (Transitioning.Format.pp_print_option pp_kf) kf;
+ if vi.vtemp then
+ Format.fprintf fmt "This is a temporary variable%s.@."
+ (match vi.vdescr with None -> "" | Some descr -> descr);
+ Format.fprintf fmt "It is %sreferenced and its address is %staken.@."
+ (if vi.vreferenced then "" else "not ")
+ (if vi.vaddrof then "" else "not ")
+
+ let print_lvalue fmt _loc = function
+ | Var vi, NoOffset ->
+ if Cil.isFunctionType vi.vtype
+ then
+ Format.fprintf fmt "%a is a C function of type %a.@."
+ print_function vi.vname Printer.pp_typ vi.vtype
+ else print_varinfo fmt vi
+ | lval ->
+ Format.fprintf fmt "This is an lvalue of type %a.@."
+ Printer.pp_typ (Cil.typeOfLval lval)
+
+ let print_localizable fmt = function
+ | PExp (_, _, e) ->
+ Format.fprintf fmt "This is a pure C expression of type %a.@."
+ Printer.pp_typ (Cil.typeOf e)
+ | PLval (_, _, lval) as loc -> print_lvalue fmt loc lval
+ | PVDecl (_, _, vi) ->
+ Format.fprintf fmt "This is the declaration of variable %a.@.@."
+ Printer.pp_varinfo vi;
+ print_varinfo fmt vi
+ | PStmt (kf, _) | PStmtStart (kf, _) ->
+ Format.fprintf fmt "This is a statement of function %a@." print_kf kf
+ | _ -> ()
+
+ let get_marker_info marker =
+ try
+ let loc = Marker.lookup marker in
+ let buffer = Jbuffer.create () in
+ print_localizable (Jbuffer.formatter buffer) loc;
+ Jbuffer.flush buffer ();
+ Jbuffer.contents buffer
+ with Not_found -> Data.failure "not a localizable marker"
end
-module Info = struct
- type record
-
- let record : record Record.signature =
- Record.signature ~page ~name:"information"
- ~descr:(Md.plain "Information about an AST marker") ()
-
- let kind = Record.field record ~name:"kind" ~descr:(Md.plain "Kind")
- (module MarkerKind)
- let typ = Record.option record ~name:"type" ~descr:(Md.plain "Type")
- (module TypeInfo)
- let kf = Record.option record ~name:"function" ~descr:(Md.plain "Function")
- (module Kf)
- let varinfo = Record.option record ~name:"varinfo"
- ~descr:(Md.plain "Varinfo information")
- (module VarInfo)
-
- module R = (val (Record.publish record) : Record.S with type r = record)
-
- type t = Printer_tag.localizable
- let syntax = R.syntax
-
- let to_json (loc: t) =
- R.default |>
- R.set kind loc |>
- R.set typ (Printer_tag.typ_of_localizable loc) |>
- R.set kf (Printer_tag.kf_of_localizable loc) |>
- R.set varinfo (Printer_tag.varinfo_of_localizable loc) |>
- R.to_json
-end
let () = Request.register ~page
~kind:`GET ~name:"kernel.ast.info"
~descr:(Md.plain "Get information about a marker")
- ~input:(module Jstring) ~output:(module Info)
- Marker.lookup
+ ~input:(module Jstring) ~output:(module Jtext)
+ Info.get_marker_info
(* -------------------------------------------------------------------------- *)
(* --- Files --- *)