瀏覽代碼

* don't give an internal error when freeing an error token in the preprocessor
(mantis #25573)

git-svn-id: trunk@26614 -

Jonas Maebe 11 年之前
父節點
當前提交
2f741121e9
共有 3 個文件被更改,包括 11 次插入1 次删除
  1. 1 0
      .gitattributes
  2. 3 1
      compiler/scanner.pas
  3. 7 0
      tests/webtbs/tw25296.pp

+ 1 - 0
.gitattributes

@@ -13787,6 +13787,7 @@ tests/webtbs/tw25210.pp svneol=native#text/pascal
 tests/webtbs/tw2525.pp svneol=native#text/plain
 tests/webtbs/tw2525.pp svneol=native#text/plain
 tests/webtbs/tw25269.pp svneol=native#text/pascal
 tests/webtbs/tw25269.pp svneol=native#text/pascal
 tests/webtbs/tw25289.pp svneol=native#text/plain
 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/tw25318.pp svneol=native#text/pascal
 tests/webtbs/tw25332.pp svneol=native#text/plain
 tests/webtbs/tw25332.pp svneol=native#text/plain
 tests/webtbs/tw25332a.pp svneol=native#text/plain
 tests/webtbs/tw25332a.pp svneol=native#text/plain

+ 3 - 1
compiler/scanner.pas

@@ -1294,7 +1294,9 @@ type
           dispose(pnormalset(value.valueptr));
           dispose(pnormalset(value.valueptr));
         constguid :
         constguid :
           dispose(pguid(value.valueptr));
           dispose(pguid(value.valueptr));
-        constord :
+        constord,
+        { error values }
+        constnone:
           ;
           ;
         else
         else
           internalerror(2013112802);
           internalerror(2013112802);

+ 7 - 0
tests/webtbs/tw25296.pp

@@ -0,0 +1,7 @@
+{ %norun }
+
+{$mode delphi}
+begin
+ {$IF Declared(XY) And (XY = 56)}WriteLn(56);{$IFEND}
+end.
+