瀏覽代碼

- removed {$ifdef compress} code (it hasn't been activated/maintained since
a very long time)

git-svn-id: trunk@27359 -

Jonas Maebe 11 年之前
父節點
當前提交
57859963d6
共有 2 個文件被更改,包括 13 次插入38 次删除
  1. 11 26
      compiler/symdef.pas
  2. 2 12
      compiler/symsym.pas

+ 11 - 26
compiler/symdef.pas

@@ -5317,16 +5317,11 @@ implementation
         if assigned(_mangledname) then
 {$endif symansistr}
           begin
-{$ifdef compress}
-           {$error add support for ansistrings in case of symansistr}
-           mangledname:=minilzw_decode(_mangledname^);
-{$else}
-  {$ifdef symansistr}
+{$ifdef symansistr}
            mangledname:=_mangledname;
-  {$else symansistr}
+{$else symansistr}
            mangledname:=_mangledname^;
-  {$endif symansistr}
-{$endif}
+{$endif symansistr}
            exit;
          end;
 {$ifndef jvm}
@@ -5344,16 +5339,11 @@ implementation
         else
           jvmaddtypeownerprefix(owner,mangledname);
 {$endif not jvm}
-{$ifdef compress}
-       {$error add support for ansistrings in case of symansistr}
-        _mangledname:=stringdup(minilzw_encode(mangledname));
-{$else}
-  {$ifdef symansistr}
-        _mangledname:=mangledname;
-  {$else symansistr}
-        _mangledname:=stringdup(mangledname);
-  {$endif symansistr}
-{$endif}
+{$ifdef symansistr}
+      _mangledname:=mangledname;
+{$else symansistr}
+      _mangledname:=stringdup(mangledname);
+{$endif symansistr}
       end;
 
 
@@ -5703,16 +5693,11 @@ implementation
         include(procoptions,po_has_importname);
         include(procoptions,po_has_mangledname);
 {$else}
-  {$ifdef compress}
-        {$error add support for symansistr}
-        _mangledname:=stringdup(minilzw_encode(s));
-  {$else}
-    {$ifdef symansistr}
+  {$ifdef symansistr}
         _mangledname:=s;
-    {$else symansistr}
+  {$else symansistr}
         _mangledname:=stringdup(s);
-    {$endif symansistr}
-  {$endif}
+  {$endif symansistr}
 {$endif jvm}
         include(procoptions,po_has_mangledname);
       end;

+ 2 - 12
compiler/symsym.pas

@@ -1848,22 +1848,14 @@ implementation
               usename:=name
             else
               usename:=_mangledbasename;
+            _mangledname:=make_mangledname(prefix,owner,usename);
   {$else symansistr}
             if not assigned(_mangledbasename) then
               usename:=name
             else
               usename:=_mangledbasename^;
+            _mangledname:=stringdup(make_mangledname(prefix,owner,usename));
   {$endif symansistr}
-{$ifdef compress}
-            {$error add ansistring support for symansistr}
-            _mangledname:=stringdup(minilzw_encode(make_mangledname(prefix,owner,usename)));
-{$else compress}
-  {$ifdef symansistr}
-           _mangledname:=make_mangledname(prefix,owner,usename);
-  {$else symansistr}
-           _mangledname:=stringdup(make_mangledname(prefix,owner,usename));
-  {$endif symansistr}
-{$endif compress}
 {$endif jvm}
           end;
 {$ifdef symansistr}
@@ -1909,8 +1901,6 @@ implementation
 {$if defined(jvm)}
         _mangledname:=jvmmangledbasename(self,s,false);
         jvmaddtypeownerprefix(owner,_mangledname);
-{$elseif defined(compress)}
-        _mangledname:=stringdup(minilzw_encode(s));
 {$else}
   {$ifdef symansistr}
         _mangledname:=s;