Fix the bug of mapping ast node types.

2017-08-05 20:43:15 +02:00
parent 21d55e82da
commit 5b8ca570cd
1 changed files with 10 additions and 5 deletions
@@ -83,11 +83,16 @@ public class HierarchicalRegrouper {
 			int index = actStrFrag.lastIndexOf(" ") + 1;
 			String nodeType = actStrFrag.substring(index);
 			if (!"".equals(nodeType)) {
-				try {
-					String type = ASTNodeMap.map.get(Integer.parseInt(nodeType));
-					nodeType = type;
-				} catch (NumberFormatException e) {
-//					nodeType = actStrFrag.substring(index);
+				if (Character.isDigit(nodeType.charAt(0)) || nodeType.startsWith("-")) {
+					try {
+						int typeInt = Integer.parseInt(nodeType);
+						if (ASTNodeMap.map.containsKey(typeInt)) {
+							String type = ASTNodeMap.map.get(Integer.parseInt(nodeType));
+							nodeType = type;
+						}
+					} catch (NumberFormatException e) {
+						nodeType = actStrFrag.substring(index);
+					}
 				}
 			}
 			actStrFrag = actStrFrag.substring(0, index) + nodeType + "@@";