flatten token

Author: cybercoder-naj

core/src/main/kotlin/io/github/cybercodernaj/parkour/lexer/Token.kt

@@ -8,28 +8,19 @@ import io.github.cybercodernaj.parkour.utils.Position
  * @author Nishant Aanjaney Jalan
  * @since 0.1.0
  */
-internal sealed class Token(open val value: Any?, open val start: Position?, open val end: Position?) {
-  class Identifier(override val value: String, start: Position, end: Position) : Token(value, start, end)
-
-  class Keyword(override val value: String, start: Position, end: Position, val soft: Boolean = false) : Token(value, start, end)
-
-  class Operator(override val value: String, start: Position, end: Position) : Token(value, start, end)
-
-  class Separator(override val value: String, start: Position, end: Position) : Token(value, start, end)
-
-  sealed class Literal(
-    override val value: Any,
-    override val start: Position,
-    override val end: Position
-  ) : Token(value, start, end) {
-    class IntLiteral(override val value: Long, start: Position, end: Position) : Literal(value, start, end)
-    class FloatLiteral(override val value: Double, start: Position, end: Position) : Literal(value, start, end)
-    class StringLiteral(override val value: String, start: Position, end: Position) : Literal(value, start, end)
-    class CharacterLiteral(override val value: Char, start: Position, end: Position) : Literal(value, start, end)
-    class BooleanLiteral(override val value: Boolean, start: Position, end: Position) : Literal(value, start, end)
-  }
-
-  data object EOF : Token(null, null, null)
+internal sealed class Token(val value: Any, val start: Position, val end: Position) {
+  class Identifier(value: String, start: Position, end: Position) : Token(value, start, end)
+  class Keyword(value: String, start: Position, end: Position, val soft: Boolean = false) :
+    Token(value, start, end)
+  class Operator(value: String, start: Position, end: Position) : Token(value, start, end)
+  class Separator(value: String, start: Position, end: Position) : Token(value, start, end)
+  class IntLiteral(value: Long, start: Position, end: Position) : Token(value, start, end)
+  class FloatLiteral(value: Double, start: Position, end: Position) : Token(value, start, end)
+  class StringLiteral(value: String, start: Position, end: Position) : Token(value, start, end)
+  class CharacterLiteral(value: Char, start: Position, end: Position) : Token(value, start, end)
+  class BooleanLiteral(value: Boolean, start: Position, end: Position) : Token(value, start, end)
+
+  data object EOF : Token(Any(), Position(-1, -1), Position(-1, -1))
 
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
@@ -43,9 +34,9 @@ internal sealed class Token(open val value: Any?, open val start: Position?, ope
   }
 
   override fun hashCode(): Int {
-    var result = value?.hashCode() ?: 0
-    result = 31 * result + (start?.hashCode() ?: 0)
-    result = 31 * result + (end?.hashCode() ?: 0)
+    var result = value.hashCode()
+    result = 31 * result + start.hashCode()
+    result = 31 * result + end.hashCode()
     return result
   }
 

core/src/test/kotlin/io/github/cybercodernaj/parkour/lexer/LexerLiteralTest.kt

@@ -26,39 +26,39 @@ class LexerLiteralTest {
     lexer.source = StringSource("12345")
 
     val token = lexer.nextToken()
-    assertEquals(Token.Literal.IntLiteral(12345L, Position(0, 0), Position(0, 4)), token)
+    assertEquals(Token.IntLiteral(12345L, Position(0, 0), Position(0, 4)), token)
   }
 
   @Test
   fun `returns a negative int number`() {
     lexer.source = StringSource("-12345")
 
     val token = lexer.nextToken()
-    assertEquals(Token.Literal.IntLiteral(-12345L, Position(0, 0), Position(0, 5)), token)
+    assertEquals(Token.IntLiteral(-12345L, Position(0, 0), Position(0, 5)), token)
   }
 
   @Test
   fun `returns an int number with underscores`() {
     lexer.source = StringSource("3_00_000")
 
     val token = lexer.nextToken()
-    assertEquals(Token.Literal.IntLiteral(300000L, Position(0, 0), Position(0, 7)), token)
+    assertEquals(Token.IntLiteral(300000L, Position(0, 0), Position(0, 7)), token)
   }
 
   @Test
   fun `returns a floating point number`() {
     lexer.source = StringSource("+12.42")
 
     val token = lexer.nextToken()
-    assertEquals(Token.Literal.FloatLiteral(12.42, Position(0, 0), Position(0, 5)), token)
+    assertEquals(Token.FloatLiteral(12.42, Position(0, 0), Position(0, 5)), token)
   }
 
   @Test
   fun `returns floating point with no leading digits`() {
     lexer.source = StringSource("0.32")
 
     val token = lexer.nextToken()
-    assertEquals(Token.Literal.FloatLiteral(0.32, Position(0, 0), Position(0, 3)), token)
+    assertEquals(Token.FloatLiteral(0.32, Position(0, 0), Position(0, 3)), token)
   }
 
 
@@ -67,15 +67,15 @@ class LexerLiteralTest {
     lexer.source = StringSource("1.609e-19")
 
     val token = lexer.nextToken()
-    assertEquals(Token.Literal.FloatLiteral(1.609e-19, Position(0, 0), Position(0, 8)), token)
+    assertEquals(Token.FloatLiteral(1.609e-19, Position(0, 0), Position(0, 8)), token)
   }
 
   @Test
   fun `returns floating point with underscores`() {
     lexer.source = StringSource("1.6__0_9e-1__9")
 
     val token = lexer.nextToken()
-    assertEquals(Token.Literal.FloatLiteral(1.609e-19, Position(0, 0), Position(0, 13)), token)
+    assertEquals(Token.FloatLiteral(1.609e-19, Position(0, 0), Position(0, 13)), token)
   }
 
   @Test
@@ -88,7 +88,7 @@ class LexerLiteralTest {
         Token.Keyword("char", Position(0, 0), Position(0, 3)),
         Token.Identifier("c", Position(0, 5), Position(0, 5)),
         Token.Operator("=", Position(0, 7), Position(0, 7)),
-        Token.Literal.StringLiteral("\'a\'", Position(0, 9), Position(0, 11))
+        Token.StringLiteral("\'a\'", Position(0, 9), Position(0, 11))
       )
     )
   }
@@ -103,7 +103,7 @@ class LexerLiteralTest {
         Token.Keyword("char", Position(0, 0), Position(0, 3)),
         Token.Identifier("c", Position(0, 5), Position(0, 5)),
         Token.Operator("=", Position(0, 7), Position(0, 7)),
-        Token.Literal.StringLiteral("\"abcde\"", Position(0, 9), Position(0, 15))
+        Token.StringLiteral("\"abcde\"", Position(0, 9), Position(0, 15))
       )
     )
   }
@@ -136,9 +136,9 @@ class LexerLiteralTest {
     assertTokens(
       lexer,
       listOf(
-        Token.Literal.StringLiteral("'\u1234'", Position(0, 0), Position(0, 7)),
-        Token.Literal.StringLiteral("'\n'", Position(0, 9), Position(0, 12)),
-        Token.Literal.StringLiteral("'f'", Position(0, 14), Position(0, 17)),
+        Token.StringLiteral("'\u1234'", Position(0, 0), Position(0, 7)),
+        Token.StringLiteral("'\n'", Position(0, 9), Position(0, 12)),
+        Token.StringLiteral("'f'", Position(0, 14), Position(0, 17)),
       )
     )
   }