added and corrected array of size conversions

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

source/FoxArrayBase.Mod

@@ -2082,22 +2082,49 @@ Sufficient (but not necessary) conditions:
 		RETURN RESULT
 	END "@Convert";
 	
+
+	OPERATOR "ENTIER"*(CONST src: ARRAY [ ? ] OF LONGREAL ):  ARRAY [ ? ] OF LONGINT;
+	BEGIN
+		ApplyUnaryAAOp( ADDRESSOF( RESULT ), ADDRESSOF( src ), SIZEOF( LONGINT ),ConvertLoopXL );
+		RETURN RESULT
+	END "ENTIER";
+	
+	(** SIZES **)
+
+	PROCEDURE ConvertLoopLY( ladr, dadr: ADDRESS; linc, dinc, len: SIZE );
+	VAR lval: LONGINT;  dval: SIZE;
+	BEGIN
+		WHILE (len > 0) DO
+			SYSTEM.GET( ladr, lval );  dval := lval;  SYSTEM.PUT( dadr, dval );
+			INC( ladr, linc );  INC( dadr, dinc );  DEC( len );
+		END;
+	END ConvertLoopLY;
+	
 	OPERATOR "@Convert"*(CONST src: ARRAY [ ? ] OF LONGINT ): ARRAY [ ? ] OF SIZE;
 	BEGIN
-		CASE SIZEOF(SIZE) OF
-			4: RETURN src;
-			|8: ApplyUnaryAAOp( ADDRESSOF( RESULT ), ADDRESSOF( src ), SIZEOF( SIZE ), ConvertLoopLX );
+		IF SIZEOF(SIZE) = SIZEOF(LONGINT) THEN
+			RETURN src;
 		ELSE
-			HALT(100);
+			ApplyUnaryAAOp( ADDRESSOF( RESULT ), ADDRESSOF( src ), SIZEOF( SIZE ), ConvertLoopLY );
 		END;
 		RETURN RESULT
 	END "@Convert";
 
-	OPERATOR "ENTIER"*(CONST src: ARRAY [ ? ] OF LONGREAL ):  ARRAY [ ? ] OF LONGINT;
+	PROCEDURE ConvertLoopYZ( ladr, dadr: ADDRESS; linc, dinc, len: SIZE );
+	VAR lval: SIZE;  dval: LONGREAL;
 	BEGIN
-		ApplyUnaryAAOp( ADDRESSOF( RESULT ), ADDRESSOF( src ), SIZEOF( LONGINT ),ConvertLoopXL );
+		WHILE (len > 0) DO
+			SYSTEM.GET( ladr, lval );  dval := lval;  SYSTEM.PUT( dadr, dval );
+			INC( ladr, linc );  INC( dadr, dinc );  DEC( len );
+		END;
+	END ConvertLoopYZ;
+
+	OPERATOR "@Convert"*(CONST src: ARRAY [ ? ] OF SIZE ): ARRAY [ ? ] OF LONGREAL;
+	BEGIN
+		ApplyUnaryAAOp( ADDRESSOF( RESULT ), ADDRESSOF( src ), SIZEOF( LONGREAL ), ConvertLoopYZ );
 		RETURN RESULT
-	END "ENTIER";
+	END "@Convert";
+
 
 	(*** monadic not A -> ~A ********************************************************************)