Fixed color settings in terminal

Author: penavon

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>
@@ -263,23 +263,23 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
-                    <Platform Name="iOSSimulator">
+                <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
+                    <Platform Name="OSX32">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Win32\Debug\RhodusVersionThreeProject.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="Win32\Release\RhodusVersionThreeProject.exe" Configuration="Release" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>RhodusVersionThreeProject.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
-                    <Platform Name="OSX32">
+                <DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">
+                    <Platform Name="iOSSimulator">
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="Win32\Release\RhodusVersionThreeProject.exe" Configuration="Release" Class="ProjectOutput">
+                <DeployFile LocalName="Win32\Debug\RhodusVersionThreeProject.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>RhodusVersionThreeProject.exe</RemoteName>
                         <Overwrite>true</Overwrite>

Rhodus_Version_3/RhodusVersionThreeProject.res

@@ -8,31 +8,29 @@ procedure startRepl;
 
 implementation
 
-Uses StrUtils, 
-     uMemoryManager, 
+Uses StrUtils,
+     uMemoryManager,
      uBuiltInGlobal,
      uBuiltInSys,
-     uSyntaxParser, 
-     uRhodusTypes, 
+     uSyntaxParser,
+     uRhodusTypes,
      uSymbolTable,
-     uCommands, 
+     uCommands,
      IOUtils,
      uCompile,
      uMachineStack;
- 
+
 
 var rhodus : TRhodus;
     sourceCode : string;
     syntaxError : TSyntaxError;
     compilerError : TCompilerError;
-    currentColor : string;
 
 
 // Print methods to support output from the VM
 // -------------------------------------------------------------------------------
 procedure print (astr : AnsiString);
 begin
-  uTerminal.setColor (currentColor);
   write (astr);
 end;
 
@@ -55,8 +53,7 @@ function myRead (const prompt : AnsiString) : PAnsiChar;
 
 procedure setColor (acolor : AnsiString);
 begin
-  currentColor := acolor;
-  uTerminal.setColor(currentColor);
+  uTerminal.setColor(aColor);
 end;
 
 
@@ -211,7 +208,11 @@ procedure executeCode (const sourceCode : string);
        end;
      end
   else
+     begin
+     setGreen;
      writeln ('ERROR ' + '[line ' + inttostr (syntaxError.lineNumber) + ', column: ' + inttostr (syntaxError.columnNumber) + '] ' + syntaxError.errorMsg);
+     setWhite;
+     end;
 end;
 
 

Rhodus_Version_3/SampleScripts/bugglobal.rh

@@ -387,9 +387,9 @@ function TRhodus.runCode (module : TModule; interactive : boolean) : boolean;
           except
           on e:exception do
              begin
-              //setGreen;
+              setColor('Cyan');
               printLnCallBack ('ERROR: ' + e.Message);
-              //setWhite;
+              setWhite;
               result := False;
               end;
         end;

Rhodus_Version_3/uRepl.pas

@@ -21,6 +21,7 @@ procedure setGreen;
 procedure setBlue;
 procedure setYellow;
 procedure setWhite;
+procedure setAqua;
 procedure setUpConsole;
 procedure shutDownConsole;
 procedure clearConsoleScreen;
@@ -32,7 +33,7 @@ procedure setCurrentColors;
 
 implementation
 
-Uses Windows, Classes, SysUtils, StrUtils, Vcl.GraphUtil, uCommands;
+Uses Windows, Classes, SysUtils, StrUtils, Vcl.GraphUtil, uCommands, uRepl;
 
 type
   COORD = record
@@ -178,7 +179,9 @@ procedure setWhite;
 
 procedure setGreen;
 begin
-  currentColor[0] := 0;  currentColor[1] := 255;  currentColor[2] := 0;
+  currentColor[0] := 0;
+  currentColor[1] := 255;
+  currentColor[2] := 0;
   setCurrentColors;
 end;