mattias 1 тиждень тому
батько
коміт
413eaabab2

+ 0 - 3
packages/pastojs/src/fppas2js.pp

@@ -21161,7 +21161,6 @@ var
   begin
     if ExtVis > -1 then
       Call.AddArg(CreateLiteralNumber(Proc,ExtVis));
-
     ExtVis := -1;
   end;
 
@@ -21268,7 +21267,6 @@ begin
       if ResultTypeInfo<>nil then
         begin
         AddExtRTTIVisibility;
-
         Call.AddArg(ResultTypeInfo);
         end;
       end;
@@ -21276,7 +21274,6 @@ begin
     if (ResultTypeInfo=nil) and ((Flags>0) or (length(Attr)>0)) then
     begin
       AddExtRTTIVisibility;
-
       Call.AddArg(CreateLiteralNull(Proc));
     end;
 

+ 8 - 8
packages/pastojs/tests/tcmodules.pas

@@ -34396,7 +34396,7 @@ begin
     '  null,',
     '  function () {',
     '    var $r = this.$rtti;',
-    '    $r.addMethod("GetItem", 1, [], rtl.longint);',
+    '    $r.addMethod("GetItem", 1, [], 2, rtl.longint);',
     '    $r.addMethod("SetItem", 0, [["Value", rtl.longint]]);',
     '    $r.addProperty("Item", 3, rtl.longint, "GetItem", "SetItem", 2);',
     '  }',
@@ -34462,9 +34462,9 @@ begin
     '  function () {',
     '    this.$kind = "com";',
     '    var $r = this.$rtti;',
-    '    $r.addMethod("QueryInterface", 1, [["iid", $mod.$rtti["TGuid"], 2], ["obj", null, 4]], rtl.longint);',
-    '    $r.addMethod("_AddRef", 1, [], rtl.longint);',
-    '    $r.addMethod("_Release", 1, [], rtl.longint);',
+    '    $r.addMethod("QueryInterface", 1, [["iid", $mod.$rtti["TGuid"], 2], ["obj", null, 4]], 2, rtl.longint);',
+    '    $r.addMethod("_AddRef", 1, [], 2, rtl.longint);',
+    '    $r.addMethod("_Release", 1, [], 2, rtl.longint);',
     '  }',
     ');',
     'rtl.createInterface(',
@@ -34475,7 +34475,7 @@ begin
     '  this.IUnknown,',
     '  function () {',
     '    var $r = this.$rtti;',
-    '    $r.addMethod("GetItem", 1, [], rtl.longint);',
+    '    $r.addMethod("GetItem", 1, [], 2, rtl.longint);',
     '    $r.addMethod("SetItem", 0, [["Value", rtl.longint]]);',
     '    $r.addProperty("Item", 3, rtl.longint, "GetItem", "SetItem", 2);',
     '  }',
@@ -34605,7 +34605,7 @@ begin
   'end;',
   '']);
   ConvertUnit;
-  CheckSource('TestRTTI_ExternalClass',
+  CheckSource('TestRTTI_Unit',
     LinesToStr([ // statements
     'rtl.createInterface(',
     '  this,',
@@ -34615,8 +34615,8 @@ begin
     '  pas.system.IUnknown,',
     '  function () {',
     '    var $r = this.$rtti;',
-    '    $r.addMethod("Swoop", 1, [], pas.unit2.$rtti["TWordArray"]);',
-    '    $r.addMethod("Glide", 1, [], pas.unit2.$rtti["TArray<System.Word>"]);',
+    '    $r.addMethod("Swoop", 1, [], 2, pas.unit2.$rtti["TWordArray"]);',
+    '    $r.addMethod("Glide", 1, [], 2, pas.unit2.$rtti["TArray<System.Word>"]);',
     '  }',
     ');',
     'this.Fly = function () {',

+ 1 - 0
utils/pas2js/dist/rtl.js

@@ -1531,6 +1531,7 @@ var rtl = {
       };
     };
     tis.addMethod = function(name,methodkind,params,vis,result,flags,options){
+      // optional: vis, result, flags, options
       var t = this.$addMember(name,rtl.tTypeMemberMethod,vis?vis:2,options);
       t.methodkind = methodkind;
       t.procsig = rtl.newTIProcSig(params,result,flags);