From 52a7c69dae50ecabe8d4a123ff9deac4a75854a3 Mon Sep 17 00:00:00 2001
From: Partho Bhattacharya <moroseui@gmail.com>
Date: Thu, 13 Feb 2025 20:02:42 -0500
Subject: [PATCH] updated comment count

---
 flex.o                          | Bin 27952 -> 27880 bytes
 lex.yy.c                        |   2 +-
 lexicalStructure.lex            |   2 +-
 runner                          | Bin 31632 -> 31632 bytes
 runner.c                        |  11 +++
 runner.h                        |   3 +-
 runner.o                        | Bin 4216 -> 4616 bytes
 test_comments.tok               |  10 +--
 test_generalTokenTest.tok       |  78 +++++++++++-----------
 test_operators.tok              |   2 +-
 test_otherpunc.tok              |   2 +-
 test_simpleIntTest.tok          |   6 +-
 test_simpleLiterals.tok         | 115 ++++++++++++++++----------------
 tests/test_simpleLiterals.alpha |   2 +-
 14 files changed, 123 insertions(+), 110 deletions(-)

diff --git a/flex.o b/flex.o
index ca2157c706aba473e84b983141b9b06e00cd79b0..c0c6827f98437382a2536fac1e48819a8616fb92 100644
GIT binary patch
delta 5683
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

delta 5715
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
BwFm$J

diff --git a/lex.yy.c b/lex.yy.c
index 683e3bd..09a71bf 100644
--- a/lex.yy.c
+++ b/lex.yy.c
@@ -824,7 +824,7 @@ do_action:	/* This label is used only to access EOF actions. */
 case 1:
 YY_RULE_SETUP
 #line 27 "lexicalStructure.lex"
-{if(DEBUG) {printf( "T_INTEGER:		%s	(%d)\n", yytext, T_INTEGER);} 		else {column_number=column_number+yyleng; return T_INTEGER;}}
+{if(DEBUG) {printf( "T_INTEGER:		%s	(%d)\n", yytext, T_INTEGER);} 		else {return T_INTEGER;}}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
diff --git a/lexicalStructure.lex b/lexicalStructure.lex
index ef6b184..86799c2 100644
--- a/lexicalStructure.lex
+++ b/lexicalStructure.lex
@@ -23,7 +23,7 @@ SCHAR \\n|\\t|\\\"|[^\"\n\\]
 
 %%
 
-"integer"		{if(DEBUG) {printf( "T_INTEGER:		%s	(%d)\n", yytext, T_INTEGER);} 		else {column_number=column_number+yyleng; return T_INTEGER;}}
+"integer"		{if(DEBUG) {printf( "T_INTEGER:		%s	(%d)\n", yytext, T_INTEGER);} 		else {return T_INTEGER;}}
 "address"		{if(DEBUG) {printf( "T_ADDRESS:		%s	(%d)\n", yytext, T_ADDRESS);} 		else {return T_ADDRESS;}}
 "Boolean"		{if(DEBUG) {printf( "T_BOOLEAN:		%s	(%d)\n", yytext, T_BOOLEAN);} 		else {return T_BOOLEAN;}}
 "character"		{if(DEBUG) {printf( "T_CHARACTER:	%s	(%d)\n", yytext, T_CHARACTER);} 	else {return T_CHARACTER;}}
diff --git a/runner b/runner
index 967e827fd228e7dc0778c47cb1d2f599a38f4ba5..067c50734e81c7aca4d80ecc4986f74a57d26c20 100755
GIT binary patch
delta 6701
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
M?5$4y$%24?0}X_;F#rGn

