Add a new token T_FOREACH_VAR specifically for 'foreach as' statements inside the loop and function bodies

Author: mertyildiran

chaos.l

@@ -202,5 +202,5 @@ switch (phase)
 "void"                          {recordToken(strdup(yytext), yyleng); if (isStreamOpen()) return T_VOID;}
 "def"                           {recordToken(strdup(yytext), yyleng); return T_FUNCTION;}
 "import"                        {recordToken(strdup(yytext), yyleng); return T_IMPORT;}
-[a-zA-Z_][a-zA-Z0-9_]*          {bool was_foreach = isForeach(); recordToken(strdup(yytext), yyleng); if ((isStreamOpen()) || was_foreach) { yylval.sval=strdup(yytext); return T_VAR; } }
+[a-zA-Z_][a-zA-Z0-9_]*          {recordToken(strdup(yytext), yyleng); yylval.sval=strdup(yytext); if (isStreamOpen()) { return T_VAR; } else { return T_FOREACH_VAR; }}
 %%

chaos.y

@@ -59,7 +59,7 @@ char *program_file_dir;
 %token<bval> T_TRUE T_FALSE
 %token<ival> T_INT T_TIMES_DO_INT
 %token<fval> T_FLOAT
-%token<sval> T_STRING T_VAR
+%token<sval> T_STRING T_VAR T_FOREACH_VAR
 %token<lluval> T_UNSIGNED_LONG_LONG_INT
 %token T_PLUS T_MINUS T_MULTIPLY T_DIVIDE T_LEFT T_RIGHT T_EQUAL
 %token T_LEFT_BRACKET T_RIGHT_BRACKET T_LEFT_CURLY_BRACKET T_RIGHT_CURLY_BRACKET T_COMMA T_DOT T_COLON
@@ -228,7 +228,7 @@ line: T_NEWLINE
     | function T_NEWLINE                                            { }
     | T_END decisionstart                                           { }
     | T_IMPORT module T_NEWLINE                                     { if (is_interactive) handleModuleImport(NULL, false); }
-    | T_IMPORT module T_AS T_VAR T_NEWLINE                          { if (is_interactive) handleModuleImport($4, false); }
+    | T_IMPORT module T_AS T_VAR T_NEWLINE                          { if (is_interactive) { handleModuleImport($4, false); } else { free($4); } }
     | T_FROM module T_IMPORT T_MULTIPLY                             { if (is_interactive) handleModuleImport(NULL, true); }
     | T_FROM module T_IMPORT function_name                          { if (is_interactive) handleModuleImport(NULL, true); }
     | error T_NEWLINE parser                                        { if (is_interactive) { yyerrok; yyclearin; } }
@@ -694,6 +694,9 @@ loop:
     | T_FOREACH T_VAR T_AS T_VAR                                    { startForeach($2, $4); }
     | T_FOREACH T_VAR T_AS T_VAR T_COLON T_VAR                      { startForeachDict($2, $4, $6); }
     | T_FOREACH T_VAR T_AS T_VAR T_FOREACH_AS_COLON T_VAR           { startForeachDict($2, $4, $6); }
+    | T_FOREACH T_FOREACH_VAR T_AS T_FOREACH_VAR                                            { startForeach($2, $4); }
+    | T_FOREACH T_FOREACH_VAR T_AS T_FOREACH_VAR T_COLON T_FOREACH_VAR                      { startForeachDict($2, $4, $6); }
+    | T_FOREACH T_FOREACH_VAR T_AS T_FOREACH_VAR T_FOREACH_AS_COLON T_FOREACH_VAR           { startForeachDict($2, $4, $6); }
 ;
 
 decisionstart:                                                                      { decision_mode = function_mode; handle_end_keyword(); }
@@ -753,6 +756,7 @@ preparser_line:                                                     { }
 function:
     | T_FOREACH_AS_COLON function                                   { }
     | T_TIMES_DO_INT function                                       { }
+    | T_FOREACH_VAR function                                        { free($1); }
 ;
 
 quit:                                                               { }

tests/everything.kaos

@@ -0,0 +1,75 @@
+/*
+This is a test that almost every feature of the language
+used in a program altogether to see if anything is wrong.
+*/
+
+import modules.lib
+from modules.lib import everything_f2
+import modules.lib as lib2
+
+/*
+This is a
+multiline comment
+for the function below
+@description Adds to numbers together
+*/
+num def add(num x, str y)
+    num z = x + y
+
+    bool a = true
+    num b = 576.34
+    // This is a comment
+    list c = ['foo', "bar", 17, 3.14, a, false] // End of Line(EOL) comment
+    pretty echo c
+    # This is a comment too
+    dict d = {'a': 1, 'b': b, 'c': [2, 3, 4]} # End of Line(EOL) comment
+    pretty print d
+
+    del c
+end {
+    z == 8  : f1(),
+    z > 10  : f2(),
+    default : f3()
+}
+
+print add(3, 5)
+
+echo lib.everything_f1(4)
+print everything_f2(32)
+print lib2.everything_f3(121, 34)
+
+num def f1()
+    num a = 101
+    return a
+end
+
+num def f2()
+    num b = 102
+    return b
+end
+
+num def f3()
+    num c = 103
+    return c
+end
+
+list a = [
+    1,
+    2,
+    3
+]
+
+foreach a as el
+    print el
+    el = 5
+    2 times do
+        print el
+    end
+end
+
+dict n = {'a': 'foo', 'b': 'bar', 'c': 'baz'}
+
+foreach n as key : val
+    print key
+    print val
+end

tests/everything.out

@@ -0,0 +1,34 @@
+[
+    'foo',
+    'bar',
+    17,
+    3.14,
+    true,
+    false
+]{
+    'a': 1,
+    'b': 576.34,
+    'c': [
+        2,
+        3,
+        4
+    ]
+}
+101
+264
+465
+1
+5
+5
+2
+5
+5
+3
+5
+5
+a
+foo
+b
+bar
+c
+baz

tests/module.kaos

@@ -2,7 +2,7 @@ import modules.hello
 from modules.module5 import *
 from modules.module6 import module6Function2, module6Function3, module6Function5
 import modules/module7
-import modules\module8
+import modules\module8 as module_x
 from modules.level1.level2.module9 import module9
 
 void def mainContext()
@@ -15,6 +15,6 @@ module6Function2()
 module6Function3()
 module6Function5()
 module7.module7()
-module8.module8()
+module_x.module8()
 module9()
 mainContext()

tests/modules/lib.kaos

@@ -27,3 +27,19 @@ dict def dict_f1()
     dict a = {'d': 4, 'e': 5, 'f': 6}
     return a
 end
+
+num def everything_f1(num x)
+    x = x / 2
+    return x
+end
+
+num def everything_f2(num x)
+    x = x * 2
+    return x
+end
+
+num def everything_f3(num x, num y)
+    x = (x + y) * 3
+    return x
+end
+

utilities/injector.c

@@ -46,12 +46,6 @@ void recordToken(char *token, int length) {
     free(token);
 }
 
-bool isForeach() {
-    if (last_token == NULL) return false;
-    if (strcmp(last_token, "foreach") == 0 || strcmp(last_token, "as") == 0 || strcmp(last_token, ":") == 0) return true;
-    return false;
-}
-
 bool isStreamOpen() {
     return loop_mode == NULL && function_mode == NULL;
 }

utilities/injector.h

@@ -19,8 +19,6 @@ void parseTheModuleContent(char *module_path);
 char *last_token;
 
 void recordToken(char *token, int length);
-
-bool isForeach();
 bool isStreamOpen();
 
 #endif