From fbd523b3de2e213a89568479091ffe8f389f14ff Mon Sep 17 00:00:00 2001
From: momoyon <ahmedsamyh10@gmail.com>
Date: Thu, 24 Apr 2025 16:30:49 +0500
Subject: [PATCH] [main.c] Fix Column of EOF, and Update tests.
---
main.c | 2 +-
main.momo | 2 +-
tests/.bool.build.out.expected | 2 +-
tests/.identifiers.build.out.expected | 2 +-
tests/.keywords.build.out.expected | 2 +-
tests/.operators.build.out.expected | 2 +-
tests/.strings.build.out.expected | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main.c b/main.c
index accc7ea..75ff8c1 100644
--- a/main.c
+++ b/main.c
@@ -1463,7 +1463,7 @@ Tokens lex(Lexer *l) {
t.lexeme = SV("EOF");
t.loc.filename = l->filename;
t.loc.line = l->line-1;
- t.loc.col = last_line.count - last_line.offset;
+ t.loc.col = last_line.count;
t.type = TK_EOF;
da_append(tokens, t);
diff --git a/main.momo b/main.momo
index 16a562a..9f9370e 100644
--- a/main.momo
+++ b/main.momo
@@ -1 +1 @@
-690 / (34 + 35) * 69;
+1 + (4 / );
diff --git a/tests/.bool.build.out.expected b/tests/.bool.build.out.expected
index e541dc4..09436a1 100644
--- a/tests/.bool.build.out.expected
+++ b/tests/.bool.build.out.expected
@@ -1,3 +1,3 @@
bool.momo:1:0 [BOOL] 'true'
bool.momo:2:0 [BOOL] 'false'
-bool.momo:3:0 [EOF] 'EOF'
+bool.momo:2:5 [EOF] 'EOF'
diff --git a/tests/.identifiers.build.out.expected b/tests/.identifiers.build.out.expected
index 9de1b78..594eb43 100644
--- a/tests/.identifiers.build.out.expected
+++ b/tests/.identifiers.build.out.expected
@@ -8,4 +8,4 @@ identifiers.momo:10:0 [IDENT] '_D'
identifiers.momo:10:3 [IDENT] 'eE'
identifiers.momo:10:6 [IDENT] '_F'
identifiers.momo:10:9 [IDENT] '_G'
-identifiers.momo:11:0 [EOF] 'EOF'
+identifiers.momo:10:11 [EOF] 'EOF'
diff --git a/tests/.keywords.build.out.expected b/tests/.keywords.build.out.expected
index 1a32452..0d456a3 100644
--- a/tests/.keywords.build.out.expected
+++ b/tests/.keywords.build.out.expected
@@ -28,4 +28,4 @@ keywords.momo:35:0 [KEYWORD] 'switch'
keywords.momo:36:0 [KEYWORD] 'break'
keywords.momo:37:0 [KEYWORD] 'case'
keywords.momo:38:0 [KEYWORD] 'default'
-keywords.momo:39:0 [EOF] 'EOF'
+keywords.momo:38:7 [EOF] 'EOF'
diff --git a/tests/.operators.build.out.expected b/tests/.operators.build.out.expected
index f92e1e0..24cb3b8 100644
--- a/tests/.operators.build.out.expected
+++ b/tests/.operators.build.out.expected
@@ -30,4 +30,4 @@ operators.momo:33:0 [<] '<'
operators.momo:34:0 [>] '>'
operators.momo:35:0 [<=] '<='
operators.momo:36:0 [>=] '>='
-operators.momo:37:0 [EOF] 'EOF'
+operators.momo:36:2 [EOF] 'EOF'
diff --git a/tests/.strings.build.out.expected b/tests/.strings.build.out.expected
index 2aadf07..08847d1 100644
--- a/tests/.strings.build.out.expected
+++ b/tests/.strings.build.out.expected
@@ -1,3 +1,3 @@
strings.momo:1:1 [STRING] 'This is a string!'
strings.momo:4:9 [STRING] 'This too is a string!'
-strings.momo:5:0 [EOF] 'EOF'
+strings.momo:4:31 [EOF] 'EOF'
--
2.39.5