2
0
Эх сурвалжийг харах

Added hex output for reals and longreals

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@6806 8c9fc860-2736-0410-a75d-ab315db34111
felixf 9 жил өмнө
parent
commit
06a7ef649e

+ 9 - 3
source/Generic.Reflection.Mod

@@ -367,19 +367,25 @@ CONST
 			SYSTEM.GET(adr, u8); Unsigned(u8, SIZEOF(UNSIGNED8));	
 			SYSTEM.GET(adr, u8); Unsigned(u8, SIZEOF(UNSIGNED8));	
 		| sfTypeUNSIGNED16:
 		| sfTypeUNSIGNED16:
 			size := SIZEOF(UNSIGNED16); 
 			size := SIZEOF(UNSIGNED16); 
-			SYSTEM.GET(adr, u16); Unsigned(u8, SIZEOF(UNSIGNED16));	
+			SYSTEM.GET(adr, u16); Unsigned(u16, SIZEOF(UNSIGNED16));	
 		| sfTypeUNSIGNED32:
 		| sfTypeUNSIGNED32:
 			size := SIZEOF(UNSIGNED32); 
 			size := SIZEOF(UNSIGNED32); 
-			SYSTEM.GET(adr, u32); Unsigned(u8, SIZEOF(UNSIGNED32));	
+			SYSTEM.GET(adr, u32); Unsigned(u32, SIZEOF(UNSIGNED32));	
 		| sfTypeUNSIGNED64:
 		| sfTypeUNSIGNED64:
 			size := SIZEOF(UNSIGNED64); 
 			size := SIZEOF(UNSIGNED64); 
-			SYSTEM.GET(adr, u64); Unsigned(u8, SIZEOF(UNSIGNED64));	
+			SYSTEM.GET(adr, s64); Unsigned(s64, SIZEOF(UNSIGNED64));	
 		| sfTypeREAL:
 		| sfTypeREAL:
 			size := SIZEOF(REAL);
 			size := SIZEOF(REAL);
 			SYSTEM.GET(adr, r); w.Float(r,7);
 			SYSTEM.GET(adr, r); w.Float(r,7);
+			w.String(" ("); 
+			SYSTEM.GET(adr, u32); Unsigned(u32, SIZEOF(UNSIGNED32));	
+			w.String(")"); 
 		| sfTypeLONGREAL:
 		| sfTypeLONGREAL:
 			size := SIZEOF(LONGREAL);
 			size := SIZEOF(LONGREAL);
 			SYSTEM.GET(adr, x); w.Float(x,13);
 			SYSTEM.GET(adr, x); w.Float(x,13);
+			w.String(" ("); 
+			SYSTEM.GET(adr, s64); Unsigned(s64, SIZEOF(UNSIGNED64));	
+			w.String(")"); 
 		| sfTypeCOMPLEX:
 		| sfTypeCOMPLEX:
 			size := SIZEOF(COMPLEX);
 			size := SIZEOF(COMPLEX);
 			SYSTEM.GET(adr, cplx); w.Float(RE(cplx),7); w.String("+ i*"); w.Float(IM(cplx),7);
 			SYSTEM.GET(adr, cplx); w.Float(RE(cplx),7); w.String("+ i*"); w.Float(IM(cplx),7);