From 55158c9e136add0581e58fa2dffbad46136d9ce9 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Sat, 26 Nov 2016 23:28:38 +0300 Subject: [PATCH] Move textual IR related things to a separate package --- .../src/main/java/org/teavm/ast/decompilation/Decompiler.java | 2 +- .../java/org/teavm/dependency/DependencyGraphBuilder.java | 2 +- .../teavm/model/{util => text}/InstructionStringifier.java | 4 ++-- .../java/org/teavm/model/{util => text}/ListingBuilder.java | 4 ++-- .../java/org/teavm/model/{util => text}/ListingLexer.java | 2 +- .../org/teavm/model/{util => text}/ListingParseException.java | 2 +- .../java/org/teavm/model/{util => text}/ListingParser.java | 2 +- .../java/org/teavm/model/{util => text}/ListingToken.java | 2 +- core/src/main/java/org/teavm/vm/TeaVM.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename core/src/main/java/org/teavm/model/{util => text}/InstructionStringifier.java (99%) rename core/src/main/java/org/teavm/model/{util => text}/ListingBuilder.java (98%) rename core/src/main/java/org/teavm/model/{util => text}/ListingLexer.java (99%) rename core/src/main/java/org/teavm/model/{util => text}/ListingParseException.java (96%) rename core/src/main/java/org/teavm/model/{util => text}/ListingParser.java (95%) rename core/src/main/java/org/teavm/model/{util => text}/ListingToken.java (97%) diff --git a/core/src/main/java/org/teavm/ast/decompilation/Decompiler.java b/core/src/main/java/org/teavm/ast/decompilation/Decompiler.java index a6f0f361c..527cfbbfb 100644 --- a/core/src/main/java/org/teavm/ast/decompilation/Decompiler.java +++ b/core/src/main/java/org/teavm/ast/decompilation/Decompiler.java @@ -65,8 +65,8 @@ import org.teavm.model.Program; import org.teavm.model.TextLocation; import org.teavm.model.TryCatchBlock; import org.teavm.model.ValueType; +import org.teavm.model.text.ListingBuilder; import org.teavm.model.util.AsyncProgramSplitter; -import org.teavm.model.util.ListingBuilder; import org.teavm.model.util.ProgramUtils; import org.teavm.model.util.TypeInferer; diff --git a/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java b/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java index 60df1b718..0bd3a6776 100644 --- a/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java +++ b/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java @@ -55,7 +55,7 @@ import org.teavm.model.instructions.AssignInstruction; import org.teavm.model.instructions.InstructionReader; import org.teavm.model.instructions.InvocationType; import org.teavm.model.instructions.NullConstantInstruction; -import org.teavm.model.util.ListingBuilder; +import org.teavm.model.text.ListingBuilder; class DependencyGraphBuilder { private DependencyChecker dependencyChecker; diff --git a/core/src/main/java/org/teavm/model/util/InstructionStringifier.java b/core/src/main/java/org/teavm/model/text/InstructionStringifier.java similarity index 99% rename from core/src/main/java/org/teavm/model/util/InstructionStringifier.java rename to core/src/main/java/org/teavm/model/text/InstructionStringifier.java index 4c64687b4..7c8e44f0f 100644 --- a/core/src/main/java/org/teavm/model/util/InstructionStringifier.java +++ b/core/src/main/java/org/teavm/model/text/InstructionStringifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Alexey Andreev. + * 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.util; +package org.teavm.model.text; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/org/teavm/model/util/ListingBuilder.java b/core/src/main/java/org/teavm/model/text/ListingBuilder.java similarity index 98% rename from core/src/main/java/org/teavm/model/util/ListingBuilder.java rename to core/src/main/java/org/teavm/model/text/ListingBuilder.java index ff2b431e1..33d5fa4ff 100644 --- a/core/src/main/java/org/teavm/model/util/ListingBuilder.java +++ b/core/src/main/java/org/teavm/model/text/ListingBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 Alexey Andreev. + * 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. @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.util; +package org.teavm.model.text; import java.util.List; import java.util.Objects; diff --git a/core/src/main/java/org/teavm/model/util/ListingLexer.java b/core/src/main/java/org/teavm/model/text/ListingLexer.java similarity index 99% rename from core/src/main/java/org/teavm/model/util/ListingLexer.java rename to core/src/main/java/org/teavm/model/text/ListingLexer.java index 4382a6f8b..43f8a229f 100644 --- a/core/src/main/java/org/teavm/model/util/ListingLexer.java +++ b/core/src/main/java/org/teavm/model/text/ListingLexer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.util; +package org.teavm.model.text; import java.io.IOException; import java.io.Reader; diff --git a/core/src/main/java/org/teavm/model/util/ListingParseException.java b/core/src/main/java/org/teavm/model/text/ListingParseException.java similarity index 96% rename from core/src/main/java/org/teavm/model/util/ListingParseException.java rename to core/src/main/java/org/teavm/model/text/ListingParseException.java index 561b52ecc..b1c4667d6 100644 --- a/core/src/main/java/org/teavm/model/util/ListingParseException.java +++ b/core/src/main/java/org/teavm/model/text/ListingParseException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.util; +package org.teavm.model.text; public class ListingParseException extends Exception { private final int index; diff --git a/core/src/main/java/org/teavm/model/util/ListingParser.java b/core/src/main/java/org/teavm/model/text/ListingParser.java similarity index 95% rename from core/src/main/java/org/teavm/model/util/ListingParser.java rename to core/src/main/java/org/teavm/model/text/ListingParser.java index a95489610..c967a268f 100644 --- a/core/src/main/java/org/teavm/model/util/ListingParser.java +++ b/core/src/main/java/org/teavm/model/text/ListingParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.util; +package org.teavm.model.text; public class ListingParser { } diff --git a/core/src/main/java/org/teavm/model/util/ListingToken.java b/core/src/main/java/org/teavm/model/text/ListingToken.java similarity index 97% rename from core/src/main/java/org/teavm/model/util/ListingToken.java rename to core/src/main/java/org/teavm/model/text/ListingToken.java index b4ecc12f5..9004a0959 100644 --- a/core/src/main/java/org/teavm/model/util/ListingToken.java +++ b/core/src/main/java/org/teavm/model/text/ListingToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.teavm.model.util; +package org.teavm.model.text; enum ListingToken { IDENTIFIER, diff --git a/core/src/main/java/org/teavm/vm/TeaVM.java b/core/src/main/java/org/teavm/vm/TeaVM.java index 8a8f75a6d..007b8fa56 100644 --- a/core/src/main/java/org/teavm/vm/TeaVM.java +++ b/core/src/main/java/org/teavm/vm/TeaVM.java @@ -63,7 +63,7 @@ import org.teavm.model.optimization.MethodOptimizationContext; import org.teavm.model.optimization.RedundantJumpElimination; import org.teavm.model.optimization.UnreachableBasicBlockElimination; import org.teavm.model.optimization.UnusedVariableElimination; -import org.teavm.model.util.ListingBuilder; +import org.teavm.model.text.ListingBuilder; import org.teavm.model.util.MissingItemsProcessor; import org.teavm.model.util.ModelUtils; import org.teavm.model.util.ProgramUtils;