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

Rename ModuleScriptData -> ModuleChunk and refactor related code

Browse Source 
Use the term "build file" instead of the old "module"/"module script"
This commit is contained in:
Alexander Udalov
2017-09-22 13:29:03 +03:00
parent f3f8db989a
commit 613297ad60
6 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java → compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleChunk.java
+3 -3
View File
@@ -22,12 +22,12 @@ import org.jetbrains.kotlin.modules.Module;
import java.util.Collections;
import java.util.List;
public class ModuleScriptData {
public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.emptyList());
public class ModuleChunk {
public static final ModuleChunk EMPTY = new ModuleChunk(Collections.emptyList());
private final List<Module> modules;
public ModuleScriptData(@NotNull List<Module> modules) {
public ModuleChunk(@NotNull List<Module> modules) {
this.modules = modules;
}
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java
+5 -6
View File
@@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil;
import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil;
import org.jetbrains.kotlin.modules.JavaRootPath;
import org.jetbrains.kotlin.modules.Module;
import org.xml.sax.Attributes;
@@ -55,7 +54,7 @@ public class ModuleXmlParser {
public static final String MODULAR_JDK_ROOT = "modularJdkRoot";
@NotNull
public static ModuleScriptData parseModuleScript(
public static ModuleChunk parseModuleScript(
@NotNull String xmlFile,
@NotNull MessageCollector messageCollector
) {
@@ -67,7 +66,7 @@ public class ModuleXmlParser {
}
catch (FileNotFoundException e) {
MessageCollectorUtil.reportException(messageCollector, e);
return ModuleScriptData.EMPTY;
return ModuleChunk.EMPTY;
}
finally {
StreamUtil.closeStream(stream);
@@ -86,7 +85,7 @@ public class ModuleXmlParser {
this.currentState = currentState;
}
private ModuleScriptData parse(@NotNull InputStream xml) {
private ModuleChunk parse(@NotNull InputStream xml) {
try {
setCurrentState(initial);
SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
@@ -97,7 +96,7 @@ public class ModuleXmlParser {
return currentState;
}
});
return new ModuleScriptData(modules);
return new ModuleChunk(modules);
}
catch (ParserConfigurationException | IOException e) {
MessageCollectorUtil.reportException(messageCollector, e);
@@ -105,7 +104,7 @@ public class ModuleXmlParser {
catch (SAXException e) {
messageCollector.report(ERROR, "Build file does not have a valid XML: " + e, null);
}
return ModuleScriptData.EMPTY;
return ModuleChunk.EMPTY;
}
private final DefaultHandler initial = new DefaultHandler() {