Codetools: Add "set of (a,b,c)" to globals

Villavu · Sep 3, 2023 · b61ccb0 · b61ccb0
1 parent f2359a9
commit b61ccb0
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 13 deletions.
diff --git a/DocGen/docgen.simba b/DocGen/docgen.simba
@@ -166,15 +166,18 @@ begin
   end;
 end;
 
-procedure BuildAPI;
+// Delete old api generation
+procedure CleanAPI;
 var
   FileName: String;
 begin
-  // Delete old api generation
   for FileName in DirList('DocGen/source/api/') do
     if (not (PathExtractName(FileName) in ['.gitkeep', 'index.rst'])) then
       FileDelete(FileName);
+end;
 
+procedure BuildAPI;
+begin
   ParseSourceFile('simba.import_colormath',     'Color Math'     );
   ParseSourceFile('simba.import_point',         'TPoint'         );
   ParseSourceFile('simba.import_tpa',           'TPointArray'    );
@@ -207,6 +210,14 @@ begin
   ParseSourceFile('simba.import_class_dtm',   'DTM'   );
 end;
 
+procedure H2ToH3(dir: String);
+var
+  FileName: String;
+begin
+  for FileName in DirList(dir) do
+    FileWrite(FileName, FileRead(FileName).Replace('h2','h3', [rfReplaceAll]));
+end;
+
 var
   SphinxOutput: String;
 begin
@@ -215,11 +226,17 @@ begin
   DirCreate('DocGen/build');
   DirDelete('DocGen/build', True);
 
+  CleanAPI();
   BuildAPI();
 
   WriteLn('Sphinx exit code: ', RunCommand('sphinx-build', ['-q', '-E', 'DocGen/source', 'DocGen/build'], SphinxOutput));
   if (SphinxOutput <> '') then
     WriteLn(SphinxOutput);
 
   WriteLn('Link: "' + PathNormalize('DocGen/build/index.html') + '"');
+
+  // it looks a lot better like this...
+  H2ToH3('DocGen/build/api');
+
+  CleanAPI();
 end.
diff --git a/DocGen/source/api/index.rst b/DocGen/source/api/index.rst
@@ -3,6 +3,7 @@ API
 ===
 
 .. toctree::
+   :maxdepth: 2
    :glob:
 
    *
diff --git a/DocGen/source/index.rst b/DocGen/source/index.rst
@@ -3,6 +3,7 @@ Simba
 =====
 
 .. toctree::
+   :maxdepth: 2
 
    tutorials/index
    api/index
diff --git a/DocGen/source/tutorials/index.rst b/DocGen/source/tutorials/index.rst
@@ -3,5 +3,6 @@ Simba
 =====
 
 .. toctree::
+   :maxdepth: 2
 
    Color Finding.rst
diff --git a/Source/codetools/simba.ide_codetools_parser.pas b/Source/codetools/simba.ide_codetools_parser.pas
@@ -240,7 +240,11 @@   TDeclaration_TypeNativeMethod = class(TDeclaration_Type)
     function GetMethod: TDeclaration;
   end;
 
-  TDeclaration_TypeSet = class(TDeclaration_Type);
+  TDeclaration_TypeSet = class(TDeclaration_Type)
+  public
+    function EnumElements: TDeclarationArray;
+  end;
+
   TDeclaration_TypeRange = class(TDeclaration_Type);
   TDeclaration_TypeUnion = class(TDeclaration_Type);
 
@@ -462,6 +466,11 @@ function TDeclaration_TypeNativeMethod.GetMethod: TDeclaration;
   Result := FItems.GetByClassFirst(TDeclaration_ParentType);
 end;
 
+function TDeclaration_TypeSet.EnumElements: TDeclarationArray;
+begin
+  Result := FItems.GetByClass(TDeclaration_EnumElement);
+end;
+
 function TDeclaration_TypeMethod.GetResultString: String;
 begin
   if FResultString.IsNull then
@@ -1234,7 +1243,10 @@ procedure TCodeParser.FindGlobals;
       Continue;
     end else
     if (Decl.ClassType = TDeclaration_TypeEnum) then
-      FGlobals.Extend(TDeclaration_TypeEnum(Decl).Elements);
+      FGlobals.Extend(TDeclaration_TypeEnum(Decl).Elements)
+    else
+    if (Decl.ClassType = TDeclaration_TypeSet) then
+      FGlobals.Extend(TDeclaration_TypeSet(Decl).EnumElements);
 
     FGlobals.Add(Decl);
   end;
@@ -1836,7 +1848,7 @@ procedure TCodeParser.SetType;
 
 procedure TCodeParser.OrdinalType;
 begin
-  if (not InDeclaration(TDeclaration_TypeSet, TDeclaration_TypeArray, TDeclaration_TypeStub)) then
+  if (not InDeclaration(TDeclaration_TypeArray, TDeclaration_TypeStub)) then
   begin
     inherited;
     Exit;
@@ -1855,15 +1867,20 @@ procedure TCodeParser.OrdinalType;
 
 procedure TCodeParser.EnumeratedType;
 begin
-  if Lexer.IsDefined('!SCOPEDENUMS') then
+  if InDeclaration(TDeclaration_TypeSet) then
   begin
-    EnumeratedScopedType();
+    inherited;
     Exit;
   end;
 
-  PushStack(TDeclaration_TypeEnum);
-  inherited;
-  PopStack();
+  if Lexer.IsDefined('!SCOPEDENUMS') then
+    EnumeratedScopedType()
+  else
+  begin
+    PushStack(TDeclaration_TypeEnum);
+    inherited;
+    PopStack();
+  end;
 end;
 
 procedure TCodeParser.EnumeratedScopedType;
@@ -1875,7 +1892,7 @@ procedure TCodeParser.EnumeratedScopedType;
 
 procedure TCodeParser.EnumeratedTypeItem;
 begin
-  if (not InDeclaration(TDeclaration_TypeEnum, TDeclaration_TypeEnumScoped)) then
+  if (not InDeclaration(TDeclaration_TypeSet, TDeclaration_TypeEnum, TDeclaration_TypeEnumScoped)) then
   begin
     inherited;
     Exit;

diff --git a/Source/simba.tpa.pas b/Source/simba.tpa.pas
@@ -1331,10 +1331,9 @@ function TPointArrayHelper.ExtractPie(StartDegree, EndDegree, MinRadius, MaxRadi
       Buffer.Add(Self[I]);
     end;
 
-    //Result := Buffer.Trim();
     Result := TPointArray(Buffer.Trim()).ExtractDist(Center, MinRadius, MaxRadius);
   end else
-    //Result := Self.ExcludeDist(Center, MinRadius, MaxRadius);
+    Result := Self.ExtractDist(Center, MinRadius, MaxRadius);
 end;
 
 function TPointArrayHelper.Extremes: TPointArray;