delta 6628
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
PCtF>a>`i@SQP95txZJ#r

diff --git a/runner.c b/runner.c
index 8567aea..30f7551 100644
--- a/runner.c
+++ b/runner.c
@@ -26,6 +26,17 @@ int main(int argc, char *argv[]) {
         if (arg == TOK_ARG) {
             fprintf(output, "%d %d %3d \"%s\"\n", line_number, column_number, token, yytext);
         }
+	if(token == COMMENT){
+		for (int i = 0; i < yyleng; i++) {
+			if(yytext[i] == '\n'){
+				line_number++;
+				column_number = 0;
+			}
+			column_number++;
+		}
+		continue;
+	}
+	column_number += yyleng;
     }
 
     if (yyin != NULL) {
diff --git a/runner.h b/runner.h
index 07ec277..b7c7369 100644
--- a/runner.h
+++ b/runner.h
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "flex.h"
+#include "typedefs.h"
 
 extern int line_number, column_number;
 extern char *yytext;
@@ -22,4 +23,4 @@ int arg;
 
 int main(int argc, char* argv[]);
 char *is_tok(int argc, char* argv[]);
-int is_alpha_file(char *file, int file_len);
\ No newline at end of file
+int is_alpha_file(char *file, int file_len);
diff --git a/runner.o b/runner.o
index 00c2836f5eb4c7ad11fa80c9286bd62f68f1c66b..6778a689da82ad0f00fa83c9b9985ff9dd0930ef 100644
GIT binary patch
delta 1092
zcmZ{jPiPZS5XRrUWV6jCyPK`8o4pi;LTu@wy%-hg`iF(!$=q6Rz38cuLrV;_E^Vl^
zMzG0%h$14rND(PStb&NQdgviS5A`G-glI!gLUNGC_p%904;^^B!|(gv%)I4o>&)u#
z`Z>O8lt(L^@$%<1&qKL6$FqR5a6|e1jxmNG!S$CG8=p91^HV!sT`+cVEmInlNy)2c
zo@StCzGs)Ud8edESo{KOon)u;?D&ogMXwHl_o7!{s2&V-t94vZ3wC!pt$B^&Vqb%q
zE0@~sb~VB`K@5U#Lx+iFkuc9lJmA;$NT|T^O?VfUv7n@2179h5kvox>;Ny~FV=a<|
zM>4CZNqCN+BENeFAFCtPZFPjhef$}<orfT2WlR<}#QG;%%2-EBvz;eIO%QbxuWGix
z-BrUvv4~nDyJ*c{gwtw=C-A?7o1%Uz7_EI2aI`hcSLNU$<V$*b^IL@X6Fx*Z^$!zH
z{bPhv|3tujCJ%p#H1NoV7~$Cy_;i=cIs?RioA{;HJ6QghUv%gRTL>}R`9NfyY}>~P
zp*D!B619mlG20&u2_!<clUKc0`2yh)!fz6On(!RqHsK3|(>gB#j?I|m>~=kJP?^q(
zC1VfI#$9o}XX3WF>V^0Z_=D4WTAS(%^qhjv^z$%^-;5Nt^duh(W4|#8<Cry5c+W_}
zYb+Zs><NPl`)HXiw1npJuR2!D$!M<o<6gn<W;(hhzmA9vbP{PTA#bsWIfl3Nq5s?c
BQojHI

delta 638
zcmeBB`JpgDgXss)M6F3oEsPWQnKS)onE1Vf=_<qITt+XZ*Y=b5FxvCIU;u(n*Eh|z
zZx~89Z*F2*#W>l3<&6Lv6HwfhPoRy-nU{_EFXLn#)-#N3lYg?RGpbKkWGe@<XR^&_
zteecpCO$cUU4pR}%xYkln7o0#X0kDd%H{|T4JO9w$&Fm%jO~*Jxy6A>HUim`Cp!Y!
z%O^kN60hIF2(q4mfdz;Kf%wmV2-t}vE`%h05-JXI95<5qRUG1Xk<1ZBQvV7fKDnJs
zQ1UkpH71iM@`y{?fUE)nkPCT%80Ny5$p?Y51xT{&NV3(FKLTZEBFTy%$?gH^HN1i(
zD~crh1xZ{CNt|J_BCj~3;^anNamfH?pac+rl!BPKAPx{jOy0<A4~&|RK$Yr~Ir;80
z=1qRdXU??)<TxN`V41ANZ^pEad2%7E*yIX+4W<pulNa&Zfv89Pc8nU66$R`WLnbEz
z$%x4dfn>$xhXVFY7Ce)c1noFKfI<NXG$v;XnsZ7(4V^Q2rJy-i0}n*5gkkb4J~;qG
CM8TE-

diff --git a/test_comments.tok b/test_comments.tok
index 2fb6907..0486ed9 100644
--- a/test_comments.tok
+++ b/test_comments.tok
@@ -2,8 +2,8 @@
 2 1 700 "(* hello *)"
 3 1 700 "(* I'd think this is a legal "string" that contains several \n \t 
 escaped characters, isn't it? *)"
-4 1 700 "(* \ *)"
-5 1 700 "(* *)"
-6 1 700 "(*{COMMENT}+ *)"
-7 1 700 "(* * *)"
-8 1 700 "(* (hello) *)"
+5 1 700 "(* \ *)"
+6 1 700 "(* *)"
+7 1 700 "(*{COMMENT}+ *)"
+8 1 700 "(* * *)"
+9 1 700 "(* (hello) *)"
diff --git a/test_generalTokenTest.tok b/test_generalTokenTest.tok
index 69b1571..08c907c 100644
--- a/test_generalTokenTest.tok
+++ b/test_generalTokenTest.tok
@@ -1,61 +1,61 @@
 1 1 101 "This"
-1 2 101 "is"
-1 3 101 "a"
-1 4 101 "test"
+1 6 101 "is"
+1 9 101 "a"
+1 11 101 "test"
 2 1 301 "9"
-2 1 101 "combined"
-2 2 301 "7"
-2 2 101 "okens"
+2 2 101 "combined"
+2 11 301 "7"
+2 12 101 "okens"
 3 1 301 "12345"
 4 1 301 "893247892"
 5 1 101 "combined"
-5 2 101 "DueToUnknownChar"
-5 3 101 "_validtoken"
-5 4 101 "__validtoken1"
-5 5 101 "_valid_token2"
-5 6 101 "validToken3_"
+5 10 101 "DueToUnknownChar"
+5 27 101 "_validtoken"
+5 39 101 "__validtoken1"
+5 53 101 "_valid_token2"
+5 67 101 "validToken3_"
 6 1 305 "true"
-6 2 306 "false"
+6 6 306 "false"
 7 1 302 "null"
-7 2 401 "while"
-7 3 609 "!"
-7 3 101 "wrong"
-7 4 402 "if"
-7 5 101 "when"
+7 6 401 "while"
+7 12 609 "!"
+7 13 101 "wrong"
+7 19 402 "if"
+7 22 101 "when"
 8 1 404 "else"
-8 2 405 "type"
-8 3 406 "function"
+8 6 405 "type"
+8 11 406 "function"
 9 1 407 "return"
-9 3 408 "external"
-9 11 409 "as"
+9 9 408 "external"
+9 25 409 "as"
 10 1 101 "string"
-10 2 101 "_NOte_that_was_not_reserved"
+10 8 101 "_NOte_that_was_not_reserved"
 11 7 508 ":"
-11 7 507 ";"
-11 7 509 ","
-11 7 510 "->"
+11 8 507 ";"
+11 9 509 ","
+11 10 510 "->"
 12 1 601 "+"
-12 1 602 "-"
-12 1 603 "*"
-12 1 604 "/"
-12 1 605 "%"
+12 2 602 "-"
+12 3 603 "*"
+12 4 604 "/"
+12 5 605 "%"
 13 1 606 "<"
-13 1 607 "="
+13 2 607 "="
 14 1 608 ":="
 15 2 101 "This"
-15 3 101 "is"
-15 4 101 "not"
-15 5 101 "a"
-15 6 101 "valid"
+15 7 101 "is"
+15 10 101 "not"
+15 14 101 "a"
+15 16 101 "valid"
 16 1 101 "String"
 17 1 304 ""This is a valid String""
 18 1 609 "!"
-18 1 611 "|"
-19 1 612 "."
+18 2 611 "|"
 19 1 612 "."
+19 2 612 "."
 20 1 700 "(* this is a comment *)"
 21 2 603 "*"
-21 2 101 "Not"
-21 3 101 "a"
-21 4 101 "comment"
+21 3 101 "Not"
+21 7 101 "a"
+21 9 101 "comment"
 22 3 610 "&"
diff --git a/test_operators.tok b/test_operators.tok
index 9ca0302..dd3eaab 100644
--- a/test_operators.tok
+++ b/test_operators.tok
@@ -7,7 +7,7 @@
 9 1 607 "="
 10 1 608 ":="
 11 1 607 "="
-11 1 508 ":"
+11 2 508 ":"
 12 1 508 ":"
 13 1 607 "="
 14 1 609 "!"
diff --git a/test_otherpunc.tok b/test_otherpunc.tok
index 005f61c..7500378 100644
--- a/test_otherpunc.tok
+++ b/test_otherpunc.tok
@@ -4,4 +4,4 @@
 4 1 510 "->"
 5 1 510 "->"
 6 1 602 "-"
-6 1 510 "->"
+6 2 510 "->"
diff --git a/test_simpleIntTest.tok b/test_simpleIntTest.tok
index e7925f5..0bcbefb 100644
--- a/test_simpleIntTest.tok
+++ b/test_simpleIntTest.tok
@@ -2,7 +2,7 @@
 2 1 301 "123"
 3 1 301 "8392"
 4 1 301 "40"
-4 2 301 "40"
+4 4 301 "40"
 5 2 301 "200"
-5 3 301 "50"
-5 4 301 "21783"
+5 6 301 "50"
+5 9 301 "21783"
diff --git a/test_simpleLiterals.tok b/test_simpleLiterals.tok
index 51f07e1..7e38bb3 100644
--- a/test_simpleLiterals.tok
+++ b/test_simpleLiterals.tok
@@ -1,62 +1,63 @@
 1 1 304 ""this is a string""
-1 2 301 "721398"
-1 3 303 "'g'"
-1 5 604 "/"
-1 5 101 "n"
-1 7 700 "(* should print 3 tokens before this *)"
+1 20 301 "721398"
+1 27 303 "'g'"
+1 32 604 "/"
+1 33 101 "n"
+1 36 700 "(* should print 3 tokens before this *)"
 4 1 301 "12893"
-4 3 101 "this"
-4 4 101 "is"
-4 5 101 "not"
-4 6 101 "a"
-4 7 101 "string"
-4 8 700 "(*one valid token before this*)"
+4 8 101 "this"
+4 13 101 "is"
+4 16 101 "not"
+4 20 101 "a"
+4 22 101 "string"
+4 29 700 "(*one valid token before this*)"
 5 1 700 "(* spacey comment here     
 over multiple lines
 will it work? *)"
-9 1 306 "false"
-10 1 700 "(**)"
-12 1 101 "nullfalse"
-13 2 101 "nulltrue"
-14 1 302 "null"
-15 1 303 "'7'"
-16 1 305 "true"
-17 2 301 "189"
-18 1 303 "'\t'"
-19 1 303 "'"'"
-20 1 303 "'/'"
-21 1 303 "'\n'"
-22 1 303 "'\''"
-23 1 303 "'\t'"
-25 1 303 "'n'"
-27 2 101 "fdsf"
-28 1 700 "(*/jnewjno2893u86^ 	Lots of random characters /n /t '") *)"
-33 1 304 ""STRINGwithnotSPaces""
-34 1 303 "' '"
-36 1 304 ""J""
-37 1 304 """"
-38 1 304 "" ""
-40 1 304 ""{SCHAR}""
-41 1 304 ""SCHAR""
-42 1 304 ""[SCHAR]""
-43 1 304 ""FINAL: I'd think this is a legal \"string\" that contains \n \t several escaped characters, isn't it?""
-44 2 101 "I"
-44 3 101 "d"
-44 4 101 "think"
-44 5 101 "this"
-44 6 101 "is"
-44 7 101 "a"
-44 8 101 "legal"
-44 11 101 "string"
-44 14 101 "that"
-44 15 101 "contains"
-44 16 101 "several"
-44 19 101 "n"
-44 21 101 "t"
-44 22 101 "escaped"
-44 23 101 "characters"
-44 23 509 ","
-44 24 101 "isn"
-44 25 101 "t"
-44 26 101 "it"
-45 1 101 "nullLike"
+7 18 306 "false"
+11 1 306 "false"
+12 1 700 "(**)"
+14 1 101 "nullfalse"
+15 2 101 "nulltrue"
+16 1 302 "null"
+17 1 303 "'7'"
+18 1 305 "true"
+19 2 301 "189"
+20 1 303 "'\t'"
+21 1 303 "'"'"
+22 1 303 "'/'"
+23 1 303 "'\n'"
+24 1 303 "'\''"
+25 1 303 "'\t'"
+27 1 303 "'n'"
+29 2 101 "fdsf"
+30 1 700 "(*/jnewjno2893u86^ 	Lots of random characters /n /t '") *)"
+35 1 304 ""STRINGwithnotSPaces""
+36 1 303 "' '"
+38 1 304 ""J""
+39 1 304 """"
+40 1 304 "" ""
+42 1 304 ""{SCHAR}""
+43 1 304 ""SCHAR""
+44 1 304 ""[SCHAR]""
+45 1 304 ""FINAL: I'd think this is a legal \"string\" that contains \n \t several escaped characters, isn't it?""
+46 2 101 "I"
+46 4 101 "d"
+46 6 101 "think"
+46 12 101 "this"
+46 17 101 "is"
+46 20 101 "a"
+46 22 101 "legal"
+46 30 101 "string"
+46 39 101 "that"
+46 44 101 "contains"
+46 53 101 "several"
+46 63 101 "n"
+46 66 101 "t"
+46 68 101 "escaped"
+46 76 101 "characters"
+46 86 509 ","
+46 88 101 "isn"
+46 92 101 "t"
+46 94 101 "it"
+47 1 101 "nullLike"
diff --git a/tests/test_simpleLiterals.alpha b/tests/test_simpleLiterals.alpha
index fd54099..4c5b0b2 100644
--- a/tests/test_simpleLiterals.alpha
+++ b/tests/test_simpleLiterals.alpha
@@ -4,7 +4,7 @@
 12893 "this is not a string (*one valid token before this*)
 (* spacey comment here     
 over multiple lines
-will it work? *)
+will it work? *) false
 "
 '''
 '\'