From 24a9dd43b974f368b263e0ecbaf4ee62eea69da3 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sun, 27 Apr 2014 15:50:37 +0000
Subject: [PATCH] * do not crash with an ie on illegal boolean expressions in
 conditional compilation directives, resolves #25951

git-svn-id: trunk@27676 -
---
 .gitattributes          |  1 +
 compiler/scanner.pas    |  3 +++
 tests/webtbf/tw25951.pp | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 tests/webtbf/tw25951.pp

diff --git a/.gitattributes b/.gitattributes
index 0622c8e1c7..4ebce22a90 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12734,6 +12734,7 @@ tests/webtbf/tw25622a.pp svneol=native#text/plain
 tests/webtbf/tw25788.pp svneol=native#text/pascal
 tests/webtbf/tw25862.pp svneol=native#text/plain
 tests/webtbf/tw25915.pp svneol=native#text/pascal
+tests/webtbf/tw25951.pp svneol=native#text/pascal
 tests/webtbf/tw2657.pp svneol=native#text/plain
 tests/webtbf/tw2670.pp svneol=native#text/plain
 tests/webtbf/tw2719.pp svneol=native#text/plain
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index a71889c05a..450d5c399c 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -1279,6 +1279,9 @@ type
               if b in pconstset(value.valueptr)^ then
                 result:=result+tostr(b)+',';
           end;
+        { error values }
+        constnone:
+          result:='';
         else
           internalerror(2013112801);
       end;
diff --git a/tests/webtbf/tw25951.pp b/tests/webtbf/tw25951.pp
new file mode 100644
index 0000000000..eb96a8f812
--- /dev/null
+++ b/tests/webtbf/tw25951.pp
@@ -0,0 +1,38 @@
+{ %fail }
+// Mainly used for compiler discovery and turning on global compiler settings.
+// This simplifies vwrdefines.inc maintenance, since vwrdefines.inc is per application, and this one is global
+
+// delphi 2009 related
+
+{$if compilerversion>=20}  //D2009
+   {$define Delphiunicode}
+   {$define has_pointermath}
+{$ifend}
+{$if compilerversion>=21} // D2010
+   {$define has_debugthread}
+   {$define has_bigrtti}
+{$ifend}
+{$if compilerversion>=22} // DXE
+   {$define has_keyboard}
+{$ifend}
+{$if compilerversion>=23} // DXE2..DXE4 (5?)
+   {$define has_globalformatsettings}
+   {$define has_extendedTrect} // ?
+{$ifend}
+
+ {$ifdef has_pointermath}
+   {$pointermath on} // aka FPC emulation
+ {$endif}
+
+// most code nowadays probably won't compile under D2009. And even D2009 might be difficult
+// due to increased generics usage in 20.
+ {$ifndef ver150}{$define inlineon}{$endif} // if not D7, then can use inline. Nicer than version.
+ {$ifndef Delphiunicode}
+   {$define vstoldstring}
+ {$else}
+   {$define newvst}
+   {$define newcomport}
+{$endif}
+
+begin
+end.