Organization + Task 1 objectives t#30

.gitignore

@@ -3,4 +3,7 @@
 alpha
 flex.h
 grammar.tab.c
-grammar.tab.h
+grammar.tab.h
+.vscode
+out
+src

Makefile

@@ -25,27 +25,20 @@ debug: CFLAGS += -DDEBUG=1
 debug: clean compiler
 
 test:
-	./$(EXE) ./tests/test_comments.alpha
+	./$(EXE) -tok ./tests/sprint1/test_comment_fix1.alpha
-	./$(EXE) ./tests/test_generalTokenTest.alpha
+	./$(EXE) -tok ./tests/sprint1/test_comment_fix2.alpha
-	./$(EXE) ./tests/test_keywords.alpha
+	./$(EXE) -tok ./tests/sprint1/test_comment_issues.alpha
-	./$(EXE) ./tests/test_operators.alpha
+	./$(EXE) -tok ./tests/sprint1/test_comments.alpha
-	./$(EXE) ./tests/test_otherpunc.alpha
+	./$(EXE) -tok ./tests/sprint1/test_general_token.alpha
-	./$(EXE) ./tests/test_simpleIntTest.alpha
+	./$(EXE) -tok ./tests/sprint1/test_keywords.alpha
-	./$(EXE) ./tests/test_simpleLiterals.alpha
+	./$(EXE) -tok ./tests/sprint1/test_operators.alpha
-	./$(EXE) ./tests/test_real_alpha_file.alpha
+	./$(EXE) -tok ./tests/sprint1/test_other_punc.alpha
-	./$(EXE) ./tests/test_real_alpha_2.alpha
+	./$(EXE) -tok ./tests/sprint1/test_punc_grouping.alpha
-	./$(EXE) -tok ./tests/test_comments.alpha
+	./$(EXE) -tok ./tests/sprint1/test_real_alpha_file1.alpha
-	./$(EXE) -tok ./tests/test_generalTokenTest.alpha
+	./$(EXE) -tok ./tests/sprint1/test_real_alpha_file2.alpha
-	./$(EXE) -tok ./tests/test_keywords.alpha
+	./$(EXE) -tok ./tests/sprint1/test_simple_int.alpha
-	./$(EXE) -tok ./tests/test_operators.alpha
+	./$(EXE) -tok ./tests/sprint1/test_simple_literals.alpha
-	./$(EXE) -tok ./tests/test_otherpunc.alpha
+	./$(EXE) -tok ./tests/sprint1/test_variables.alpha
-	./$(EXE) -tok ./tests/test_simpleIntTest.alpha
-	./$(EXE) -tok ./tests/test_simpleLiterals.alpha
-	./$(EXE) -tok ./tests/test_real_alpha_file.alpha
-	./$(EXE) -tok ./tests/test_real_alpha_2.alpha
-	./$(EXE) -tok -st ./tests/test_real_alpha_2.alpha
-	./$(EXE) -st -tok ./tests/test_operators.alpha
-	./$(EXE) -st ./tests/test_keywords.alpha
 
 clean:
 	rm -f *.o
@@ -56,3 +49,4 @@ clean:
 	rm -f grammar.tab.c
 	rm -f grammar.tab.h
 	rm -f *.st
+	rm -rf out

grammar.y

@@ -52,6 +52,13 @@
 %token RESERVE 613
 %token RELEASE 614
 %token COMMENT 700
-%%
 
+%%
+  DBLOCK: %empty;
+
+  FUNCTION_DECLARATION: FUNCTION ID COLON ID
+                      | EXTERNAL FUNCTION ID COLON ID
+					  ;
+  RECORD_DECLARATION: TYPE ID COLON DBLOCK;
+  ARRAY_DECLARATION: ID ASSIGN RESERVE ID L_PAREN C_INTEGER R_PAREN;
 %%

runner.c

@@ -87,7 +87,7 @@ int run(FILE *alpha) {
 
     if (st_flag != NULL) {
         //output symbol table, file pointer is
-        print_symbol_table(top,st_flag);
+        //print_symbol_table(top,st_flag);
     }
 
     if (yyin != NULL) {
@@ -115,10 +115,19 @@ int new_file(char *arg, char *alpha) {
     int type_len;
     const char *basename = alpha;
     const char *slash = strchr(alpha, '/');
+
     while (slash != NULL) {
         basename = slash + 1;
         slash = strchr(basename, '/');
     }
+	
+	mkdir("./out", 0777);
+
+	char *new_basename = calloc(strlen(basename) + 5, sizeof(char));
+	strcpy(new_basename, "./out/");
+	strcat(new_basename, basename);
+	basename = new_basename;
+
     if (strcmp(arg, "-tok") == 0) {
         type_len = TOK_LEN;
     } else if (strcmp(arg, "-st") == 0) {

runner.h

@@ -12,6 +12,7 @@
 #include "typedefs.h"
 #include <stdbool.h>
 #include "symbol_table.h"
+#include <sys/stat.h>
 
 extern int line_number, column_number;
 extern char *yytext;

tests/sprint1/test_comment_fix1.alpha

@@ -0,0 +1 @@
+(***)

tests/sprint1/test_comment_fix2.alpha

@@ -0,0 +1 @@
+(*(**)*)

tests/testPath/testPath.alpha

@@ -1,23 +0,0 @@
-This is a test
-9combined 7okens
-12345
-893247892
-combined'DueToUnknownChar _validtoken __validtoken1 _valid_token2 validToken3_
-true false
-null while !wrong if when
-else	type	function
-return  external        as
-string _NOte_that_was_not_reserved
-([)]{}:;,->"\
-+-*/%
-<=
-:=
-"This is not a valid
-String"
-"This is a valid String"
-!|
-..
-(* this is a comment *)
-(*Not a comment
-$^&
->

tests/test_operators.alpha~

@@ -1,17 +0,0 @@
-+
--
-*
-/
-\
-%
-<
->
-=
-:=
-=:
-:
-=
-!
-&
-|
-.