@@ -44,7 +44,7 @@
4444
4545namespace PureScript {
4646
47−using cstring = const char *;
47+using cstring = const char *; // TODO: deprecated
4848using std::string;
4949using std::nullptr_t;
5050using std::runtime_error;
@@ -193,6 +193,9 @@ class any {
193193 assert(val >= std::numeric_limits<decltype(i)>::min() &&
194194 val <= std::numeric_limits<decltype(i)>::max());
195195 }
196+ any(const size_t val) noexcept : tag(Tag::Integer), i(static_cast<decltype(i)>(val)) {
197+ assert(val <= std::numeric_limits<decltype(i)>::max());
198+ }
196199 any(const double val) noexcept : tag(Tag::Double), d(val) {}
197200 any(const char32_t val) noexcept : tag(Tag::Character), c(val) {}
198201 any(const char val) noexcept : tag(Tag::Character), c(val) {}
@@ -333,14 +336,14 @@ class any {
333336 operator const record&() const;
334337
335338 operator void *() const {
336− return extractPointer(IF_DEBUG(Tag::RawPointer));
339+ return rawPointer();
337340 }
338341
339342 template <typename T,
340343 typename = typename std::enable_if<std::is_pointer<T>::value &&
341344 std::is_class<typename std::remove_pointer<T>::type>::value>::type>
342345 operator T() const {
343− return static_cast<T>(extractPointer(IF_DEBUG(Tag::RawPointer)));
346+ return static_cast<T>(rawPointer());
344347 }
345348
346349 auto operator[](const size_t) const -> const any&;
@@ -419,77 +422,24 @@ class any {
419422
420423}; // class any
421424
422−namespace Private {
423− template <typename T, typename U=void>
424− struct TagHelper {};
425−
426− template <>
427− struct TagHelper<string> {
428− static constexpr any::Tag tag = any::Tag::String;
429− };
430−
431− template <>
432− struct TagHelper<const char *> {
433− static constexpr any::Tag tag = any::Tag::String;
434− };
435−
436− template <size_t N>
437− struct TagHelper<any::dict<N>> {
438− static constexpr any::Tag tag = any::Tag::Dictionary;
439− };
440−
441− template <size_t N>
442− struct TagHelper<any::data<N>> {
443− static constexpr any::Tag tag = any::Tag::Data;
444− };
445−
446− template <>
447− struct TagHelper<any::array> {
448− static constexpr any::Tag tag = any::Tag::Array;
449− };
450−
451− template <>
452− struct TagHelper<any::record> {
453− static constexpr any::Tag tag = any::Tag::Record;
454− };
455−
456− template <typename T>
457− struct TagHelper<T> {
458− static constexpr any::Tag tag = any::Tag::Pointer;
459− };
460−}
461−
462−// Pass-through
463−template <typename T>
464−constexpr auto cast(const T& a) -> const T& {
465− return a;
466−}
467−
468−template <typename T>
469−inline auto cast(const any& a) ->
470− typename std::enable_if<std::is_arithmetic<T>::value ||
471− std::is_same<T,const char *>::value, T>::type {
472− return a;
473−}
474−
475425template <typename T,
476426 typename = typename std::enable_if<std::is_class<T>::value>::type>
477−inline auto cast(const any& a) -> T& {
478− return *static_cast<T*>(a.extractPointer(IF_DEBUG(Private::TagHelper<T>::tag)));
427+inline auto cast_managed(const any& a) -> T& {
428+ return *static_cast<T*>(a.extractPointer(IF_DEBUG(any::Tag::Pointer)));
479429}
480430
431+// TODO: Deprecated - use static_cast
481432template <typename T,
482− typename = typename std::enable_if<std::is_pointer<T>::value &&
483− !std::is_same<T,void*>::value &&
484− !std::is_same<T,const char *>::value>::type>
433+ typename = typename std::enable_if<!std::is_class<T>::value>::type>
485434inline auto cast(const any& a) -> T {
486− return static_cast<T>(a.extractPointer(IF_DEBUG(Private::TagHelper<T>::tag)));
435+ return static_cast<T>(a);
487436}
488437
489−template <typename T>
490−inline auto cast(const any& a) ->
491− typename std::enable_if<std::is_same<void*, T>::value, T>::type {
492− return a.rawPointer();
438+// TODO: Deprecated - use cast_managed
439+template <typename T,
440+ typename = typename std::enable_if<std::is_class<T>::value>::type>
441+inline auto cast(const any& a) -> T& {
442+ return cast_managed<T>(a);
493443}
494444
495445namespace dict {
@@ -501,7 +451,7 @@ namespace dict {
501451
502452 template <size_t N>
503453 inline auto get(const any& a) -> const any& {
504− return cast<any::dict<N+1>>(a)[N].second;
454+ return (*static_cast<const any::dict<N+1>*>(a.extractPointer(IF_DEBUG(any::Tag::Dictionary))))[N].second;
505455 }
506456
507457 template <size_t N>
@@ -519,7 +469,7 @@ namespace dict {
519469 }
520470
521471 inline auto get(const Private::Symbol key, const any& a) -> const any& {
522− return get(key, cast<any::dict<unknown_size>>(a));
472+ return get(key, *static_cast<const any::dict<unknown_size>*>(a.extractPointer(IF_DEBUG(any::Tag::Dictionary))));
523473 }
524474
525475 #define P(N) any::dict_pair&& arg ## N
@@ -567,7 +517,7 @@ namespace data {
567517
568518 template <size_t N>
569519 inline auto get(const any& a) -> const any& {
570− return cast<any::data<N+1>>(a)[N];
520+ return (*static_cast<const any::data<N+1>*>(a.extractPointer(IF_DEBUG(any::Tag::Data))))[N];
571521 }
572522
573523 template <typename T>