|
@@ -998,12 +998,14 @@ implementation
|
|
|
|
|
|
procedure tscannerfile.skipuntildirective;
|
|
procedure tscannerfile.skipuntildirective;
|
|
var
|
|
var
|
|
|
|
+ incomment : boolean;
|
|
found : longint;
|
|
found : longint;
|
|
next_char_loaded : boolean;
|
|
next_char_loaded : boolean;
|
|
oldcommentstyle : tcommentstyle;
|
|
oldcommentstyle : tcommentstyle;
|
|
begin
|
|
begin
|
|
found:=0;
|
|
found:=0;
|
|
next_char_loaded:=false;
|
|
next_char_loaded:=false;
|
|
|
|
+ incomment:=true;
|
|
oldcommentstyle:=aktcommentstyle;
|
|
oldcommentstyle:=aktcommentstyle;
|
|
repeat
|
|
repeat
|
|
case c of
|
|
case c of
|
|
@@ -1018,11 +1020,13 @@ implementation
|
|
aktcommentstyle:=comment_tp;
|
|
aktcommentstyle:=comment_tp;
|
|
end;
|
|
end;
|
|
inc_comment_level;
|
|
inc_comment_level;
|
|
|
|
+ incomment:=true;
|
|
end;
|
|
end;
|
|
'}' :
|
|
'}' :
|
|
begin
|
|
begin
|
|
dec_comment_level;
|
|
dec_comment_level;
|
|
found:=0;
|
|
found:=0;
|
|
|
|
+ incomment:=false;
|
|
end;
|
|
end;
|
|
'$' :
|
|
'$' :
|
|
begin
|
|
begin
|
|
@@ -1030,7 +1034,7 @@ implementation
|
|
found:=2;
|
|
found:=2;
|
|
end;
|
|
end;
|
|
'''' :
|
|
'''' :
|
|
- if not(m_nested_comment in aktmodeswitches) then
|
|
|
|
|
|
+ if not incomment then
|
|
begin
|
|
begin
|
|
repeat
|
|
repeat
|
|
readchar;
|
|
readchar;
|
|
@@ -1932,7 +1936,10 @@ exit_label:
|
|
end.
|
|
end.
|
|
{
|
|
{
|
|
$Log$
|
|
$Log$
|
|
- Revision 1.9 2000-11-30 20:27:51 peter
|
|
|
|
|
|
+ Revision 1.10 2000-12-16 15:36:02 peter
|
|
|
|
+ * fixed parsing of strings and comments in skipuntildirective
|
|
|
|
+
|
|
|
|
+ Revision 1.9 2000/11/30 20:27:51 peter
|
|
* merged fix for bug 1229
|
|
* merged fix for bug 1229
|
|
|
|
|
|
Revision 1.8 2000/11/29 00:30:40 florian
|
|
Revision 1.8 2000/11/29 00:30:40 florian
|