Better error reporting and new color options

Author: penavon

Rhodus_Version_3/RhodusVersionThreeProject.dpr

@@ -30,7 +30,7 @@ program RhodusVersionThreeProject;
 
 uses
   {$IFDEF DEBUG}
-  FastMM4 in '..\..\Library\FastMM\FastMM4.pas',
+  //FastMM4 in '..\..\Library\FastMM\FastMM4.pas',
   {$ENDIF }
   Windows,
   ShellAPI,
@@ -39,6 +39,8 @@ uses
   Math,
   IOUtils,
   Classes,
+  Vcl.GraphUtil,
+  Vcl.Graphics,
   System.Types,
   System.Generics.Defaults,
   System.Generics.Collections,
@@ -80,7 +82,9 @@ uses
   uRhodusTypes in '..\VirtualMachine\uRhodusTypes.pas';
 
 var sourceCode : string;
+    fragment : string;
     runFramework : TRunFramework;
+    color : TColor;
 
 
 function searchHelp (const helpStr : string) : string;
@@ -223,6 +227,7 @@ begin
 
     try
       computeBaseLineMemoryAllocated;
+      SetExtendedConsoleMode; // To get more colors
       displayWelcome;
       while True do
           begin
@@ -235,8 +240,28 @@ begin
             if runCommand (sourceCode) then
                 continue;
 
-             runFramework.showAssembler := bolShowAssembler;
-             runFramework.runCode (sourceCode, True);
+            runFramework.showAssembler := bolShowAssembler;
+
+            if sourceCode = '#p' then
+               begin
+               writeln ('Type q or return to exit and run program');
+               write ('... ');
+               sourceCode := '';
+               readln (fragment);
+               while (fragment <> 'q') and (fragment <> '') do
+                   begin
+                   if sourceCode = '' then
+                      sourceCode := fragment
+                   else
+                      sourceCode := sourceCode + sLineBreak + fragment;
+                   write ('... ');
+                   readln (fragment)
+                   end;
+              // writeln (sourceCode);
+               runFramework.runCode (sourceCode, True);
+               end
+            else
+              runFramework.runCode (sourceCode, True);
 
           except
               on e:exception do

Rhodus_Version_3/RhodusVersionThreeProject.dproj

@@ -5,7 +5,7 @@
         <FrameworkType>None</FrameworkType>
         <MainSource>RhodusVersionThreeProject.dpr</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>3</TargetedPlatforms>
         <AppType>Console</AppType>
@@ -137,8 +137,8 @@
         <DCC_RangeChecking>true</DCC_RangeChecking>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_MajorVer>3</VerInfo_MajorVer>
-        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=3.0.0.3;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <VerInfo_Build>3</VerInfo_Build>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=3.0.0.5;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Build>5</VerInfo_Build>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <DCC_MapFile>3</DCC_MapFile>
@@ -168,7 +168,6 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="..\..\Library\FastMM\FastMM4.pas"/>
         <DCCReference Include="uScanner.pas"/>
         <DCCReference Include="..\..\Library\FastMM\FastMM4Messages.pas"/>
         <DCCReference Include="uFindWindows.pas"/>

Rhodus_Version_3/RhodusVersionThreeProject.res

@@ -0,0 +1,22 @@
+
+setColor ("yellow")
+println ("yellow")
+
+setColor ("aqua")
+println ("aqua")
+
+setColor ("purple")
+println ("purple")
+
+setColor ("red")
+println ("red")
+
+setColor ("green")
+println ("green")
+
+setColor("RoyalBlue")
+println ("Royal Blue")
+
+setColor("DeepSkyBlue")
+println ("Deep Sky Blue")
+

Rhodus_Version_3/SampleScripts/colors.rh

@@ -1,4 +1,6 @@
 
+a = 1.2
+
 function callme ()
   println ("calling lib")
 end

Rhodus_Version_3/SampleScripts/lib.rh

@@ -8,19 +8,19 @@ import testUtils
 //setColor ("white")
 testUtils.beginTests ("")
   testUtils.runtestTrue (1E2 == 100);
-  //testUtils.runtestTrue (1.2E2 == 120); 
-  //testUtils.runtestTrue (0.1E2 == 10); 
-  //testUtils.runtestTrue (1E-2 == 0.01); 
-  //testUtils.runtestTrue (1.2E-2 == 0.012); 
-  //testUtils.runtestTrue (-1E-2 == -0.01);
-
-  //testUtils.runtestTrue (2 + 3 == 5);
-  //testUtils.runtestTrue (2 - 3 == -1);
-  //testUtils.runtestTrue (3 - 2 == 1);
-  //testUtils.runtestTrue (2 * 3 == 6);
-  //testUtils.runtestTrue (10 / 2 == 5);
-  //testUtils.runtestTrue (2^4 == 16);
-//testUtils.endTests()
+  testUtils.runtestTrue (1.2E2 == 120); 
+  testUtils.runtestTrue (0.1E2 == 10); 
+  testUtils.runtestTrue (1E-2 == 0.01); 
+  testUtils.runtestTrue (1.2E-2 == 0.012); 
+  testUtils.runtestTrue (-1E-2 == -0.01);
+
+  testUtils.runtestTrue (2 + 3 == 5);
+  testUtils.runtestTrue (2 - 3 == -1);
+  testUtils.runtestTrue (3 - 2 == 1);
+  testUtils.runtestTrue (2 * 3 == 6);
+  testUtils.runtestTrue (10 / 2 == 5);
+  testUtils.runtestTrue (2^4 == 16);
+testUtils.endTests()
 
 /*
 testUtils.beginTests ("")

Rhodus_Version_3/TestScripts/arith1.rh

@@ -3,7 +3,7 @@ testNumber = 0; nSuccess = 0; nFail = 0
 
 function beginTests(msg)
    global nSuccess, nFail, testNumber
-   setColor ("blue")
+   setColor ("DeepSkyBlue")
    print (testNumber, " ", msg)  
    setColor ("white")
    nSuccess = 0