From 9b98866d49c7cdad7e2739f05abaf1f3a6b743b4 Mon Sep 17 00:00:00 2001
From: Linda-Njau <111066204+Linda-Njau@users.noreply.github.com>
Date: Tue, 20 Aug 2024 23:32:30 +0300
Subject: [PATCH] Fix name and description extraction (#38)

Instructions with fewer than two inputs were missing their names and descriptions in the JSON output.

```
union clause ast = C_J : (bits(11))
```
```
union clause ast = EBREAK : unit
```

By moving the code blocks responsible for parsing and extracting names and descriptions from the tuple match block, all instructions now have their names and descriptions correctly extracted.
---
 src/sail_json_backend/json.ml | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/sail_json_backend/json.ml b/src/sail_json_backend/json.ml
index 29bee37c9..760980758 100644
--- a/src/sail_json_backend/json.ml
+++ b/src/sail_json_backend/json.ml
@@ -364,6 +364,14 @@ let parse_type_union i ucl =
   match ucl with
   | Tu_aux (Tu_ty_id (c, d), annot) ->
       debug_print ~printer:prerr_string ("Tu_ty_id " ^ string_of_id d ^ "(");
+      List.iter
+        (fun attr ->
+          match attr with _, "name", Some (AD_aux (AD_string s, _)) -> Hashtbl.add names (string_of_id d) s | _ -> ()
+        )
+        annot.attrs;
+      begin
+        match annot.doc_comment with None -> () | Some s -> Hashtbl.add descriptions (string_of_id d) s
+      end;
       begin
         match c with
         | Typ_aux (Typ_tuple x, _) ->
@@ -375,17 +383,7 @@ let parse_type_union i ucl =
               )
               x;
             let l = List.map string_of_typ x in
-            Hashtbl.add sigs (string_of_id d) l;
-            List.iter
-              (fun attr ->
-                match attr with
-                | _, "name", Some (AD_aux (AD_string s, _)) -> Hashtbl.add names (string_of_id d) s
-                | _ -> ()
-              )
-              annot.attrs;
-            begin
-              match annot.doc_comment with None -> () | Some s -> Hashtbl.add descriptions (string_of_id d) s
-            end
+            Hashtbl.add sigs (string_of_id d) l
         | Typ_aux (Typ_id i, _) -> Hashtbl.add sigs (string_of_id d) [string_of_id i]
         | Typ_aux (Typ_app (i, _), _) ->
             debug_print (string_of_typ c);