Updates symbol serialization in all Location subclasses in Scanner (#214

) Followup to #213, this PR fixes symbol serialization in all `Location` subclasses.
ucr-riple · Nov 17, 2023 · a134f7c · a134f7c
1 parent e085b64
commit a134f7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/annotator-scanner/src/main/java/edu/ucr/cs/riple/scanner/location/FieldLocation.java b/annotator-scanner/src/main/java/edu/ucr/cs/riple/scanner/location/FieldLocation.java
@@ -23,6 +23,7 @@
 package edu.ucr.cs.riple.scanner.location;
 
 import com.sun.tools.javac.code.Symbol;
+import edu.ucr.cs.riple.scanner.Serializer;
 import javax.lang.model.element.ElementKind;
 
 /**
@@ -44,9 +45,9 @@ public String tabSeparatedToString() {
     return String.join(
         "\t",
         type.toString(),
-        enclosingClass.flatName(),
+        Serializer.serializeSymbol(enclosingClass),
         "null",
-        variableSymbol.toString(),
+        Serializer.serializeSymbol(variableSymbol),
         "null",
         path != null ? path.toString() : "null");
   }

diff --git a/annotator-scanner/src/main/java/edu/ucr/cs/riple/scanner/location/MethodLocation.java b/annotator-scanner/src/main/java/edu/ucr/cs/riple/scanner/location/MethodLocation.java
@@ -23,6 +23,7 @@
 package edu.ucr.cs.riple.scanner.location;
 
 import com.sun.tools.javac.code.Symbol;
+import edu.ucr.cs.riple.scanner.Serializer;
 import javax.lang.model.element.ElementKind;
 
 /**
@@ -44,8 +45,8 @@ public String tabSeparatedToString() {
     return String.join(
         "\t",
         type.toString(),
-        enclosingClass.flatName(),
-        enclosingMethod.toString(),
+        Serializer.serializeSymbol(enclosingClass),
+        Serializer.serializeSymbol(enclosingMethod),
         "null",
         "null",
         path != null ? path.toString() : "null");

diff --git a/...ator-scanner/src/main/java/edu/ucr/cs/riple/scanner/location/MethodParameterLocation.java b/...ator-scanner/src/main/java/edu/ucr/cs/riple/scanner/location/MethodParameterLocation.java
@@ -66,7 +66,7 @@ public String tabSeparatedToString() {
     return String.join(
         "\t",
         type.toString(),
-        enclosingClass.flatName(),
+        Serializer.serializeSymbol(enclosingClass),
         Serializer.serializeSymbol(enclosingMethod),
         Serializer.serializeSymbol(paramSymbol),
         String.valueOf(index),