Explicitly cast assigned values to the correct type in P6{int,num}.

Also factors out a shared subexpression in P6num.
Raku · Feb 2, 2013 · 9cb0060 · 9cb0060
1 parent e221d3d
commit 9cb0060
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/6model/reprs/P6int.c b/src/6model/reprs/P6int.c
@@ -92,25 +92,25 @@ static void set_int(PARROT_INTERP, STable *st, void *data, INTVAL value) {
 
     switch (repr_data->bits) {
     case 1:
-        *(Parrot_Int1 *)data = value & 0x1;
+        *(Parrot_Int1 *)data = (Parrot_Int1) value & 0x1;
         break;
     case 2:
-        *(Parrot_Int1 *)data = value & 0x3;
+        *(Parrot_Int1 *)data = (Parrot_Int1) value & 0x3;
         break;
     case 4:
-        *(Parrot_Int1 *)data = value & 0xf;
+        *(Parrot_Int1 *)data = (Parrot_Int1) value & 0xf;
         break;
     case 8:
-        *(Parrot_Int1 *)data = value;
+        *(Parrot_Int1 *)data = (Parrot_Int1) value;
         break;
     case 16:
-        *(Parrot_Int2 *)data = value;
+        *(Parrot_Int2 *)data = (Parrot_Int2) value;
         break;
     case 32:
-        *(Parrot_Int4 *)data = value;
+        *(Parrot_Int4 *)data = (Parrot_Int4) value;
         break;
     case 64:
-        *(Parrot_Int8 *)data = value;
+        *(Parrot_Int8 *)data = (Parrot_Int8) value;
         break;
     default:
         die_bad_bits(interp);

diff --git a/src/6model/reprs/P6num.c b/src/6model/reprs/P6num.c
@@ -75,12 +75,11 @@ static PMC * allocate(PARROT_INTERP, STable *st) {
 static void initialize(PARROT_INTERP, STable *st, void *data) {
     P6numREPRData *repr_data = (P6numREPRData *)st->REPR_data;
 
+    double x = 0.0;
     if (repr_data->bits == 32) {
-        float x = 0.0;
         set_num(interp, st, data, 0.0/x);
     }
     else if (repr_data->bits == 64) {
-        double x = 0.0;
         set_num(interp, st, data, 0.0/x);
     }
     else {
@@ -115,10 +114,10 @@ static void set_num(PARROT_INTERP, STable *st, void *data, FLOATVAL value) {
 
     switch (repr_data->bits) {
     case 32:
-        *(Parrot_Float4 *)data = value;
+        *(Parrot_Float4 *)data = (Parrot_Float4) value;
         break;
     case 64:
-        *(Parrot_Float8 *)data = value;
+        *(Parrot_Float8 *)data = (Parrot_Float8) value;
         break;
     default:
         die_bad_bits(interp);