From 257a5a6443acd38c874fb0cd14a17a50894a1c21 Mon Sep 17 00:00:00 2001
From: Anil Koyuncu <koyuncu.anil@gmail.com>
Date: Thu, 22 Feb 2018 15:47:22 +0100
Subject: [PATCH] minor modifications on canonical form

---
 .../violations/FixedViolationHunkParser.java          | 11 ++++++-----
 .../lu/uni/serval/gumtree/regroup/SimplifyTree.java   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java b/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java
index 29bbcde..7056ea0 100644
--- a/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java
+++ b/src/main/java/edu/lu/uni/serval/FixPatternParser/violations/FixedViolationHunkParser.java
@@ -8,6 +8,7 @@ import java.util.Map;
 
 import com.github.gumtreediff.tree.ITree;
 
+import edu.lu.uni.serval.FixPatternParser.Tokenizer;
 import edu.lu.uni.serval.config.Configuration;
 import edu.lu.uni.serval.diffentry.DiffEntryHunk;
 import edu.lu.uni.serval.diffentry.DiffEntryReader;
@@ -139,17 +140,17 @@ public class FixedViolationHunkParser extends FixedViolationParser {
 				}
 
 				String patchPosition = "\n" + revFile.getName() + "\n@@ -" + bugStartLine + ", " + bugEndLine + " +" + fixStartLine + ", " + fixEndLine + "@@\n";
-				String info = Configuration.PATCH_SIGNAL + "\n" + patchPosition + patchHunk.getHunk() + "\nAST Diff###:\n" + getAstEditScripts(hunkActionSets, bugEndPosition, fixEndPosition) + "\n";
+//				String info = Configuration.PATCH_SIGNAL + "\n" + patchPosition + patchHunk.getHunk() + "\nAST Diff###:\n" + getAstEditScripts(hunkActionSets, bugEndPosition, fixEndPosition) + "\n";
 //TODO uncomment the line below for more detailed gumtree input.
-				//				String info = Configuration.PATCH_SIGNAL + "\n" + patchPosition + patchHunk.getHunk() + "\nAST Diff###:\n" + getAstEditScripts(hunkActionSets) + "\n";
+								String info = Configuration.PATCH_SIGNAL + "\n" + patchPosition + patchHunk.getHunk() + "\nAST Diff###:\n" + getAstEditScripts(hunkActionSets) + "\n";
 //				if (noUpdate(editScriptTokens)) {
 //				}
 
 				String canonicalVariableNames = getBuggyCodeTree(patchHunk, prevFile, revFile);
 				this.patchesSourceCode += info;
-				this.patchesSourceCode += "\nRenamed_Variables###:" + canonicalVariableNames;
-//				this.sizes += size + "\n";
-//				this.astEditScripts += astEditScripts + "\n";
+				this.patchesSourceCode += "\nRenamed_Variables###:\n" + canonicalVariableNames;
+				this.sizes += size + "\n";
+				this.astEditScripts += astEditScripts + "\n";
 //				String tokens = Tokenizer.getTokensDeepFirst(simpleTree).trim();
 //				this.tokensOfSourceCode += tokens + "\n";
 			}
diff --git a/src/main/java/edu/lu/uni/serval/gumtree/regroup/SimplifyTree.java b/src/main/java/edu/lu/uni/serval/gumtree/regroup/SimplifyTree.java
index 3dac976..317bf18 100644
--- a/src/main/java/edu/lu/uni/serval/gumtree/regroup/SimplifyTree.java
+++ b/src/main/java/edu/lu/uni/serval/gumtree/regroup/SimplifyTree.java
@@ -507,7 +507,7 @@ public class SimplifyTree {
 	}
 
 	private String canonicalizeVariable(String label, String typeStr) {
-		String key = label + "_" + typeStr;
+		String key = label + ":" + typeStr;
 		if (canonicalVariableMap.containsKey(key)) {
 			label = canonicalVariableMap.get(key);
 		} else {