Merge pull request #26 from Ruun/branch-new

some more errors changed
Ruun · Jun 14, 2024 · edbb556 · edbb556
2 parents 38a3c07 + a75fb44
commit edbb556
Show file tree

Hide file tree

Showing 27 changed files with 53 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.vs/RuanScript/FileContentIndex/0e0bc77c-8447-4fac-81de-b5686f73670f.vsidx b/.vs/RuanScript/FileContentIndex/0e0bc77c-8447-4fac-81de-b5686f73670f.vsidx
diff --git a/...8a9c420-3a2a-4c5a-874a-e984256691a2.vsidx → ...7a328bb-9bcb-40bf-9241-123a2f0706a8.vsidx b/...8a9c420-3a2a-4c5a-874a-e984256691a2.vsidx → ...7a328bb-9bcb-40bf-9241-123a2f0706a8.vsidx
diff --git a/.vs/RuanScript/FileContentIndex/d9dd0939-806a-4c2d-832d-474f5fe2cad3.vsidx b/.vs/RuanScript/FileContentIndex/d9dd0939-806a-4c2d-832d-474f5fe2cad3.vsidx
diff --git a/.vs/RuanScript/v17/.wsuo b/.vs/RuanScript/v17/.wsuo
diff --git a/.vs/RuanScript/v17/Browse.VC.db b/.vs/RuanScript/v17/Browse.VC.db
diff --git a/.vs/RuanScript/v17/Browse.VC.db-shm b/.vs/RuanScript/v17/Browse.VC.db-shm
diff --git a/.vs/RuanScript/v17/Browse.VC.db-wal b/.vs/RuanScript/v17/Browse.VC.db-wal
diff --git a/.vs/RuanScript/v17/Browse.VC.opendb b/.vs/RuanScript/v17/Browse.VC.opendb
diff --git a/.vs/RuanScript/v17/DocumentLayout.json b/.vs/RuanScript/v17/DocumentLayout.json
@@ -2,6 +2,10 @@
   "Version": 1,
   "WorkspaceRootPath": "C:\\Mac\\Home\\Downloads\\RuanScript\\",
   "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Mac\\Home\\Downloads\\RuanScript\\code\\Compilers.c||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
+      "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:code\\Compilers.c||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Mac\\Home\\Downloads\\RuanScript\\code\\Reader.c||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}",
       "RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:code\\Reader.c||{D0E1A5C6-B359-4E41-9B60-3365922C2A22}"
@@ -23,25 +27,38 @@
             {
               "$type": "Document",
               "DocumentIndex": 0,
+              "Title": "Compilers.c",
+              "DocumentMoniker": "C:\\Mac\\Home\\Downloads\\RuanScript\\code\\Compilers.c",
+              "RelativeDocumentMoniker": "code\\Compilers.c",
+              "ToolTip": "C:\\Mac\\Home\\Downloads\\RuanScript\\code\\Compilers.c",
+              "RelativeToolTip": "code\\Compilers.c",
+              "ViewState": "AQIAAFkAAADAmZmZmdkswGQAAAAdAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
+              "WhenOpened": "2024-06-14T00:55:57.429Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
               "Title": "Reader.c",
               "DocumentMoniker": "C:\\Mac\\Home\\Downloads\\RuanScript\\code\\Reader.c",
               "RelativeDocumentMoniker": "code\\Reader.c",
               "ToolTip": "C:\\Mac\\Home\\Downloads\\RuanScript\\code\\Reader.c",
               "RelativeToolTip": "code\\Reader.c",
-              "ViewState": "AQIAAO4CAAAAwMzMzMwXwPEAAAAAAAAA",
+              "ViewState": "AQIAADgBAAAAAAAAAAAswE4BAAADAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000423|",
               "WhenOpened": "2024-06-13T16:55:18.632Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 2,
               "Title": "launch.vs.json",
               "DocumentMoniker": "C:\\Mac\\Home\\Downloads\\RuanScript\\code\\launch.vs.json",
               "RelativeDocumentMoniker": "code\\launch.vs.json",
               "ToolTip": "C:\\Mac\\Home\\Downloads\\RuanScript\\code\\launch.vs.json",
               "RelativeToolTip": "code\\launch.vs.json",
-              "ViewState": "AQIAAAEAAACazMzMzIwjwAkAAAAIAAAA",
+              "ViewState": "AQIAAAEAAACazMzMzIwjwAsAAAAIAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
               "WhenOpened": "2024-06-12T20:34:20.187Z",
               "EditorCaption": ""

diff --git a/.vs/RuanScript/v17/ipch/AutoPCH/f2749ef70574d092/COMPILERS.ipch b/.vs/RuanScript/v17/ipch/AutoPCH/f2749ef70574d092/COMPILERS.ipch
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
@@ -6,6 +6,6 @@
     "\\code\\out",
     "\\input"
   ],
