Organizing input files

faizal3199 · Apr 1, 2018 · e66018e · e66018e
1 parent 1ec173f
commit e66018e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 149 deletions.
diff --git a/error_test_input.txt b/error_test_input.txt
diff --git a/intermediate_test_input.txt b/intermediate_test_input.txt
diff --git a/listing_test_input.txt b/listing_test_input.txt
diff --git a/object_test_input.txt b/object_test_input.txt
diff --git a/pass1.cpp b/pass1.cpp
@@ -321,7 +321,7 @@ void pass1(){
             valueString += valueTemp;
 
             singleOperator= "";
-            while(i<operand.length()-1&&(lastByte=='+'||lastByte=='-'||lastByte=='/'||lastByte=='*')){
+            while(i<operand.length()&&(lastByte=='+'||lastByte=='-'||lastByte=='/'||lastByte=='*')){
               singleOperator += lastByte;
               lastByte = operand[++i];
             }
@@ -339,9 +339,9 @@ void pass1(){
             else{
               lastOperator = 0;
             }
-          }
 
-          valueString += singleOperator;
+            valueString += singleOperator;
+          }
 
           if(!Illegal){
             if(pairCount==1){
@@ -353,6 +353,7 @@ void pass1(){
             else if(pairCount==0){
               /*absolute*/
               relative = 0;
+              cout<<valueString<<endl;
               EvaluateString tempOBJ(valueString);
               tempOperand = intToStringHex(tempOBJ.getResult());
             }

diff --git a/test_input.txt → test_inputs/input.asm b/test_input.txt → test_inputs/input.asm
@@ -8,22 +8,22 @@ CLOOP   JSUB    RDREC  Comment here
         JSUB    WRREC  Comment here
         J       CLOOP Comment here
 ENDFIL  LDA     =C'EOF' Comment here
-        STA    BUFFER Comment here
+        STA     BUFFER Comment here
         LDA     #3  Comment here
         STA     LENGTH  Comment here
         JSUB    WRREC  Comment here
         J       @RETADR Comment here
-        USE CDATA
+        USE     CDATA
 RETADR  RESW    1 Comment here
 LENGTH  RESW    1 Comment here
-  USE CBLKS
+        USE     CBLKS
 BUFFER  RESB    4096 Comment here
-BUFEND  EQU * Comment here to test * literal
-MAXLEN EQU BUFEND-BUFFER
+BUFEND  EQU     * Comment here to test * literal
+MAXLEN  EQU     BUFEND-BUFFER
 .
 .   RDREC SUBROUTINE
 .
-  USE DEFAULT
+        USE     DEFAULT
 RDREC   CLEAR   X Comment here
         CLEAR   A Comment here
         CLEAR   S Comment here
@@ -37,13 +37,13 @@ RLOOP   TD      INPUT Comment here
         TIXR    T Comment here
         JLT     RLOOP Comment here
 EXIT    STX     LENGTH Comment here
-        RSUB Comment here
-        USE CDATA
+        RSUB    Comment here
+        USE     CDATA
 INPUT   BYTE    X'F1' Comment here
 .
 .   WRREC SUBROUTINE
 .
-  USE DEFAULT
+        USE     DEFAULT
 WRREC   CLEAR   X Comment here
         LDT     LENGTH Comment here
 WLOOP   TD      =X'05' Comment here
@@ -52,7 +52,7 @@ WLOOP   TD      =X'05' Comment here
         WD      =X'05' Comment here
         TIXR    T Comment here
         JLT     WLOOP Comment here
-        RSUB Comment here
-        USE CDATA
+        RSUB         Comment here
+        USE     CDATA
         LTORG
         END     FIRST Comment here