- The algorithms for REAL-string conversion existed twice (in Streams.Mod and

Strings.Mod). They have been moved into the new module RealConversions.Mod
which gets imported by both Streams.Mod and Strings.Mod.

- Module Strings got extended by the operator + for concatenating strings,
characters, integers and and reals to a new string.

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8428 8c9fc860-2736-0410-a75d-ab315db34111

source/RealConversions.Mod

@@ -0,0 +1,254 @@
+MODULE RealConversions;  (* GF *)
+
+IMPORT SYSTEM;
+
+TYPE 
+	ReadProc* = PROCEDURE {DELEGATE} ( ): CHAR;
+
+VAR
+	H, L: INTEGER;
+
+	(**	Scan a floating-point number. 
+		EBNF: Real = Digit {Digit} '.' Digit {Digit} ['e'|'E' ['+'|'-'] Digit {Digit}]. *)
+	PROCEDURE ScanReal*( next: ReadProc ): LONGREAL;
+	VAR 
+		e: INTEGER; y, g: LONGREAL; neg, negE: BOOLEAN; ch: CHAR;
+	BEGIN
+		ch := next();
+		WHILE (ch = "0") DO  ch := next()  END;
+		IF ch = "-" THEN  neg := TRUE; ch := next()  ELSE  neg := FALSE  END;
+		WHILE (ch = " ") OR (ch = "0") DO  ch := next()  END;
+		y := 0;
+		WHILE ("0" <= ch) & (ch <= "9") DO
+			y := y * 10 + (ORD(ch) - ORD("0"));
+			ch := next();
+		END;
+		IF ch = "." THEN
+			ch := next();
+			g := 1;
+			WHILE ("0" <= ch) & (ch <= "9") DO
+				g := g / 10;  y := y + g * (ORD(ch) - ORD("0"));
+				ch := next()
+			END;
+		END;
+		IF (ch = "d") OR (ch = "D") OR (ch = "e") OR (ch = "E") THEN
+			ch := next();  e := 0;
+			IF ch = "-" THEN  negE := TRUE; ch := next()
+			ELSIF ch = "+" THEN  negE := FALSE; ch := next()
+			ELSE  negE := FALSE
+			END;
+			WHILE (ch = "0") DO  ch := next()  END;
+			WHILE ("0" <= ch) & (ch <= "9") DO
+				e := e * 10 + (ORD(ch) - ORD("0"));
+				ch := next()
+			END;
+			IF negE THEN  y := y / Ten(e)
+			ELSE  y := y * Ten(e)
+			END;
+		END;
+		IF neg THEN  y := -y  END;
+		RETURN y
+	END ScanReal;
+	
+
+
+	(**	Convert LONGREAL x  to string using n character positions. *)
+	PROCEDURE RealToString*( x: LONGREAL;  n: WORD;  VAR buf: ARRAY OF CHAR );
+	(* BM 1993.4.22. Do not simplify rounding! *)
+	VAR 
+		e, h, l, i, pos: LONGINT;  z: LONGREAL;  d: ARRAY 16 OF CHAR;
+		
+		PROCEDURE Char( c: CHAR );
+		BEGIN
+			buf[pos] := c;  INC( pos )
+		END Char;
+		
+		PROCEDURE String( CONST s: ARRAY OF CHAR );
+		VAR i: LONGINT;
+		BEGIN
+			i := 0;
+			WHILE s[i] # 0X DO  Char( s[i] );  INC( i )  END
+		END String;
+			
+	BEGIN
+		pos := 0;
+		e := ExpoL( x );
+		IF e = 2047 THEN
+			WHILE n > 5 DO  Char( " " );  DEC( n )  END;
+			NaNCodeL( x, h, l );
+			IF (h # 0) OR (l # 0) THEN  String( "  NaN" )
+			ELSIF x < 0 THEN  String(" -INF" )
+			ELSE  String("  INF" )
+			END
+		ELSE
+			IF n <= 9 THEN  n := 1  ELSE  DEC( n, 8 )  END;
+			REPEAT  Char( " " );  DEC( n )  UNTIL n <= 15;   (* 0 <= n <= 15 fraction digits *)
+			IF (e # 0) & (x < 0) THEN  Char( "-" );  x := -x  ELSE  Char( " " )  END;
+			IF e = 0 THEN
+				h := 0;  l := 0 (* no denormals *)
+			ELSE
+				e := (e - 1023) * 301029 DIV 1000000;   (* ln(2)/ln(10) = 0.301029996 *)
+				z := Ten( e + 1 );
+				IF x >= z THEN  x := x / z;  INC( e )  ELSE  x := x * Ten( -e )  END;
+				IF x >= 10 THEN  x := x * Ten( -1 ) + 0.5D0 / Ten( n );  INC( e )
+				ELSE
+					x := x + 0.5D0 / Ten( n );
+					IF x >= 10 THEN  x := x * Ten( -1 );  INC( e )  END
+				END;
+				x := x * Ten( 7 );  h := ENTIER( x );  x := (x - h) * Ten( 8 );  l := ENTIER( x )
+			END;
+			i := 15;
+			WHILE i > 7 DO  d[i] := CHR( l MOD 10 + ORD( "0" ) );  l := l DIV 10;  DEC( i )  END;
+			WHILE i >= 0 DO  d[i] := CHR( h MOD 10 + ORD( "0" ) );  h := h DIV 10;  DEC( i )  END;
+			Char( d[0] );  Char( "." );  i := 1;
+			WHILE i <= n DO  Char( d[i] );  INC( i )  END;
+			IF e < 0 THEN  String( "E-" );  e := -e  ELSE  String( "E+" )  END;
+			Char( CHR( e DIV 100 + ORD( "0" ) ) );  e := e MOD 100;  
+			Char( CHR( e DIV 10 + ORD( "0" ) ) );  Char( CHR( e MOD 10 + ORD( "0" ) ) )
+		END;
+		Char( 0X )
+	END RealToString;
+
+
+	(**	Convert LONGREAL x to string in a fixed point notation. 
+		n is the overall minimal length for the output field, f the number of fraction digits following the decimal point, 
+		D the fixed exponent (printed only when D # 0). *)
+	PROCEDURE RealToStringFix*( x: LONGREAL;  n, f, D: WORD; VAR buf: ARRAY OF CHAR );
+	(* BM 1993.4.22. Do not simplify rounding! / JG formatting adjusted *)
+	VAR 
+		e, h, l, i, pos: LONGINT;  r, z: LONGREAL;
+		d: ARRAY 16 OF CHAR;
+		s: CHAR;  dot: BOOLEAN;
+		
+		PROCEDURE Char( c: CHAR );
+		BEGIN
+			buf[pos] := c;  INC( pos )
+		END Char;
+		
+		PROCEDURE String( CONST s: ARRAY OF CHAR );
+		VAR i: LONGINT; ch: CHAR;
+		BEGIN
+			ch := s[0]; i := 1;
+			WHILE ch # 0X DO  Char( ch );  ch := s[i];  INC( i )  END
+		END String;
+			
+	BEGIN
+		pos := 0;
+		e := ExpoL( x );
+		IF (e = 2047) OR (ABS( D ) > 308) THEN
+			WHILE n > 5 DO  Char( " " );  DEC( n )  END;
+			NaNCodeL( x, h, l );
+			IF (h # 0) OR (l # 0) THEN  String( "  NaN" )
+			ELSIF x < 0 THEN  String( " -INF" )
+			ELSE  String( "  INF" )
+			END
+		ELSE
+			IF D = 0 THEN 
+				IF f = 0 THEN  dot := FALSE; DEC( n, 1 )  ELSE  dot := TRUE;  DEC( n, 2 )  END 
+			ELSE  dot := TRUE;  DEC( n, 7 ) 
+			END;
+			IF n < 2 THEN  n := 2  END;
+			IF f < 0 THEN  f := 0  END;
+			IF n < f + 2 THEN  n := f + 2  END;
+			DEC( n, f );
+			IF (e # 0) & (x < 0) THEN  s := "-";  x := -x  ELSE  s := " "  END;
+			IF e = 0 THEN
+				h := 0;  l := 0;  DEC( e, D - 1 ) (* no denormals *)
+			ELSE
+				e := (e - 1023) * 301029 DIV 1000000;   (* ln(2)/ln(10) = 0.301029996 *)
+				z := Ten( e + 1 );
+				IF x >= z THEN  x := x / z;  INC( e )  ELSE  x := x * Ten( -e )  END;
+				DEC( e, D - 1 );  i := -(e + f);
+				IF i <= 0 THEN  r := 5 * Ten( i )  ELSE  r := 0  END;
+				IF x >= 10 THEN  x := x * Ten( -1 ) + r;  INC( e )
+				ELSE
+					x := x + r;
+					IF x >= 10 THEN  x := x * Ten( -1 );  INC( e )  END
+				END;
+				x := x * Ten( 7 );  h := ENTIER( x );  x := (x - h) * Ten( 8 );  l := ENTIER( x )
+			END;
+			i := 15;
+			WHILE i > 7 DO  d[i] := CHR( l MOD 10 + ORD( "0" ) );  l := l DIV 10;  DEC( i )  END;
+			WHILE i >= 0 DO  d[i] := CHR( h MOD 10 + ORD( "0" ) );  h := h DIV 10;  DEC( i )  END;
+			IF n <= e THEN  n := e + 1  END;
+			IF e > 0 THEN
+				WHILE n > e DO  Char( " " );  DEC( n )  END;
+				Char( s );  e := 0;
+				WHILE n > 0 DO
+					DEC( n );
+					IF e < 16 THEN  Char( d[e] );  INC( e )  ELSE  Char( "0" )  END
+				END;
+				IF dot THEN  Char( "." )  END;
+			ELSE
+				WHILE n > 1 DO  Char( " " );  DEC( n )  END;
+				Char( s );  Char( "0" );  IF dot  THEN Char( "." )  END;
+				WHILE (0 < f) & (e < 0) DO  Char( "0" );  DEC( f );  INC( e )  END
+			END;
+			WHILE f > 0 DO
+				DEC( f );
+				IF e < 16 THEN  Char( d[e] );  INC( e )  ELSE  Char( "0" )  END
+			END;
+			IF D # 0 THEN
+				IF D < 0 THEN  String( "E-" );  D := -D  ELSE  String( "E+" )  END;
+				Char( CHR( D DIV 100 + ORD( "0" ) ) );  D := D MOD 100;  
+				Char( CHR( D DIV 10 + ORD( "0" ) ) );  Char( CHR( D MOD 10 + ORD( "0" ) ) )
+			END
+		END;
+		Char( 0X )
+	END RealToStringFix;
+	
+	
+
+	(*** the following procedures stem from Reals.Mod *)
+
+	(** Returns the NaN code (0 <= h < 1048576, MIN(LONGINT) <= l <= MAX(LONGINT)) or (-1,-1) if not NaN/Infinite. *)
+	PROCEDURE NaNCodeL( x: LONGREAL;  VAR h, l: LONGINT );
+	BEGIN
+		SYSTEM.GET( ADDRESSOF( x ) + H, h );  SYSTEM.GET( ADDRESSOF( x ) + L, l );
+		IF ASH( h, -20 ) MOD 2048 = 2047 THEN  (* Infinite or NaN *)
+			h := h MOD 100000H (* lowest 20 bits *)
+		ELSE h := -1;  l := -1
+		END
+	END NaNCodeL;
+
+
+	(** Returns the shifted binary exponent (0 <= e < 2048). *)
+	PROCEDURE ExpoL( x: LONGREAL ): LONGINT;
+	VAR i: LONGINT;
+	BEGIN
+		SYSTEM.GET( ADDRESSOF( x ) + H, i );  RETURN ASH( i, -20 ) MOD 2048
+	END ExpoL;
+
+	(** Convert hexadecimal to LONGREAL. h and l are the high and low parts.*)
+	PROCEDURE RealL( h, l: LONGINT ): LONGREAL;
+	VAR x: LONGREAL;
+	BEGIN
+		SYSTEM.PUT( ADDRESSOF( x ) + H, h );  SYSTEM.PUT( ADDRESSOF( x ) + L, l );  RETURN x
+	END RealL;
+
+
+	(** Returns 10^e (e <= 308, 308 < e delivers IEEE-code +INF). *)
+	PROCEDURE Ten( e: LONGINT ): LONGREAL;   (* naiive version *)
+	VAR r: LONGREAL;
+	BEGIN
+		IF e < -307 THEN RETURN 0
+		ELSIF 308 < e THEN RETURN RealL( 2146435072, 0 )
+		END;
+		r := 1;
+		WHILE (e > 0) DO r := r * 10;  DEC( e );  END;
+		WHILE (e < 0) DO r := r / 10;  INC( e );  END;
+		RETURN r;
+	END Ten;
+
+	PROCEDURE InitHL;
+	VAR i: ADDRESS;  dmy: INTEGER;  littleEndian: BOOLEAN;
+	BEGIN
+		dmy := 1;  i := ADDRESSOF( dmy );
+		SYSTEM.GET( i, littleEndian );   (* indirection via i avoids warning on SUN cc -O *)
+		IF littleEndian THEN  H := 4;  L := 0  ELSE  H := 0;  L := 4  END
+	END InitHL;
+
+BEGIN  
+	InitHL
+END RealConversions.
+

source/Release.Tool

@@ -344,7 +344,7 @@ PACKAGE System ARCHIVE "System.zip" SOURCE "SystemSrc.zip" DESCRIPTION "System"
 	KernelLog.Mod
 
 	# Services and device drivers
-	Plugins.Mod Streams.Mod Pipes.Mod Commands.Mod
+	Plugins.Mod RealConversions.Mod Streams.Mod Pipes.Mod Commands.Mod
 	In.Mod Out.Mod
 
 	I386 { I386.Reals.Mod }

source/Streams.Mod

@@ -2,7 +2,7 @@
 
 MODULE Streams;   (** AUTHOR "pjm/be"; PURPOSE "I/O buffering and formatted writing and reading"; *)
 
-IMPORT SYSTEM;
+IMPORT SYSTEM, RC := RealConversions;
 
 CONST
 	Ok* = 0;   (** zero result code means no error occurred *)
@@ -21,9 +21,6 @@ CONST
 CONST
 	CR = 0DX;  LF = 0AX;  TAB = 9X;  SP = 20X;
 
-VAR
-	H, L: INTEGER;
-
 TYPE
 	TSize* = LONGINT;
 
@@ -393,110 +390,20 @@ TYPE
 
 	(** Write LONGREAL x  using n character positions. *)
 		PROCEDURE Float*( x: LONGREAL;  n: WORD );
-		(* BM 1993.4.22. Do not simplify rounding! *)
-		VAR e, h, l, i: LONGINT;  z: LONGREAL;
-			d: ARRAY 16 OF CHAR;
-		BEGIN
-			e := ExpoL( x );
-			IF e = 2047 THEN
-				WHILE n > 5 DO Char( " " );  DEC( n ) END;
-				NaNCodeL( x, h, l );
-				IF (h # 0) OR (l # 0) THEN String( "  NaN" )
-				ELSIF x < 0 THEN String(" -INF" )
-				ELSE String("  INF" )
-				END
-			ELSE
-				IF n <= 9 THEN n := 1 ELSE DEC( n, 8 ) END;
-				REPEAT Char( " " );  DEC( n ) UNTIL n <= 15;   (* 0 <= n <= 15 fraction digits *)
-				IF (e # 0) & (x < 0) THEN Char( "-" );  x := -x ELSE Char( " " ) END;
-				IF e = 0 THEN
-					h := 0;  l := 0 (* no denormals *)
-				ELSE
-					e := (e - 1023) * 301029 DIV 1000000;   (* ln(2)/ln(10) = 0.301029996 *)
-					z := Ten( e + 1 );
-					IF x >= z THEN x := x / z;  INC( e ) ELSE x := x * Ten( -e ) END;
-					IF x >= 10 THEN x := x * Ten( -1 ) + 0.5D0 / Ten( n );  INC( e )
-					ELSE
-						x := x + 0.5D0 / Ten( n );
-						IF x >= 10 THEN x := x * Ten( -1 );  INC( e ) END
-					END;
-					x := x * Ten( 7 );  h := ENTIER( x );  x := (x - h) * Ten( 8 );  l := ENTIER( x )
-				END;
-				i := 15;
-				WHILE i > 7 DO d[i] := CHR( l MOD 10 + ORD( "0" ) );  l := l DIV 10;  DEC( i ) END;
-				WHILE i >= 0 DO d[i] := CHR( h MOD 10 + ORD( "0" ) );  h := h DIV 10;  DEC( i ) END;
-				Char( d[0] );  Char( "." );  i := 1;
-				WHILE i <= n DO Char( d[i] );  INC( i ) END;
-				IF e < 0 THEN String( "E-" );  e := -e ELSE String( "E+" ) END;
-				Char( CHR( e DIV 100 + ORD( "0" ) ) );  e := e MOD 100;  Char( CHR( e DIV 10 + ORD( "0" ) ) );  Char( CHR( e MOD 10 + ORD( "0" ) ) )
-			END
+		VAR 
+			buf: ARRAY 32 OF CHAR;
+		BEGIN
+			RC.RealToString( x, n, buf );
+			String( buf )
 		END Float;
 
 	(** Write LONGREAL x in a fixed point notation. n is the overall minimal length for the output field, f the number of fraction digits following the decimal point, D the fixed exponent (printed only when D # 0). *)
 		PROCEDURE FloatFix*( x: LONGREAL;  n, f, D: WORD );
-		(* BM 1993.4.22. Do not simplify rounding! / JG formatting adjusted *)
-		VAR e, h, l, i: LONGINT;  r, z: LONGREAL;
-			d: ARRAY 16 OF CHAR;
-			s: CHAR;  dot: BOOLEAN;
-		BEGIN
-			e := ExpoL( x );
-			IF (e = 2047) OR (ABS( D ) > 308) THEN
-				WHILE n > 5 DO Char( " " );  DEC( n ) END;
-				NaNCodeL( x, h, l );
-				IF (h # 0) OR (l # 0) THEN String( "  NaN" )
-				ELSIF x < 0 THEN String( " -INF" )
-				ELSE String( "  INF" )
-				END
-			ELSE
-				IF D = 0 THEN IF (f=0) THEN dot := FALSE; DEC( n, 1 ) ELSE dot := TRUE; DEC(n,2);  END;  ELSE dot := TRUE; DEC( n, 7 ) END;
-				IF n < 2 THEN n := 2 END;
-				IF f < 0 THEN f := 0 END;
-				IF n < f + 2 THEN n := f + 2 END;
-				DEC( n, f );
-				IF (e # 0) & (x < 0) THEN s := "-";  x := -x ELSE s := " " END;
-				IF e = 0 THEN
-					h := 0;  l := 0;  DEC( e, D - 1 ) (* no denormals *)
-				ELSE
-					e := (e - 1023) * 301029 DIV 1000000;   (* ln(2)/ln(10) = 0.301029996 *)
-					z := Ten( e + 1 );
-					IF x >= z THEN x := x / z;  INC( e ) ELSE x := x * Ten( -e ) END;
-					DEC( e, D - 1 );  i := -(e + f);
-					IF i <= 0 THEN r := 5 * Ten( i ) ELSE r := 0 END;
-					IF x >= 10 THEN x := x * Ten( -1 ) + r;  INC( e )
-					ELSE
-						x := x + r;
-						IF x >= 10 THEN x := x * Ten( -1 );  INC( e ) END
-					END;
-					x := x * Ten( 7 );  h := ENTIER( x );  x := (x - h) * Ten( 8 );  l := ENTIER( x )
-				END;
-				i := 15;
-				WHILE i > 7 DO d[i] := CHR( l MOD 10 + ORD( "0" ) );  l := l DIV 10;  DEC( i ) END;
-				WHILE i >= 0 DO d[i] := CHR( h MOD 10 + ORD( "0" ) );  h := h DIV 10;  DEC( i ) END;
-				IF n <= e THEN n := e + 1 END;
-				IF e > 0 THEN
-					WHILE n > e DO Char( " " );  DEC( n ) END;
-					Char( s );  e := 0;
-					WHILE n > 0 DO
-						DEC( n );
-						IF e < 16 THEN Char( d[e] );  INC( e ) ELSE Char( "0" ) END
-					END;
-					IF dot THEN
-					Char( "." )
-					END;
-				ELSE
-					WHILE n > 1 DO Char( " " );  DEC( n ) END;
-					Char( s );  Char( "0" );  IF dot THEN Char( "." );  END;
-					WHILE (0 < f) & (e < 0) DO Char( "0" );  DEC( f );  INC( e ) END
-				END;
-				WHILE f > 0 DO
-					DEC( f );
-					IF e < 16 THEN Char( d[e] );  INC( e ) ELSE Char( "0" ) END
-				END;
-				IF D # 0 THEN
-					IF D < 0 THEN String( "E-" );  D := -D ELSE String( "E+" ) END;
-					Char( CHR( D DIV 100 + ORD( "0" ) ) );  D := D MOD 100;  Char( CHR( D DIV 10 + ORD( "0" ) ) );  Char( CHR( D MOD 10 + ORD( "0" ) ) )
-				END
-			END
+		VAR 
+			buf: ARRAY 64 OF CHAR;
+		BEGIN
+			RC.RealToStringFix( x, n, f, D, buf );
+			String( buf )
 		END FloatFix;
 
 	END Writer;
@@ -807,45 +714,6 @@ TYPE
 			IF (res = 0) & ~ok THEN res := FormatError END
 		END Int;
 
-	(** Read a floating-point number. EBNF: Real = Digit {Digit} '.' Digit {Digit} ['e'|'E' ['+'|'-'] Digit {Digit}]. *)
-		PROCEDURE Real* (VAR real: LONGREAL);
-		VAR e: INTEGER; y, g: LONGREAL; neg, negE: BOOLEAN; ch: CHAR;
-		BEGIN
-			ch := Get();
-			WHILE (ch = "0") DO ch := Get() END;
-			IF ch = "-" THEN neg := TRUE; ch := Get(); ELSE neg := FALSE END;
-			WHILE (ch = " ") OR (ch = "0") DO ch := Get(); END;
-			y := 0;
-			WHILE ("0" <= ch) & (ch <= "9") DO
-				y := y * 10 + (ORD(ch) - ORD("0"));
-				ch := Get();
-			END;
-			IF ch = "." THEN
-				ch := Get();
-				g := 1;
-				WHILE ("0" <= ch) & (ch <= "9") DO
-					g := g / 10; y := y + g * (ORD(ch) - ORD("0"));
-					ch := Get();
-				END;
-			END;
-			IF (ch = "d") OR (ch = "D") OR (ch = "e") OR (ch = "E") THEN
-				ch := Get(); e := 0;
-				IF ch = "-" THEN negE := TRUE; ch := Get()
-				ELSIF ch = "+" THEN negE := FALSE; ch := Get()
-				ELSE negE := FALSE
-				END;
-				WHILE (ch = "0") DO ch := Get() END;
-				WHILE ("0" <= ch) & (ch <= "9") DO
-					e := e * 10 + (ORD(ch) - ORD("0"));
-					ch := Get();
-				END;
-				IF negE THEN y := y / Ten(e)
-				ELSE y := y * Ten(e)
-				END;
-			END;
-			IF neg THEN y := -y END;
-			real := y
-		END Real;
 
 	(** Return TRUE iff at the end of a line (or file). *)
 		PROCEDURE EOLN*( ): BOOLEAN;
@@ -975,7 +843,7 @@ TYPE
 		PROCEDURE GetReal*(VAR real: LONGREAL): BOOLEAN;
 		BEGIN
 			SkipWhitespace;
-			Real(real);
+			real := RC.ScanReal(Get);
 			RETURN res = Ok
 		END GetReal;
 
@@ -1072,59 +940,9 @@ VAR
 		END;
 	END Copy;
 
-	(** from module Reals.Mod *)
-
-
-(*** the following procedures stem from Reals.Mod and are needed for Writer.Float and Writer.FloatFix *)
-
-(** Returns the NaN code (0 <= h < 1048576, MIN(LONGINT) <= l <= MAX(LONGINT)) or (-1,-1) if not NaN/Infinite. *)
-	PROCEDURE NaNCodeL( x: LONGREAL;  VAR h, l: LONGINT );
-	BEGIN
-		SYSTEM.GET( ADDRESSOF( x ) + H, h );  SYSTEM.GET( ADDRESSOF( x ) + L, l );
-		IF ASH( h, -20 ) MOD 2048 = 2047 THEN  (* Infinite or NaN *)
-			h := h MOD 100000H (* lowest 20 bits *)
-		ELSE h := -1;  l := -1
-		END
-	END NaNCodeL;
-
-(** Returns the shifted binary exponent (0 <= e < 2048). *)
-	PROCEDURE ExpoL( x: LONGREAL ): LONGINT;
-	VAR i: LONGINT;
-	BEGIN
-		SYSTEM.GET( ADDRESSOF( x ) + H, i );  RETURN ASH( i, -20 ) MOD 2048
-	END ExpoL;
-
-(** Convert hexadecimal to LONGREAL. h and l are the high and low parts.*)
-	PROCEDURE RealL( h, l: LONGINT ): LONGREAL;
-	VAR x: LONGREAL;
-	BEGIN
-		SYSTEM.PUT( ADDRESSOF( x ) + H, h );  SYSTEM.PUT( ADDRESSOF( x ) + L, l );  RETURN x
-	END RealL;
-
-(** Returns 10^e (e <= 308, 308 < e delivers IEEE-code +INF). *)
-	PROCEDURE Ten( e: LONGINT ): LONGREAL;   (* naiive version *)
-	VAR r: LONGREAL;
-	BEGIN
-		IF e < -307 THEN RETURN 0
-		ELSIF 308 < e THEN RETURN RealL( 2146435072, 0 )
-		END;
-		r := 1;
-		WHILE (e > 0) DO r := r * 10;  DEC( e );  END;
-		WHILE (e < 0) DO r := r / 10;  INC( e );  END;
-		RETURN r;
-	END Ten;
-
-	PROCEDURE InitHL;
-	VAR i: ADDRESS;  dmy: INTEGER;  littleEndian: BOOLEAN;
-	BEGIN
-		dmy := 1;  i := ADDRESSOF( dmy );
-		SYSTEM.GET( i, littleEndian );   (* indirection via i avoids warning on SUN cc -O *)
-		IF littleEndian THEN H := 4;  L := 0 ELSE H := 0;  L := 4 END
-	END InitHL;
-
 
 BEGIN
-	months := " Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec";  InitHL;
+	months := " Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec"; 
 END Streams.
 
 (**

source/Strings.Mod

@@ -1,6 +1,6 @@
 MODULE Strings; (** AUTHOR "be,tf, staubesv"; PURPOSE "String functions" *)
 
-IMPORT SYSTEM, Streams, Reals, Dates;
+IMPORT Streams, Dates, RC := RealConversions;
 
 CONST
 	Ok* = 0;
@@ -82,6 +82,56 @@ TYPE
 
 	END Buffer;
 
+
+	
+	
+	OPERATOR "+"*( a: String; CONST b: ARRAY OF CHAR ): String;
+	VAR str: String; 
+	BEGIN
+		NEW( str, LEN( a ) + Length( b ) );  
+		COPY( a^, str^ );  Append( str^, b );
+		RETURN str
+	END "+"; 
+
+	OPERATOR "+"*( a: String; b: CHAR ): String;
+	VAR str: String; 
+	BEGIN
+		NEW( str, LEN( a ) + 1 );  
+		COPY( a^, str^ );  AppendChar( str^, b );
+		RETURN str
+	END "+"; 
+	
+	OPERATOR "+"*( a, b: String ): String;
+	VAR str: String; 
+	BEGIN
+		NEW( str, LEN( a ) + LEN( b ) );  
+		COPY( a^, str^ );  Append( str^, b^ );
+		RETURN str
+	END "+"; 
+	
+	OPERATOR "+"*( a: String; b: HUGEINT ): String;
+	VAR 
+		digits: ARRAY 32 OF CHAR;
+		str: String;  
+	BEGIN
+		IntToStr( b, digits );
+		NEW( str, LEN( a ) + Length( digits ) );  
+		COPY( a^, str^ );  Append( str^, digits );
+		RETURN str
+	END "+"; 
+
+	OPERATOR "+"*( a: String; b: LONGREAL ): String;
+	VAR 
+		digits: ARRAY 32 OF CHAR;
+		str: String;  
+	BEGIN
+		RC.RealToString( b, 18, digits );
+		NEW( str, LEN( a ) + Length( digits ) );  
+		COPY( a^, str^ );  Append( str^, digits );
+		RETURN str
+	END "+"; 
+	
+	
 (** useful functions *)
 
 PROCEDURE Min*(a,b: LONGINT): LONGINT;
@@ -648,70 +698,8 @@ END HexStrToInt;
 (** converts a real value to a string *)
 (* adopted from Strings.Mod *)
 PROCEDURE FloatToStr*(x: LONGREAL; n, f, D: LONGINT; VAR str: ARRAY OF CHAR);
-VAR pos, len, e, i, h, l: LONGINT; r, z: LONGREAL; d: ARRAY 16 OF CHAR; s: CHAR;
-
-	PROCEDURE Wr(ch: CHAR);
-	BEGIN IF pos < len THEN str[pos] := ch; INC(pos) END;
-	END Wr;
-
 BEGIN
-	len := LEN(str)-1; pos := 0;
-	e := Reals.ExpoL(x);
-	IF (e = 2047) OR (ABS(D) > 308) THEN
-		Wr("N"); Wr("a"); Wr("N")
-	ELSE
-		IF D = 0 THEN DEC(n, 2) ELSE DEC(n, 7) END;
-		IF n < 2 THEN n := 2 END;
-		IF f < 0 THEN f := 0 END;
-		IF n < f + 2 THEN n := f + 2 END;
-		DEC(n, f);
-		IF (e # 0) & (x < 0) THEN s := "-"; x := - x ELSE s := " " END;
-		IF e = 0 THEN
-			h := 0; l := 0; DEC(e, D-1) (* no denormals *)
-		ELSE
-			e := (e - 1023) * 301029 DIV 1000000; (* ln(2)/ln(10) = 0.301029996 *)
-			z := Reals.Ten(e+1);
-			IF x >= z THEN x := x/z; INC(e) ELSE x:= x * Reals.Ten(-e) END;
-			DEC(e, D-1); i := -(e+f);
-			IF i <= 0 THEN r := 5 * Reals.Ten(i) ELSE r := 0 END;
-			IF x >= 10 THEN
-				x := x * Reals.Ten(-1) + r; INC(e)
-			ELSE
-				x := x + r;
-				IF x >= 10 THEN x := x * Reals.Ten(-1); INC(e) END
-			END;
-			x := x * Reals.Ten(7); h:= ENTIER(x); x := (x-h) * Reals.Ten(8); l := ENTIER(x)
-		END;
-		i := 15;
-		WHILE i > 7 DO d[i] := CHR(l MOD 10 + ORD("0")); l := l DIV 10; DEC(i) END;
-		WHILE i >= 0 DO d[i] := CHR(h MOD 10 + ORD("0")); h := h DIV 10; DEC(i) END;
-		IF n <= e THEN n := e + 1 END;
-		IF e > 0 THEN
-			WHILE n > e DO Wr(" "); DEC(n) END;
-			Wr(s); e:= 0;
-			WHILE n > 0 DO
-				DEC(n);
-				IF e < 16 THEN Wr(d[e]); INC(e) ELSE Wr("0") END
-			END;
-			Wr(".")
-		ELSE
-			WHILE n > 1 DO Wr(" "); DEC(n) END;
-			Wr(s); Wr("0"); Wr(".");
-			WHILE (0 < f) & (e < 0) DO Wr("0"); DEC(f); INC(e) END
-		END;
-		WHILE f > 0 DO
-			DEC(f);
-			IF e < 16 THEN Wr(d[e]); INC(e) ELSE Wr("0") END
-		END;
-		IF D # 0 THEN
-			IF D < 0 THEN Wr("D"); Wr("-"); D := - D
-			ELSE Wr("D"); Wr("+")
-			END;
-			Wr(CHR(D DIV 100 + ORD("0"))); D := D MOD 100;
-			Wr(CHR(D DIV 10 + ORD("0"))); Wr(CHR(D MOD 10 + ORD("0")))
-		END
-	END;
-	str[pos] := 0X
+	RC.RealToStringFix( x, n, f, D, str )
 END FloatToStr;
 
 PROCEDURE AddressToStr*(adr : ADDRESS; VAR str : ARRAY OF CHAR);
@@ -722,41 +710,10 @@ END AddressToStr;
 (** converts a string to a real value *)
 (* adopted from Strings.Mod *)
 PROCEDURE StrToFloat*(CONST s: ARRAY OF CHAR; VAR r: LONGREAL);
-VAR p, e: INTEGER; y, g: LONGREAL; neg, negE: BOOLEAN;
+VAR sr: Streams.StringReader;
 BEGIN
-	p := 0;
-	WHILE (s[p] = " ") OR (s[p] = "0") DO INC(p) END;
-	IF s[p] = "-" THEN neg := TRUE; INC(p) ELSE neg := FALSE END;
-	WHILE (s[p] = " ") OR (s[p] = "0") DO INC(p) END;
-
-	y := 0;
-	WHILE ("0" <= s[p]) & (s[p] <= "9") DO
-		y := y * 10 + (ORD(s[p]) - 30H);
-		INC(p);
-	END;
-	IF s[p] = "." THEN
-		INC(p); g := 1;
-		WHILE ("0" <= s[p]) & (s[p] <= "9") DO
-			g := g / 10; y := y + g * (ORD(s[p]) - 30H);
-			INC(p);
-		END;
-	END;
-	IF (s[p] = "d") OR (s[p] = "D") OR (s[p] = "e") OR (s[p] = "E") THEN
-		INC(p); e := 0;
-		IF s[p] = "-" THEN negE := TRUE; INC(p)
-		ELSIF s[p] = "+" THEN negE := FALSE; INC(p)
-		ELSE negE := FALSE
-		END;
-		WHILE (s[p] = "0") DO INC(p) END;
-		WHILE ("0" <= s[p]) & (s[p] <= "9") DO
-			e := e * 10 + (ORD(s[p]) - 30H);
-			INC(p);
-		END;
-		IF negE THEN y := y / Reals.Ten(e)
-		ELSE y := y * Reals.Ten(e) END;
-	END;
-	IF neg THEN y := -y END;
-	r := y
+	NEW( sr, 64 );  sr.Set( s );
+	r := RC.ScanReal( sr.Get );
 END StrToFloat;
 
 (** converts a set to a string *)