Merge pull request #6 from ChAoSUnItY/master

More implmentation

build.gradle.kts

@@ -1,13 +1,13 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 plugins {
     id("maven-publish")
     id("java")
     id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
+val commonVersion: String by properties
+
 group = "chaos.unity.nenggao"
-version = "1.4.0"
+version = commonVersion
 
 repositories {
     mavenCentral()

gradle.properties

@@ -0,0 +1 @@
+commonVersion=1.4.1

kotlinImpl/build.gradle.kts

@@ -2,8 +2,10 @@ plugins {
     kotlin("jvm") version "1.7.20"
 }
 
+val commonVersion: String by project(":").properties
+
 group = "chaos.unity.nenggao"
-version = "1.4.0"
+version = commonVersion
 
 repositories {
     mavenCentral()

kotlinImpl/src/main/kotlin/chaos/unity/nengao/KtLabel.kt

@@ -0,0 +1,7 @@
+package chaos.unity.nengao
+
+import chaos.unity.nenggao.AbstractLabel
+import chaos.unity.nenggao.AbstractSpan
+
+@Suppress("unused")
+data class KtLabel(val span: AbstractSpan, val message: String) : AbstractLabel(span, message)

kotlinImpl/src/main/kotlin/chaos/unity/nengao/KtPosition.kt

@@ -0,0 +1,6 @@
+package chaos.unity.nengao
+
+import chaos.unity.nenggao.AbstractPosition
+
+@Suppress("unused")
+data class KtPosition(val line: Int, val pos: Int) : AbstractPosition(line, pos)

kotlinImpl/src/main/kotlin/chaos/unity/nengao/kotlin/Span.kt → kotlinImpl/src/main/kotlin/chaos/unity/nengao/KtSpan.kt

@@ -1,10 +1,11 @@
-package chaos.unity.nengao.kotlin
+package chaos.unity.nengao
 
 import chaos.unity.nenggao.AbstractPosition
 import chaos.unity.nenggao.AbstractSpan
 import chaos.unity.nenggao.Span
 
-data class Span(val startPosition: AbstractPosition, val endPosition: AbstractPosition) :
+@Suppress("unused")
+data class KtSpan(val startPosition: AbstractPosition, val endPosition: AbstractPosition) :
     AbstractSpan(startPosition, endPosition) {
     override fun expand(endSpan: AbstractSpan?): AbstractSpan =
         endSpan?.let {

scalaImpl/build.gradle.kts

@@ -0,0 +1,16 @@
+plugins {
+    scala
+}
+
+val commonVersion: String by properties
+
+group = "chaos.unity.nenggao"
+version = commonVersion
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation(project(":"))
+}

scalaImpl/src/main/scala/chaos/unity/nenggao/ScLabel.scala

@@ -0,0 +1,6 @@
+package chaos.unity.nenggao
+
+import scala.annotation.unused
+
+@unused
+case class ScLabel(span: AbstractSpan, message: String) extends AbstractLabel(span, message)

scalaImpl/src/main/scala/chaos/unity/nenggao/ScPosition.scala

@@ -0,0 +1,6 @@
+package chaos.unity.nenggao
+
+import scala.annotation.unused
+
+@unused
+case class ScPosition(line: Int, pos: Int) extends AbstractPosition(line, pos)

scalaImpl/src/main/scala/chaos/unity/nenggao/ScSpan.scala

@@ -0,0 +1,20 @@
+package chaos.unity.nenggao
+
+case class ScSpan(startPosition: AbstractPosition, endPosition: AbstractPosition) extends AbstractSpan(startPosition, endPosition) {
+  override def expand(endSpan: AbstractSpan): AbstractSpan = {
+    val copied = copy()
+
+    if (endSpan == null) copied
+    else if (endSpan.endPosition.line < startPosition.line) copied
+    else if (endSpan.endPosition.line == startPosition.line && endSpan.endPosition.pos < startPosition.pos) copied
+    else {
+      val startPosition = startPosition
+      val endPosition = endSpan.endPosition
+
+      ScSpan(startPosition, endPosition) 
+    }
+  }
+
+  override def copy(): AbstractSpan =
+    ScSpan(startPosition, endPosition)
+}

settings.gradle.kts

@@ -1,2 +1,4 @@
 rootProject.name = "Nenggao"
+
 include("kotlinImpl")
+include("scalaImpl")

src/test/resources/long_line.yk

@@ -1,10 +0,0 @@
-start
-post-start
-
-
-
-
-
-
-pre-end
-end