Began basic syntax checking

1 files changed, 22 insertions, 20 deletions

diff --git a/src/runMain/kotlin/Lexical.kt b/src/runMain/kotlin/Lexical.kt
index 2910bca..dbf2bad 100644
--- a/src/runMain/kotlin/Lexical.kt
+++ b/src/runMain/kotlin/Lexical.kt
@@ -1,8 +1,10 @@
+import TokenType.*
 import exceptions.*
 
 class Lexical {
     /**
      * Analyzes the given [source] and returns the tokens divided into an array of statements
+     * TODO: Add line number to token (abstract to class?)
      */
     fun analyze(source: String): MutableList<MutableList<Pair<String, TokenType>>> {
         var buffer = ""
@@ -15,7 +17,7 @@ class Lexical {
             if (source[i] == '"') skipStatementEnd = !skipStatementEnd
             statementEnd = source[i] == ';' && !skipStatementEnd
             val tokenType = getTokenType(buffer, if (source.length > i + 1) source[i + 1] else ' ')
-            if (tokenType != TokenType.Skip && !statementEnd) {
+            if (tokenType != Skip && !statementEnd) {
                 currentStatement.add(buffer to tokenType)
                 buffer = ""
             } else if (statementEnd) {
@@ -32,37 +34,37 @@ class Lexical {
      */
     private fun getTokenType(token: String, next: Char): TokenType {
         return when {
-            token + next in keyword -> TokenType.Skip
-            token in keyword -> TokenType.Keyword
+            token + next in keyword -> Skip
+            token in keyword -> Keyword
 
-            token + next in comparison -> TokenType.Skip
-            token in assignment -> TokenType.Assignment
+            token + next in comparison -> Skip
+            token in assignment -> Assignment
 
-            token + next in assignment -> TokenType.Skip
-            token in arithmetic -> TokenType.Arithmetic
+            token + next in assignment -> Skip
+            token in arithmetic -> Arithmetic
 
-            token + next in comparison -> TokenType.Skip
-            token in comparison -> TokenType.Comparison
+            token + next in comparison -> Skip
+            token in comparison -> Comparison
 
-            token + next in comparison -> TokenType.Skip
-            token in logical -> TokenType.Logical
+            token + next in comparison -> Skip
+            token in logical -> Logical
 
-            (token + next).matches(Regex("[a-zA-Z]*")) -> TokenType.Skip
-            token.matches(Regex("[a-zA-Z]*")) -> TokenType.Identifier
+            (token + next).matches(Regex("[a-zA-Z]*")) -> Skip
+            token.matches(Regex("[a-zA-Z]*")) -> Identifier
 
-            (token + next).matches(Regex("[0-9]*")) -> TokenType.Skip
-            token.matches(Regex("[0-9]*")) -> TokenType.Constant
+            (token + next).matches(Regex("[0-9]*")) -> Skip
+            token.matches(Regex("[0-9]*")) -> Constant
 
             token in emptiness && token.length > 1 -> throw UnknownType(token)
-            token in emptiness -> TokenType.Empty
+            token in emptiness -> Empty
 
-            token in punctuation -> TokenType.Punctuation
+            token in punctuation -> Punctuation
 
-            token in brackets -> TokenType.Bracket
+            token in brackets -> Bracket
 
-            token in classifier -> TokenType.Classifier
+            token in classifier -> Classifier
 
-            else -> TokenType.Skip
+            else -> Skip
         }
     }