Merge pull request #8 from RomanR-dev/release

prepare for delivery

Author: RomanR-dev

.github/workflows/CI.yml

@@ -21,16 +21,16 @@ jobs:
           echo building project
           rm -f assembler
           make
-          ./assembler ps ps2 ps3 ps4 ps5 ps6 ps7
-          echo compare tester/ps.ob tester/main_tester
-          cmp tester/ps.ob tester/main_tester
+          ./assembler ps
+          echo compare ps.ob input_output_results/main_tester
+          diff ps.ob input_output_results/main_tester.ob -s
       - uses: actions/upload-artifact@v3
         with:
           name: assembler.zip
           path: |
             misc
             passes
-            tester 
+            input_output_results 
             assembler
             assembler.c
             Makefile
@@ -45,9 +45,9 @@ jobs:
           echo building project
           rm -f assembler
           make
-          ./assembler ps ps2 ps3 ps4 ps5 ps6 ps7
-          echo compare tester/ps.ob tester/main_tester
-          cmp tester/ps.ob tester/main_tester
+          ./assembler ps
+          echo compare ps.ob input_output_results/main_tester
+          diff ps.ob input_output_results/main_tester.ob -s
 
   build_and_test_macos-latest:
     runs-on: macos-latest
@@ -59,4 +59,4 @@ jobs:
           echo building project
           rm -f assembler
           make
-          ./assembler ps ps2 ps3 ps4 ps5 ps6 ps7
+          ./assembler ps

assembler

@@ -41,10 +41,9 @@ void mainRunner(int argc, char **argv) {
             lineNum = 1;
             firstPass(line, outP, &errors, outPutFileName);
         } else {
-            fclose(outP);
             fclose(inp);
             remove(outPutFileName);
-            printError("due to errors not continuing with flow on current file, continue with next file...");
+            printError("due to errors not continuing with flow on current file, continue with next file");
         }
         printf("===>>>>>> Finished file: %s <<<<<<===\n", outPutFileName);
         printf("======================================================================\n\n");

assembler.c

@@ -0,0 +1,62 @@
+Received 3 files, starting assembler process.
+
+Processing: ps7.as
+===>>>>>> Pre assembler finished: Errors: 0
+1 --->Too many commas in 1 line
+1 --->Too many commas in 1 line
+1 --->Too many commas in 1 line
+2 --->Wrong number of operands for command: clr
+3 --->Error: CMD: [ ... ] not found.
+4 --->Error: CMD: [ #$%#@$%@#$#@ ] not found.
+5 --->Error: CMD: [ r1 ] not found.
+6 --->Undefined label: MAIN:
+7 --->Wrong number of operands for command: jsr
+8 --->expected regs between 10 and 15
+9 --->reg: r32, wrong number
+===>>>>>> First pass finished: Errors: 11
+
+-->due to errors not continuing with flow on current file, continue with next file...
+===>>>>>> Finished file: tester/ps7.am <<<<<<===
+======================================================================
+
+Processing: ps4.as
+===>>>>>> Pre assembler finished: Errors: 0
+1 --->Error: CMD: [ mow ] not found.
+2 --->Error: CMD: [ wom ] not found.
+3 --->Error: CMD: [ step ] not found.
+4 --->Error: CMD: [ jpr ] not found.
+5 --->Error: CMD: [ ABC ] not found.
+7 --->Operand: 1, did not find matching sort type
+
+9 --->String not declared properly
+===>>>>>> First pass finished: Errors: 7
+
+-->due to errors not continuing with flow on current file, continue with next file...
+===>>>>>> Finished file: tester/ps4.am <<<<<<===
+======================================================================
+
+Processing: ps3.as
+===>>>>>> Pre assembler finished: Errors: 0
+1 --->Undefined label: LIST:
+2 --->Wrong number of operands for command: lea
+3 --->Wrong number of operands for command: mov
+5 --->Too many commas in 1 line
+6 --->Wrong number of operands for command: mov
+7 --->Undefined label: MAIN:
+8 --->Wrong number of operands for command: mov
+8 --->Too many commas in 1 line
+9 --->Wrong number of operands for command: clr
+10 --->Wrong number of operands for command: dec
+11 --->Wrong number of operands for command: bne
+12 --->Wrong number of operands for command: lea
+13 --->No data after .data declaration
+14 --->Undefined label: LABEL:
+
+14 --->No characters after .string declaration or string undeclared properly
+===>>>>>> First pass finished: Errors: 15
+
+-->due to errors not continuing with flow on current file, continue with next file...
+===>>>>>> Finished file: tester/ps3.am <<<<<<===
+======================================================================
+
+Finished processing - 3 file(s) that were received.

tester/main_tester input_output_results/main_tester.obtester/main_tester renamed to input_output_results/main_tester.ob

@@ -0,0 +1,3 @@
+Received 0 files, starting assembler process.
+
+Finished processing - 0 file(s) that were received.

input_output_results/multi_file_log.txt

@@ -13,7 +13,7 @@ dec K
 .entry MAIN
 sub LOOP[r10] ,r14
 END: stop
-STR: .string “abcd”
+STR: .string "abcd"
 LIST: .data 6, -9
 .data -100
 .entry K

input_output_results/no_files_received_log.txt

@@ -17,7 +17,7 @@ dec K
     .entry MAIN
 sub LOOP[r10] ,r14
 END: stop
-STR: .string “abcd”
+STR: .string "abcd"
 LIST: .data 6, -9
     .data -100
     .entry K