summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2008-05-23 13:45:32 +0000
committermichael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2>2008-05-23 13:45:32 +0000
commitc050277d06d4ccf3f634019045dbcb0b0b3b6b53 (patch)
tree1d48f8b08777fd9bc0028fcd39a1f3a0bd0a944f
parenta6a2b42b174fa5637e8914c7e299090ca24f7c7a (diff)
downloadfpc-c050277d06d4ccf3f634019045dbcb0b0b3b6b53.tar.gz
* Skip unknown tokens when skipping due to conditional compiling
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11056 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--packages/fcl-passrc/src/pscanner.pp7
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/fcl-passrc/src/pscanner.pp b/packages/fcl-passrc/src/pscanner.pp
index 33776fca1c..95b8570fc8 100644
--- a/packages/fcl-passrc/src/pscanner.pp
+++ b/packages/fcl-passrc/src/pscanner.pp
@@ -1071,8 +1071,11 @@ begin
Result := tkIdentifier;
end;
- else
- Error(SErrInvalidCharacter, [TokenStr[0]]);
+ else
+ if PPIsSkipping then
+ Inc(TokenStr)
+ else
+ Error(SErrInvalidCharacter, [TokenStr[0]]);
end;
FCurToken := Result;