azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refactoring in JavaModuleInfo

Browse Source 
Remove unused declarations
This commit is contained in:
Alexander Udalov
2017-06-21 20:58:12 +03:00
parent fd0658e0f4
commit 69efb81a12
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleGraph.kt
+3 -3
View File
@@ -29,9 +29,9 @@ class JavaModuleGraph(finder: JavaModuleFinder) {
fun dfs(module: String) { fun dfs(module: String) {
if (!visited.add(module)) return if (!visited.add(module)) return
val moduleInfo = moduleInfo(module) ?: return val moduleInfo = moduleInfo(module) ?: return
for (dependency in moduleInfo.requires) { for ((moduleName, isTransitive) in moduleInfo.requires) {
if (dependency.isTransitive) { if (isTransitive) {
dfs(dependency.moduleName) dfs(moduleName)
} }
} }
} }
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/modules/JavaModuleInfo.kt
+4 -6
View File
@@ -31,11 +31,9 @@ class JavaModuleInfo(
val requires: List<Requires>, val requires: List<Requires>,
val exports: List<Exports> val exports: List<Exports>
) { ) {
data class Requires(val moduleName: String, val flags: Int) { data class Requires(val moduleName: String, val isTransitive: Boolean)
val isTransitive get() = (flags and ACC_TRANSITIVE) != 0
}
data class Exports(val packageFqName: FqName, val flags: Int, val toModules: List<String>) data class Exports(val packageFqName: FqName, val toModules: List<String>)
override fun toString(): String = override fun toString(): String =
"Module $moduleName (${requires.size} requires, ${exports.size} exports)" "Module $moduleName (${requires.size} requires, ${exports.size} exports)"
@@ -54,11 +52,11 @@ class JavaModuleInfo(
return object : ModuleVisitor(Opcodes.ASM6) { return object : ModuleVisitor(Opcodes.ASM6) {
override fun visitRequire(module: String, access: Int, version: String?) { override fun visitRequire(module: String, access: Int, version: String?) {
requires.add(Requires(module, access)) requires.add(Requires(module, (access and ACC_TRANSITIVE) != 0))
} }
override fun visitExport(packageFqName: String, access: Int, modules: Array<String>?) { override fun visitExport(packageFqName: String, access: Int, modules: Array<String>?) {
exports.add(Exports(FqName(packageFqName), access, modules?.toList().orEmpty())) exports.add(Exports(FqName(packageFqName), modules?.toList().orEmpty()))
} }
} }
} }