pastojs: fixed with-do x, where x is in helper and class

git-svn-id: trunk@44432 -

packages/pastojs/tests/tcmodules.pas

@@ -20160,6 +20160,7 @@ begin
   '    function Foo(w: word = 1): word;',
   '  end;',
   'procedure TObject.Run(w: word);',
+  'var o: TObject;',
   'begin',
   '  Foo;',
   '  Foo();',
@@ -20172,6 +20173,7 @@ begin
   '    Foo();',
   '    Foo(4);',
   '  end;',
+  '  with o do Foo(5);',
   'end;',
   'function THelper.foo(w: word): word;',
   'begin',
@@ -20210,6 +20212,7 @@ begin
     '  this.$final = function () {',
     '  };',
     '  this.Run = function (w) {',
+    '    var o = null;',
     '    $mod.THelper.Foo.call(this, 1);',
     '    $mod.THelper.Foo.call(this, 1);',
     '    $mod.THelper.Foo.call(this, 2);',
@@ -20219,6 +20222,7 @@ begin
     '    $mod.THelper.Foo.call(this, 1);',
     '    $mod.THelper.Foo.call(this, 1);',
     '    $mod.THelper.Foo.call(this, 4);',
+    '    $mod.THelper.Foo.call(o, 5);',
     '  };',
     '});',
     'rtl.createHelper($mod, "THelper", null, function () {',
@@ -20311,7 +20315,7 @@ begin
     '      $mod.THelper.Foo.call(Self, 1);',
     '      $mod.THelper.Foo.call(Self, 1);',
     '      $mod.THelper.Foo.call(Self, 1);',
-    '      $mod.THelper.Foo.call($Self, 1);',
+    '      $mod.THelper.Foo.call(Self, 1);',
     '    };',
     '  };',
     '});',
@@ -20327,7 +20331,7 @@ begin
     '      $mod.THelper.Foo.call(Self, 1);',
     '      $mod.THelper.Foo.call(Self, 1);',
     '      $mod.THelper.Foo.call(Self, 1);',
-    '      $mod.THelper.Foo.call($Self, 1);',
+    '      $mod.THelper.Foo.call(Self, 1);',
     '    };',
     '    return Result;',
     '  };',