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

jcf: sync with r746 (misc fixes in comments)

Browse Source 
git-svn-id: trunk@17880 -
This commit is contained in:
paul 2008-12-22 08:35:35 +00:00
parent 52c3090688
commit a4326b440c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/jcf2/Parse/BuildParseTree.pas
View File

@ -1018,7 +1018,7 @@ begin
if pbNestedInClass and (leFirstTokenType in ClassVisibility) then if pbNestedInClass and (leFirstTokenType in ClassVisibility) then
break; break;
// can be followed by an operator decl in Lazarus // can be followed by an operator decl in FreePascal
if leFirstTokenType = ttOperator then if leFirstTokenType = ttOperator then
break; break;
end; end;
@ -2275,7 +2275,7 @@ begin
if fcTokenList.FirstSolidTokenType = ttOpenBracket then if fcTokenList.FirstSolidTokenType = ttOpenBracket then
RecogniseFormalParameters; RecogniseFormalParameters;
// lazarus can give a name to "result" here // FreePascal can give a name to "result" here
if fcTokenList.FirstSolidTokenType <> ttColon then if fcTokenList.FirstSolidTokenType <> ttColon then
begin begin
RecogniseIdentifier(false, idAny); RecogniseIdentifier(false, idAny);

2
components/jcf2/Parse/Tokens.pas
View File

@ -738,7 +738,7 @@ begin
AddKeyword('@', wtOperator, ttAtSign); AddKeyword('@', wtOperator, ttAtSign);
AddKeyword('^', wtOperator, ttHat); AddKeyword('^', wtOperator, ttHat);
AddKeyword('*', wtOperator, ttTimes); AddKeyword('*', wtOperator, ttTimes);
AddKeyword('**', wtOperator, ttExponent); // in Lazarus AddKeyword('**', wtOperator, ttExponent); // in FreePascal
AddKeyword('/', wtOperator, ttFloatDiv); AddKeyword('/', wtOperator, ttFloatDiv);
AddKeyword('+', wtOperator, ttPlus); AddKeyword('+', wtOperator, ttPlus);
AddKeyword('-', wtOperator, ttMinus); AddKeyword('-', wtOperator, ttMinus);

2
components/jcf2/Utils/JcfStringUtils.pas
View File

@ -516,7 +516,7 @@ function PathRemoveExtension(const Path: string): string;
var var
p: Integer; p: Integer;
begin begin
// from lazarus FileUtil // from Lazarus FileUtil
Result := Path; Result := Path;
p := Length(Result); p := Length(Result);
while (p>0) do while (p>0) do

2
components/jcf2/readme.txt
View File

@ -1,3 +1,3 @@
This directory contains a copy (sometimes modified) of r743 jcf2 svn tree: https://jedicodeformat.svn.sourceforge.net/svnroot/jedicodeformat/trunk/CodeFormat/Jcf2 This directory contains a copy (sometimes modified) of r746 jcf2 svn tree: https://jedicodeformat.svn.sourceforge.net/svnroot/jedicodeformat/trunk/CodeFormat/Jcf2
Only command line utility works currently. Only command line utility works currently.