From dcb1046b98d0067d0c2321ebc93c98255582299b Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Sat, 2 May 2009 08:48:48 +0000
Subject: [PATCH]   * moved core logic from fpc_shortstr_enum into a separate
 function, so     it can be reused in fpc_write_text_enum (currently it
 duplicates that     code). I seem to have lost my corresponding changes to
 text.inc though,     so removing the duplicate code will be for another time.

git-svn-id: trunk@13076 -
---
 rtl/inc/sstrings.inc | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/rtl/inc/sstrings.inc b/rtl/inc/sstrings.inc
index 797ce368c7..d6619bfdc3 100644
--- a/rtl/inc/sstrings.inc
+++ b/rtl/inc/sstrings.inc
@@ -407,7 +407,7 @@ begin
 end;
 {$endif}
 
-procedure fpc_shortstr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:shortstring);[public,alias:'FPC_SHORTSTR_ENUM'];compilerproc;
+function fpc_shortstr_enum_intern(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:shortstring): longint;
 
 type
   Ptypeinfo=^Ttypeinfo;
@@ -435,23 +435,21 @@ var
   sorted_array:^Tsorted_array;
   i,spaces:byte;
 
-label
-  error;
-
 begin
+  fpc_shortstr_enum_intern:=107;
   if Pcardinal(ord2strindex)^=0 then
     begin
       {The compiler did generate a lookup table.}
       with Penuminfo(Pbyte(typinfo)+2+length(Ptypeinfo(typinfo)^.name))^ do
         begin
           if (ordinal<minvalue) or (ordinal>maxvalue) then
-            goto error;  {Invalid ordinal value for this enum.}
+            exit;  {Invalid ordinal value for this enum.}
           dec(ordinal,minvalue);
         end;
       {Get the address of the string.}
       p:=Pshortstring((PPpointer(ord2strindex)+1+ordinal)^);
       if p=nil then
-        goto error;      {Invalid ordinal value for this enum.}
+        exit;      {Invalid ordinal value for this enum.}
       s:=p^;
     end
   else
@@ -470,7 +468,7 @@ begin
         else
           break;
         if l>h then
-          goto error; {Ordinal value not found? Kaboom.}
+          exit; {Ordinal value not found? Kaboom.}
       until false;
       s:=sorted_array[m].s^;
     end;
@@ -482,15 +480,23 @@ begin
         s[length(s)+i]:=' ';
       inc(byte(s[0]),spaces);
     end;
-  exit;
-error:
-  {Call runtime error in a central place, this saves space.}
-  runerror(107);
+  fpc_shortstr_enum_intern:=0;
+end;
+
+
+procedure fpc_shortstr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:shortstring);[public,alias:'FPC_SHORTSTR_ENUM'];compilerproc;
+var
+  res: longint;
+begin
+  res:=fpc_shortstr_enum_intern(ordinal,len,typinfo,ord2strindex,s);
+  if (res<>0) then
+    runerror(107);
 end;
 
 { also define alias for internal use in the system unit }
 procedure fpc_shortstr_enum(ordinal,len:sizeint;typinfo,ord2strindex:pointer;out s:shortstring);external name 'FPC_SHORTSTR_ENUM';
 
+
 procedure fpc_shortstr_currency(c : currency; len,f : SizeInt; out s : shortstring);[public,alias:'FPC_SHORTSTR_CURRENCY']; compilerproc;
 const
   MinLen = 8; { Minimal string length in scientific format }