Merge pull request #11 from UB-CSE443/Sprint1-BasicProgSetupFix-t#06

Sprint1 basic prog setup fix t#06

Makefile

@@ -2,10 +2,20 @@ CC := gcc
 FLEX := flex
 LEX := lexicalStructure.lex
 EXE := lexicalStructure
+CFLAGS := -std=c99 -Wall
+CPPFLAGS :=
 
-lexicalStructure:
-	$(FLEX) $(LEX)
-	$(CC) lex.yy.c -o $(EXE)
+runner: flex.o runner.o
+	$(CC) -o runner runner.o flex.o
+
+runner.o: runner.c runner.h flex.h
+	$(CC) $(CFLAGS) -o runner.o -c runner.c
+
+flex.o: lex.yy.c typedefs.h
+	$(CC) $(CFLAGS) -o flex.o -c lex.yy.c
+
+lex.yy.c: lexicalStructure.lex
+	$(FLEX) -o lex.yy.c $(LEX)
   
 test:
 	./$(EXE) ./tests/test_comments.alpha
@@ -20,3 +30,4 @@ clean:
 	rm -f *.o
 	rm -f lex.yy.c
 	rm -f $(EXE)
+	rm -f flex.h

lexicalStructure.lex

@@ -3,6 +3,7 @@
 /* definitions */
 
 %option noyywrap
+%option header-file="flex.h"
 %{
 	#include <stdbool.h>
 	#include "typedefs.h"
@@ -70,13 +71,3 @@ SCHAR \\n|\\t|\\\"|[^\"\n\\]
 .				{column_number++;}
 
 %%
-
-int main( int argc, char **argv )
-{
-	argc--, argv++;
-	if ( argc > 0 )
-		yyin = fopen( argv[0], "r" );
-	else
-		yyin = stdin;
-	yylex();
-}

runner.c

@@ -1,18 +1,29 @@
 #include "runner.h"
 
-int main(int argc, char ** argv) {
+
+int main(int argc, char *argv[]) {
     char *check_input;
     int token;
-    //check_input can be compared to INVALID_ARG and DIFF_ARG to determine if -tok and holds the generated file name if it is
-    check_input = is_tok(argc, argv);
-    FILE * output = fopen(check_input, "w");
+    FILE *output;
 
-    if (check_input == INVALID_ARG) {
-        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
+        yyin = fopen(argv[1], "r");
+    } else {
+        check_input = is_tok(argc, argv);
+        if (strcmp(CHECK_OTHER, check_input) == 0 || strcmp(INVALID_ARG, check_input) == 0) {
+             fprintf(stderr, "check_other or invalid_arg \n"); 
+            return -1; //invalid argument (need to update as we add more valid arguments)
+        }
+        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())) {
-        if (check_input != DIFF_ARG) {
+        if (arg == TOK_ARG) {
             fprintf(output, "%d %d %3d \"%s\"\n", line_number, column_number, token, yytext);
         }
     }
@@ -21,17 +32,38 @@ int main(int argc, char ** argv) {
 }
 
 char *is_tok(int argc, char *argv[]) {
-    if (argc == 3 && strcmp("-tok", argv[1])) {
+    if (argc == 3 && strcmp("-tok", argv[1]) == 0) {
         char *input_prog = argv[2];
-        int file_len = strlen(input);
+        int file_len = strlen(input_prog);
         //check that input program is a .alpha file
-        if (strcmp(".alpha", input_prog[file_len - ALPHA_OFFSET]) != 0) {
+        if (is_alpha_file(input_prog, file_len) != 0) {
             return INVALID_ARG;
         }
-        char *FILE_tok[file_len - ALPHA_OFFSET + TOK_LEN]; 
-        strncpy(input, FILE_tok, file_len - ALPHA_OFFSET); //copy name of prog before .alpha
-        strcpy(".tok", FILE_tok[file_len - ALPHA_OFFSET]); //add .tok to end of file name
+
+        int ignore_path = 0;
+        int count_since_slash = 0;
+        for (int i = 0; i < file_len; i++) {
+            count_since_slash++;
+            if (input_prog[i] == '/') {
+                ignore_path += count_since_slash;
+                count_since_slash = 0;
+            }
+        }
+        
+        file_len -= ignore_path;
+        input_prog += ignore_path;
+        char* FILE_tok = calloc(sizeof(char), file_len - ALPHA_OFFSET + TOK_LEN);
+        strncpy(FILE_tok, input_prog, file_len - ALPHA_OFFSET); //copy name of prog before .alpha
+        strcpy(FILE_tok + sizeof(char) * (file_len - ALPHA_OFFSET), ".tok"); //add .tok to end of file name
         return FILE_tok;
     }
-    return DIFF_ARG;
+    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,14 +1,25 @@
-#define ALPHA_OFFSET 5
+#define ALPHA_OFFSET 6
 #define TOK_LEN 3
+
+//returns for is_tok
 #define INVALID_ARG "invalid"
-#define DIFF_ARG "diff"
+#define CHECK_OTHER "diff"
+
+//argument type in main
+#define NO_ARG 0
+#define DIFF_ARG 1
+#define TOK_ARG 2
+
 #include <string.h>
 #include <stdio.h>
-#include "lex.yy.c"
+#include <stdlib.h>
+#include "flex.h"
 
 extern int line_number, column_number;
 extern char *yytext;
+extern FILE *yyin;
+int arg;
 
-int main(int argc, char *argv[]);
-char *is_tok(int argc, char *argv[]);
-#define ALPHA_OFFSET 5
+int main(int argc, char* argv[]);
+char *is_tok(int argc, char* argv[]);
+int is_alpha_file(char *file, int file_len);

tests/testPath/testPath.alpha

@@ -0,0 +1,23 @@
+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~

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