Merge branch 'Dev' into Sprint2-Symbol_Table_Setup-FE-t#32

.gitignore

@@ -0,0 +1,4 @@
+*.tok
+*.o
+alpha
+flex.h

Makefile

@@ -1,21 +1,20 @@
 CC := gcc
 FLEX := flex
 LEX := lexicalStructure.lex
-EXE := runner
+EXE := alpha
 CFLAGS := -std=c99 -Wall
 CPPFLAGS :=
 
-runner: flex.o runner.o
+build: lex.yy.c runner.o runner
-	$(CC) -o runner runner.o flex.o
+
+lex.yy.c: lexicalStructure.lex
+	$(FLEX) -o lex.yy.c $(LEX)
 
 runner.o: runner.c runner.h flex.h
 	$(CC) $(CFLAGS) -o runner.o -c runner.c
 
-flex.o: lex.yy.c typedefs.h
+runner: lex.yy.c runner.o
-	$(CC) $(CFLAGS) -o flex.o -c lex.yy.c
+	$(CC) -o $(EXE) runner.o lex.yy.c
-
-lex.yy.c: lexicalStructure.lex
-	$(FLEX) -o lex.yy.c $(LEX)
 
 debug: CFLAGS += -DDEBUG=1
 debug: clean runner
@@ -39,9 +38,14 @@ test:
 	./$(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
 	rm -f lex.yy.c
 	rm -f $(EXE)
 	rm -f flex.h
 	rm -f *.tok
+	rm -f *.st

runner.c

@@ -2,83 +2,151 @@
 
 
 int main(int argc, char *argv[]) {
-    char *check_input;
+    if (argc == 1) {
-    int token;
+        fprintf(stderr, "INVALID INPUT: Include a .alpha file or use -help for more inputs \n");
-    FILE *output;
+        return -1;
-
-    if (argc == 1 || argc > 3 || (argc == 2 && is_alpha_file(argv[1], strlen(argv[1])) != 0)) {
-        fprintf(stderr, "invalid input with 1, >3, or non .alpha arg \n");
-        return -1; //no alpha file or too many args
     } else if (argc == 2) {
-        arg = NO_ARG;   //no argument but valid input
+        //can be either -help or .alpha file
-        yyin = fopen(argv[1], "r");
+        if (is_help(argv[1])) {
+            return 0;
+        } else if (is_alpha_file(argv[1], strlen(argv[1])) == 0) {
+            //run flex for now
+            no_flag = SET_FLAG;   //no argument but valid input
+            alpha_file = fopen(argv[1], "r");
+
+        } else {
+            fprintf(stderr, "INVALID INPUT: Include a .alpha file or use -help for more inputs\n");
+            return -1;
+        }
     } else {
-        check_input = is_tok(argc, argv);
+        //last input must be .alpha
-        if (strcmp(CHECK_OTHER, check_input) == 0 || strcmp(INVALID_ARG, check_input) == 0) {
+        if (is_alpha_file(argv[argc - 1], strlen(argv[argc - 1])) != 0) {
-             fprintf(stderr, "check_other or invalid_arg \n");
+            fprintf(stderr, "INVALID INPUT: Include a .alpha file at end of input or use -help for more inputs \n");
-            return -1; //invalid argument (need to update as we add more valid arguments)
+            return -1;
+        } else {
+            //now check that other args are valid (flags will not be null if flag is present)
+            for (int i = 1; i < argc - 1; i++) {
+                if (check_flag(argv[i], argv[argc - 1]) != 0) {
+                    fprintf(stderr, "INVALID FLAG(S): Use -help to view valid inputs \n");
+                    return -1;
+                }
+            }
+            alpha_file = fopen(argv[argc - 1], "r");
         }
-        output = fopen(check_input, "w");
-        arg = TOK_ARG; //it is a -tok arg with a valid alpha file at argv[2]
-        yyin = fopen(argv[2], "r");
     }
-    while (0 != (token = yylex())) {
+    return run(alpha_file);
-        if (arg == TOK_ARG) {
+}
-            fprintf(output, "%d %d %3d \"%s\"\n", line_number, column_number, token, yytext);
+
+int check_flag(char *arg, char* alpha) {
+    if (strcmp("-tok", arg) == 0) {
+        if (tok_flag == NULL) {
+            return new_file(arg, alpha);
         }
-	if(token == COMMENT){
+        fprintf(stderr, "FLAGS REPEAT\n");
-		for (int i = 0; i < yyleng; i++) {
+        return -1;
-			if(yytext[i] == '\n'){
+    } else if (strcmp("-st", arg) == 0) {
-				line_number++;
+        if (st_flag == NULL) {
-				column_number = 0;
+            return new_file(arg, alpha);
-			}
+        }
-			column_number++;
+        fprintf(stderr, "FLAGS REPEAT\n");
-		}
+        return -1;
-		continue;
+    } else {
+        fprintf(stderr, "INVALID FLAG: Use -help for valid inputs\n");
+        return -1;
+    }
+}
+
+
+int run(FILE *alpha) {
+    int token;
+    //check that file exists
+    if (alpha == NULL) {
+        fprintf(stderr, "INPUT FILE NOT FOUND\n");
+        return -1;
+    }
+    yyin = alpha;
+    while (0 != (token = yylex())) {
+        if (tok_flag != NULL) {
+            fprintf(tok_flag, "%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 (st_flag != NULL) {
+        //output symbol table, file pointer is
+        fprintf(st_flag, "just checking that this works \n");
+    }
+
     if (yyin != NULL) {
         fclose(yyin);
     }
-    if (output != NULL && arg == TOK_ARG) {
+    
-        fclose(output);
+    if (tok_flag != NULL) {
+        fclose(tok_flag);
+    }
+
+    return 0;
+}
+
+
+
+bool is_help(char * input) {
+    if (strcmp(input, "-help") == 0) {
+        printf("%s", HELP);
+        return true;
+    }
+    return false;
+}
+
+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, '/');
+    }
+    if (strcmp(arg, "-tok") == 0) {
+        type_len = TOK_LEN;
+    } else if (strcmp(arg, "-st") == 0) {
+        type_len = ST_LEN;
+    } else {
+        fprintf(stderr, "INVALID FLAG: Use -help to view valid inputs\n");
+        return -1;
+    }
+
+
+    // calculate lengths
+    int basename_len = strlen(basename);
+    char *file_name = calloc(basename_len - ALPHA_OFFSET + type_len + 2, sizeof(char));
+
+    //coy filename and add extension
+    strncpy(file_name, basename, basename_len - ALPHA_OFFSET);
+    strcat(file_name, ".");
+    strcat(file_name, arg + 1);
+
+    
+    if (strcmp(arg, "-tok") == 0) {
+        tok_flag = fopen(file_name, "w");
+    } else if (strcmp(arg, "-st") == 0) {
+        st_flag = fopen(file_name, "w");
     }
     return 0;
 }
 
-char *is_tok(int argc, char *argv[]) {
-    if (argc == 3 && strcmp("-tok", argv[1]) == 0) {
-        char *input_prog = argv[2];
-        int file_len = strlen(input_prog);
-        //check that input program is a .alpha file
-        if (is_alpha_file(input_prog, file_len) != 0) {
-            return INVALID_ARG;
-        }
 
-        const char *basename = input_prog;
+int is_alpha_file(char *alpha, int file_len) {
-        const char *slash = strrchr(input_prog, '/');
+    if (strcmp(".alpha", alpha + sizeof(char) * (file_len - ALPHA_OFFSET)) != 0) {
-        if (slash != NULL) {
-            basename = slash + 1;
-        }
-
-        // Calculate lengths
-        int basename_len = strlen(basename);
-        char* FILE_tok = calloc(basename_len - ALPHA_OFFSET + TOK_LEN + 2, sizeof(char));
-
-        // Copy filename and add .tok extension
-        strncpy(FILE_tok, basename, basename_len - ALPHA_OFFSET);
-        //fprintf(stderr, "hello");
-        strcat(FILE_tok, ".tok");
-
-        return FILE_tok;
-    }
-    return CHECK_OTHER;
-}
-
-int is_alpha_file(char *file, int file_len) {
-    if (strcmp(".alpha", file + sizeof(char) * (file_len - ALPHA_OFFSET)) != 0) {
         return -1; //not alpha file
     }
     return 0; //is alpha file

runner.h

@@ -1,26 +1,29 @@
 #define ALPHA_OFFSET 6
 #define TOK_LEN 3
-
+#define ST_LEN 2
-//returns for is_tok
+#define HELP "HELP:\nHow to run the alpha compiler:\n./alpha [options] program\nValid options:\n-tok   output the token number, token, line number, and column number for each of the tokens to the .tok file\n-st    output the symbol table for the program to the .st file\n-help  print this message and exit the alpha compiler\n"
-#define INVALID_ARG "invalid"
+//use to set flags for arg types
-#define CHECK_OTHER "diff"
+#define SET_FLAG 1
-
-//argument type in main
-#define NO_ARG 0
-#define DIFF_ARG 1
-#define TOK_ARG 2
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "flex.h"
 #include "typedefs.h"
+#include <stdbool.h>
 
 extern int line_number, column_number;
 extern char *yytext;
 extern FILE *yyin;
 int arg;
+FILE *alpha_file;
+FILE *tok_flag = NULL;
+FILE *st_flag = NULL;
+int no_flag = 0;
 
 int main(int argc, char* argv[]);
-char *is_tok(int argc, char* argv[]);
+int new_file(char *arg, char *alpha);
-int is_alpha_file(char *file, int file_len);
+int is_alpha_file(char *alpha, int file_len);
+bool is_help(char * input);
+int run(FILE*alpha);
+int check_flag(char * arg, char* alpha);

symbol_table.c

@@ -1,7 +1,9 @@
 //Defining a symbol table
 //Using a Linked List Structure. Head of linked List points to parent scope (if one exists)
+
 //Tail of Linked List points to a List of child scopes
 
+
 #include "symbol_table.h"
 
 SymbolTable* CreateScope(SymbolTable* ParentScope, int Line, int Column){