From dffcbd97cc969d07e5da5f0f5441246b51ff2c76 Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 7 Nov 2009 12:52:44 +0000 Subject: [PATCH] codetools: procedure modifier deprecated git-svn-id: trunk@22471 - --- components/codetools/keywordfunclists.pas | 2 ++ components/codetools/pascalparsertool.pas | 1 + lcl/lclproc.pas | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/codetools/keywordfunclists.pas b/components/codetools/keywordfunclists.pas index d2e847462f..edd1df774c 100644 --- a/components/codetools/keywordfunclists.pas +++ b/components/codetools/keywordfunclists.pas @@ -779,6 +779,7 @@ begin Add('LIBRARY' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('FINAL' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('ENUMERATOR' ,{$ifdef FPC}@{$endif}AllwaysTrue); + Add('DEPRECATED' ,{$ifdef FPC}@{$endif}AllwaysTrue); end; IsKeyWordProcedureSpecifier:=TKeyWordFunctionList.Create; @@ -815,6 +816,7 @@ begin Add('ALIAS' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('EXPERIMENTAL' ,{$ifdef FPC}@{$endif}AllwaysTrue); Add('LIBRARY' ,{$ifdef FPC}@{$endif}AllwaysTrue); + Add('DEPRECATED' ,{$ifdef FPC}@{$endif}AllwaysTrue); end; IsKeyWordProcedureTypeSpecifier:=TKeyWordFunctionList.Create; diff --git a/components/codetools/pascalparsertool.pas b/components/codetools/pascalparsertool.pas index 3be1e459d2..4c5261e5ac 100644 --- a/components/codetools/pascalparsertool.pas +++ b/components/codetools/pascalparsertool.pas @@ -1593,6 +1593,7 @@ begin if IsSpecifier then begin // read specifier if UpAtomIs('MESSAGE') or UpAtomIs('DISPID') or UpAtomIs('ENUMERATOR') + or UpAtomIs('DEPRECATED') then begin ReadNextAtom; ReadConstant(true,false,[]); diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas index c7eb1390fc..8ff3439384 100644 --- a/lcl/lclproc.pas +++ b/lcl/lclproc.pas @@ -3652,7 +3652,7 @@ begin end else if ((ord(p^) and %11100000) = %11000000) then begin // could be 2 byte character - if (ord(p[1]) and %11000000) = %10000000 then + if (Count) (ord(p[1]) and %11000000) = %10000000 then CharLen:=2 else exit; // missing following bytes