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

Merged revisions 530 via svnmerge from

Browse Source 
/trunk

git-svn-id: branches/fixes_2_0@653 -
This commit is contained in:
peter 2005-07-18 13:41:52 +00:00
parent a0b2338871
commit 25883d98d2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/scanner.pas
View File

@ -213,7 +213,8 @@ implementation
var
low,high,mid : longint;
begin
if not (length(s) in [tokenlenmin..tokenlenmax]) then
if not (length(s) in [tokenlenmin..tokenlenmax]) or
not (s[1] in ['a'..'z','A'..'Z']) then
begin
is_keyword:=false;
exit;
@ -869,9 +870,6 @@ implementation
mac.is_used:=true;
if (cs_support_macro in aktmoduleswitches) then
begin
{ key words are never substituted }
if is_keyword(hs) then
Message(scan_e_keyword_cant_be_a_macro);
{ !!!!!! handle macro params, need we this? }
current_scanner.skipspace;
@ -887,6 +885,10 @@ implementation
current_scanner.skipspace;
end;
{ key words are never substituted }
if is_keyword(hs) then
Message(scan_e_keyword_cant_be_a_macro);
new(macrobuffer);
macropos:=0;
{ parse macro, brackets are counted so it's possible