[JEDI.NET-commits] main/run Jedi.System.Strings.pas,1.6,1.7

[Marcel B. <jed...@us...>]

Update of /cvsroot/jedidotnet/main/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/main/run

Modified Files:
	Jedi.System.Strings.pas 
Log Message:
ExpandTabs: added overloads to define starting column of input string

Index: Jedi.System.Strings.pas
===================================================================
RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.Strings.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Jedi.System.Strings.pas	14 Mar 2005 13:31:26 -0000	1.6
--- Jedi.System.Strings.pas	25 Sep 2005 11:26:16 -0000	1.7
***************
*** 176,181 ****
    public
      class function ExpandTabs(s: string; tabs: IntegerArray): string; overload; static;
!     class function ExpandTabs(s: string; tabs: array of Integer; additionalTabsWidth: Int32): string; overload; static;
      class function ExpandTabs(s: string; tabSet: TabSet): string; overload; static;
    {$ENDREGION}
    end;
--- 176,185 ----
    public
      class function ExpandTabs(s: string; tabs: IntegerArray): string; overload; static;
!     class function ExpandTabs(s: string; columnStart: Integer; tabs: IntegerArray): string; overload; static;
!     class function ExpandTabs(s: string; tabs: IntegerArray; additionalTabsWidth: Int32): string; overload; static;
!     class function ExpandTabs(s: string; columnStart: Integer; tabs: IntegerArray;
!       additionalTabsWidth: Int32): string; overload; static;
      class function ExpandTabs(s: string; tabSet: TabSet): string; overload; static;
+     class function ExpandTabs(s: string; columnStart: Integer; tabSet: TabSet): string; overload; static;
    {$ENDREGION}
    end;
***************
*** 384,396 ****
  class function StringUtils.ExpandTabs(s: string; tabs: array of Integer): string;
  begin
!   Result := ExpandTabs(s, TabSet.Create(tabs));
  end;
  
  class function StringUtils.ExpandTabs(s: string; tabs: array of Integer; additionalTabsWidth: Integer): string;
  begin
!   Result := ExpandTabs(s, TabSet.Create(tabs, additionalTabsWidth));
  end;
  
  class function StringUtils.ExpandTabs(s: string; tabSet: TabSet): string;
  var
    sb: StringBuilder;
--- 388,416 ----
  class function StringUtils.ExpandTabs(s: string; tabs: array of Integer): string;
  begin
!   Result := ExpandTabs(s, 0, TabSet.Create(tabs));
! end;
! 
! class function StringUtils.ExpandTabs(s: string; columnStart: Integer; tabs: array of Integer): string;
! begin
!   Result := ExpandTabs(s, columnStart, TabSet.Create(tabs));
  end;
  
  class function StringUtils.ExpandTabs(s: string; tabs: array of Integer; additionalTabsWidth: Integer): string;
  begin
!   Result := ExpandTabs(s, 0, TabSet.Create(tabs, additionalTabsWidth));
! end;
! 
! class function StringUtils.ExpandTabs(s: string; columnStart: Integer; tabs: array of Integer;
!   additionalTabsWidth: Integer): string;
! begin
!   Result := ExpandTabs(s, columnStart, TabSet.Create(tabs, additionalTabsWidth));
  end;
  
  class function StringUtils.ExpandTabs(s: string; tabSet: TabSet): string;
+ begin
+   Result := ExpandTabs(s, 0, tabSet);
+ end;
+ 
+ class function StringUtils.ExpandTabs(s: string; columnStart: Integer; tabSet: TabSet): string;
  var
    sb: StringBuilder;
***************
*** 408,412 ****
        Inc(idx);
        startIndex := idx;
!       idx := tabSet.TabFrom(sb.Length);
        sb.Append(' ', idx - sb.Length)
      end
--- 428,432 ----
        Inc(idx);
        startIndex := idx;
!       idx := tabSet.TabFrom(columnStart + sb.Length);
        sb.Append(' ', idx - sb.Length)
      end