Use '$' instead of '-' in package part class names

Otherwise some tools break (e.g. CheckMethodAdapter in ASM, used in generic
signature writer) because they expect class names to be Java identifiers.

Some tests fixed, some will be fixed in future commits
This commit is contained in:
Alexander Udalov
2014-09-22 11:43:30 +04:00
parent e3876624d8
commit c57441b51b
69 changed files with 148 additions and 135 deletions
@@ -26,8 +26,8 @@ class MyDelegateThrowsException {
}
// PRINT_FRAME
frame = main():8, DelegatedPropertyInClassPackage-@packagePartHASH {delegatedPropertyInClass}
static = static = delegatedPropertyInClass.DelegatedPropertyInClassPackage-@packagePartHASH
frame = main():8, DelegatedPropertyInClassPackage$@packagePartHASH {delegatedPropertyInClass}
static = static = delegatedPropertyInClass.DelegatedPropertyInClassPackage$@packagePartHASH
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID}
local = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID}
field = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID}
@@ -22,8 +22,8 @@ fun A.foo() {
// EXPRESSION: prop
// RESULT: 1: I
frame = foo():13, FrameExtensionFunPackage-@packagePartHASH {frameExtensionFun}
static = static = frameExtensionFun.FrameExtensionFunPackage-@packagePartHASH
frame = foo():13, FrameExtensionFunPackage$@packagePartHASH {frameExtensionFun}
static = static = frameExtensionFun.FrameExtensionFunPackage$@packagePartHASH
local = $receiver: frameExtensionFun.A = {frameExtensionFun.A@uniqueID}
field = prop: int = 1
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
@@ -30,8 +30,8 @@ fun main(args: Array<String>) {
// EXPRESSION: val1 + topVal1
// RESULT: 2: I
frame = main():9, FrameSimplePackage-@packagePartHASH {frameSimple}
static = static = frameSimple.FrameSimplePackage-@packagePartHASH
frame = main():9, FrameSimplePackage$@packagePartHASH {frameSimple}
static = static = frameSimple.FrameSimplePackage$@packagePartHASH
field = topVal1: int = 1
local = args: java.lang.String[] = {java.lang.String[0]@uniqueID}
local = val1: int = 1