Hello,

Should this comparison (!) be fixed? Seeing that this code is going to be changed, what about change Pa[I] assignment from a variable to a constant?

<<rtl/inc/fexpand.inc>>

  (* Allow both '/' and '\' as directory separators *)
  (* by converting all to the native one.           *)
      if DirectorySeparator = '\' then
      {Allow slash as backslash}
        begin
          for I := 1 to Length (Pa) do
            if Pa [I] = '/' then
              Pa [I] := DirectorySeparator
        end
      else
!      if DirectorySeparator = '\' then
      {Allow backslash as slash}
          begin
            for I := 1 to Length (Pa) do
              if Pa [I] = '\' then
                Pa [I] := DirectorySeparator;
          end;

Thanks,

The comparison can be fixed.

In fact I think the code can be reduced to a single loop:

if (DirectorySeparator='\') or (DirectorySeparator='/') then
  for I:=1 to Length(PA) do
    if (Pa[I] in ['\','/']) and (PA[I]DirectorySeparator) then
      Pa[I]:=DirectorySeparator;

Could you test this, please ?

Michael.

It works.
Perhaps you could use the in operator in the first if.

Michael Van Canneyt wrote

On Sat, 4 Mar 2006, Joao Morais wrote:

Hi,

> Should this comparison (!) be fixed? Seeing that this code is going to > be changed, what about change Pa[I] assignment from a variable to a > constant?

Fixed now, thanks a lot.

I replaced DirectorySeparator with the character
according to your suggestion too, but that didn't
really change anything, in fact -
DirectorySeparator is a constant too, so the code
generated for both versions is equal.

Preferably not, I guess. The current version
allows to optimize the unnecessary branch away
altogether. This version is probably considerably
slower.

Tomas