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
@@ -5,4 +5,4 @@ fun simpleFoo(s: Int = 111) {
}
// 1 BIPUSH 111
// 1 INVOKESTATIC foo/FooPackage-.*\.simpleFoo\$default \(II\)V
// 1 INVOKESTATIC foo/FooPackage.+\.simpleFoo\$default \(II\)V
@@ -3,5 +3,5 @@ fun foo() {
}
// assert function will be inlined, and we assure that there are no calls via package part, but is call via package facade in inlined code
// 0 INVOKESTATIC kotlin\/KotlinPackage-[^-]+-[^-]+.getASSERTIONS_ENABLED \(\)Z
// 1 INVOKESTATIC kotlin\/KotlinPackage.getASSERTIONS_ENABLED \(\)Z
// 0 INVOKESTATIC kotlin\/KotlinPackage.+\.getASSERTIONS_ENABLED \(\)Z
// 1 INVOKESTATIC kotlin\/KotlinPackage\.getASSERTIONS_ENABLED \(\)Z
@@ -1,4 +1,4 @@
fun foo(a: Int = 1) {}
//0 _DefaultPackage.foo
//3 INVOKESTATIC _DefaultPackage-
// 0 _DefaultPackage.foo
// 3 INVOKESTATIC _DefaultPackage.+
@@ -24,4 +24,3 @@ fun bar2(x : Season) : String {
}
// 2 TABLESWITCH
// 1 @_DefaultPackage-expression-.*\$WhenMappings\.class
@@ -19,4 +19,3 @@ fun box() : String {
}
// 1 LOOKUPSWITCH
// 1 @_DefaultPackage-functionLiteralInTopLevel-[a-z0-9]+\$WhenMappings.class
@@ -33,4 +33,3 @@ class A {
}
// 2 TABLESWITCH
// 1 @abc/foo/A\$WhenMappings\.class
@@ -28,4 +28,3 @@ fun bar2(x : Season) : String {
}
// 2 TABLESWITCH
// 1 @_DefaultPackage-withoutElse-.*\$WhenMappings\.class