From 0d3888a5ff40addaf87d5f82dc27778b746911b8 Mon Sep 17 00:00:00 2001
From: Saurabh Sinha <sinhas@us.ibm.com>
Date: Tue, 23 Apr 2024 17:12:24 -0400
Subject: [PATCH] Added signature field to Callable; broadened handled
 exception types for expression resolution

Signed-off-by: Saurabh Sinha <sinha108@gmail.com>
---
 src/main/java/com/ibm/northstar/SymbolTable.java       | 5 ++++-
 src/main/java/com/ibm/northstar/entities/Callable.java | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ibm/northstar/SymbolTable.java b/src/main/java/com/ibm/northstar/SymbolTable.java
index 8e68981f..226dc571 100644
--- a/src/main/java/com/ibm/northstar/SymbolTable.java
+++ b/src/main/java/com/ibm/northstar/SymbolTable.java
@@ -252,6 +252,9 @@ private static Pair<String, Callable> processCallableDeclaration(CallableDeclara
                                                                      List<String> classFields, String typeName) {
         Callable callableNode = new Callable();
 
+        // add callable signature
+        callableNode.setSignature(callableDecl.getSignature().asString());
+
         // add comment associated with method/constructor
         callableNode.setComment(callableDecl.getComment().isPresent() ? callableDecl.getComment().get().asString() : "");
 
@@ -435,7 +438,7 @@ private static String resolveExpression(Expression expression) {
             if (resolvedType.isReferenceType() || resolvedType.isUnionType()) {
                 return resolvedType.describe();
             }
-        } catch (UnsolvedSymbolException | IllegalStateException exception) {
+        } catch (RuntimeException exception) {
             Log.warn("Could not resolve expression: "+expression+"\n"+exception.getMessage());
         }
         return "";
diff --git a/src/main/java/com/ibm/northstar/entities/Callable.java b/src/main/java/com/ibm/northstar/entities/Callable.java
index b623e991..27a18b2e 100644
--- a/src/main/java/com/ibm/northstar/entities/Callable.java
+++ b/src/main/java/com/ibm/northstar/entities/Callable.java
@@ -6,6 +6,7 @@
 
 @Data
 public class Callable {
+    private String signature;
     private String comment;
     private List<String> annotations;
     private List<String> modifiers;