Improved syntax analyser

1 files changed, 4 insertions, 4 deletions

diff --git a/src/runMain/kotlin/Lexical.kt b/src/runMain/kotlin/Lexical.kt
index 73b15aa..0d37065 100644
--- a/src/runMain/kotlin/Lexical.kt
+++ b/src/runMain/kotlin/Lexical.kt
@@ -4,7 +4,6 @@ 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<Token>> {
         var buffer = ""
@@ -21,7 +20,7 @@ class Lexical {
                 val newToken = Token()
                 newToken.content = buffer
                 newToken.type = tokenType
-                newToken.lineNumber = 13
+                newToken.lineNumber = 1
                 currentStatement.add(newToken)
                 buffer = ""
             } else if (statementEnd) {
@@ -54,7 +53,8 @@ class Lexical {
             token in logical -> Logical
 
             (token + next).matches(Regex("[a-zA-Z]*")) -> Skip
-            token.matches(Regex("[a-zA-Z]*")) -> Identifier
+            token.matches(Regex("[a-zA-Z]*")) && next == '(' -> Function
+            token.matches(Regex("[a-zA-Z]*")) -> Variable
 
             (token + next).matches(Regex("[0-9]*")) -> Skip
             token.matches(Regex("[0-9]*")) -> Constant
@@ -72,7 +72,7 @@ class Lexical {
         }
     }
 
-    private val keyword = listOf("print") // TODO: DataType matching
+    private val keyword = listOf("if", "elif", "else", "for", "while")
     private val assignment = listOf("=", "+=", "-=", "*=", "/*")
     private val arithmetic = listOf("+", "-", "*", "/", "%")
     private val comparison = listOf("==", "!=", "<", "<=", ">", ">=")