heap

Villavu · Aug 29, 2024 · e3b4161 · e3b4161
1 parent 2425c9f
commit e3b4161
Show file tree

Hide file tree

Showing 12 changed files with 340 additions and 41 deletions.
diff --git a/Source/ide/codetools/simba.ide_codetools_generics.pas b/Source/ide/codetools/simba.ide_codetools_generics.pas
@@ -40,9 +40,13 @@ interface
     'property <MapName>.CaseSens(Value: Boolean); external;'                                                               + LineEnding;
 
   HEAP_METHODS =
-    'procedure <HeapName>.Push(Value: <ValueType>; Index: SizeInt; LoHi: Boolean); external;'             + LineEnding +
-    'procedure <HeapName>.Pop(LoHi: Boolean); external;'                                                  + LineEnding +
-    'function <HeapName>.Peek(LoHi: Boolean): record Value: <ValueType>; Index: SizeInt; end; external;';
+    'procedure <HeapName>.Push(Value: <ValueType>; Index: Integer); external;'                      + LineEnding +
+    'property <HeapName>.Pop: record Value: <ValueType>; Index: Integer; end; external;'            + LineEnding +
+    'property <HeapName>.Peek: record Value: <ValueType>; Index: Integer; end; external;'           + LineEnding +
+    'property <HeapName>.Items: array of record Value: <ValueType>; Index: Integer; end; external;' + LineEnding +
+    'property <HeapName>.Count: Integer; external;'                                                 + LineEnding +
+    'procedure <HeapName>.Clear; external;'                                                         + LineEnding +
+    'function <HeapName>.ToString: String; external;'                                               + LineEnding;
 
 function GetGeneric(Decl: TDeclaration): TDeclarationArray;
 

