Fixed ? help system

Author: penavon

Rhodus_Version_3/RhodusVersionThreeProject.dpr

@@ -84,22 +84,60 @@ var sourceCode : string;
 
 
 function searchHelp (const helpStr : string) : string;
-var i, index : integer;
+var i, j, index : integer;
+    astr : TArray<string>;
+    symbol1, symbol2: TSymbol;
 begin
-  if helpstr = '?' then
+  // Search places for any help  whcih will be of the form X or X.Y
+  astr := SplitString(helpStr, '.');
+  if length (astr) = 1 then
      begin
-     result := 'Builtin functions:' + sLineBreak;
-     //result := builtinList[0].name;
-     //for i := 1 to builtinList.Count - 1 do
-     //    result := result + ', ' + builtinList[i].name;
-     exit;
+     // Its either in the global space or its a module name
+     if mainModule.symbolTable.find(astr[0], symbol1) then
+        begin
+        if symbol1.symbolType = symModule then
+           result := symbol1.mValue.helpStr
+        else
+           result := 'Unable to locate symbol';
+        end
+     else
+        begin
+        // Check the global space
+        if mainModule.symbolTable.find(TSymbol.globalId, symbol1) then
+           begin
+           if symbol1.mValue.symbolTable.find(astr[0], symbol2) then
+              begin
+              result := symbol2.fValue.helpStr;
+              end
+           else
+              result := 'Unable to locate symbol';
+           end
+        else
+           result := 'Internal error: global space could not be located';
+         end;
+     end
+  else
+     begin
+     if length (astr) = 2 then
+        begin
+        if mainModule.symbolTable.find(astr[0], symbol1) then
+           begin
+           if symbol1.symbolType = symModule then
+              begin
+              if symbol1.mValue.symbolTable.find (astr[1], symbol2)  then
+                 case symbol2.symbolType of
+                     symUserFunc : result := symbol2.fValue.helpStr;
+                 else
+                    result := symbol2.helpStr
+                 end;
+              end;
+           end
+        else
+           result := 'Unable to locate the module: ' + astr[0];
+        end
+     else
+        result := 'Don''t know how to search what you indicated: ' + helpstr;
      end;
-
-  // Search places for any help
-  //if builtinList.find(helpStr, index) then
-  //   result := builtinList[index].helpStr
-  //else
-  //   result := 'No help found';
 end;
 
 

Rhodus_Version_3/RhodusVersionThreeProject.dproj

@@ -137,7 +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.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=3.0.0.1;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+        <VerInfo_Build>1</VerInfo_Build>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <DCC_MapFile>3</DCC_MapFile>

Rhodus_Version_3/Win32/Debug/RhodusVersionThreeProject.exe

@@ -211,7 +211,7 @@ procedure TBuiltInGlobal.myHelp (vm : TObject);
   case x.stackType of
     stInteger  : TVM (vm).push (TStringObject.create ('Integer Value'));
     stBoolean  : TVM (vm).push (TStringObject.create ('Boolean Value'));
-    stDouble   : TVM (vm).push (TStringObject.create ('Double Value'));
+    stDouble   : TVM (vm).push (TStringObject.create ('Double value: ' + floattostr (x.dValue)));
     stString   : TVM (vm).push (TStringObject.create ('String Value'));
     stList     : TVM (vm).push (TStringObject.create ('List Value'));
     stModule   : TVM (vm).push (TStringObject.create (getModuleHelp (x.module)));

Rhodus_Version_3/uBuiltInGlobal.pas

@@ -11,11 +11,7 @@
 
 interface
 
-Uses
-{$IFDEF DEBUG}
-     //FastMM4,
-{$ENDIF}
-     Windows, Classes, SysUtils, StrUtils, Generics.Collections, uVM, uRunCode;
+Uses Windows, Classes, SysUtils, StrUtils, Generics.Collections, uVM, uRunCode;
 
 type
   TCallCommand = function (argument : string) : boolean;
@@ -101,9 +97,12 @@ procedure displayHelp;
   writeln ('symbols'#9#9'Display symbols in main module');
   writeln ('tests'#9#9'Run the tests');
   writeln ('');
-  writeln ('?name'#9#9'Get help about object name');
-  writeln ('??'#9#9'List help topics');
+  writeln ('?X or ?M.X'#9'Get help about a symbol, X, or a symbol in a module, M');
+  writeln ('Type dir() to get a list of global functions. Note, no space beteen dir and ()');
+  writeln ('Type modules() to get a list of loaded modules');
+  writeln ('Type dir() on any module to get the list of methods, eg math.dir()');
   writeln;
+
   writeln ('To run a script, type run followed by its filename. Note: there is no need to specify the .rh extension');
 end;
 

Rhodus_Version_3/uCommands.pas

@@ -10,8 +10,6 @@
 
 interface
 
-var mainModuleId : string = '_ main_';
-
 implementation
 
 end.