+ also support & to escape identifiers (and for octal notation) in Delplhi

    mode (patch by Blaise Thorn, mantis #15930)

git-svn-id: trunk@15031 -

.gitattributes

@@ -10317,6 +10317,7 @@ tests/webtbs/tw15777f.pp svneol=native#text/plain
 tests/webtbs/tw15812.pp svneol=native#text/plain
 tests/webtbs/tw15909.pp svneol=native#text/plain
 tests/webtbs/tw1592.pp svneol=native#text/plain
+tests/webtbs/tw15930.pp svneol=native#text/plain
 tests/webtbs/tw1617.pp svneol=native#text/plain
 tests/webtbs/tw1622.pp svneol=native#text/plain
 tests/webtbs/tw1623.pp svneol=native#text/plain

compiler/scanner.pas

@@ -3494,7 +3494,7 @@ In case not, the value returned can be arbitrary.
 
              '&' :
                begin
-                 if m_fpc in current_settings.modeswitches then
+                 if [m_fpc,m_delphi] * current_settings.modeswitches <> [] then
                   begin
                     readnumber;
                     if length(pattern)=1 then

tests/webtbs/tw15930.pp

@@ -0,0 +1,16 @@
+{ %norun }
+
+{$mode delphi}
+
+var
+  &file: integer;
+  &do: string;
+  &in: boolean;
+  &for: char;
+begin
+  &file:=1;
+  &do:='abc';
+  &in:=true;
+  &for:='h'
+end.
+