diff --git a/Source/ide/codetools/simba.ide_codetools_parser.pas b/Source/ide/codetools/simba.ide_codetools_parser.pas
@@ -113,6 +113,7 @@   TDeclaration = class({$IFDEF PARSER_LEAK_CHECKS}TLeakChecker{$ELSE}TObject{$EN
   public
     procedure Add(const Decl: TDeclaration); overload;
     procedure Add(const Decls: TDeclarationArray); overload;
+    procedure Remove(const Decl: TDeclaration);
 
     function GetByName(Name: String): TDeclarationArray;
     function GetByClassAndName(Name: String; DeclClass: TDeclarationClass; ExactClass: Boolean = False): TDeclarationArray;
@@ -456,7 +457,6 @@   TCodeParser = class(TPasParser)
     procedure MethodDirective; override;
     procedure Method; override;
     procedure MethodOfType; override;
-    procedure MethodBlock; override;
     procedure MethodName; override;
     procedure MethodTypeName; override;
     procedure MethodResultType; override;
@@ -911,6 +911,18 @@ procedure TDeclarationArrayHelper.Add(const Decls: TDeclarationArray);
   Self += Decls;
 end;
 
+procedure TDeclarationArrayHelper.Remove(const Decl: TDeclaration);
+var
+  I: Integer;
+begin
+  for I := 0 to High(Self) do
+    if (Self[I] = Decl) then
+    begin
+      Delete(Self, I, 1);
+      Exit;
+    end;
+end;
+
 function TDeclarationArrayHelper.GetByName(Name: String): TDeclarationArray;
 var
   I, Count: Integer;
@@ -1804,15 +1816,6 @@ procedure TCodeParser.ConstantName;
   VarName();
 end;
 
-procedure TCodeParser.MethodBlock;
-begin
-  //if (FStack.Top is TDeclaration_Method) then
-  //  if (fLastNoJunkTok <> tokSemiColon) then
-  //    TDeclaration_Method(FStack.Top).isNotFullyDeclared := True;
-
-  inherited;
-end;
-
 procedure TCodeParser.Method;
 var
   Decl: TDeclaration_Method;

diff --git a/Source/ide/codetools/simba.ide_codetools_pasparser.pas b/Source/ide/codetools/simba.ide_codetools_pasparser.pas
@@ -1791,7 +1791,7 @@ procedure TPasParser.TypeKind;
     S: String;
   begin
     S := UpperCase(fLexer.Token);
-    Result := (S = 'STRINGMAP') or (S = 'MAP');
+    Result := (S = 'STRINGMAP') or (S = 'MAP') or (S = 'HEAP');
   end;
 
 begin

diff --git a/Source/ide/simba.ide_editor_paramhint.pas b/Source/ide/simba.ide_editor_paramhint.pas
@@ -446,23 +446,6 @@ procedure TSimbaParamHint.DoEditorCommand(Sender: TObject; AfterProcessing: Bool
       end;
   end;
 
-  function FilterProperties(Decls: TDeclarationArray; IsIndexing: Boolean): TDeclarationArray;
-  var
-    I: Integer;
-  begin
-    if IsIndexing then
-      Result := RemoveDuplicateProperties(Decls)
-    else
-    begin
-      // for `obj.Prop(` to be valid syntax it must return a method
-      Result := [];
-      for I := 0 to High(Decls) do
-        if FCodeinsight.ResolveVarType(TDeclaration_Property(Decls[I]).ResultType) is TDeclaration_TypeMethod then
-          Result.Add(Decls[I]);
-      Result := RemoveDuplicateProperties(Result);
-    end;
-  end;
-
 var
   Decl: TDeclaration;
   Members, Decls: TDeclarationArray;
@@ -491,14 +474,13 @@ procedure TSimbaParamHint.DoEditorCommand(Sender: TObject; AfterProcessing: Bool
 
       if (Decl <> nil) then
       begin
-        // properties
+        // property indexing
         if IsIndexing then
         begin
           if (Decl is TDeclaration_Property) then
           begin
             Decls := Members.GetByClassAndName(Decl.Name, TDeclaration_Property);
-            Decls := FilterProperties(Decls, IsIndexing);
-            Decls := IndexableProperties(Decls);
+            Decls := RemoveDuplicateProperties(Decls);
           end;
         end else
         begin
@@ -509,12 +491,6 @@ procedure TSimbaParamHint.DoEditorCommand(Sender: TObject; AfterProcessing: Bool
             if (Decl is TDeclaration_TypeMethod) then
               Decls := [TDeclaration_TypeMethod(Decl).Method];
           end else
-          // properties
-          if (Decl is TDeclaration_Property) then
-          begin
-            Decls := Members.GetByClassAndName(Decl.Name, TDeclaration_Property);
-            //Decls := FilterProperties(Decls, IsIndexing);
-          end else
           // method of type
           if (Decl is TDeclaration_MethodOfType) then
           begin
@@ -529,6 +505,11 @@ procedure TSimbaParamHint.DoEditorCommand(Sender: TObject; AfterProcessing: Bool
 
         // remove overrides
         Decls := RemoveOverridenMethods(Decls);
+
+        // if declarating a new method such as "procedure foo(hello," remove it.
+        Decl := FCodeinsight.ScriptParser.Items.GetByPosition(FCodeinsight.ScriptParser.CaretPos);
+        if (Decl is TDeclaration_ParamList) and (Decl.Parent is TDeclaration_Method) then
+          Decls.Remove(Decl.Parent);
       end;
 
       if (Length(Decls) > 0) then

diff --git a/Source/script/simba.compiler_dump.pas b/Source/script/simba.compiler_dump.pas
@@ -132,6 +132,10 @@ procedure TSimbaCompilerDump.InitBaseDefinitions;
   Add('Base', 'function GetScriptMethodName(Address: Pointer): String; external;');
   Add('Base', 'function DumpCallStack(Start: Integer = 0): String; external;');
 
+  Add('Base', 'function Map(KeyType: T; ValueType: V): Map; external;');
+  Add('Base', 'function StringMap(ValueType: V): StringMap; external;');
+  Add('Base', 'function Heap(ValueType: V): Heap; external;');
+
   ImportingSection := '';
 end;
 

diff --git a/Source/script/simba.script_compiler.pas b/Source/script/simba.script_compiler.pas
@@ -65,7 +65,8 @@ implementation
   simba.script_compiler_rtti,
   simba.script_compiler_imagefromstring,
   simba.script_genericmap,
-  simba.script_genericstringmap;
+  simba.script_genericstringmap,
+  simba.script_genericheap;
 
 procedure TSimbaScript_Compiler.addProperty(Obj, Name, Typ: String; ReadFunc: Pointer; WriteFunc: Pointer);
 begin
@@ -148,6 +149,7 @@ procedure TSimbaScript_Compiler.Import;
     InitializeRTTI(Self);
     InitializeMap(Self);
     InitializeStringMap(Self);
+    InitializeHeap(Self);
 
     AddSimbaImports(Self);
   finally

diff --git a/Source/script/simba.script_genericbase.pas b/Source/script/simba.script_genericbase.pas
@@ -2,6 +2,9 @@
   Author: Raymond van Venetië and Merlijn Wajer
   Project: Simba (https://github.com/MerlijnWajer/Simba)
   License: GNU General Public License (https://www.gnu.org/licenses/gpl-3.0)
+  --------------------------------------------------------------------------
+
+  Base class for generating generic methods.
 }
 unit simba.script_genericbase;