Enable ll functions

Trying to determine which compiler(s) they work on

Author: lefticus

include/chaiscript/extras/math.hpp

@@ -1,8 +1,7 @@
 #include <cmath>
 #include <memory>
 
-#include "../dispatchkit/dispatchkit.hpp"
-#include "../chaiscript.hpp"
+#include <chaiscript/chaiscript.hpp>
 
 namespace chaiscript {
   namespace extras {
@@ -300,12 +299,12 @@ namespace chaiscript {
       }
 
       // long long ints do not work
-      /*template<typename Ret, typename Param>
+      template<typename Ret, typename Param>
       ModulePtr llround(ModulePtr m = std::make_shared<Module>())
       {
     	  m->add(chaiscript::fun(static_cast<Ret (*)(Param)>(&std::llround)), "llround");
     	  return m;
-      }*/
+      }
 
       template<typename Ret, typename Param>
       ModulePtr rint(ModulePtr m = std::make_shared<Module>())
@@ -322,12 +321,12 @@ namespace chaiscript {
       }
 
       // long long ints do not work
-      /*template<typename Ret, typename Param>
+      template<typename Ret, typename Param>
       ModulePtr llrint(ModulePtr m = std::make_shared<Module>())
       {
     	  m->add(chaiscript::fun(static_cast<Ret (*)(Param)>(&std::llrint)), "llrint");
     	  return m;
-      }*/
+      }
 
       template<typename Ret, typename Param>
       ModulePtr nearbyint(ModulePtr m = std::make_shared<Module>())
@@ -683,9 +682,9 @@ namespace chaiscript {
         lround<long int, long double>(m);
 
         // long long ints do not work
-        /*llround<long long int, double>(m);
+        llround<long long int, double>(m);
         llround<long long int, float>(m);
-        llround<long long int, long double>(m);*/
+        llround<long long int, long double>(m);
 
         rint<double, double>(m);
         rint<float, float>(m);
@@ -696,9 +695,9 @@ namespace chaiscript {
         lrint<long int, long double>(m);
 
         // long long ints do not work
-        /*llrint<long long int, double>(m);
+        llrint<long long int, double>(m);
         llrint<long long int, float>(m);
-        llrint<long long int, long double>(m);*/
+        llrint<long long int, long double>(m);
 
         nearbyint<double, double>(m);
         nearbyint<float, float>(m);

tests/math.cpp

@@ -1,4 +1,5 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
+//#include <sstream>
 #include "catch.hpp"
 
 #include <chaiscript/chaiscript.hpp>
@@ -68,10 +69,10 @@ TEST_CASE( "Math functions work", "[math]" ) {
   CHECK(chai.eval<double>("trunc(0.5)") == trunc(0.5));
   CHECK(chai.eval<double>("round(0.5)") == round(0.5));
   CHECK(chai.eval<long int>("lround(0.5)") == lround(0.5));
-  // CHECK(chai.eval<double>("llround(0.5)") == llround(0.5)); // long longs do not work
+  CHECK(chai.eval<long long int>("llround(0.5)") == llround(0.5)); // long longs do not work
   CHECK(chai.eval<double>("rint(0.5)") == rint(0.5));
   CHECK(chai.eval<long int>("lrint(0.5)") == lrint(0.5));
-  // CHECK(chai.eval<double>("llrint(0.5)") == llrint(0.5));
+  CHECK(chai.eval<long long int>("llrint(0.5)") == llrint(0.5));
   CHECK(chai.eval<double>("nearbyint(0.5)") == nearbyint(0.5));
   CHECK(chai.eval<double>("remainder(6.0, 2.5)") == remainder(6.0, 2.5));
   int quot = 0; CHECK(chai.eval<double>("var quot = 0\nremquo(6.0, 2.5, quot)") == remquo(6.0, 2.5, &quot));