Mercurial > hg > truffle
changeset 17255:c53ff2dc8284
Truffle: aligned expansion logger to changed Graal type name API.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 29 Sep 2014 18:39:05 +0200 |
parents | 11db1a51607c |
children | 88d5fd9e1a6c |
files | graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java |
diffstat | 1 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java Mon Sep 29 18:39:05 2014 +0200 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/TruffleExpansionLogger.java Mon Sep 29 18:39:05 2014 +0200 @@ -137,15 +137,16 @@ className = className.substring(lastIndex + 1, className.length()); } - lastIndex = className.lastIndexOf('$'); - if (lastIndex != -1) { - className = className.substring(lastIndex + 1, className.length()); - } + className = extractInnerClassName(className); String constantType = ""; if (targetReceiverType != null) { - if (!targetReceiverType.getName().equals(className)) { - constantType = "<" + targetReceiverType.getName() + ">"; + String javaName = targetReceiverType.toJavaName(false); + + javaName = extractInnerClassName(javaName); + + if (!javaName.equals(className)) { + constantType = "<" + javaName + ">"; } } @@ -164,6 +165,14 @@ } } + private static String extractInnerClassName(String className) { + int lastIndex = className.lastIndexOf('$'); + if (lastIndex != -1) { + return className.substring(lastIndex + 1, className.length()); + } + return className; + } + private static String formatSource(StackTraceElement e) { if (e == null) { return "";