-  "SelectedNode": "\\code\\Reader.c",
+  "SelectedNode": "\\input",
   "PreviewInSolutionExplorer": false
 }
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/code/Compilers.c b/code/Compilers.c
@@ -96,6 +96,14 @@ Rs_intg main(int argc, char** argv) {
 		mainReader(argc, argv);
 		break;
 		/* TO_DO: Include later SCANNER (A22) and PARSER (A32) */
+		case PGM_SCANNER:
+        printf("%s%c%s", "\n[Option '", PGM_SCANNER, "': Starting SCANNER .....]\n\n");
+		// mainScanner(argc, argv);
+        break;
+    case PGM_PARSER:
+        printf("%s%c%s", "\n[Option '", PGM_PARSER, "': Starting PARSER .....]\n\n");
+		// mainParser(argc, argv);
+        break;
 	default:
 		printf("%s%c%s%c%s%c%s", "* OPTIONS:\n- [",
 			PGM_READER, "] - Reader\n- [",

diff --git a/code/Compilers.h b/code/Compilers.h
@@ -131,6 +131,9 @@ Rs_intg mainReader(Rs_intg argc, Rs_string* argv);
 /* 
 TO_DO: Include later mainScaner (A22) and mainParser (A32)
 */
+// Rs_intg mainScanner(Rs_intg argc, Rs_string* argv);
+// Rs_intg mainParser(Rs_intg argc, Rs_string* argv); 
+
 Rs_void printLogo();
 
 #endif
diff --git a/code/Reader.c b/code/Reader.c
@@ -331,8 +331,8 @@ Rs_boln readerSetMark(BufferPointer const readerPointer, Rs_intg mark) {
 *************************************************************
 */
 Rs_intg readerPrint(BufferPointer const readerPointer) {
-	Rs_intg cont = 0;
-	Rs_char c;
+	//Rs_intg cont = 0;
+	//Rs_char c;
 	/* TO_DO: Defensive programming (including invalid chars) */
 	if (!readerPointer) {
         return -1;

diff --git a/code/Reader.h b/code/Reader.h
@@ -23,7 +23,7 @@
 # ECHO "    @@     @ @@   /@/   @@@ @      @@    �
 # ECHO "    @@     @@@@@@@@@@@@@@@         @@    �
 # ECHO "    @@                             @@    �
-# ECHO "    @@         S O F I A           @@    �
+# ECHO "    @@         RuanScript          @@    �
 # ECHO "    @@                             @@    �
 # ECHO "    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@    �
 # ECHO "                                         "

diff --git a/code/launch.vs.json b/code/launch.vs.json
@@ -7,9 +7,9 @@
       "name": "Compiler.exe",
       "args": [
         "r",
-         "C:/Mac/Home/Downloads/RuanScript/input/test.rs",
+        // "C:/Mac/Home/Downloads/RuanScript/input/test.rs",
         // "C:/Mac/Home/Downloads/RuanScript/input/INPUT0_Empty.rs",
-        // "C:/Mac/Home/Downloads/RuanScript/input/INPUT1_Hello.rs",
+        "C:/Mac/Home/Downloads/RuanScript/input/INPUT1_Hello.rs",
         //  "C:/Mac/Home/Downloads/RuanScript/input/INPUT2_Volume.rs",
         //  "C:/Mac/Home/Downloads/RuanScript/input/INPUT3_Factorial.rs",
         //  "C:/Mac/Home/Downloads/RuanScript/input/INPUT4_Datatypes.rs",

diff --git a/code/out/build/x64-Debug/.ninja_deps b/code/out/build/x64-Debug/.ninja_deps
diff --git a/code/out/build/x64-Debug/.ninja_log b/code/out/build/x64-Debug/.ninja_log
@@ -13,3 +13,19 @@
 193	610	7400263495124599	Compiler.exe	60774a4753864fbb
 19	442	7400281131362751	CMakeFiles/Compiler.dir/Reader.c.obj	a4c8113ae2b0e945
 446	803	7400281134183904	Compiler.exe	60774a4753864fbb
+14	43	0	clean	3807ae1e948da024
+17	439	7400297125079894	CMakeFiles/Compiler.dir/Compilers.c.obj	415acfa213439be1
+30	458	7400297125275060	CMakeFiles/Compiler.dir/MainReader.c.obj	a8187c3450edeeda
+18	46	0	clean	3807ae1e948da024
+17	189	7400297412533598	CMakeFiles/Compiler.dir/Compilers.c.obj	415acfa213439be1
+25	194	7400297412574715	CMakeFiles/Compiler.dir/Reader.c.obj	a4c8113ae2b0e945
+32	216	7400297412821408	CMakeFiles/Compiler.dir/MainReader.c.obj	a8187c3450edeeda
+17	46	0	clean	3807ae1e948da024
+23	166	7400299090246317	CMakeFiles/Compiler.dir/Compilers.c.obj	415acfa213439be1
+31	171	7400299090299895	CMakeFiles/Compiler.dir/Reader.c.obj	a4c8113ae2b0e945
+38	193	7400299090520106	CMakeFiles/Compiler.dir/MainReader.c.obj	a8187c3450edeeda
+16	49	0	clean	3807ae1e948da024
+22	170	7400300468544324	CMakeFiles/Compiler.dir/Compilers.c.obj	415acfa213439be1
+31	174	7400300468580750	CMakeFiles/Compiler.dir/Reader.c.obj	a4c8113ae2b0e945
+38	189	7400300468754824	CMakeFiles/Compiler.dir/MainReader.c.obj	a8187c3450edeeda
+191	550	7400300471508904	Compiler.exe	60774a4753864fbb
diff --git a/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/Compilers.c.obj b/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/Compilers.c.obj
diff --git a/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/MainReader.c.obj b/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/MainReader.c.obj
diff --git a/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/Reader.c.obj b/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/Reader.c.obj
diff --git a/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/vc140.pdb b/code/out/build/x64-Debug/CMakeFiles/Compiler.dir/vc140.pdb
diff --git a/code/out/build/x64-Debug/Compiler.exe b/code/out/build/x64-Debug/Compiler.exe
diff --git a/code/out/build/x64-Debug/Compiler.ilk b/code/out/build/x64-Debug/Compiler.ilk
diff --git a/code/out/build/x64-Debug/Compiler.pdb b/code/out/build/x64-Debug/Compiler.pdb