浏览代码

- Removed ConcatPasString procedure, it duplicates ConcatString (it the past they probably used to differ, but today both preserve null characters).

git-svn-id: trunk@23662 -
sergei 12 年之前
父节点
当前提交
d2995cbf14
共有 3 个文件被更改,包括 2 次插入17 次删除
  1. 1 1
      compiler/m68k/ra68kmot.pas
  2. 1 1
      compiler/raatt.pas
  3. 0 15
      compiler/rautils.pas

+ 1 - 1
compiler/m68k/ra68kmot.pas

@@ -1617,7 +1617,7 @@ const
                       expr:=actasmpattern;
                       if asciiz then
                        expr:=expr+#0;
-                      ConcatPasString(curlist,expr);
+                      ConcatString(curlist,expr);
                       Consume(AS_STRING);
                     end;
           AS_COMMA:  begin

+ 1 - 1
compiler/raatt.pas

@@ -947,7 +947,7 @@ unit raatt;
                 expr:=actasmpattern;
                 if asciiz then
                   expr:=expr+#0;
-                ConcatPasString(curlist,expr);
+                ConcatString(curlist,expr);
                 Consume(AS_STRING);
               end;
             AS_COMMA:

+ 0 - 15
compiler/rautils.pas

@@ -206,7 +206,6 @@ Function SearchIConstant(const s:string; var l:aint): boolean;
                   Instruction generation routines
 ---------------------------------------------------------------------}
 
-  Procedure ConcatPasString(p : TAsmList;s:string);
   Procedure ConcatLabel(p: TAsmList;var l : tasmlabel);
   Procedure ConcatConstant(p : TAsmList;value: aint; constsize:byte);
   Procedure ConcatConstSymbol(p : TAsmList;const sym:string;symtyp:tasmsymtype;l:aint);
@@ -1528,20 +1527,6 @@ end;
   {  Description: This routine adds the character chain pointed to in   }
   {  s to the instruction linked list.                                  }
   {*********************************************************************}
-  Var
-   pc: PChar;
-  Begin
-     getmem(pc,length(s)+1);
-     p.concat(Tai_string.Create_pchar(strpcopy(pc,s),length(s)));
-  end;
-
-  Procedure ConcatPasString(p : TAsmList;s:string);
-  {*********************************************************************}
-  { PROCEDURE ConcatPasString(s:string);                                }
-  {  Description: This routine adds the character chain pointed to in   }
-  {  s to the instruction linked list, contrary to ConcatString it      }
-  {  uses a pascal style string, so it conserves null characters.       }
-  {*********************************************************************}
   Begin
      p.concat(Tai_string.Create(s));
   end;