Merge branch 'xjtu-enre:main' into main

xjtu-enre · Mar 5, 2024 · 89859eb · 89859eb
2 parents e512917 + c1abf5a
commit 89859eb
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/src/main/java/TempOutput/JsonString.java b/src/main/java/TempOutput/JsonString.java
@@ -199,6 +199,14 @@ public static JSONObject JSONWriteRelation(Map<Integer, ArrayList<Tuple<Integer,
                     enhanceObj.put("isAbstract", ((MethodEntity) entity).getIndices().getMethodIsAbstract());
                     entityObj.accumulate("enhancement", enhanceObj);
                 }
+
+                // method block loc
+                JSONObject methodBlock = new JSONObject();
+                methodBlock.put("startLine", entity.getLocation().getStartLine());
+                methodBlock.put("endLine", entity.getLocation().getEndLine());
+                methodBlock.put("startColumn", entity.getLocation().getStartColumn());
+                methodBlock.put("endColumn", entity.getLocation().getEndColumn());
+                entityObj.accumulate("blockLoc", methodBlock);
             }
             //bin path
             if (entity.getBinPath()!= null){

diff --git a/src/main/java/entity/MethodEntity.java b/src/main/java/entity/MethodEntity.java
@@ -30,6 +30,8 @@ public void setLambda(boolean lambda) {
     //record the id of blocks in method
     protected ArrayList<Block> blocks = new ArrayList<>();
 
+    Location blockLoc = new Location();
+
     //record the initial local var name
     protected ArrayList<VariableEntity> localVars = new ArrayList<>();
 
@@ -153,6 +155,14 @@ public ArrayList<VariableEntity> getLocalVars(){
 //        }
 //    }
 
+    public Location getBlockLoc(){
+        return this.blockLoc;
+    }
+
+    public void setBlockLoc(Location loc){
+        this.blockLoc = loc;
+    }
+
     public HashMap<String, String> getName2Role(){ return this.name2Role; }
 
     public void addName2Role (String name, String role){

diff --git a/src/main/java/entity/dto/MethodEntityDTO.java b/src/main/java/entity/dto/MethodEntityDTO.java
@@ -15,6 +15,8 @@ public class MethodEntityDTO extends InternalEntityDTO {
   private String hidden;
   private ICCMethodAttributeDTO iccMethodAttribute;
 
+  private LocationDTO blockLoc;
+
   public MethodEntityDTO() {
   }
 
@@ -26,7 +28,8 @@ public MethodEntityDTO(
       LocationDTO location,
       String modifiers,
       ParameterDTO parameter,
-      String rawType) {
+      String rawType,
+      LocationDTO blockLoc) {
     super(parentId, "Method");
     this.File = file;
     this.additionalBin = additionalBin;
@@ -35,6 +38,7 @@ public MethodEntityDTO(
     this.modifiers = modifiers;
     this.parameter = parameter;
     this.rawType = rawType;
+    this.blockLoc = blockLoc;
   }
 
   public MethodEntityDTO(
@@ -49,7 +53,8 @@ public MethodEntityDTO(
       String modifiers,
       ParameterDTO parameter,
       String rawType,
-      ICCMethodAttributeDTO iccMethodAttribute) {
+      ICCMethodAttributeDTO iccMethodAttribute,
+      LocationDTO blockLoc) {
     super(id, name, qualifiedName, parentId, "Method");
     this.File = file;
     this.additionalBin = additionalBin;
@@ -59,6 +64,7 @@ public MethodEntityDTO(
     this.parameter = parameter;
     this.rawType = rawType;
     this.iccMethodAttribute = iccMethodAttribute;
+    this.blockLoc = blockLoc;
   }
 
   public MethodEntityDTO(
@@ -74,7 +80,8 @@ public MethodEntityDTO(
           ParameterDTO parameter,
           String rawType,
           String hidden,
-          ICCMethodAttributeDTO iccMethodAttribute) {
+          ICCMethodAttributeDTO iccMethodAttribute,
+          LocationDTO blockLoc) {
     super(id, name, qualifiedName, parentId, "Method");
     this.File = file;
     this.additionalBin = additionalBin;
@@ -85,6 +92,7 @@ public MethodEntityDTO(
     this.rawType = rawType;
     this.hidden = hidden;
     this.iccMethodAttribute = iccMethodAttribute;
+    this.blockLoc = blockLoc;
   }
 
   public String getHidden() {
@@ -152,6 +160,12 @@ public void setRawType(String rawType) {
     this.rawType = rawType;
   }
 
+  public LocationDTO getBlockLoc(){return blockLoc; }
+
+  public void setBlockLoc(LocationDTO blockLoc) {
+    this.blockLoc = blockLoc;
+  }
+
   public static class EnhancementDTO {
 
     private Boolean isGetter;

diff --git a/src/main/java/util/EnreFormatParser.java b/src/main/java/util/EnreFormatParser.java
@@ -214,6 +214,7 @@ private static EntityDTO parseEntityDTO(JSONObject variableObj) {
       String hidden = (String) get(variableObj, "hidden");
       AdditionalBinDTO additionalBinDTO = parseAdditionalBinDTO(variableObj);
       LocationDTO locationDTO = parseLocationDTO(variableObj, "location");
+      LocationDTO blockLocDTO = parseLocationDTO(variableObj, "blockLoc");
       ICCMethodAttributeDTO iccMethodAttributeDTO = parseICCMethodAttributeDTO(variableObj);
       ICCVariableAttributeDTO iccVariableAttributeDTO = parseICCVariableAttributeDTO(variableObj);
       ComponentDTO componentDTO = parseComponentDTO(variableObj);
@@ -327,7 +328,8 @@ private static EntityDTO parseEntityDTO(JSONObject variableObj) {
                   parameterDTO,
                   rawType,
                   hidden,
-                  iccMethodAttributeDTO);
+                  iccMethodAttributeDTO,
+                  blockLocDTO);
           break;
         case "Module":
           res = null;

diff --git a/src/main/java/visitor/ProcessEntity.java b/src/main/java/visitor/ProcessEntity.java
@@ -492,12 +492,12 @@ public int processMethod(MethodDeclaration node,int parentTypeId, CompilationUni
         String methodName = node.getName().getIdentifier();
         String methodQualifiedName = singleCollect.getEntityById(parentTypeId).getQualifiedName() + "." + methodName;
 
-
         MethodEntity methodEntity = new MethodEntity(methodId,methodName);
         methodEntity.setQualifiedName(methodQualifiedName);
         methodEntity.setParentId(parentTypeId);
         methodEntity.setLocation(supplement_location(cu, node.getStartPosition(), node.getLength()));
         //methodEntity.setCodeSnippet(node.toString());
+        methodEntity.setBlockLoc(supplement_location(cu, node.getBody().getStartPosition(), node.getBody().getLength()));
 
         if(node.isConstructor()){
             methodEntity.setConstructor(true);