From 5b752d280097731fdac052ff9e3a3c98d6bccf89 Mon Sep 17 00:00:00 2001
From: Daniil Demidko <demidko@farpost.com>
Date: Tue, 26 Oct 2021 22:25:29 +1000
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                                         | 2 +-
 .../github/demidko/aot/{Reader.java => AotReader.java}   | 9 ++++-----
 src/main/java/com/github/demidko/aot/PartOfSpeech.java   | 2 --
 .../java/com/github/demidko/aot/WordformMeaning.java     | 9 ++++-----
 4 files changed, 9 insertions(+), 13 deletions(-)
 rename src/main/java/com/github/demidko/aot/{Reader.java => AotReader.java} (89%)

diff --git a/build.gradle.kts b/build.gradle.kts
index b4c66ab..477012e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
   `maven-publish`
 }
 dependencies {
-  implementation("com.github.demidko:aot-bytecode:2021.10.26")
+  api("com.github.demidko:aot-bytecode:2021.10.27")
   testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
   testImplementation("org.hamcrest:hamcrest:2.2")
 }
diff --git a/src/main/java/com/github/demidko/aot/Reader.java b/src/main/java/com/github/demidko/aot/AotReader.java
similarity index 89%
rename from src/main/java/com/github/demidko/aot/Reader.java
rename to src/main/java/com/github/demidko/aot/AotReader.java
index 35860aa..1f2af37 100644
--- a/src/main/java/com/github/demidko/aot/Reader.java
+++ b/src/main/java/com/github/demidko/aot/AotReader.java
@@ -1,14 +1,13 @@
 package com.github.demidko.aot;
 
-import static com.github.demidko.aot.bytecode.Bytecode.isContent;
-import static com.github.demidko.aot.bytecode.MorphologyTag.values;
-import static com.github.demidko.aot.bytecode.Utils.safeByteToChar;
+import static com.github.demidko.aot.Bytecode.isContent;
+import static com.github.demidko.aot.MorphologyTag.values;
+import static com.github.demidko.aot.Utils.safeByteToChar;
 
-import com.github.demidko.aot.bytecode.MorphologyTag;
 import java.util.HashMap;
 import java.util.Map;
 
-class Reader {
+class AotReader {
 
   static MorphologyTag[][] readMorph(ByteBlock block) {
     MorphologyTag[][] result = new MorphologyTag[block.getLinesCount()][];
diff --git a/src/main/java/com/github/demidko/aot/PartOfSpeech.java b/src/main/java/com/github/demidko/aot/PartOfSpeech.java
index a33be42..4fd7238 100644
--- a/src/main/java/com/github/demidko/aot/PartOfSpeech.java
+++ b/src/main/java/com/github/demidko/aot/PartOfSpeech.java
@@ -1,7 +1,5 @@
 package com.github.demidko.aot;
 
-import com.github.demidko.aot.bytecode.MorphologyTag;
-
 /**
  * Часть речи, например существительное, глагол и т. д.
  */
diff --git a/src/main/java/com/github/demidko/aot/WordformMeaning.java b/src/main/java/com/github/demidko/aot/WordformMeaning.java
index 8e1f01c..f795176 100644
--- a/src/main/java/com/github/demidko/aot/WordformMeaning.java
+++ b/src/main/java/com/github/demidko/aot/WordformMeaning.java
@@ -1,16 +1,15 @@
 package com.github.demidko.aot;
 
+import static com.github.demidko.aot.AotReader.readLemmas;
+import static com.github.demidko.aot.AotReader.readMorph;
+import static com.github.demidko.aot.AotReader.readRefs;
+import static com.github.demidko.aot.AotReader.readStrings;
 import static com.github.demidko.aot.ByteBlock.readBlockFrom;
 import static com.github.demidko.aot.PartOfSpeech.partOfSpeech;
-import static com.github.demidko.aot.Reader.readLemmas;
-import static com.github.demidko.aot.Reader.readMorph;
-import static com.github.demidko.aot.Reader.readRefs;
-import static com.github.demidko.aot.Reader.readStrings;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Objects.hash;
 
-import com.github.demidko.aot.bytecode.MorphologyTag;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;