Use pointer type to return list reference in list monitor

Author: adazem009

src/blocks/listblocks.cpp

@@ -50,12 +50,9 @@ CompilerValue *ListBlocks::compileListContents(Compiler *compiler)
     assert(list);
 
     // If this block is used in a list monitor, return the list pointer
-    if (compiler->block()->isMonitorBlock()) {
-        // TODO: Refactor this
-        // List monitors expect a reference to the list
-        // We don't have a list reference type, so cast the pointer to number
-        return compiler->addConstValue((uintptr_t)list.get());
-    } else
+    if (compiler->block()->isMonitorBlock())
+        return compiler->addConstValue(list.get());
+    else
         return compiler->addListContents(static_cast<List *>(list.get()));
 }
 

test/blocks/list_blocks_test.cpp

@@ -114,8 +114,8 @@ TEST_F(ListBlocksTest, ListMonitor)
     ASSERT_EQ(monitor1->name(), list1->name());
     ASSERT_EQ(monitor2->name(), list2->name());
 
-    EXPECT_CALL(iface1, onValueChanged(_)).WillOnce(Invoke([list1](const Value &value) { ASSERT_EQ(value.toDouble(), (uintptr_t)list1.get()); }));
-    EXPECT_CALL(iface2, onValueChanged(_)).WillOnce(Invoke([list2](const Value &value) { ASSERT_EQ(value.toDouble(), (uintptr_t)list2.get()); }));
+    EXPECT_CALL(iface1, onValueChanged(_)).WillOnce(Invoke([list1](const Value &value) { ASSERT_EQ(value.toPointer(), list1.get()); }));
+    EXPECT_CALL(iface2, onValueChanged(_)).WillOnce(Invoke([list2](const Value &value) { ASSERT_EQ(value.toPointer(), list2.get()); }));
     m_engine->updateMonitors();
 }