From 2f741121e9413582276384bde43e81f52bfe12b4 Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Wed, 29 Jan 2014 19:26:03 +0000
Subject: [PATCH]   * don't give an internal error when freeing an error token
 in the preprocessor     (mantis #25573)

git-svn-id: trunk@26614 -
---
 .gitattributes          | 1 +
 compiler/scanner.pas    | 4 +++-
 tests/webtbs/tw25296.pp | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 tests/webtbs/tw25296.pp

diff --git a/.gitattributes b/.gitattributes
index ef8957abe7..4f881345ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13787,6 +13787,7 @@ tests/webtbs/tw25210.pp svneol=native#text/pascal
 tests/webtbs/tw2525.pp svneol=native#text/plain
 tests/webtbs/tw25269.pp svneol=native#text/pascal
 tests/webtbs/tw25289.pp svneol=native#text/plain
+tests/webtbs/tw25296.pp svneol=native#text/plain
 tests/webtbs/tw25318.pp svneol=native#text/pascal
 tests/webtbs/tw25332.pp svneol=native#text/plain
 tests/webtbs/tw25332a.pp svneol=native#text/plain
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index 3d015fe05a..2739337601 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -1294,7 +1294,9 @@ type
           dispose(pnormalset(value.valueptr));
         constguid :
           dispose(pguid(value.valueptr));
-        constord :
+        constord,
+        { error values }
+        constnone:
           ;
         else
           internalerror(2013112802);
diff --git a/tests/webtbs/tw25296.pp b/tests/webtbs/tw25296.pp
new file mode 100644
index 0000000000..81eb88562b
--- /dev/null
+++ b/tests/webtbs/tw25296.pp
@@ -0,0 +1,7 @@
+{ %norun }
+
+{$mode delphi}
+begin
+ {$IF Declared(XY) And (XY = 56)}WriteLn(56);{$IFEND}
+end.
+