paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 00:08:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

------------------------------------------------------------------------

Browse Source 
r40619 | pierre | 2018-12-23 16:17:49 +0000 (Sun, 23 Dec 2018) | 8 lines

  * in lexbase and yaccbase units,
    use DirectorySeparator instead of '\' in functions
    path, root and addext.
  * in plex and pyacc programs, for unix,
    try to find installed yyparse.cod using
    path of paramstr(0).


------------------------------------------------------------------------
--- Merging r40619 into '.':
U    utils/tply/pyacc.pas
U    utils/tply/plex.pas
U    utils/tply/yaccbase.pas
U    utils/tply/lexbase.pas
U    utils/tply/pyacc.y
--- Recording mergeinfo for merge of r40619 into '.':
 U   .

git-svn-id: branches/fixes_3_2@40627 -
This commit is contained in:
pierre 2018-12-24 08:34:03 +00:00
parent de6e6c1443
commit 7bcb8e911c
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/tply/lexbase.pas
View File

@ -969,7 +969,7 @@ function path(filename : String) : String;
var i : Integer;
begin
i := length(filename);
while (i>0) and (filename[i]<>'\') and (filename[i]<>':') do
while (i>0) and (filename[i]<>DirectorySeparator) and (filename[i]<>':') do
dec(i);
path := copy(filename, 1, i);
end(*path*);
@ -985,10 +985,10 @@ function root(filename : String) : String;
root := copy(filename, 1, i-1);
exit
end;
'\': exit;
DirectorySeparator : exit;
else
end;
end(*addExt*);
end(*root*);
function addExt(filename, ext : String) : String;
(* implemented with goto for maximum efficiency *)
label x;
@ -999,7 +999,7 @@ function addExt(filename, ext : String) : String;
for i := length(filename) downto 1 do
case filename[i] of
'.' : exit;
'\': goto x;
DirectorySeparator: goto x;
else
end;
x : addExt := filename+'.'+ext

6
utils/tply/plex.pas
View File

@ -597,7 +597,11 @@ var i : Integer;
begin
{$ifdef Unix}
codfilepath1:='/usr/local/lib/fpc/lexyacc/';
codfilepath1:=path(paramstr(0));
if (codfilepath1<>'') then
codfilepath1:=codfilepath1+'../lib/fpc/lexyacc/'
else
codfilepath1:='/usr/local/lib/fpc/lexyacc/';
codfilepath2:='/usr/lib/fpc/lexyacc/';
{$else}
codfilepath1:=path(paramstr(0));

6
utils/tply/pyacc.pas
View File

@ -2375,7 +2375,11 @@ var i : Integer;
begin
{$ifdef Unix}
codfilepath1:='/usr/local/lib/fpc/lexyacc/';
codfilepath1:=path(paramstr(0));
if (codfilepath1<>'') then
codfilepath1:=codfilepath1+'../lib/fpc/lexyacc/'
else
codfilepath1:='/usr/local/lib/fpc/lexyacc/';
codfilepath2:='/usr/lib/fpc/lexyacc/';
{$else}
codfilepath1:=path(paramstr(0));

6
utils/tply/pyacc.y
View File

@ -711,7 +711,11 @@ var i : Integer;
begin
{$ifdef Unix}
codfilepath1:='/usr/local/lib/fpc/lexyacc/';
codfilepath1:=path(paramstr(0));
if (codfilepath1<>'') then
codfilepath1:=codfilepath1+'../lib/fpc/lexyacc/'
else
codfilepath1:='/usr/local/lib/fpc/lexyacc/';
codfilepath2:='/usr/lib/fpc/lexyacc/';
{$else}
codfilepath1:=path(paramstr(0));

8
utils/tply/yaccbase.pas
View File

@ -640,7 +640,7 @@ function path(filename : String) : String;
var i : Integer;
begin
i := length(filename);
while (i>0) and (filename[i]<>'\') and (filename[i]<>':') do
while (i>0) and (filename[i]<>DirectorySeparator) and (filename[i]<>':') do
dec(i);
path := copy(filename, 1, i);
end(*path*);
@ -656,10 +656,10 @@ function root(filename : String) : String;
root := copy(filename, 1, i-1);
exit
end;
'\': exit;
DirectorySeparator: exit;
else
end;
end(*addExt*);
end(*root*);
function addExt(filename, ext : String) : String;
(* implemented with goto for maximum efficiency *)
label x;
@ -670,7 +670,7 @@ function addExt(filename, ext : String) : String;
for i := length(filename) downto 1 do
case filename[i] of
'.' : exit;
'\': goto x;
DirectorySeparator : goto x;
else
end;
x : addExt := filename+'.'+ext