mirror of
https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git
synced 2024-12-22 08:14:09 -08:00
Fix minor bugs
This commit is contained in:
parent
8bfcb5f086
commit
7aaf67d16f
|
@ -233,6 +233,7 @@ public class JavaScriptTarget implements TeaVMTarget, TeaVMJavaScriptHost {
|
|||
}
|
||||
RenderingContext renderingContext = new RenderingContext(debugEmitterToUse, classes,
|
||||
controller.getClassLoader(), controller.getServices(), controller.getProperties(), naming);
|
||||
renderingContext.setMinifying(minifying);
|
||||
Renderer renderer = new Renderer(sourceWriter, asyncMethods, asyncFamilyMethods,
|
||||
controller.getDiagnostics(), renderingContext);
|
||||
renderer.setProperties(controller.getProperties());
|
||||
|
|
|
@ -454,8 +454,8 @@ public class StatementRenderer implements ExprVisitor, StatementVisitor {
|
|||
}
|
||||
|
||||
private String generateVariableName(int index) {
|
||||
if (index == 0) {
|
||||
return minifying ? "$t" : "$this";
|
||||
if (index == 0 && minifying) {
|
||||
return "$t";
|
||||
}
|
||||
|
||||
if (!minifying) {
|
||||
|
|
|
@ -1,8 +1,18 @@
|
|||
<!-- Copyright 2014 Alexey Andreev. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
|
||||
file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
|
||||
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS
|
||||
IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language
|
||||
governing permissions and limitations under the License. -->
|
||||
<!--
|
||||
~ Copyright 2016 Alexey Andreev.
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
@ -129,8 +139,9 @@
|
|||
<targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
|
||||
<mainClass>org.teavm.samples.benchmark.teavm.BenchmarkStarter</mainClass>
|
||||
<runtime>SEPARATE</runtime>
|
||||
<minifying>false</minifying>
|
||||
<minifying>true</minifying>
|
||||
<debugInformationGenerated>true</debugInformationGenerated>
|
||||
<optimizationLevel>FULL</optimizationLevel>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
|
|
|
@ -80,11 +80,11 @@ public final class TeaVMRunner {
|
|||
options.addOption(OptionBuilder
|
||||
.withDescription("Generate debug information")
|
||||
.withLongOpt("debug")
|
||||
.create('D'));
|
||||
.create('g'));
|
||||
options.addOption(OptionBuilder
|
||||
.withDescription("Generate source maps")
|
||||
.withLongOpt("sourcemaps")
|
||||
.create('S'));
|
||||
.create('G'));
|
||||
options.addOption(OptionBuilder
|
||||
.withDescription("Incremental build")
|
||||
.withLongOpt("incremental")
|
||||
|
|
|
@ -432,7 +432,7 @@ public class TeaVMTool implements BaseTeaVMTool {
|
|||
}
|
||||
|
||||
if (targetType == TeaVMTargetType.JAVASCRIPT) {
|
||||
try (OutputStream output = buildTarget.createResource(outputName)) {
|
||||
try (OutputStream output = new FileOutputStream(new File(targetDirectory, outputName), true)) {
|
||||
Writer writer = new OutputStreamWriter(output, "UTF-8");
|
||||
additionalJavaScriptOutput(writer);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user