From eb637d5a950e15e83ca07aab2884a3a4c3e7758d Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 29 Jan 2019 17:27:30 -0800
Subject: [PATCH 01/38] Port to new v8 api

---
 DESCRIPTION            |   2 +-
 R/RcppExports.R        |  16 +-
 configure              |  26 +-
 src/Makevars.in        |   3 +-
 src/RcppExports.cpp    |  53 +--
 src/V8.cpp             | 254 -------------
 src/V8_types.h         |   1 +
 src/bindings.cpp       | 216 ++++++++++++
 src/v8_json.h          |  51 ---
 src/v8_typed_array.cpp | 785 -----------------------------------------
 src/v8_typed_array.h   |  35 --
 11 files changed, 240 insertions(+), 1202 deletions(-)
 delete mode 100644 src/V8.cpp
 create mode 100644 src/bindings.cpp
 delete mode 100644 src/v8_json.h
 delete mode 100644 src/v8_typed_array.cpp
 delete mode 100644 src/v8_typed_array.h

diff --git a/DESCRIPTION b/DESCRIPTION
index 41a8e8f..e05ac23 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -27,4 +27,4 @@ Suggests:
     testthat,
     knitr,
     rmarkdown
-RoxygenNote: 6.0.1.9000
+RoxygenNote: 6.1.1
diff --git a/R/RcppExports.R b/R/RcppExports.R
index 1815e06..08cc30f 100644
--- a/R/RcppExports.R
+++ b/R/RcppExports.R
@@ -1,12 +1,8 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-make_context <- function(set_console) {
-    .Call('_V8_make_context', PACKAGE = 'V8', set_console)
-}
-
-context_enable_typed_arrays <- function(ctx) {
-    .Call('_V8_context_enable_typed_arrays', PACKAGE = 'V8', ctx)
+R_init_all <- function() {
+    invisible(.Call('_V8_R_init_all', PACKAGE = 'V8'))
 }
 
 version <- function() {
@@ -25,11 +21,7 @@ context_null <- function(ctx) {
     .Call('_V8_context_null', PACKAGE = 'V8', ctx)
 }
 
-context_assign_bin <- function(name, data, ctx) {
-    .Call('_V8_context_assign_bin', PACKAGE = 'V8', name, data, ctx)
-}
-
-context_get_bin <- function(name, ctx) {
-    .Call('_V8_context_get_bin', PACKAGE = 'V8', name, ctx)
+make_context <- function(set_console) {
+    .Call('_V8_make_context', PACKAGE = 'V8', set_console)
 }
 
diff --git a/configure b/configure
index 64897bc..274d5c2 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,6 @@
 #!/bin/bash
 # Anticonf (tm) script by Jeroen Ooms (2017)
-# V8 requires libv8 version 3.14 or 3.15. Newer versions are not supported.
-# A suitable version is available here: https://github.com/v8-314/v8
+# V8 requires either libv8 6.8 LTS OR legacy libv8 (3.14 / 3.15).
 # This script will check for the required cflags and ldflags.
 # If your libv8 is installed in a custom location you need to set
 # INCLUDE_DIR and LIB_DIR manually via e.g:
@@ -10,11 +9,11 @@
 PKG_DEB_NAME="libv8-3.14-dev (formerly: libv8-dev)"
 PKG_RPM_NAME="v8-314-devel (formerly: v8-devel)"
 PKG_CSW_NAME="libv8_dev"
-PKG_BREW_NAME="v8@3.15"
+PKG_BREW_NAME="v8"
 PKG_TEST_HEADER="<v8.h>"
-PKG_LIBS="-lv8"
+PKG_LIBS="-lv8 -lv8_libplatform"
 PKG_LIBS_STATIC="-lv8_{base,snapshot} -lpreparser_lib"
-PKG_CFLAGS="-I/usr/include/v8-3.14"
+PKG_CFLAGS="-I/usr/include/nodejs/deps"
 
 # Check for custom locations
 if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
@@ -56,23 +55,6 @@ if [ $? -ne 0 ]; then
   exit 1;
 fi
 
-# Test for libv8 version
-${CXXCPP} ${CPPFLAGS} ${PKG_CFLAGS} ${CXXFLAGS} tools/version.cpp >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-  echo "------------------------- ANTICONF ERROR ---------------------------"
-  echo "Oh dear. The wrong version of libv8 is installed on the system."
-  echo "This package needs the 3.14 / 3.15 branch of libv8."
-  echo "On Fedora try this:"
-  echo "  sudo yum remove v8-devel"
-  echo "  sudo yum install v8-314-devel"
-  echo "On MacOS Homebrew you need:"
-  echo "  brew remove v8"
-  echo "  brew install v8@3.15"
-  echo "To use a custom libv8 build set INCLUDE_DIR and LIB_DIR manually via:"
-  echo "R CMD INSTALL --configure-vars='INCLUDE_DIR=... LIB_DIR=...'"
-  echo "--------------------------------------------------------------------"
-  exit 1;
-fi
 
 # Write to Makevars
 sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS|" src/Makevars.in > src/Makevars
diff --git a/src/Makevars.in b/src/Makevars.in
index 00ca9d7..4c1ee12 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -1,6 +1,7 @@
-PKG_CXXFLAGS=-DV8_DISABLE_DEPRECATIONS $(C_VISIBILITY)
+#PKG_CXXFLAGS=-DV8_DISABLE_DEPRECATIONS $(C_VISIBILITY)
 PKG_CPPFLAGS=@cflags@
 PKG_LIBS=@libs@
+CXX_STD=CXX11
 
 all: clean
 
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index 6113e18..1ba7665 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -6,26 +6,13 @@
 
 using namespace Rcpp;
 
-// make_context
-ctxptr make_context(bool set_console);
-RcppExport SEXP _V8_make_context(SEXP set_consoleSEXP) {
+// R_init_all
+void R_init_all();
+RcppExport SEXP _V8_R_init_all() {
 BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< bool >::type set_console(set_consoleSEXP);
-    rcpp_result_gen = Rcpp::wrap(make_context(set_console));
-    return rcpp_result_gen;
-END_RCPP
-}
-// context_enable_typed_arrays
-bool context_enable_typed_arrays(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
-RcppExport SEXP _V8_context_enable_typed_arrays(SEXP ctxSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
-    rcpp_result_gen = Rcpp::wrap(context_enable_typed_arrays(ctx));
-    return rcpp_result_gen;
+    R_init_all();
+    return R_NilValue;
 END_RCPP
 }
 // version
@@ -73,41 +60,25 @@ BEGIN_RCPP
     return rcpp_result_gen;
 END_RCPP
 }
-// context_assign_bin
-bool context_assign_bin(std::string name, Rcpp::RawVector data, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
-RcppExport SEXP _V8_context_assign_bin(SEXP nameSEXP, SEXP dataSEXP, SEXP ctxSEXP) {
-BEGIN_RCPP
-    Rcpp::RObject rcpp_result_gen;
-    Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< std::string >::type name(nameSEXP);
-    Rcpp::traits::input_parameter< Rcpp::RawVector >::type data(dataSEXP);
-    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
-    rcpp_result_gen = Rcpp::wrap(context_assign_bin(name, data, ctx));
-    return rcpp_result_gen;
-END_RCPP
-}
-// context_get_bin
-Rcpp::RawVector context_get_bin(std::string name, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
-RcppExport SEXP _V8_context_get_bin(SEXP nameSEXP, SEXP ctxSEXP) {
+// make_context
+ctxptr make_context(bool set_console);
+RcppExport SEXP _V8_make_context(SEXP set_consoleSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< std::string >::type name(nameSEXP);
-    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
-    rcpp_result_gen = Rcpp::wrap(context_get_bin(name, ctx));
+    Rcpp::traits::input_parameter< bool >::type set_console(set_consoleSEXP);
+    rcpp_result_gen = Rcpp::wrap(make_context(set_console));
     return rcpp_result_gen;
 END_RCPP
 }
 
 static const R_CallMethodDef CallEntries[] = {
-    {"_V8_make_context", (DL_FUNC) &_V8_make_context, 1},
-    {"_V8_context_enable_typed_arrays", (DL_FUNC) &_V8_context_enable_typed_arrays, 1},
+    {"_V8_R_init_all", (DL_FUNC) &_V8_R_init_all, 0},
     {"_V8_version", (DL_FUNC) &_V8_version, 0},
     {"_V8_context_eval", (DL_FUNC) &_V8_context_eval, 2},
     {"_V8_context_validate", (DL_FUNC) &_V8_context_validate, 2},
     {"_V8_context_null", (DL_FUNC) &_V8_context_null, 1},
-    {"_V8_context_assign_bin", (DL_FUNC) &_V8_context_assign_bin, 3},
-    {"_V8_context_get_bin", (DL_FUNC) &_V8_context_get_bin, 2},
+    {"_V8_make_context", (DL_FUNC) &_V8_make_context, 1},
     {NULL, NULL, 0}
 };
 
diff --git a/src/V8.cpp b/src/V8.cpp
deleted file mode 100644
index 5f04fab..0000000
--- a/src/V8.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- R bindings to V8. Copyright 2014, Jeroen Ooms.
-
- Notes:
- - Implementation of Typed Arrays taken from node v0.6.21
-
- V8 source parsing:
- - http://stackoverflow.com/questions/16613828/how-to-convert-stdstring-to-v8s-localstring
-
- Xptr examples:
- - https://github.com/RcppCore/Rcpp/blob/master/inst/unitTests/cpp/XPtr.cpp
- - http://romainfrancois.blog.free.fr/index.php?post/2010/01/08/External-pointers-with-Rcpp
-*/
-
-#include <v8.h>
-#include <Rcpp.h>
-#include "v8_typed_array.h"
-#include "v8_json.h"
-using namespace v8;
-
-void ctx_finalizer( Persistent<Context>* context ){
-  if(context)
-    context->Dispose();
-  delete context;
-}
-
-typedef Rcpp::XPtr<Persistent<Context>, Rcpp::PreserveStorage, ctx_finalizer> ctxptr;
-
-/* Helper fun that compiles JavaScript source code */
-Handle<Script> compile_source( std::string src ){
-  Handle<String> source = String::New(src.c_str());
-  Handle<Script> script = Script::Compile(source);
-  return script;
-}
-
-/* console.log */
-static Handle<Value> ConsoleLog(const Arguments& args) {
-  for (int i=0; i < args.Length(); i++) {
-    String::AsciiValue str(args[i]->ToString());
-    Rprintf("%s", *str);
-  }
-  Rprintf("\n");
-  return v8::Undefined();
-}
-
-/* console.warn */
-static Handle<Value> ConsoleWarn(const Arguments& args) {
-  for (int i=0; i < args.Length(); i++) {
-    String::AsciiValue str(args[i]->ToString());
-    Rf_warningcall_immediate(R_NilValue, *str);
-  }
-  return v8::Undefined();
-}
-
-/* console.error */
-static Handle<Value> ConsoleError(const Arguments& args) {
-  if(args.Length()){
-    return v8::ThrowException(args[0]);
-  }
-  return v8::Undefined();
-}
-
-static Handle<Value> r_callback(std::string fun, const Arguments& args) {
-  try {
-    Rcpp::Function r_call = Rcpp::Environment::namespace_env("V8")[fun];
-    String::Utf8Value arg0(args[0]);
-    Rcpp::String fun(*arg0);
-    Rcpp::CharacterVector out;
-    if(args[1]->IsUndefined()){
-      out = r_call(fun);
-    } else if(args[2]->IsUndefined()) {
-      String::Utf8Value arg1(json_stringify(args[1]));
-      Rcpp::String json(*arg1);
-      out = r_call(fun, json);
-    } else {
-      String::Utf8Value arg1(json_stringify(args[1]));
-      String::Utf8Value arg2(json_stringify(args[2]));
-      Rcpp::String val(*arg1);
-      Rcpp::String json(*arg2);
-      out = r_call(fun, val, json);
-    }
-    return json_parse(String::New(std::string(out[0]).c_str()));
-  } catch( const std::exception& e ) {
-    return v8::ThrowException(String::New(e.what()));
-  }
-}
-
-/* console.r.call() function */
-static Handle<Value> console_r_call(const Arguments& args) {
-  return r_callback("r_call", args);
-}
-
-/* console.r.get() function */
-static Handle<Value> console_r_get(const Arguments& args) {
-  return r_callback("r_get", args);
-}
-
-/* console.r.eval() function */
-static Handle<Value> console_r_eval(const Arguments& args) {
-  r_callback("r_eval", args);
-  return v8::Undefined();
-}
-
-/* console.r.eval() function */
-static Handle<Value> console_r_assign(const Arguments& args) {
-  r_callback("r_assign", args);
-  return v8::Undefined();
-}
-
-// [[Rcpp::export]]
-ctxptr make_context(bool set_console){
-  /* setup console.log */
-  HandleScope handle_scope;
-  Handle<ObjectTemplate> global = ObjectTemplate::New();
-  if(set_console){
-    Handle<ObjectTemplate> console = ObjectTemplate::New();
-    global->Set(String::NewSymbol("console"), console);
-    console->Set(String::NewSymbol("log"), FunctionTemplate::New(ConsoleLog));
-    console->Set(String::NewSymbol("warn"), FunctionTemplate::New(ConsoleWarn));
-    console->Set(String::NewSymbol("error"), FunctionTemplate::New(ConsoleError));
-
-    /* emscripted assumes a print function */
-    global->Set(String::NewSymbol("print"), FunctionTemplate::New(ConsoleLog));
-
-    /* R callback interface */
-    Handle<ObjectTemplate> console_r = ObjectTemplate::New();
-    console->Set(String::NewSymbol("r"), console_r);
-    console_r->Set(String::NewSymbol("call"), FunctionTemplate::New(console_r_call));
-    console_r->Set(String::NewSymbol("get"), FunctionTemplate::New(console_r_get));
-    console_r->Set(String::NewSymbol("eval"), FunctionTemplate::New(console_r_eval));
-    console_r->Set(String::NewSymbol("assign"), FunctionTemplate::New(console_r_assign));
-
-  }
-  /* initialize the context */
-  Persistent<Context> *ctptr = new Persistent<Context>(Context::New(NULL, global));
-  return ctxptr(ctptr);
-}
-
-// [[Rcpp::export]]
-bool context_enable_typed_arrays( Rcpp::XPtr< v8::Persistent<v8::Context> > ctx ){
-  HandleScope handle_scope;
-  Context::Scope context_scope(*ctx);
-  v8_typed_array::AttachBindings((*ctx)->Global());
-  return true;
-}
-
-// [[Rcpp::export]]
-std::string version(){
-  return v8::V8::GetVersion();
-}
-
-// [[Rcpp::export]]
-Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx){
-  // Test if context still exists
-  if(!ctx)
-    throw std::runtime_error("Context has been disposed.");
-
-  //converts input to UTF8 if needed
-  src.set_encoding(CE_UTF8);
-
-  // Create a scope
-  HandleScope handle_scope;
-  Context::Scope context_scope(*ctx);
-
-  // Compile source code
-  TryCatch trycatch;
-  Handle<Script> script = compile_source(src);
-  if(script.IsEmpty()) {
-    Local<Value> exception = trycatch.Exception();
-    String::AsciiValue exception_str(exception);
-    throw std::invalid_argument(*exception_str);
-  }
-
-  // Run the script to get the result.
-  Handle<Value> result = script->Run();
-  if(result.IsEmpty()){
-    Local<Value> exception = trycatch.Exception();
-    String::AsciiValue exception_str(exception);
-    throw std::runtime_error(*exception_str);
-  }
-
-  // Convert result to UTF8.
-  String::Utf8Value utf8(result);
-  Rcpp::String out(*utf8);
-  out.set_encoding(CE_UTF8);
-  return out;
-}
-
-// [[Rcpp::export]]
-bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
-
-  // Test if context still exists
-  if(!ctx)
-    throw std::runtime_error("Context has been disposed.");
-
-  //converts input to UTF8 if needed
-  src.set_encoding(CE_UTF8);
-
-  // Create scope
-  HandleScope handle_scope;
-  Context::Scope context_scope(*ctx);
-
-  // Try to compile, catch errors
-  TryCatch trycatch;
-  Handle<Script> script = compile_source(src);
-  return !script.IsEmpty();
-}
-
-// [[Rcpp::export]]
-bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
-  // Test if context still exists
-  return(!ctx);
-}
-
-/*
-Method below does not work because null bytes get lost when converting to strings.
-Should use ArrayBuffer types instead, e.g. Uint8Array.
-*/
-
-// [[Rcpp::export]]
-bool context_assign_bin(std::string name, Rcpp::RawVector data, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
-
-  // Test if context still exists
-  if(!ctx)
-    throw std::runtime_error("Context has been disposed.");
-
-  // Create scope
-  HandleScope handle_scope;
-  Context::Scope context_scope(*ctx);
-  v8::Handle<v8::Object> global = (*ctx)->Global();
-
-  // Currently converts raw vectors to strings. Better would be ArrayBuffer (Uint8Array specifically)
-  Local<v8::String> mystring = v8::String::New((const char*) RAW(data), data.length());
-  global->Set(String::NewSymbol(name.c_str()), mystring);
-  return true;
-}
-
-// [[Rcpp::export]]
-Rcpp::RawVector context_get_bin(std::string name, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
-  // Test if context still exists
-  if(!ctx)
-    throw std::runtime_error("Context has been disposed.");
-
-  // Create scope
-  HandleScope handle_scope;
-  Context::Scope context_scope(*ctx);
-  v8::Handle<v8::Object> global = (*ctx)->Global();
-
-  //find the string
-  Local<v8::String> mystring = global->Get(String::NewSymbol(name.c_str()))->ToString();
-  Rcpp::RawVector res(mystring->Length());
-  mystring->WriteAscii((char*) res.begin());
-  return res;
-}
diff --git a/src/V8_types.h b/src/V8_types.h
index 6ba49ff..f98e5f2 100644
--- a/src/V8_types.h
+++ b/src/V8_types.h
@@ -1,3 +1,4 @@
+#include <libplatform/libplatform.h>
 #include <v8.h>
 #include <Rcpp.h>
 void ctx_finalizer( v8::Persistent<v8::Context>* ctx );
diff --git a/src/bindings.cpp b/src/bindings.cpp
new file mode 100644
index 0000000..6808948
--- /dev/null
+++ b/src/bindings.cpp
@@ -0,0 +1,216 @@
+#include <libplatform/libplatform.h>
+#include <v8.h>
+#include <Rcpp.h>
+#include "V8_types.h"
+using namespace v8;
+
+void ctx_finalizer( Persistent<Context>* context ){
+  if(context)
+    context->Reset();
+  delete context;
+}
+
+static v8::Isolate* isolate = NULL;
+
+// Extracts a C string from a V8 Utf8Value.
+static const char* ToCString(const v8::String::Utf8Value& value) {
+  return *value ? *value : "<string conversion failed>";
+}
+
+static Local<String> ToJSString(const char * str){
+  return String::NewFromUtf8(isolate, str, NewStringType::kNormal).ToLocalChecked();
+}
+
+// [[Rcpp::export]]
+void R_init_all(){
+  //v8::V8::InitializeICUDefaultLocation(argv[0]);
+  //v8::V8::InitializeExternalStartupData(argv[0]);
+  std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
+  V8::InitializePlatform(platform.get());
+  V8::Initialize();
+  Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator =
+    ArrayBuffer::Allocator::NewDefaultAllocator();
+  isolate = Isolate::New(create_params);
+}
+
+/* Helper fun that compiles JavaScript source code */
+static Local<Script> compile_source(std::string src){
+  Local<String> source = String::NewFromUtf8(isolate, src.c_str(), NewStringType::kNormal).ToLocalChecked();
+  Local<Script> script = Script::Compile(source);
+  return script;
+}
+
+/* console.log */
+static void ConsoleLog(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  for (int i=0; i < args.Length(); i++) {
+    v8::HandleScope handle_scope(args.GetIsolate());
+    v8::String::Utf8Value str(args.GetIsolate(), args[i]);
+    Rprintf("%s", ToCString(str));
+  }
+  Rprintf("\n");
+  args.GetReturnValue().Set(v8::Undefined(args.GetIsolate()));
+}
+
+/* console.warn */
+static void ConsoleWarn(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  for (int i=0; i < args.Length(); i++) {
+    v8::HandleScope handle_scope(args.GetIsolate());
+    v8::String::Utf8Value str(args.GetIsolate(), args[i]);
+    Rf_warningcall_immediate(R_NilValue, ToCString(str));
+  }
+  Rprintf("\n");
+  args.GetReturnValue().Set(v8::Undefined(args.GetIsolate()));
+}
+
+/* console.error */
+static void ConsoleError(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  if(args.Length()){
+    args.GetIsolate()->ThrowException(args[0]);
+  }
+  args.GetReturnValue().Set(v8::Undefined(args.GetIsolate()));
+}
+
+static Local<Value> r_callback(std::string fun, const v8::FunctionCallbackInfo<v8::Value>& args) {
+  try {
+    Rcpp::Function r_call = Rcpp::Environment::namespace_env("V8")[fun];
+    String::Utf8Value arg0(args[0]);
+    Rcpp::String fun(*arg0);
+    Rcpp::CharacterVector out;
+    if(args[1]->IsUndefined()){
+      out = r_call(fun);
+    } else if(args[2]->IsUndefined()) {
+      Local<String> arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
+      Rcpp::String json(*arg1);
+      out = r_call(fun, json);
+    } else {
+      Local<String> arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
+      Local<String> arg2(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[2]).ToLocalChecked());
+      Rcpp::String val(*arg1);
+      Rcpp::String json(*arg2);
+      out = r_call(fun, val, json);
+    }
+    return v8::JSON::Parse(args.GetIsolate(), ToJSString(std::string(out[0]).c_str())).ToLocalChecked();
+  } catch( const std::exception& e ) {
+    return args.GetIsolate()->ThrowException(ToJSString(e.what()));
+  }
+}
+
+/* console.r.call() function */
+static void console_r_call(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  args.GetReturnValue().Set(r_callback("r_call", args));
+}
+
+/* console.r.get() function */
+static void console_r_get(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  args.GetReturnValue().Set(r_callback("r_get", args));
+}
+
+/* console.r.eval() function */
+static void console_r_eval(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  r_callback("r_eval", args);
+  args.GetReturnValue().Set(v8::Undefined(args.GetIsolate())); //TODO: redundant?
+}
+
+/* console.r.eval() function */
+static void console_r_assign(const v8::FunctionCallbackInfo<v8::Value>& args) {
+  r_callback("r_assign", args);
+  args.GetReturnValue().Set(v8::Undefined(args.GetIsolate()));  //TODO: redundant?
+}
+
+// [[Rcpp::export]]
+std::string version(){
+  return v8::V8::GetVersion();
+}
+
+// [[Rcpp::export]]
+Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx){
+  // Test if context still exists
+  if(!ctx)
+    throw std::runtime_error("Context has been disposed.");
+
+  //converts input to UTF8 if needed
+  src.set_encoding(CE_UTF8);
+
+  // Create a scope
+  v8::Isolate::Scope isolate_scope(isolate);
+  v8::HandleScope handle_scope(isolate);
+
+  // Compile source code
+  TryCatch trycatch(isolate);
+  Handle<Script> script = compile_source(src);
+  if(script.IsEmpty()) {
+    v8::String::Utf8Value exception(isolate, trycatch.Exception());
+    throw std::invalid_argument(ToCString(exception));
+  }
+
+  // Run the script to get the result.
+  Handle<Value> result = script->Run();
+  if(result.IsEmpty()){
+    v8::String::Utf8Value exception(isolate, trycatch.Exception());
+    throw std::runtime_error(ToCString(exception));
+  }
+
+  // Convert result to UTF8.
+  String::Utf8Value utf8(result);
+  Rcpp::String out(*utf8);
+  out.set_encoding(CE_UTF8);
+  return out;
+}
+
+// [[Rcpp::export]]
+bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
+
+  // Test if context still exists
+  if(!ctx)
+    throw std::runtime_error("Context has been disposed.");
+
+  //converts input to UTF8 if needed
+  src.set_encoding(CE_UTF8);
+
+  // Create scope
+  HandleScope handle_scope(isolate);
+
+  // Try to compile, catch errors
+  TryCatch trycatch(isolate);
+  Handle<Script> script = compile_source(src);
+  return !script.IsEmpty();
+}
+
+// [[Rcpp::export]]
+bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
+  // Test if context still exists
+  return(!ctx);
+}
+
+// [[Rcpp::export]]
+ctxptr make_context(bool set_console){
+  //setup console.log
+  v8::Isolate::Scope isolate_scope(isolate);
+  // Create a stack-allocated handle scope.
+  v8::HandleScope handle_scope(isolate);
+  // Create a new context.
+  Local<ObjectTemplate> global = ObjectTemplate::New(isolate);
+  if(set_console){
+    Local<ObjectTemplate> console = ObjectTemplate::New(isolate);
+    global->Set(ToJSString("console"), console);
+    console->Set(ToJSString("log"), FunctionTemplate::New(isolate, ConsoleLog));
+    console->Set(ToJSString("warn"), FunctionTemplate::New(isolate, ConsoleWarn));
+    console->Set(ToJSString("error"), FunctionTemplate::New(isolate, ConsoleError));
+
+    // emscripted assumes a print function
+    global->Set(ToJSString("print"), FunctionTemplate::New(isolate, ConsoleLog));
+
+    // R callback interface
+    Local<ObjectTemplate> console_r = ObjectTemplate::New(isolate);
+    console->Set(ToJSString("r"), console_r);
+    console_r->Set(ToJSString("call"), FunctionTemplate::New(isolate, console_r_call));
+    console_r->Set(ToJSString("get"), FunctionTemplate::New(isolate, console_r_get));
+    console_r->Set(ToJSString("eval"), FunctionTemplate::New(isolate, console_r_eval));
+    console_r->Set(ToJSString("assign"), FunctionTemplate::New(isolate, console_r_assign));
+
+  }
+  // initialize the context
+  Persistent<Context> *ctptr = new Persistent<Context>(isolate, Context::New(isolate, NULL, global));
+  return ctxptr(ctptr);
+}
diff --git a/src/v8_json.h b/src/v8_json.h
deleted file mode 100644
index 08c7717..0000000
--- a/src/v8_json.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Jeroen: old versions do not have the v8::JSON C++ api
- * Hence we just wrap the actual JavaScript functions
- */
-
-#include <v8.h>
-
-v8::Handle<v8::Value> json_parse (v8::Handle<v8::Value> jsonString) {
-  v8::HandleScope scope;
-  v8::Handle<v8::Context> context = v8::Context::GetCurrent();
-  v8::Handle<v8::Object> global = context->Global();
-  v8::Handle<v8::Value> jsonValue = global->Get(v8::String::New("JSON"));
-
-  if (! jsonValue->IsObject()) {
-    return scope.Close(v8::Undefined());
-  }
-
-  v8::Handle<v8::Object> json = jsonValue->ToObject();
-  v8::Handle<v8::Value> parse = json->Get(v8::String::New("parse"));
-
-  if (parse.IsEmpty() ||
-      ! parse->IsFunction()) {
-      return scope.Close(v8::Undefined());
-  }
-
-  // cast into a function and call
-  v8::Handle<v8::Function> parseFunction = v8::Handle<v8::Function>::Cast(parse);
-  return scope.Close(parseFunction->Call(json, 1, &jsonString));
-}
-
-v8::Handle<v8::Value> json_stringify (v8::Handle<v8::Value> obj) {
-  v8::HandleScope scope;
-  v8::Handle<v8::Context> context = v8::Context::GetCurrent();
-  v8::Handle<v8::Object> global = context->Global();
-  v8::Handle<v8::Value> jsonValue = global->Get(v8::String::New("JSON"));
-
-  if (! jsonValue->IsObject()) {
-    return scope.Close(v8::Undefined());
-  }
-
-  v8::Handle<v8::Object> json = jsonValue->ToObject();
-  v8::Handle<v8::Value> stringify = json->Get(v8::String::New("stringify"));
-
-  if (stringify.IsEmpty() ||
-      ! stringify->IsFunction()) {
-      return scope.Close(v8::Undefined());
-  }
-
-  // cast into a function and call
-  v8::Handle<v8::Function> stringifyFunction = v8::Handle<v8::Function>::Cast(stringify);
-  return scope.Close(stringifyFunction->Call(json, 1, &obj));
-}
diff --git a/src/v8_typed_array.cpp b/src/v8_typed_array.cpp
deleted file mode 100644
index d6fbd15..0000000
--- a/src/v8_typed_array.cpp
+++ /dev/null
@@ -1,785 +0,0 @@
-// V8 Typed Array implementation.
-// (c) Dean McNamee <dean@gmail.com>, 2011.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-
-#include <stdlib.h>  // calloc, etc
-#include <string.h>  // memmove
-
-#include <v8.h>
-
-#include "v8_typed_array.h"
-
-namespace {
-
-v8::Handle<v8::Value> ThrowError(const char* msg) {
-  return v8::ThrowException(v8::Exception::Error(v8::String::New(msg)));
-}
-
-v8::Handle<v8::Value> ThrowTypeError(const char* msg) {
-  return v8::ThrowException(v8::Exception::TypeError(v8::String::New(msg)));
-}
-
-v8::Handle<v8::Value> ThrowRangeError(const char* msg) {
-  return v8::ThrowException(v8::Exception::RangeError(v8::String::New(msg)));
-}
-
-struct BatchedMethods {
-  const char* name;
-  v8::Handle<v8::Value> (*func)(const v8::Arguments& args);
-};
-
-class ArrayBuffer {
- public:
-  static v8::Persistent<v8::FunctionTemplate> GetTemplate() {
-    static v8::Persistent<v8::FunctionTemplate> ft_cache;
-    if (!ft_cache.IsEmpty())
-      return ft_cache;
-
-    v8::HandleScope scope;
-    ft_cache = v8::Persistent<v8::FunctionTemplate>::New(
-        v8::FunctionTemplate::New(&ArrayBuffer::V8New));
-    ft_cache->SetClassName(v8::String::New("ArrayBuffer"));
-    v8::Local<v8::ObjectTemplate> instance = ft_cache->InstanceTemplate();
-    instance->SetInternalFieldCount(1);  // Buffer.
-
-    return ft_cache;
-  }
-
-  static bool HasInstance(v8::Handle<v8::Value> value) {
-    return GetTemplate()->HasInstance(value);
-  }
-
- private:
-  static void WeakCallback(v8::Persistent<v8::Value> value, void* data) {
-    v8::Object* obj = v8::Object::Cast(*value);
-
-    void* ptr = obj->GetIndexedPropertiesExternalArrayData();
-    int element_size = v8_typed_array::SizeOfArrayElementForType(
-        obj->GetIndexedPropertiesExternalArrayDataType());
-    int size =
-        obj->GetIndexedPropertiesExternalArrayDataLength() * element_size;
-
-    v8::V8::AdjustAmountOfExternalAllocatedMemory(-size);
-
-    value.ClearWeak();
-    value.Dispose();
-
-    free(ptr);
-  }
-
-  static v8::Handle<v8::Value> V8New(const v8::Arguments& args) {
-    if (!args.IsConstructCall())
-      return ThrowTypeError("Constructor cannot be called as a function.");
-
-    // To match Chrome, we allow "new ArrayBuffer()".
-    // if (args.Length() != 1)
-    //   return ThrowError("Wrong number of arguments.");
-
-    if (args[0]->Int32Value() < 0) {
-      return ThrowRangeError("ArrayBufferView size is not a small enough "
-                             "positive integer.");
-    }
-
-    size_t num_bytes = args[0]->Uint32Value();
-    void* buf = calloc(num_bytes, 1);
-    if (!buf)
-      return ThrowError("Unable to allocate ArrayBuffer.");
-
-    args.This()->SetPointerInInternalField(0, buf);
-
-    args.This()->Set(v8::String::New("byteLength"),
-                     v8::Integer::NewFromUnsigned(num_bytes),
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-
-    // NOTE(deanm): This is not in the spec, you shouldn't be able to index
-    // the ArrayBuffer.  However, it currently simplifies some handling in our
-    // implementation, so we make ArrayView operator[] act like an Uint8Array.
-    // , This allows DataView to work with both ArrayBuffers and TypedArrays.
-    args.This()->SetIndexedPropertiesToExternalArrayData(
-        buf, v8::kExternalUnsignedByteArray, num_bytes);
-
-    v8::V8::AdjustAmountOfExternalAllocatedMemory(num_bytes);
-
-    v8::Persistent<v8::Object> persistent =
-        v8::Persistent<v8::Object>::New(args.This());
-    persistent.MakeWeak(NULL, &ArrayBuffer::WeakCallback);
-
-    return args.This();
-  }
-};
-
-static bool checkAlignment(unsigned int val, unsigned int bytes) {
-  return (val & (bytes - 1)) == 0;  // Handles bytes == 0.
-}
-
-template <unsigned int TBytes, v8::ExternalArrayType TEAType>
-class TypedArray {
- public:
-  static v8::Persistent<v8::FunctionTemplate> GetTemplate() {
-    static v8::Persistent<v8::FunctionTemplate> ft_cache;
-    if (!ft_cache.IsEmpty())
-      return ft_cache;
-
-    v8::HandleScope scope;
-    ft_cache = v8::Persistent<v8::FunctionTemplate>::New(
-        v8::FunctionTemplate::New(&TypedArray<TBytes, TEAType>::V8New));
-    ft_cache->SetClassName(v8::String::New(TypeName()));
-    v8::Local<v8::ObjectTemplate> instance = ft_cache->InstanceTemplate();
-    instance->SetInternalFieldCount(0);
-
-    ft_cache->Set(v8::String::New("BYTES_PER_ELEMENT"),
-                  v8::Uint32::New(TBytes), v8::ReadOnly);
-    instance->Set(v8::String::New("BYTES_PER_ELEMENT"),
-                  v8::Uint32::New(TBytes), v8::ReadOnly);
-
-    v8::Local<v8::Signature> default_signature = v8::Signature::New(ft_cache);
-
-    static BatchedMethods methods[] = {
-      { "set", &TypedArray<TBytes, TEAType>::set },
-      { "slice", &TypedArray<TBytes, TEAType>::subarray },
-      { "subarray", &TypedArray<TBytes, TEAType>::subarray },
-    };
-
-    for (size_t i = 0; i < sizeof(methods) / sizeof(*methods); ++i) {
-      instance->Set(v8::String::New(methods[i].name),
-                    v8::FunctionTemplate::New(methods[i].func,
-                                              v8::Handle<v8::Value>(),
-                                              default_signature));
-    }
-
-    return ft_cache;
-  }
-
-  static bool HasInstance(v8::Handle<v8::Value> value) {
-    return GetTemplate()->HasInstance(value);
-  }
-
- private:
-  static v8::Handle<v8::Value> V8New(const v8::Arguments& args) {
-    if (!args.IsConstructCall())
-      return ThrowTypeError("Constructor cannot be called as a function.");
-
-    // To match Chrome, we allow "new Float32Array()".
-    // if (args.Length() != 1)
-    //   return ThrowError("Wrong number of arguments.");
-
-    v8::Local<v8::Object> buffer;
-    unsigned int length = 0;
-    unsigned int byte_offset = 0;
-
-    if (ArrayBuffer::HasInstance(args[0])) {  // ArrayBuffer constructor.
-      buffer = v8::Local<v8::Object>::Cast(args[0]);
-      unsigned int buflen =
-          buffer->GetIndexedPropertiesExternalArrayDataLength();
-
-      if (args[1]->Int32Value() < 0)
-        return ThrowRangeError("Byte offset out of range.");
-      byte_offset = args[1]->Uint32Value();
-
-      if (!checkAlignment(byte_offset, TBytes))
-        return ThrowRangeError("Byte offset is not aligned.");
-
-      if (args.Length() > 2) {
-        if (args[2]->Int32Value() < 0)
-          return ThrowRangeError("Length out of range.");
-        length = args[2]->Uint32Value();
-      } else {
-        if (buflen < byte_offset ||
-            !checkAlignment(buflen - byte_offset, TBytes)) {
-          return ThrowRangeError("Byte offset / length is not aligned.");
-        }
-        length = (buflen - byte_offset) / TBytes;
-      }
-
-      // NOTE(deanm): Sloppy integer overflow checks.
-      if (byte_offset > buflen || byte_offset + length > buflen ||
-          byte_offset + length * TBytes > buflen) {
-        return ThrowRangeError("Length is out of range.");
-      }
-
-      // TODO(deanm): Error check.
-      void* buf = buffer->GetPointerFromInternalField(0);
-      args.This()->SetIndexedPropertiesToExternalArrayData(
-          reinterpret_cast<char*>(buf) + byte_offset, TEAType, length);
-    } else if (args[0]->IsObject()) {  // TypedArray / type[] constructor.
-      v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(args[0]);
-      length = obj->Get(v8::String::New("length"))->Uint32Value();
-
-      // TODO(deanm): Handle integer overflow.
-      v8::Handle<v8::Value> argv[1] = {
-          v8::Integer::NewFromUnsigned(length * TBytes)};
-      buffer = ArrayBuffer::GetTemplate()->
-                 GetFunction()->NewInstance(1, argv);
-
-      void* buf = buffer->GetPointerFromInternalField(0);
-      args.This()->SetIndexedPropertiesToExternalArrayData(
-          buf, TEAType, length);
-      // TODO(deanm): check for failure.
-      for (uint32_t i = 0; i < length; ++i) {
-        // Use the v8 setter to deal with typing.  Maybe slow?
-        args.This()->Set(i, obj->Get(i));
-      }
-    } else {  // length constructor.
-      // Try to match Chrome, Float32Array(""), Float32Array(true/false) is
-      // okay, but Float32Array(null) throws a TypeError and
-      // Float32Array(undefined) throw a RangeError.
-      if (args.Length() > 0 && (args[0]->IsUndefined() || args[0]->IsNull()))
-        return ThrowTypeError("Type error");
-
-      if (args[0]->Int32Value() < 0) {
-        return ThrowRangeError("ArrayBufferView size is not a small enough "
-                               "positive integer.");
-      }
-
-      length = args[0]->Uint32Value();
-      // TODO(deanm): Handle integer overflow.
-      v8::Handle<v8::Value> argv[1] = {
-          v8::Integer::NewFromUnsigned(length * TBytes)};
-
-      buffer = ArrayBuffer::GetTemplate()->
-                 GetFunction()->NewInstance(1, argv);
-      void* buf = buffer->GetPointerFromInternalField(0);
-
-      args.This()->SetIndexedPropertiesToExternalArrayData(
-          buf, TEAType, length);
-      // TODO(deanm): check for failure.
-    }
-
-    args.This()->Set(v8::String::New("buffer"),
-                     buffer,
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-    args.This()->Set(v8::String::New("length"),
-                     v8::Integer::NewFromUnsigned(length),
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-    args.This()->Set(v8::String::New("byteOffset"),
-                     v8::Integer::NewFromUnsigned(byte_offset),
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-    args.This()->Set(v8::String::New("byteLength"),
-                     v8::Integer::NewFromUnsigned(length * TBytes),
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-
-    return args.This();
-  }
-
-  static v8::Handle<v8::Value> set(const v8::Arguments& args) {
-    if (args.Length() < 1)
-      return ThrowError("Wrong number of arguments.");
-
-    if (!args[0]->IsObject())
-      return ThrowTypeError("Type error.");
-
-    v8::Handle<v8::Object> obj = v8::Handle<v8::Object>::Cast(args[0]);
-
-    if (TypedArray<TBytes, TEAType>::HasInstance(obj)) {  // ArrayBufferView.
-      //v8::Handle<v8::Object> src_buffer =
-      v8::Handle<v8::Object>::Cast(obj->Get(v8::String::New("buffer")));
-      //v8::Handle<v8::Object> dst_buffer =
-      v8::Handle<v8::Object>::Cast(args.This()->Get(v8::String::New("buffer")));
-
-      if (args[1]->Int32Value() < 0)
-        return ThrowRangeError("Offset may not be negative.");
-
-      unsigned int offset = args[1]->Uint32Value();
-      unsigned int src_length =
-          obj->Get(v8::String::New("length"))->Uint32Value();
-      unsigned int dst_length =
-          args.This()->Get(v8::String::New("length"))->Uint32Value();
-      if (offset > dst_length)
-        return ThrowRangeError("Offset out of range.");
-
-      if (src_length > dst_length - offset)
-        return ThrowRangeError("Offset/length out of range.");
-
-      // We don't want to get the buffer pointer, because that means we'll have
-      // to just do the calculations for byteOffset / byteLength again.
-      // Instead just use the pointer on the external array data.
-      void* src_ptr = obj->GetIndexedPropertiesExternalArrayData();
-      void* dst_ptr = args.This()->GetIndexedPropertiesExternalArrayData();
-
-      // From the spec:
-      // If the input array is a TypedArray, the two arrays may use the same
-      // underlying ArrayBuffer. In this situation, setting the values takes
-      // place as if all the data is first copied into a temporary buffer that
-      // does not overlap either of the arrays, and then the data from the
-      // temporary buffer is copied into the current array.
-      memmove(reinterpret_cast<char*>(dst_ptr) + offset * TBytes,
-              src_ptr, src_length * TBytes);
-    } else {  // type[]
-      if (args[1]->Int32Value() < 0)
-        return ThrowRangeError("Offset may not be negative.");
-
-      unsigned int src_length =
-          obj->Get(v8::String::New("length"))->Uint32Value();
-      unsigned int dst_length =
-          args.This()->Get(v8::String::New("length"))->Uint32Value();
-      unsigned int offset = args[1]->Uint32Value();
-
-      if (offset > dst_length)
-        return ThrowRangeError("Offset out of range.");
-
-      if (src_length > dst_length - offset)
-        return ThrowRangeError("Offset/length out of range.");
-
-      for (uint32_t i = 0; i < src_length; ++i) {
-        // Use the v8 setter to deal with typing.  Maybe slow?
-        args.This()->Set(i + offset, obj->Get(i));
-      }
-    }
-
-    return v8::Undefined();
-  }
-
-  static v8::Handle<v8::Value> subarray(const v8::Arguments& args) {
-    // TODO(deanm): The unsigned / signed type mixing makes me super nervous.
-
-    unsigned int length =
-        args.This()->Get(v8::String::New("length"))->Uint32Value();
-    int begin = args[0]->Int32Value();
-    int end = length;
-    if (args.Length() > 1)
-      end = args[1]->Int32Value();
-
-    if (begin < 0) begin = length + begin;
-    if (begin < 0) begin = 0;
-    if ((unsigned)begin > length) begin = length;
-
-    if (end < 0) end = length + end;
-    if (end < 0) end = 0;
-    if ((unsigned)end > length) end = length;
-
-    if (begin > end) begin = end;
-
-    int byte_offset = begin * TBytes +
-        args.This()->Get(v8::String::New("byteOffset"))->Uint32Value();
-
-    // Call through to the ArrayBuffer, byteOffset, length constructor.
-    v8::Handle<v8::Value> argv[] = {
-        args.This()->Get(v8::String::New("buffer")),
-        v8::Integer::New(byte_offset),
-        v8::Integer::New(end - begin)};
-    return TypedArray<TBytes, TEAType>::GetTemplate()->
-        GetFunction()->NewInstance(3, argv);
-  }
-
-  static const char* TypeName() {
-    switch (TEAType) {
-      case v8::kExternalByteArray: return "Int8Array";
-      case v8::kExternalUnsignedByteArray: return "Uint8Array";
-      case v8::kExternalShortArray: return "Int16Array";
-      case v8::kExternalUnsignedShortArray: return "Uint16Array";
-      case v8::kExternalIntArray: return "Int32Array";
-      case v8::kExternalUnsignedIntArray: return "Uint32Array";
-      case v8::kExternalFloatArray: return "Float32Array";
-      case v8::kExternalDoubleArray: return "Float64Array";
-    }
-    abort();
-    // Please the compiler
-    return "";
-  }
-};
-
-class Int8Array : public TypedArray<1, v8::kExternalByteArray> { };
-class Uint8Array : public TypedArray<1, v8::kExternalUnsignedByteArray> { };
-class Int16Array : public TypedArray<2, v8::kExternalShortArray> { };
-class Uint16Array : public TypedArray<2, v8::kExternalUnsignedShortArray> { };
-class Int32Array : public TypedArray<4, v8::kExternalIntArray> { };
-class Uint32Array : public TypedArray<4, v8::kExternalUnsignedIntArray> { };
-class Float32Array : public TypedArray<4, v8::kExternalFloatArray> { };
-class Float64Array : public TypedArray<8, v8::kExternalDoubleArray> { };
-
-template <typename T>
-v8::Handle<v8::Value> cTypeToValue(T) {
-  return v8::Undefined();
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(unsigned char val) {
-  return v8::Integer::NewFromUnsigned(val);
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(char val) {
-  return v8::Integer::New(val);
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(unsigned short val) {
-  return v8::Integer::NewFromUnsigned(val);
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(short val) {
-  return v8::Integer::New(val);
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(unsigned int val) {
-  return v8::Integer::NewFromUnsigned(val);
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(int val) {
-  return v8::Integer::New(val);
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(float val) {
-  return v8::Number::New(val);
-}
-
-template <>
-v8::Handle<v8::Value> cTypeToValue(double val) {
-  return v8::Number::New(val);
-}
-
-
-template <typename T>
-T valueToCType(v8::Handle<v8::Value> value) {
-  return 0;
-}
-
-template <>
-unsigned char valueToCType(v8::Handle<v8::Value> value) {
-  return value->Uint32Value();
-}
-
-template <>
-char valueToCType(v8::Handle<v8::Value> value) {
-  return value->Int32Value();
-}
-
-template <>
-unsigned short valueToCType(v8::Handle<v8::Value> value) {
-  return value->Uint32Value();
-}
-
-template <>
-short valueToCType(v8::Handle<v8::Value> value) {
-  return value->Int32Value();
-}
-
-template <>
-unsigned int valueToCType(v8::Handle<v8::Value> value) {
-  return value->Uint32Value();
-}
-
-template <>
-int valueToCType(v8::Handle<v8::Value> value) {
-  return value->Int32Value();
-}
-
-template <>
-float valueToCType(v8::Handle<v8::Value> value) {
-  return static_cast<float>(value->NumberValue());
-}
-
-template <>
-double valueToCType(v8::Handle<v8::Value> value) {
-  return value->NumberValue();
-}
-
-
-class DataView {
- public:
-  static v8::Persistent<v8::FunctionTemplate> GetTemplate() {
-    static v8::Persistent<v8::FunctionTemplate> ft_cache;
-    if (!ft_cache.IsEmpty())
-      return ft_cache;
-
-    v8::HandleScope scope;
-    ft_cache = v8::Persistent<v8::FunctionTemplate>::New(
-        v8::FunctionTemplate::New(&DataView::V8New));
-    ft_cache->SetClassName(v8::String::New("DataView"));
-    v8::Local<v8::ObjectTemplate> instance = ft_cache->InstanceTemplate();
-    instance->SetInternalFieldCount(0);
-
-    v8::Local<v8::Signature> default_signature = v8::Signature::New(ft_cache);
-
-    static BatchedMethods methods[] = {
-      { "getUint8", &DataView::getUint8 },
-      { "getInt8", &DataView::getInt8 },
-      { "getUint16", &DataView::getUint16 },
-      { "getInt16", &DataView::getInt16 },
-      { "getUint32", &DataView::getUint32 },
-      { "getInt32", &DataView::getInt32 },
-      { "getFloat32", &DataView::getFloat32 },
-      { "getFloat64", &DataView::getFloat64 },
-      { "setUint8", &DataView::setUint8 },
-      { "setInt8", &DataView::setInt8 },
-      { "setUint16", &DataView::setUint16 },
-      { "setInt16", &DataView::setInt16 },
-      { "setUint32", &DataView::setUint32 },
-      { "setInt32", &DataView::setInt32 },
-      { "setFloat32", &DataView::setFloat32 },
-      { "setFloat64", &DataView::setFloat64 },
-    };
-
-    for (size_t i = 0; i < sizeof(methods) / sizeof(*methods); ++i) {
-      instance->Set(v8::String::New(methods[i].name),
-                    v8::FunctionTemplate::New(methods[i].func,
-                                              v8::Handle<v8::Value>(),
-                                              default_signature));
-    }
-
-    return ft_cache;
-  }
-
-  static bool HasInstance(v8::Handle<v8::Value> value) {
-    return GetTemplate()->HasInstance(value);
-  }
-
- private:
-  static v8::Handle<v8::Value> V8New(const v8::Arguments& args) {
-    if (!args.IsConstructCall())
-      return ThrowTypeError("Constructor cannot be called as a function.");
-
-    if (args.Length() < 1)
-      return ThrowError("Wrong number of arguments.");
-
-    if (!args[0]->IsObject())
-      return ThrowError("Object must be an ArrayBuffer.");
-
-    v8::Handle<v8::Object> buffer = v8::Handle<v8::Object>::Cast(args[0]);
-    if (!buffer->HasIndexedPropertiesInExternalArrayData())
-      return ThrowError("Object must be an ArrayBuffer.");
-
-    unsigned int byte_length =
-        buffer->GetIndexedPropertiesExternalArrayDataLength();
-    unsigned int byte_offset = args[1]->Uint32Value();
-
-    if (args[1]->Int32Value() < 0 || byte_offset >= byte_length)
-      return ThrowRangeError("byteOffset out of range.");
-
-    if (!args[2]->IsUndefined()) {
-      if (args[2]->Int32Value() < 0)
-        return ThrowRangeError("byteLength out of range.");
-      unsigned int new_byte_length = args[2]->Uint32Value();
-      if (new_byte_length > byte_length)
-        return ThrowRangeError("byteLength out of range.");
-      if (byte_offset + new_byte_length > byte_length)
-        return ThrowRangeError("byteOffset/byteLength out of range.");
-      byte_length = new_byte_length;
-    } else {
-      // Adjust the original byte_length from total length to length to end.
-      byte_length -= byte_offset;
-    }
-
-    void* buf = buffer->GetIndexedPropertiesExternalArrayData();
-
-    // Like ArrayBuffer, we violate the spec and add an operator[].
-    args.This()->SetIndexedPropertiesToExternalArrayData(
-        reinterpret_cast<char*>(buf) + byte_offset,
-        v8::kExternalUnsignedByteArray, byte_length);
-
-    args.This()->Set(v8::String::New("buffer"),
-                     buffer,
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-    args.This()->Set(v8::String::New("byteOffset"),
-                     v8::Integer::NewFromUnsigned(byte_offset),
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-    args.This()->Set(v8::String::New("byteLength"),
-                     v8::Integer::NewFromUnsigned(byte_length),
-                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
-    return args.This();
-  }
-
-  // TODO(deanm): This isn't beautiful or optimal.
-  static void swizzle(char* buf, size_t len) {
-    for (size_t i = 0; i < len / 2; ++i) {
-      char t = buf[i];
-      buf[i] = buf[len - i - 1];
-      buf[len - i - 1] = t;
-    }
-  }
-
-  template <typename T>
-  static T getValue(void* ptr, unsigned int index, bool swiz) {
-    char buf[sizeof(T)];
-    memcpy(buf, reinterpret_cast<char*>(ptr) + index, sizeof(T));
-    if (swiz)
-      swizzle(buf, sizeof(T));
-    T val;
-    memcpy(&val, buf, sizeof(T));
-    return val;
-  }
-
-  template <typename T>
-  static void setValue(void* ptr, unsigned int index, T val, bool swiz) {
-    char buf[sizeof(T)];
-    memcpy(buf, &val, sizeof(T));
-    if (swiz)
-      swizzle(buf, sizeof(T));
-    memcpy(reinterpret_cast<char*>(ptr) + index, buf, sizeof(T));
-  }
-
-  template <typename T>
-  static v8::Handle<v8::Value> getGeneric(const v8::Arguments& args) {
-    if (args.Length() < 1)
-      return ThrowError("Wrong number of arguments.");
-
-    unsigned int index = args[0]->Uint32Value();
-    bool little_endian = args[1]->BooleanValue();
-    // TODO(deanm): All of these things should be cacheable.
-    int element_size = v8_typed_array::SizeOfArrayElementForType(
-        args.This()->GetIndexedPropertiesExternalArrayDataType());
-    int size = args.This()->GetIndexedPropertiesExternalArrayDataLength() *
-               element_size;
-
-    if (index + sizeof(T) > (unsigned)size)  // TODO(deanm): integer overflow.
-      return ThrowError("Index out of range.");
-
-    void* ptr = args.This()->GetIndexedPropertiesExternalArrayData();
-    return cTypeToValue<T>(getValue<T>(ptr, index, !little_endian));
-  }
-
-  template <typename T>
-  static v8::Handle<v8::Value> setGeneric(const v8::Arguments& args) {
-    if (args.Length() < 2)
-      return ThrowError("Wrong number of arguments.");
-
-    unsigned int index = args[0]->Int32Value();
-    bool little_endian = args[2]->BooleanValue();
-    // TODO(deanm): All of these things should be cacheable.
-    int element_size = v8_typed_array::SizeOfArrayElementForType(
-        args.This()->GetIndexedPropertiesExternalArrayDataType());
-    int size = args.This()->GetIndexedPropertiesExternalArrayDataLength() *
-               element_size;
-
-    if (index + sizeof(T) > (unsigned)size)  // TODO(deanm): integer overflow.
-      return ThrowError("Index out of range.");
-
-    void* ptr = args.This()->GetIndexedPropertiesExternalArrayData();
-    setValue<T>(ptr, index, valueToCType<T>(args[1]), !little_endian);
-    return v8::Undefined();
-  }
-
-  static v8::Handle<v8::Value> getUint8(const v8::Arguments& args) {
-    return getGeneric<unsigned char>(args);
-  }
-
-  static v8::Handle<v8::Value> getInt8(const v8::Arguments& args) {
-    return getGeneric<char>(args);
-  }
-
-  static v8::Handle<v8::Value> getUint16(const v8::Arguments& args) {
-    return getGeneric<unsigned short>(args);
-  }
-
-  static v8::Handle<v8::Value> getInt16(const v8::Arguments& args) {
-    return getGeneric<short>(args);
-  }
-
-  static v8::Handle<v8::Value> getUint32(const v8::Arguments& args) {
-    return getGeneric<unsigned int>(args);
-  }
-
-  static v8::Handle<v8::Value> getInt32(const v8::Arguments& args) {
-    return getGeneric<int>(args);
-  }
-
-  static v8::Handle<v8::Value> getFloat32(const v8::Arguments& args) {
-    return getGeneric<float>(args);
-  }
-
-  static v8::Handle<v8::Value> getFloat64(const v8::Arguments& args) {
-    return getGeneric<double>(args);
-  }
-
-  static v8::Handle<v8::Value> setUint8(const v8::Arguments& args) {
-    return setGeneric<unsigned char>(args);
-  }
-
-  static v8::Handle<v8::Value> setInt8(const v8::Arguments& args) {
-    return setGeneric<char>(args);
-  }
-
-  static v8::Handle<v8::Value> setUint16(const v8::Arguments& args) {
-    return setGeneric<unsigned short>(args);
-  }
-
-  static v8::Handle<v8::Value> setInt16(const v8::Arguments& args) {
-    return setGeneric<short>(args);
-  }
-
-  static v8::Handle<v8::Value> setUint32(const v8::Arguments& args) {
-    return setGeneric<unsigned int>(args);
-  }
-
-  static v8::Handle<v8::Value> setInt32(const v8::Arguments& args) {
-    return setGeneric<int>(args);
-  }
-
-  static v8::Handle<v8::Value> setFloat32(const v8::Arguments& args) {
-    return setGeneric<float>(args);
-  }
-
-  static v8::Handle<v8::Value> setFloat64(const v8::Arguments& args) {
-    return setGeneric<double>(args);
-  }
-};
-
-
-}  // namespace
-
-namespace v8_typed_array {
-
-void AttachBindings(v8::Handle<v8::Object> obj) {
-  obj->Set(v8::String::New("ArrayBuffer"),
-           ArrayBuffer::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Int8Array"),
-           Int8Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Uint8Array"),
-           Uint8Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Int16Array"),
-           Int16Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Uint16Array"),
-           Uint16Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Int32Array"),
-           Int32Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Uint32Array"),
-           Uint32Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Float32Array"),
-           Float32Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("Float64Array"),
-           Float64Array::GetTemplate()->GetFunction());
-  obj->Set(v8::String::New("DataView"),
-           DataView::GetTemplate()->GetFunction());
-}
-
-int SizeOfArrayElementForType(v8::ExternalArrayType type) {
-  switch (type) {
-    case v8::kExternalByteArray:
-    case v8::kExternalUnsignedByteArray:
-      return 1;
-    case v8::kExternalShortArray:
-    case v8::kExternalUnsignedShortArray:
-      return 2;
-    case v8::kExternalIntArray:
-    case v8::kExternalUnsignedIntArray:
-    case v8::kExternalFloatArray:
-      return 4;
-    case v8::kExternalDoubleArray:
-      return 8;
-    default:
-      return 0;
-  }
-}
-
-}  // namespace v8_typed_array
diff --git a/src/v8_typed_array.h b/src/v8_typed_array.h
deleted file mode 100644
index a95b29a..0000000
--- a/src/v8_typed_array.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// V8 Typed Array implementation.
-// (c) Dean McNamee <dean@gmail.com>, 2011.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to
-// deal in the Software without restriction, including without limitation the
-// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-// IN THE SOFTWARE.
-
-#ifndef V8_TYPED_ARRAY_H_
-#define V8_TYPED_ARRAY_H_
-
-#include <v8.h>
-
-namespace v8_typed_array {
-
-void AttachBindings(v8::Handle<v8::Object> obj);
-
-int SizeOfArrayElementForType(v8::ExternalArrayType type);
-
-}  // namespace v8_typed_array
-
-#endif  // V8_TYPED_ARRAY_H_

From 324cc5315a5cf5d53d8baa1fbeaa2302f0535fef Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 29 Jan 2019 23:16:31 -0800
Subject: [PATCH 02/38] Backup wip

---
 R/RcppExports.R     |  8 ++++++--
 R/onLoad.R          |  1 +
 src/Makevars.in     |  5 -----
 src/RcppExports.cpp | 22 +++++++++++++++++-----
 src/bindings.cpp    | 28 ++++++++++++++++------------
 5 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/R/RcppExports.R b/R/RcppExports.R
index 08cc30f..4c867d1 100644
--- a/R/RcppExports.R
+++ b/R/RcppExports.R
@@ -1,8 +1,8 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-R_init_all <- function() {
-    invisible(.Call('_V8_R_init_all', PACKAGE = 'V8'))
+start_v8_isolate <- function() {
+    invisible(.Call('_V8_start_v8_isolate', PACKAGE = 'V8'))
 }
 
 version <- function() {
@@ -25,3 +25,7 @@ make_context <- function(set_console) {
     .Call('_V8_make_context', PACKAGE = 'V8', set_console)
 }
 
+context_enable_typed_arrays <- function(ctx) {
+    .Call('_V8_context_enable_typed_arrays', PACKAGE = 'V8', ctx)
+}
+
diff --git a/R/onLoad.R b/R/onLoad.R
index 42a776f..869c541 100644
--- a/R/onLoad.R
+++ b/R/onLoad.R
@@ -1,4 +1,5 @@
 .onLoad <- function(libname, pkgname){
+  start_v8_isolate()
   # Test for development
   # ct <- v8()
   # ct$source(system.file("js/underscore.js", package = pkgname))
diff --git a/src/Makevars.in b/src/Makevars.in
index 4c1ee12..2b6b7f3 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -2,8 +2,3 @@
 PKG_CPPFLAGS=@cflags@
 PKG_LIBS=@libs@
 CXX_STD=CXX11
-
-all: clean
-
-clean:
-	rm -f $(SHLIB) $(OBJECTS)
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index 1ba7665..c5b48d0 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -6,12 +6,12 @@
 
 using namespace Rcpp;
 
-// R_init_all
-void R_init_all();
-RcppExport SEXP _V8_R_init_all() {
+// start_v8_isolate
+void start_v8_isolate();
+RcppExport SEXP _V8_start_v8_isolate() {
 BEGIN_RCPP
     Rcpp::RNGScope rcpp_rngScope_gen;
-    R_init_all();
+    start_v8_isolate();
     return R_NilValue;
 END_RCPP
 }
@@ -71,14 +71,26 @@ BEGIN_RCPP
     return rcpp_result_gen;
 END_RCPP
 }
+// context_enable_typed_arrays
+bool context_enable_typed_arrays(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+RcppExport SEXP _V8_context_enable_typed_arrays(SEXP ctxSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    rcpp_result_gen = Rcpp::wrap(context_enable_typed_arrays(ctx));
+    return rcpp_result_gen;
+END_RCPP
+}
 
 static const R_CallMethodDef CallEntries[] = {
-    {"_V8_R_init_all", (DL_FUNC) &_V8_R_init_all, 0},
+    {"_V8_start_v8_isolate", (DL_FUNC) &_V8_start_v8_isolate, 0},
     {"_V8_version", (DL_FUNC) &_V8_version, 0},
     {"_V8_context_eval", (DL_FUNC) &_V8_context_eval, 2},
     {"_V8_context_validate", (DL_FUNC) &_V8_context_validate, 2},
     {"_V8_context_null", (DL_FUNC) &_V8_context_null, 1},
     {"_V8_make_context", (DL_FUNC) &_V8_make_context, 1},
+    {"_V8_context_enable_typed_arrays", (DL_FUNC) &_V8_context_enable_typed_arrays, 1},
     {NULL, NULL, 0}
 };
 
diff --git a/src/bindings.cpp b/src/bindings.cpp
index 6808948..c7a0b51 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -1,6 +1,3 @@
-#include <libplatform/libplatform.h>
-#include <v8.h>
-#include <Rcpp.h>
 #include "V8_types.h"
 using namespace v8;
 
@@ -22,16 +19,16 @@ static Local<String> ToJSString(const char * str){
 }
 
 // [[Rcpp::export]]
-void R_init_all(){
-  //v8::V8::InitializeICUDefaultLocation(argv[0]);
-  //v8::V8::InitializeExternalStartupData(argv[0]);
-  std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
+void start_v8_isolate(){
+  static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
   V8::InitializePlatform(platform.get());
   V8::Initialize();
   Isolate::CreateParams create_params;
   create_params.array_buffer_allocator =
     ArrayBuffer::Allocator::NewDefaultAllocator();
   isolate = Isolate::New(create_params);
+  if(!isolate)
+    throw std::runtime_error("Failed to initiate V8 isolate");
 }
 
 /* Helper fun that compiles JavaScript source code */
@@ -134,7 +131,11 @@ Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Conte
 
   // Create a scope
   v8::Isolate::Scope isolate_scope(isolate);
+  // Create a stack-allocated handle scope.
   v8::HandleScope handle_scope(isolate);
+  // Create a new context.
+  v8::Local<v8::Context> context = v8::Context::New(isolate);
+  v8::Context::Scope context_scope(context);
 
   // Compile source code
   TryCatch trycatch(isolate);
@@ -185,12 +186,10 @@ bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
 
 // [[Rcpp::export]]
 ctxptr make_context(bool set_console){
-  //setup console.log
   v8::Isolate::Scope isolate_scope(isolate);
-  // Create a stack-allocated handle scope.
   v8::HandleScope handle_scope(isolate);
-  // Create a new context.
   Local<ObjectTemplate> global = ObjectTemplate::New(isolate);
+
   if(set_console){
     Local<ObjectTemplate> console = ObjectTemplate::New(isolate);
     global->Set(ToJSString("console"), console);
@@ -211,6 +210,11 @@ ctxptr make_context(bool set_console){
 
   }
   // initialize the context
-  Persistent<Context> *ctptr = new Persistent<Context>(isolate, Context::New(isolate, NULL, global));
-  return ctxptr(ctptr);
+  Persistent<Context> *ptr = new Persistent<Context>(isolate, Context::New(isolate, NULL, global));
+  return ctxptr(ptr);
+}
+
+// [[Rcpp::export]]
+bool context_enable_typed_arrays( Rcpp::XPtr< v8::Persistent<v8::Context> > ctx ){
+  return true;
 }

From 9ce3c9530c9a534449603901f88db4aab940e612 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 30 Jan 2019 10:54:52 -0800
Subject: [PATCH 03/38] Fix context

---
 src/bindings.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index c7a0b51..a876575 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -131,11 +131,8 @@ Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Conte
 
   // Create a scope
   v8::Isolate::Scope isolate_scope(isolate);
-  // Create a stack-allocated handle scope.
   v8::HandleScope handle_scope(isolate);
-  // Create a new context.
-  v8::Local<v8::Context> context = v8::Context::New(isolate);
-  v8::Context::Scope context_scope(context);
+  v8::Context::Scope context_scope(ctx.checked_get()->Get(isolate));
 
   // Compile source code
   TryCatch trycatch(isolate);
@@ -169,8 +166,10 @@ bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context>
   //converts input to UTF8 if needed
   src.set_encoding(CE_UTF8);
 
-  // Create scope
-  HandleScope handle_scope(isolate);
+  // Create a scope
+  v8::Isolate::Scope isolate_scope(isolate);
+  v8::HandleScope handle_scope(isolate);
+  v8::Context::Scope context_scope(ctx.checked_get()->Get(isolate));
 
   // Try to compile, catch errors
   TryCatch trycatch(isolate);

From a282f1d726f0bc972828ffe65ad95ec0a069ff5f Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 30 Jan 2019 13:20:42 -0800
Subject: [PATCH 04/38] More fixes

---
 src/bindings.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index a876575..4bc93ab 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -68,7 +68,7 @@ static void ConsoleError(const v8::FunctionCallbackInfo<v8::Value>& args) {
   args.GetReturnValue().Set(v8::Undefined(args.GetIsolate()));
 }
 
-static Local<Value> r_callback(std::string fun, const v8::FunctionCallbackInfo<v8::Value>& args) {
+void r_callback(std::string fun, const v8::FunctionCallbackInfo<v8::Value>& args) {
   try {
     Rcpp::Function r_call = Rcpp::Environment::namespace_env("V8")[fun];
     String::Utf8Value arg0(args[0]);
@@ -77,42 +77,40 @@ static Local<Value> r_callback(std::string fun, const v8::FunctionCallbackInfo<v
     if(args[1]->IsUndefined()){
       out = r_call(fun);
     } else if(args[2]->IsUndefined()) {
-      Local<String> arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
-      Rcpp::String json(*arg1);
+      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
+      Rcpp::String json(ToCString(arg1));
       out = r_call(fun, json);
     } else {
-      Local<String> arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
-      Local<String> arg2(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[2]).ToLocalChecked());
-      Rcpp::String val(*arg1);
-      Rcpp::String json(*arg2);
+      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
+      String::Utf8Value arg2(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[2]).ToLocalChecked());
+      Rcpp::String val(ToCString(arg1));
+      Rcpp::String json(ToCString(arg2));
       out = r_call(fun, val, json);
     }
-    return v8::JSON::Parse(args.GetIsolate(), ToJSString(std::string(out[0]).c_str())).ToLocalChecked();
+    args.GetReturnValue().Set( v8::JSON::Parse(args.GetIsolate(), ToJSString(std::string(out[0]).c_str())).ToLocalChecked());
   } catch( const std::exception& e ) {
-    return args.GetIsolate()->ThrowException(ToJSString(e.what()));
+    args.GetIsolate()->ThrowException(ToJSString(e.what()));
   }
 }
 
 /* console.r.call() function */
 static void console_r_call(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  args.GetReturnValue().Set(r_callback("r_call", args));
+  r_callback("r_call", args);
 }
 
 /* console.r.get() function */
 static void console_r_get(const v8::FunctionCallbackInfo<v8::Value>& args) {
-  args.GetReturnValue().Set(r_callback("r_get", args));
+  r_callback("r_get", args);
 }
 
 /* console.r.eval() function */
 static void console_r_eval(const v8::FunctionCallbackInfo<v8::Value>& args) {
   r_callback("r_eval", args);
-  args.GetReturnValue().Set(v8::Undefined(args.GetIsolate())); //TODO: redundant?
 }
 
 /* console.r.eval() function */
 static void console_r_assign(const v8::FunctionCallbackInfo<v8::Value>& args) {
   r_callback("r_assign", args);
-  args.GetReturnValue().Set(v8::Undefined(args.GetIsolate()));  //TODO: redundant?
 }
 
 // [[Rcpp::export]]

From acdcb33de406f3070556d47f3e5bb53a9c6afc6e Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 30 Jan 2019 13:21:36 -0800
Subject: [PATCH 05/38] Fix unit test

---
 tests/testthat/test_exception.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testthat/test_exception.R b/tests/testthat/test_exception.R
index f1296a3..35c5aa0 100644
--- a/tests/testthat/test_exception.R
+++ b/tests/testthat/test_exception.R
@@ -2,5 +2,5 @@ context("Error message")
 
 test_that("SyntaxError from V8", {
   ctx <- V8::v8()
-  expect_error(ctx$eval('var foo = {bla}'), 'SyntaxError')
+  expect_error(ctx$eval('var foo = }bla}'), 'SyntaxError')
 })

From 4ccec9679753cdb700fcb6a48e43dc6593d7622a Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Fri, 1 Feb 2019 22:49:15 -0800
Subject: [PATCH 06/38] Bump

---
 DESCRIPTION | 16 ++++++++--------
 configure   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index e05ac23..cb9629e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,20 +1,20 @@
 Package: V8
 Type: Package
 Title: Embedded JavaScript Engine for R
-Version: 1.5.9000
+Version: 1.9000
 Author: Jeroen Ooms
 Maintainer: Jeroen Ooms <jeroen@berkeley.edu>
-Description: An R interface to Google's open source JavaScript engine.
-    V8 is written in C++ and implements ECMAScript as specified in ECMA-262,
-    5th edition. In addition, this package implements typed arrays as
-    specified in ECMA 6 used for high-performance computing and libraries
-    compiled with 'emscripten'.
+Description: An R interface to Google's open source JavaScript engine. This 
+    package can now be compiled either with V8 version 6.8 (LTS) or with the 
+    legacy 3.14/3.15 version of V8. In the latter case, only ECMAScript v5 
+    is supported, hence promises and async functionality won't work.
 License: MIT + file LICENSE
 URL: https://github.com/jeroen/v8 (devel)
   https://developers.google.com/v8/intro (upstream)
 BugReports: https://github.com/jeroen/v8/issues
-SystemRequirements: V8 <= 3.15: libv8-3.14-dev (deb), v8-314-devel (rpm),
-    v8-3.14 (arch, from AUR), v8@3.15 (homebrew)
+SystemRequirements: V8 version 6.8 or 3.14. On Ubuntu/Debian: either libv8-dev
+    or libnode-dev should work. On Fedora v8-314-devel (rpm), v8-3.14 (arch, 
+    from AUR), v8@3.15 (homebrew)
 NeedsCompilation: yes
 VignetteBuilder: knitr
 Imports:
diff --git a/configure b/configure
index 274d5c2..a6da4fb 100755
--- a/configure
+++ b/configure
@@ -13,7 +13,7 @@ PKG_BREW_NAME="v8"
 PKG_TEST_HEADER="<v8.h>"
 PKG_LIBS="-lv8 -lv8_libplatform"
 PKG_LIBS_STATIC="-lv8_{base,snapshot} -lpreparser_lib"
-PKG_CFLAGS="-I/usr/include/nodejs/deps"
+PKG_CFLAGS="-I/usr/include/nodejs/deps/v8/include"
 
 # Check for custom locations
 if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then

From 00dcf5a90d349906174f11fb47a6ae09026cc178 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sat, 2 Feb 2019 15:33:59 -0800
Subject: [PATCH 07/38] Special case Debian for now

---
 configure | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index a6da4fb..2c2bdc8 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Anticonf (tm) script by Jeroen Ooms (2017)
 # V8 requires either libv8 6.8 LTS OR legacy libv8 (3.14 / 3.15).
 # This script will check for the required cflags and ldflags.
@@ -13,7 +13,13 @@ PKG_BREW_NAME="v8"
 PKG_TEST_HEADER="<v8.h>"
 PKG_LIBS="-lv8 -lv8_libplatform"
 PKG_LIBS_STATIC="-lv8_{base,snapshot} -lpreparser_lib"
+PKG_CFLAGS="-I/usr/include/v8-3.14"
+
+# Special case for Debian libnode-dev
+if [ -f /usr/include/nodejs/deps/v8/include/v8.h ]; then
+PKG_LIBS="-lnode"
 PKG_CFLAGS="-I/usr/include/nodejs/deps/v8/include"
+fi
 
 # Check for custom locations
 if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then

From 72baa6118bb85212f5c4bf981361ddfb06209928 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sat, 2 Feb 2019 15:44:45 -0800
Subject: [PATCH 08/38] Move include to keep types same as legacy

---
 src/V8_types.h   | 1 -
 src/bindings.cpp | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/V8_types.h b/src/V8_types.h
index f98e5f2..6ba49ff 100644
--- a/src/V8_types.h
+++ b/src/V8_types.h
@@ -1,4 +1,3 @@
-#include <libplatform/libplatform.h>
 #include <v8.h>
 #include <Rcpp.h>
 void ctx_finalizer( v8::Persistent<v8::Context>* ctx );
diff --git a/src/bindings.cpp b/src/bindings.cpp
index 4bc93ab..a4952dc 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -1,3 +1,4 @@
+#include <libplatform/libplatform.h>
 #include "V8_types.h"
 using namespace v8;
 

From 62ed60a10360ce14c320f72535059387cffb41a7 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sat, 2 Feb 2019 16:12:31 -0800
Subject: [PATCH 09/38] Add back support for legacy V8

---
 configure                                |  24 +-
 src/Makevars.in                          |   7 +-
 src/legacy/Makevars.in                   |  10 +
 src/legacy/RcppExports.cpp               | 117 ++++
 src/legacy/V8.cpp                        | 254 ++++++++
 src/legacy/V8_types.h                    |   4 +
 tools/version.cpp => src/legacy/test.cpp |   2 +-
 src/legacy/v8_json.h                     |  51 ++
 src/legacy/v8_typed_array.cpp            | 785 +++++++++++++++++++++++
 src/legacy/v8_typed_array.h              |  35 +
 10 files changed, 1278 insertions(+), 11 deletions(-)
 create mode 100644 src/legacy/Makevars.in
 create mode 100644 src/legacy/RcppExports.cpp
 create mode 100644 src/legacy/V8.cpp
 create mode 100644 src/legacy/V8_types.h
 rename tools/version.cpp => src/legacy/test.cpp (58%)
 create mode 100644 src/legacy/v8_json.h
 create mode 100644 src/legacy/v8_typed_array.cpp
 create mode 100644 src/legacy/v8_typed_array.h

diff --git a/configure b/configure
index 2c2bdc8..275b3e6 100755
--- a/configure
+++ b/configure
@@ -1,24 +1,24 @@
 #!/usr/bin/env bash
-# Anticonf (tm) script by Jeroen Ooms (2017)
-# V8 requires either libv8 6.8 LTS OR legacy libv8 (3.14 / 3.15).
-# This script will check for the required cflags and ldflags.
+# Anticonf (tm) script by Jeroen Ooms (2019)
+# Package requires either libv8 LTS 6.8 or legacy libv8 (3.14 / 3.15).
 # If your libv8 is installed in a custom location you need to set
 # INCLUDE_DIR and LIB_DIR manually via e.g:
 # R CMD INSTALL --configure-vars='INCLUDE_DIR=/.../include LIB_DIR=/.../lib'
 
-PKG_DEB_NAME="libv8-3.14-dev (formerly: libv8-dev)"
+PKG_DEB_NAME="libnode-dev / libv8-dev"
 PKG_RPM_NAME="v8-314-devel (formerly: v8-devel)"
 PKG_CSW_NAME="libv8_dev"
 PKG_BREW_NAME="v8"
 PKG_TEST_HEADER="<v8.h>"
 PKG_LIBS="-lv8 -lv8_libplatform"
+PKG_LIBS_LEGACY="-lv8"
 PKG_LIBS_STATIC="-lv8_{base,snapshot} -lpreparser_lib"
 PKG_CFLAGS="-I/usr/include/v8-3.14"
 
 # Special case for Debian libnode-dev
-if [ -f /usr/include/nodejs/deps/v8/include/v8.h ]; then
-PKG_LIBS="-lnode"
+if [ -e /usr/include/nodejs/deps/v8/include/v8.h ] && [ -e /usr/lib/x86_64-linux-gnu/libnode.so ]; then
 PKG_CFLAGS="-I/usr/include/nodejs/deps/v8/include"
+PKG_LIBS="-lnode"
 fi
 
 # Check for custom locations
@@ -61,9 +61,15 @@ if [ $? -ne 0 ]; then
   exit 1;
 fi
 
+# Test for legacy libv8 version
+${CXXCPP} ${CPPFLAGS} ${PKG_CFLAGS} ${CXXFLAGS} src/legacy/test.cpp >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+  echo "Found legacy version of libv8"
+  echo "Using PKG_LIBS=$PKG_LIBS_LEGACY"
+  sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS_LEGACY|" src/legacy/Makevars.in > src/Makevars
+  exit 0
+fi
 
-# Write to Makevars
+# Assume a modern V8 API
 sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS|" src/Makevars.in > src/Makevars
-
-# Success
 exit 0
diff --git a/src/Makevars.in b/src/Makevars.in
index 2b6b7f3..74a5462 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -1,4 +1,9 @@
-#PKG_CXXFLAGS=-DV8_DISABLE_DEPRECATIONS $(C_VISIBILITY)
+PKG_CXXFLAGS=$(C_VISIBILITY)
 PKG_CPPFLAGS=@cflags@
 PKG_LIBS=@libs@
 CXX_STD=CXX11
+
+all: clean
+
+clean:
+	rm -f $(SHLIB) $(OBJECTS)
diff --git a/src/legacy/Makevars.in b/src/legacy/Makevars.in
new file mode 100644
index 0000000..d60d00b
--- /dev/null
+++ b/src/legacy/Makevars.in
@@ -0,0 +1,10 @@
+PKG_CXXFLAGS=-DV8_DISABLE_DEPRECATIONS $(C_VISIBILITY)
+PKG_CPPFLAGS=@cflags@ -Ilegacy
+PKG_LIBS=@libs@
+
+all: clean
+
+clean:
+	rm -f $(SHLIB) $(OBJECTS)
+
+OBJECTS = legacy/V8.o legacy/v8_typed_array.o legacy/RcppExports.o
diff --git a/src/legacy/RcppExports.cpp b/src/legacy/RcppExports.cpp
new file mode 100644
index 0000000..6113e18
--- /dev/null
+++ b/src/legacy/RcppExports.cpp
@@ -0,0 +1,117 @@
+// Generated by using Rcpp::compileAttributes() -> do not edit by hand
+// Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
+
+#include "V8_types.h"
+#include <Rcpp.h>
+
+using namespace Rcpp;
+
+// make_context
+ctxptr make_context(bool set_console);
+RcppExport SEXP _V8_make_context(SEXP set_consoleSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< bool >::type set_console(set_consoleSEXP);
+    rcpp_result_gen = Rcpp::wrap(make_context(set_console));
+    return rcpp_result_gen;
+END_RCPP
+}
+// context_enable_typed_arrays
+bool context_enable_typed_arrays(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+RcppExport SEXP _V8_context_enable_typed_arrays(SEXP ctxSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    rcpp_result_gen = Rcpp::wrap(context_enable_typed_arrays(ctx));
+    return rcpp_result_gen;
+END_RCPP
+}
+// version
+std::string version();
+RcppExport SEXP _V8_version() {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    rcpp_result_gen = Rcpp::wrap(version());
+    return rcpp_result_gen;
+END_RCPP
+}
+// context_eval
+Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+RcppExport SEXP _V8_context_eval(SEXP srcSEXP, SEXP ctxSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< Rcpp::String >::type src(srcSEXP);
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    rcpp_result_gen = Rcpp::wrap(context_eval(src, ctx));
+    return rcpp_result_gen;
+END_RCPP
+}
+// context_validate
+bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+RcppExport SEXP _V8_context_validate(SEXP srcSEXP, SEXP ctxSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< Rcpp::String >::type src(srcSEXP);
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    rcpp_result_gen = Rcpp::wrap(context_validate(src, ctx));
+    return rcpp_result_gen;
+END_RCPP
+}
+// context_null
+bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+RcppExport SEXP _V8_context_null(SEXP ctxSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    rcpp_result_gen = Rcpp::wrap(context_null(ctx));
+    return rcpp_result_gen;
+END_RCPP
+}
+// context_assign_bin
+bool context_assign_bin(std::string name, Rcpp::RawVector data, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+RcppExport SEXP _V8_context_assign_bin(SEXP nameSEXP, SEXP dataSEXP, SEXP ctxSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< std::string >::type name(nameSEXP);
+    Rcpp::traits::input_parameter< Rcpp::RawVector >::type data(dataSEXP);
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    rcpp_result_gen = Rcpp::wrap(context_assign_bin(name, data, ctx));
+    return rcpp_result_gen;
+END_RCPP
+}
+// context_get_bin
+Rcpp::RawVector context_get_bin(std::string name, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+RcppExport SEXP _V8_context_get_bin(SEXP nameSEXP, SEXP ctxSEXP) {
+BEGIN_RCPP
+    Rcpp::RObject rcpp_result_gen;
+    Rcpp::RNGScope rcpp_rngScope_gen;
+    Rcpp::traits::input_parameter< std::string >::type name(nameSEXP);
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    rcpp_result_gen = Rcpp::wrap(context_get_bin(name, ctx));
+    return rcpp_result_gen;
+END_RCPP
+}
+
+static const R_CallMethodDef CallEntries[] = {
+    {"_V8_make_context", (DL_FUNC) &_V8_make_context, 1},
+    {"_V8_context_enable_typed_arrays", (DL_FUNC) &_V8_context_enable_typed_arrays, 1},
+    {"_V8_version", (DL_FUNC) &_V8_version, 0},
+    {"_V8_context_eval", (DL_FUNC) &_V8_context_eval, 2},
+    {"_V8_context_validate", (DL_FUNC) &_V8_context_validate, 2},
+    {"_V8_context_null", (DL_FUNC) &_V8_context_null, 1},
+    {"_V8_context_assign_bin", (DL_FUNC) &_V8_context_assign_bin, 3},
+    {"_V8_context_get_bin", (DL_FUNC) &_V8_context_get_bin, 2},
+    {NULL, NULL, 0}
+};
+
+RcppExport void R_init_V8(DllInfo *dll) {
+    R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
+    R_useDynamicSymbols(dll, FALSE);
+}
diff --git a/src/legacy/V8.cpp b/src/legacy/V8.cpp
new file mode 100644
index 0000000..5f04fab
--- /dev/null
+++ b/src/legacy/V8.cpp
@@ -0,0 +1,254 @@
+/*
+ R bindings to V8. Copyright 2014, Jeroen Ooms.
+
+ Notes:
+ - Implementation of Typed Arrays taken from node v0.6.21
+
+ V8 source parsing:
+ - http://stackoverflow.com/questions/16613828/how-to-convert-stdstring-to-v8s-localstring
+
+ Xptr examples:
+ - https://github.com/RcppCore/Rcpp/blob/master/inst/unitTests/cpp/XPtr.cpp
+ - http://romainfrancois.blog.free.fr/index.php?post/2010/01/08/External-pointers-with-Rcpp
+*/
+
+#include <v8.h>
+#include <Rcpp.h>
+#include "v8_typed_array.h"
+#include "v8_json.h"
+using namespace v8;
+
+void ctx_finalizer( Persistent<Context>* context ){
+  if(context)
+    context->Dispose();
+  delete context;
+}
+
+typedef Rcpp::XPtr<Persistent<Context>, Rcpp::PreserveStorage, ctx_finalizer> ctxptr;
+
+/* Helper fun that compiles JavaScript source code */
+Handle<Script> compile_source( std::string src ){
+  Handle<String> source = String::New(src.c_str());
+  Handle<Script> script = Script::Compile(source);
+  return script;
+}
+
+/* console.log */
+static Handle<Value> ConsoleLog(const Arguments& args) {
+  for (int i=0; i < args.Length(); i++) {
+    String::AsciiValue str(args[i]->ToString());
+    Rprintf("%s", *str);
+  }
+  Rprintf("\n");
+  return v8::Undefined();
+}
+
+/* console.warn */
+static Handle<Value> ConsoleWarn(const Arguments& args) {
+  for (int i=0; i < args.Length(); i++) {
+    String::AsciiValue str(args[i]->ToString());
+    Rf_warningcall_immediate(R_NilValue, *str);
+  }
+  return v8::Undefined();
+}
+
+/* console.error */
+static Handle<Value> ConsoleError(const Arguments& args) {
+  if(args.Length()){
+    return v8::ThrowException(args[0]);
+  }
+  return v8::Undefined();
+}
+
+static Handle<Value> r_callback(std::string fun, const Arguments& args) {
+  try {
+    Rcpp::Function r_call = Rcpp::Environment::namespace_env("V8")[fun];
+    String::Utf8Value arg0(args[0]);
+    Rcpp::String fun(*arg0);
+    Rcpp::CharacterVector out;
+    if(args[1]->IsUndefined()){
+      out = r_call(fun);
+    } else if(args[2]->IsUndefined()) {
+      String::Utf8Value arg1(json_stringify(args[1]));
+      Rcpp::String json(*arg1);
+      out = r_call(fun, json);
+    } else {
+      String::Utf8Value arg1(json_stringify(args[1]));
+      String::Utf8Value arg2(json_stringify(args[2]));
+      Rcpp::String val(*arg1);
+      Rcpp::String json(*arg2);
+      out = r_call(fun, val, json);
+    }
+    return json_parse(String::New(std::string(out[0]).c_str()));
+  } catch( const std::exception& e ) {
+    return v8::ThrowException(String::New(e.what()));
+  }
+}
+
+/* console.r.call() function */
+static Handle<Value> console_r_call(const Arguments& args) {
+  return r_callback("r_call", args);
+}
+
+/* console.r.get() function */
+static Handle<Value> console_r_get(const Arguments& args) {
+  return r_callback("r_get", args);
+}
+
+/* console.r.eval() function */
+static Handle<Value> console_r_eval(const Arguments& args) {
+  r_callback("r_eval", args);
+  return v8::Undefined();
+}
+
+/* console.r.eval() function */
+static Handle<Value> console_r_assign(const Arguments& args) {
+  r_callback("r_assign", args);
+  return v8::Undefined();
+}
+
+// [[Rcpp::export]]
+ctxptr make_context(bool set_console){
+  /* setup console.log */
+  HandleScope handle_scope;
+  Handle<ObjectTemplate> global = ObjectTemplate::New();
+  if(set_console){
+    Handle<ObjectTemplate> console = ObjectTemplate::New();
+    global->Set(String::NewSymbol("console"), console);
+    console->Set(String::NewSymbol("log"), FunctionTemplate::New(ConsoleLog));
+    console->Set(String::NewSymbol("warn"), FunctionTemplate::New(ConsoleWarn));
+    console->Set(String::NewSymbol("error"), FunctionTemplate::New(ConsoleError));
+
+    /* emscripted assumes a print function */
+    global->Set(String::NewSymbol("print"), FunctionTemplate::New(ConsoleLog));
+
+    /* R callback interface */
+    Handle<ObjectTemplate> console_r = ObjectTemplate::New();
+    console->Set(String::NewSymbol("r"), console_r);
+    console_r->Set(String::NewSymbol("call"), FunctionTemplate::New(console_r_call));
+    console_r->Set(String::NewSymbol("get"), FunctionTemplate::New(console_r_get));
+    console_r->Set(String::NewSymbol("eval"), FunctionTemplate::New(console_r_eval));
+    console_r->Set(String::NewSymbol("assign"), FunctionTemplate::New(console_r_assign));
+
+  }
+  /* initialize the context */
+  Persistent<Context> *ctptr = new Persistent<Context>(Context::New(NULL, global));
+  return ctxptr(ctptr);
+}
+
+// [[Rcpp::export]]
+bool context_enable_typed_arrays( Rcpp::XPtr< v8::Persistent<v8::Context> > ctx ){
+  HandleScope handle_scope;
+  Context::Scope context_scope(*ctx);
+  v8_typed_array::AttachBindings((*ctx)->Global());
+  return true;
+}
+
+// [[Rcpp::export]]
+std::string version(){
+  return v8::V8::GetVersion();
+}
+
+// [[Rcpp::export]]
+Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx){
+  // Test if context still exists
+  if(!ctx)
+    throw std::runtime_error("Context has been disposed.");
+
+  //converts input to UTF8 if needed
+  src.set_encoding(CE_UTF8);
+
+  // Create a scope
+  HandleScope handle_scope;
+  Context::Scope context_scope(*ctx);
+
+  // Compile source code
+  TryCatch trycatch;
+  Handle<Script> script = compile_source(src);
+  if(script.IsEmpty()) {
+    Local<Value> exception = trycatch.Exception();
+    String::AsciiValue exception_str(exception);
+    throw std::invalid_argument(*exception_str);
+  }
+
+  // Run the script to get the result.
+  Handle<Value> result = script->Run();
+  if(result.IsEmpty()){
+    Local<Value> exception = trycatch.Exception();
+    String::AsciiValue exception_str(exception);
+    throw std::runtime_error(*exception_str);
+  }
+
+  // Convert result to UTF8.
+  String::Utf8Value utf8(result);
+  Rcpp::String out(*utf8);
+  out.set_encoding(CE_UTF8);
+  return out;
+}
+
+// [[Rcpp::export]]
+bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
+
+  // Test if context still exists
+  if(!ctx)
+    throw std::runtime_error("Context has been disposed.");
+
+  //converts input to UTF8 if needed
+  src.set_encoding(CE_UTF8);
+
+  // Create scope
+  HandleScope handle_scope;
+  Context::Scope context_scope(*ctx);
+
+  // Try to compile, catch errors
+  TryCatch trycatch;
+  Handle<Script> script = compile_source(src);
+  return !script.IsEmpty();
+}
+
+// [[Rcpp::export]]
+bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
+  // Test if context still exists
+  return(!ctx);
+}
+
+/*
+Method below does not work because null bytes get lost when converting to strings.
+Should use ArrayBuffer types instead, e.g. Uint8Array.
+*/
+
+// [[Rcpp::export]]
+bool context_assign_bin(std::string name, Rcpp::RawVector data, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
+
+  // Test if context still exists
+  if(!ctx)
+    throw std::runtime_error("Context has been disposed.");
+
+  // Create scope
+  HandleScope handle_scope;
+  Context::Scope context_scope(*ctx);
+  v8::Handle<v8::Object> global = (*ctx)->Global();
+
+  // Currently converts raw vectors to strings. Better would be ArrayBuffer (Uint8Array specifically)
+  Local<v8::String> mystring = v8::String::New((const char*) RAW(data), data.length());
+  global->Set(String::NewSymbol(name.c_str()), mystring);
+  return true;
+}
+
+// [[Rcpp::export]]
+Rcpp::RawVector context_get_bin(std::string name, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
+  // Test if context still exists
+  if(!ctx)
+    throw std::runtime_error("Context has been disposed.");
+
+  // Create scope
+  HandleScope handle_scope;
+  Context::Scope context_scope(*ctx);
+  v8::Handle<v8::Object> global = (*ctx)->Global();
+
+  //find the string
+  Local<v8::String> mystring = global->Get(String::NewSymbol(name.c_str()))->ToString();
+  Rcpp::RawVector res(mystring->Length());
+  mystring->WriteAscii((char*) res.begin());
+  return res;
+}
diff --git a/src/legacy/V8_types.h b/src/legacy/V8_types.h
new file mode 100644
index 0000000..6ba49ff
--- /dev/null
+++ b/src/legacy/V8_types.h
@@ -0,0 +1,4 @@
+#include <v8.h>
+#include <Rcpp.h>
+void ctx_finalizer( v8::Persistent<v8::Context>* ctx );
+typedef Rcpp::XPtr<v8::Persistent<v8::Context>, Rcpp::PreserveStorage, ctx_finalizer> ctxptr;
diff --git a/tools/version.cpp b/src/legacy/test.cpp
similarity index 58%
rename from tools/version.cpp
rename to src/legacy/test.cpp
index e05d216..cec3424 100644
--- a/tools/version.cpp
+++ b/src/legacy/test.cpp
@@ -1,4 +1,4 @@
 #include <v8.h>
 #if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 3 || V8_MINOR_VERSION > 16)
-#error "Version of libv8 is too new! Need V8 version 3.14 or 3.15."
+#error "Version of libv8 is newer than 3.14 or 3.15. Disable legacy API"
 #endif
diff --git a/src/legacy/v8_json.h b/src/legacy/v8_json.h
new file mode 100644
index 0000000..08c7717
--- /dev/null
+++ b/src/legacy/v8_json.h
@@ -0,0 +1,51 @@
+/* Jeroen: old versions do not have the v8::JSON C++ api
+ * Hence we just wrap the actual JavaScript functions
+ */
+
+#include <v8.h>
+
+v8::Handle<v8::Value> json_parse (v8::Handle<v8::Value> jsonString) {
+  v8::HandleScope scope;
+  v8::Handle<v8::Context> context = v8::Context::GetCurrent();
+  v8::Handle<v8::Object> global = context->Global();
+  v8::Handle<v8::Value> jsonValue = global->Get(v8::String::New("JSON"));
+
+  if (! jsonValue->IsObject()) {
+    return scope.Close(v8::Undefined());
+  }
+
+  v8::Handle<v8::Object> json = jsonValue->ToObject();
+  v8::Handle<v8::Value> parse = json->Get(v8::String::New("parse"));
+
+  if (parse.IsEmpty() ||
+      ! parse->IsFunction()) {
+      return scope.Close(v8::Undefined());
+  }
+
+  // cast into a function and call
+  v8::Handle<v8::Function> parseFunction = v8::Handle<v8::Function>::Cast(parse);
+  return scope.Close(parseFunction->Call(json, 1, &jsonString));
+}
+
+v8::Handle<v8::Value> json_stringify (v8::Handle<v8::Value> obj) {
+  v8::HandleScope scope;
+  v8::Handle<v8::Context> context = v8::Context::GetCurrent();
+  v8::Handle<v8::Object> global = context->Global();
+  v8::Handle<v8::Value> jsonValue = global->Get(v8::String::New("JSON"));
+
+  if (! jsonValue->IsObject()) {
+    return scope.Close(v8::Undefined());
+  }
+
+  v8::Handle<v8::Object> json = jsonValue->ToObject();
+  v8::Handle<v8::Value> stringify = json->Get(v8::String::New("stringify"));
+
+  if (stringify.IsEmpty() ||
+      ! stringify->IsFunction()) {
+      return scope.Close(v8::Undefined());
+  }
+
+  // cast into a function and call
+  v8::Handle<v8::Function> stringifyFunction = v8::Handle<v8::Function>::Cast(stringify);
+  return scope.Close(stringifyFunction->Call(json, 1, &obj));
+}
diff --git a/src/legacy/v8_typed_array.cpp b/src/legacy/v8_typed_array.cpp
new file mode 100644
index 0000000..d6fbd15
--- /dev/null
+++ b/src/legacy/v8_typed_array.cpp
@@ -0,0 +1,785 @@
+// V8 Typed Array implementation.
+// (c) Dean McNamee <dean@gmail.com>, 2011.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#include <stdlib.h>  // calloc, etc
+#include <string.h>  // memmove
+
+#include <v8.h>
+
+#include "v8_typed_array.h"
+
+namespace {
+
+v8::Handle<v8::Value> ThrowError(const char* msg) {
+  return v8::ThrowException(v8::Exception::Error(v8::String::New(msg)));
+}
+
+v8::Handle<v8::Value> ThrowTypeError(const char* msg) {
+  return v8::ThrowException(v8::Exception::TypeError(v8::String::New(msg)));
+}
+
+v8::Handle<v8::Value> ThrowRangeError(const char* msg) {
+  return v8::ThrowException(v8::Exception::RangeError(v8::String::New(msg)));
+}
+
+struct BatchedMethods {
+  const char* name;
+  v8::Handle<v8::Value> (*func)(const v8::Arguments& args);
+};
+
+class ArrayBuffer {
+ public:
+  static v8::Persistent<v8::FunctionTemplate> GetTemplate() {
+    static v8::Persistent<v8::FunctionTemplate> ft_cache;
+    if (!ft_cache.IsEmpty())
+      return ft_cache;
+
+    v8::HandleScope scope;
+    ft_cache = v8::Persistent<v8::FunctionTemplate>::New(
+        v8::FunctionTemplate::New(&ArrayBuffer::V8New));
+    ft_cache->SetClassName(v8::String::New("ArrayBuffer"));
+    v8::Local<v8::ObjectTemplate> instance = ft_cache->InstanceTemplate();
+    instance->SetInternalFieldCount(1);  // Buffer.
+
+    return ft_cache;
+  }
+
+  static bool HasInstance(v8::Handle<v8::Value> value) {
+    return GetTemplate()->HasInstance(value);
+  }
+
+ private:
+  static void WeakCallback(v8::Persistent<v8::Value> value, void* data) {
+    v8::Object* obj = v8::Object::Cast(*value);
+
+    void* ptr = obj->GetIndexedPropertiesExternalArrayData();
+    int element_size = v8_typed_array::SizeOfArrayElementForType(
+        obj->GetIndexedPropertiesExternalArrayDataType());
+    int size =
+        obj->GetIndexedPropertiesExternalArrayDataLength() * element_size;
+
+    v8::V8::AdjustAmountOfExternalAllocatedMemory(-size);
+
+    value.ClearWeak();
+    value.Dispose();
+
+    free(ptr);
+  }
+
+  static v8::Handle<v8::Value> V8New(const v8::Arguments& args) {
+    if (!args.IsConstructCall())
+      return ThrowTypeError("Constructor cannot be called as a function.");
+
+    // To match Chrome, we allow "new ArrayBuffer()".
+    // if (args.Length() != 1)
+    //   return ThrowError("Wrong number of arguments.");
+
+    if (args[0]->Int32Value() < 0) {
+      return ThrowRangeError("ArrayBufferView size is not a small enough "
+                             "positive integer.");
+    }
+
+    size_t num_bytes = args[0]->Uint32Value();
+    void* buf = calloc(num_bytes, 1);
+    if (!buf)
+      return ThrowError("Unable to allocate ArrayBuffer.");
+
+    args.This()->SetPointerInInternalField(0, buf);
+
+    args.This()->Set(v8::String::New("byteLength"),
+                     v8::Integer::NewFromUnsigned(num_bytes),
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+
+    // NOTE(deanm): This is not in the spec, you shouldn't be able to index
+    // the ArrayBuffer.  However, it currently simplifies some handling in our
+    // implementation, so we make ArrayView operator[] act like an Uint8Array.
+    // , This allows DataView to work with both ArrayBuffers and TypedArrays.
+    args.This()->SetIndexedPropertiesToExternalArrayData(
+        buf, v8::kExternalUnsignedByteArray, num_bytes);
+
+    v8::V8::AdjustAmountOfExternalAllocatedMemory(num_bytes);
+
+    v8::Persistent<v8::Object> persistent =
+        v8::Persistent<v8::Object>::New(args.This());
+    persistent.MakeWeak(NULL, &ArrayBuffer::WeakCallback);
+
+    return args.This();
+  }
+};
+
+static bool checkAlignment(unsigned int val, unsigned int bytes) {
+  return (val & (bytes - 1)) == 0;  // Handles bytes == 0.
+}
+
+template <unsigned int TBytes, v8::ExternalArrayType TEAType>
+class TypedArray {
+ public:
+  static v8::Persistent<v8::FunctionTemplate> GetTemplate() {
+    static v8::Persistent<v8::FunctionTemplate> ft_cache;
+    if (!ft_cache.IsEmpty())
+      return ft_cache;
+
+    v8::HandleScope scope;
+    ft_cache = v8::Persistent<v8::FunctionTemplate>::New(
+        v8::FunctionTemplate::New(&TypedArray<TBytes, TEAType>::V8New));
+    ft_cache->SetClassName(v8::String::New(TypeName()));
+    v8::Local<v8::ObjectTemplate> instance = ft_cache->InstanceTemplate();
+    instance->SetInternalFieldCount(0);
+
+    ft_cache->Set(v8::String::New("BYTES_PER_ELEMENT"),
+                  v8::Uint32::New(TBytes), v8::ReadOnly);
+    instance->Set(v8::String::New("BYTES_PER_ELEMENT"),
+                  v8::Uint32::New(TBytes), v8::ReadOnly);
+
+    v8::Local<v8::Signature> default_signature = v8::Signature::New(ft_cache);
+
+    static BatchedMethods methods[] = {
+      { "set", &TypedArray<TBytes, TEAType>::set },
+      { "slice", &TypedArray<TBytes, TEAType>::subarray },
+      { "subarray", &TypedArray<TBytes, TEAType>::subarray },
+    };
+
+    for (size_t i = 0; i < sizeof(methods) / sizeof(*methods); ++i) {
+      instance->Set(v8::String::New(methods[i].name),
+                    v8::FunctionTemplate::New(methods[i].func,
+                                              v8::Handle<v8::Value>(),
+                                              default_signature));
+    }
+
+    return ft_cache;
+  }
+
+  static bool HasInstance(v8::Handle<v8::Value> value) {
+    return GetTemplate()->HasInstance(value);
+  }
+
+ private:
+  static v8::Handle<v8::Value> V8New(const v8::Arguments& args) {
+    if (!args.IsConstructCall())
+      return ThrowTypeError("Constructor cannot be called as a function.");
+
+    // To match Chrome, we allow "new Float32Array()".
+    // if (args.Length() != 1)
+    //   return ThrowError("Wrong number of arguments.");
+
+    v8::Local<v8::Object> buffer;
+    unsigned int length = 0;
+    unsigned int byte_offset = 0;
+
+    if (ArrayBuffer::HasInstance(args[0])) {  // ArrayBuffer constructor.
+      buffer = v8::Local<v8::Object>::Cast(args[0]);
+      unsigned int buflen =
+          buffer->GetIndexedPropertiesExternalArrayDataLength();
+
+      if (args[1]->Int32Value() < 0)
+        return ThrowRangeError("Byte offset out of range.");
+      byte_offset = args[1]->Uint32Value();
+
+      if (!checkAlignment(byte_offset, TBytes))
+        return ThrowRangeError("Byte offset is not aligned.");
+
+      if (args.Length() > 2) {
+        if (args[2]->Int32Value() < 0)
+          return ThrowRangeError("Length out of range.");
+        length = args[2]->Uint32Value();
+      } else {
+        if (buflen < byte_offset ||
+            !checkAlignment(buflen - byte_offset, TBytes)) {
+          return ThrowRangeError("Byte offset / length is not aligned.");
+        }
+        length = (buflen - byte_offset) / TBytes;
+      }
+
+      // NOTE(deanm): Sloppy integer overflow checks.
+      if (byte_offset > buflen || byte_offset + length > buflen ||
+          byte_offset + length * TBytes > buflen) {
+        return ThrowRangeError("Length is out of range.");
+      }
+
+      // TODO(deanm): Error check.
+      void* buf = buffer->GetPointerFromInternalField(0);
+      args.This()->SetIndexedPropertiesToExternalArrayData(
+          reinterpret_cast<char*>(buf) + byte_offset, TEAType, length);
+    } else if (args[0]->IsObject()) {  // TypedArray / type[] constructor.
+      v8::Local<v8::Object> obj = v8::Local<v8::Object>::Cast(args[0]);
+      length = obj->Get(v8::String::New("length"))->Uint32Value();
+
+      // TODO(deanm): Handle integer overflow.
+      v8::Handle<v8::Value> argv[1] = {
+          v8::Integer::NewFromUnsigned(length * TBytes)};
+      buffer = ArrayBuffer::GetTemplate()->
+                 GetFunction()->NewInstance(1, argv);
+
+      void* buf = buffer->GetPointerFromInternalField(0);
+      args.This()->SetIndexedPropertiesToExternalArrayData(
+          buf, TEAType, length);
+      // TODO(deanm): check for failure.
+      for (uint32_t i = 0; i < length; ++i) {
+        // Use the v8 setter to deal with typing.  Maybe slow?
+        args.This()->Set(i, obj->Get(i));
+      }
+    } else {  // length constructor.
+      // Try to match Chrome, Float32Array(""), Float32Array(true/false) is
+      // okay, but Float32Array(null) throws a TypeError and
+      // Float32Array(undefined) throw a RangeError.
+      if (args.Length() > 0 && (args[0]->IsUndefined() || args[0]->IsNull()))
+        return ThrowTypeError("Type error");
+
+      if (args[0]->Int32Value() < 0) {
+        return ThrowRangeError("ArrayBufferView size is not a small enough "
+                               "positive integer.");
+      }
+
+      length = args[0]->Uint32Value();
+      // TODO(deanm): Handle integer overflow.
+      v8::Handle<v8::Value> argv[1] = {
+          v8::Integer::NewFromUnsigned(length * TBytes)};
+
+      buffer = ArrayBuffer::GetTemplate()->
+                 GetFunction()->NewInstance(1, argv);
+      void* buf = buffer->GetPointerFromInternalField(0);
+
+      args.This()->SetIndexedPropertiesToExternalArrayData(
+          buf, TEAType, length);
+      // TODO(deanm): check for failure.
+    }
+
+    args.This()->Set(v8::String::New("buffer"),
+                     buffer,
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+    args.This()->Set(v8::String::New("length"),
+                     v8::Integer::NewFromUnsigned(length),
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+    args.This()->Set(v8::String::New("byteOffset"),
+                     v8::Integer::NewFromUnsigned(byte_offset),
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+    args.This()->Set(v8::String::New("byteLength"),
+                     v8::Integer::NewFromUnsigned(length * TBytes),
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+
+    return args.This();
+  }
+
+  static v8::Handle<v8::Value> set(const v8::Arguments& args) {
+    if (args.Length() < 1)
+      return ThrowError("Wrong number of arguments.");
+
+    if (!args[0]->IsObject())
+      return ThrowTypeError("Type error.");
+
+    v8::Handle<v8::Object> obj = v8::Handle<v8::Object>::Cast(args[0]);
+
+    if (TypedArray<TBytes, TEAType>::HasInstance(obj)) {  // ArrayBufferView.
+      //v8::Handle<v8::Object> src_buffer =
+      v8::Handle<v8::Object>::Cast(obj->Get(v8::String::New("buffer")));
+      //v8::Handle<v8::Object> dst_buffer =
+      v8::Handle<v8::Object>::Cast(args.This()->Get(v8::String::New("buffer")));
+
+      if (args[1]->Int32Value() < 0)
+        return ThrowRangeError("Offset may not be negative.");
+
+      unsigned int offset = args[1]->Uint32Value();
+      unsigned int src_length =
+          obj->Get(v8::String::New("length"))->Uint32Value();
+      unsigned int dst_length =
+          args.This()->Get(v8::String::New("length"))->Uint32Value();
+      if (offset > dst_length)
+        return ThrowRangeError("Offset out of range.");
+
+      if (src_length > dst_length - offset)
+        return ThrowRangeError("Offset/length out of range.");
+
+      // We don't want to get the buffer pointer, because that means we'll have
+      // to just do the calculations for byteOffset / byteLength again.
+      // Instead just use the pointer on the external array data.
+      void* src_ptr = obj->GetIndexedPropertiesExternalArrayData();
+      void* dst_ptr = args.This()->GetIndexedPropertiesExternalArrayData();
+
+      // From the spec:
+      // If the input array is a TypedArray, the two arrays may use the same
+      // underlying ArrayBuffer. In this situation, setting the values takes
+      // place as if all the data is first copied into a temporary buffer that
+      // does not overlap either of the arrays, and then the data from the
+      // temporary buffer is copied into the current array.
+      memmove(reinterpret_cast<char*>(dst_ptr) + offset * TBytes,
+              src_ptr, src_length * TBytes);
+    } else {  // type[]
+      if (args[1]->Int32Value() < 0)
+        return ThrowRangeError("Offset may not be negative.");
+
+      unsigned int src_length =
+          obj->Get(v8::String::New("length"))->Uint32Value();
+      unsigned int dst_length =
+          args.This()->Get(v8::String::New("length"))->Uint32Value();
+      unsigned int offset = args[1]->Uint32Value();
+
+      if (offset > dst_length)
+        return ThrowRangeError("Offset out of range.");
+
+      if (src_length > dst_length - offset)
+        return ThrowRangeError("Offset/length out of range.");
+
+      for (uint32_t i = 0; i < src_length; ++i) {
+        // Use the v8 setter to deal with typing.  Maybe slow?
+        args.This()->Set(i + offset, obj->Get(i));
+      }
+    }
+
+    return v8::Undefined();
+  }
+
+  static v8::Handle<v8::Value> subarray(const v8::Arguments& args) {
+    // TODO(deanm): The unsigned / signed type mixing makes me super nervous.
+
+    unsigned int length =
+        args.This()->Get(v8::String::New("length"))->Uint32Value();
+    int begin = args[0]->Int32Value();
+    int end = length;
+    if (args.Length() > 1)
+      end = args[1]->Int32Value();
+
+    if (begin < 0) begin = length + begin;
+    if (begin < 0) begin = 0;
+    if ((unsigned)begin > length) begin = length;
+
+    if (end < 0) end = length + end;
+    if (end < 0) end = 0;
+    if ((unsigned)end > length) end = length;
+
+    if (begin > end) begin = end;
+
+    int byte_offset = begin * TBytes +
+        args.This()->Get(v8::String::New("byteOffset"))->Uint32Value();
+
+    // Call through to the ArrayBuffer, byteOffset, length constructor.
+    v8::Handle<v8::Value> argv[] = {
+        args.This()->Get(v8::String::New("buffer")),
+        v8::Integer::New(byte_offset),
+        v8::Integer::New(end - begin)};
+    return TypedArray<TBytes, TEAType>::GetTemplate()->
+        GetFunction()->NewInstance(3, argv);
+  }
+
+  static const char* TypeName() {
+    switch (TEAType) {
+      case v8::kExternalByteArray: return "Int8Array";
+      case v8::kExternalUnsignedByteArray: return "Uint8Array";
+      case v8::kExternalShortArray: return "Int16Array";
+      case v8::kExternalUnsignedShortArray: return "Uint16Array";
+      case v8::kExternalIntArray: return "Int32Array";
+      case v8::kExternalUnsignedIntArray: return "Uint32Array";
+      case v8::kExternalFloatArray: return "Float32Array";
+      case v8::kExternalDoubleArray: return "Float64Array";
+    }
+    abort();
+    // Please the compiler
+    return "";
+  }
+};
+
+class Int8Array : public TypedArray<1, v8::kExternalByteArray> { };
+class Uint8Array : public TypedArray<1, v8::kExternalUnsignedByteArray> { };
+class Int16Array : public TypedArray<2, v8::kExternalShortArray> { };
+class Uint16Array : public TypedArray<2, v8::kExternalUnsignedShortArray> { };
+class Int32Array : public TypedArray<4, v8::kExternalIntArray> { };
+class Uint32Array : public TypedArray<4, v8::kExternalUnsignedIntArray> { };
+class Float32Array : public TypedArray<4, v8::kExternalFloatArray> { };
+class Float64Array : public TypedArray<8, v8::kExternalDoubleArray> { };
+
+template <typename T>
+v8::Handle<v8::Value> cTypeToValue(T) {
+  return v8::Undefined();
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(unsigned char val) {
+  return v8::Integer::NewFromUnsigned(val);
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(char val) {
+  return v8::Integer::New(val);
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(unsigned short val) {
+  return v8::Integer::NewFromUnsigned(val);
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(short val) {
+  return v8::Integer::New(val);
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(unsigned int val) {
+  return v8::Integer::NewFromUnsigned(val);
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(int val) {
+  return v8::Integer::New(val);
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(float val) {
+  return v8::Number::New(val);
+}
+
+template <>
+v8::Handle<v8::Value> cTypeToValue(double val) {
+  return v8::Number::New(val);
+}
+
+
+template <typename T>
+T valueToCType(v8::Handle<v8::Value> value) {
+  return 0;
+}
+
+template <>
+unsigned char valueToCType(v8::Handle<v8::Value> value) {
+  return value->Uint32Value();
+}
+
+template <>
+char valueToCType(v8::Handle<v8::Value> value) {
+  return value->Int32Value();
+}
+
+template <>
+unsigned short valueToCType(v8::Handle<v8::Value> value) {
+  return value->Uint32Value();
+}
+
+template <>
+short valueToCType(v8::Handle<v8::Value> value) {
+  return value->Int32Value();
+}
+
+template <>
+unsigned int valueToCType(v8::Handle<v8::Value> value) {
+  return value->Uint32Value();
+}
+
+template <>
+int valueToCType(v8::Handle<v8::Value> value) {
+  return value->Int32Value();
+}
+
+template <>
+float valueToCType(v8::Handle<v8::Value> value) {
+  return static_cast<float>(value->NumberValue());
+}
+
+template <>
+double valueToCType(v8::Handle<v8::Value> value) {
+  return value->NumberValue();
+}
+
+
+class DataView {
+ public:
+  static v8::Persistent<v8::FunctionTemplate> GetTemplate() {
+    static v8::Persistent<v8::FunctionTemplate> ft_cache;
+    if (!ft_cache.IsEmpty())
+      return ft_cache;
+
+    v8::HandleScope scope;
+    ft_cache = v8::Persistent<v8::FunctionTemplate>::New(
+        v8::FunctionTemplate::New(&DataView::V8New));
+    ft_cache->SetClassName(v8::String::New("DataView"));
+    v8::Local<v8::ObjectTemplate> instance = ft_cache->InstanceTemplate();
+    instance->SetInternalFieldCount(0);
+
+    v8::Local<v8::Signature> default_signature = v8::Signature::New(ft_cache);
+
+    static BatchedMethods methods[] = {
+      { "getUint8", &DataView::getUint8 },
+      { "getInt8", &DataView::getInt8 },
+      { "getUint16", &DataView::getUint16 },
+      { "getInt16", &DataView::getInt16 },
+      { "getUint32", &DataView::getUint32 },
+      { "getInt32", &DataView::getInt32 },
+      { "getFloat32", &DataView::getFloat32 },
+      { "getFloat64", &DataView::getFloat64 },
+      { "setUint8", &DataView::setUint8 },
+      { "setInt8", &DataView::setInt8 },
+      { "setUint16", &DataView::setUint16 },
+      { "setInt16", &DataView::setInt16 },
+      { "setUint32", &DataView::setUint32 },
+      { "setInt32", &DataView::setInt32 },
+      { "setFloat32", &DataView::setFloat32 },
+      { "setFloat64", &DataView::setFloat64 },
+    };
+
+    for (size_t i = 0; i < sizeof(methods) / sizeof(*methods); ++i) {
+      instance->Set(v8::String::New(methods[i].name),
+                    v8::FunctionTemplate::New(methods[i].func,
+                                              v8::Handle<v8::Value>(),
+                                              default_signature));
+    }
+
+    return ft_cache;
+  }
+
+  static bool HasInstance(v8::Handle<v8::Value> value) {
+    return GetTemplate()->HasInstance(value);
+  }
+
+ private:
+  static v8::Handle<v8::Value> V8New(const v8::Arguments& args) {
+    if (!args.IsConstructCall())
+      return ThrowTypeError("Constructor cannot be called as a function.");
+
+    if (args.Length() < 1)
+      return ThrowError("Wrong number of arguments.");
+
+    if (!args[0]->IsObject())
+      return ThrowError("Object must be an ArrayBuffer.");
+
+    v8::Handle<v8::Object> buffer = v8::Handle<v8::Object>::Cast(args[0]);
+    if (!buffer->HasIndexedPropertiesInExternalArrayData())
+      return ThrowError("Object must be an ArrayBuffer.");
+
+    unsigned int byte_length =
+        buffer->GetIndexedPropertiesExternalArrayDataLength();
+    unsigned int byte_offset = args[1]->Uint32Value();
+
+    if (args[1]->Int32Value() < 0 || byte_offset >= byte_length)
+      return ThrowRangeError("byteOffset out of range.");
+
+    if (!args[2]->IsUndefined()) {
+      if (args[2]->Int32Value() < 0)
+        return ThrowRangeError("byteLength out of range.");
+      unsigned int new_byte_length = args[2]->Uint32Value();
+      if (new_byte_length > byte_length)
+        return ThrowRangeError("byteLength out of range.");
+      if (byte_offset + new_byte_length > byte_length)
+        return ThrowRangeError("byteOffset/byteLength out of range.");
+      byte_length = new_byte_length;
+    } else {
+      // Adjust the original byte_length from total length to length to end.
+      byte_length -= byte_offset;
+    }
+
+    void* buf = buffer->GetIndexedPropertiesExternalArrayData();
+
+    // Like ArrayBuffer, we violate the spec and add an operator[].
+    args.This()->SetIndexedPropertiesToExternalArrayData(
+        reinterpret_cast<char*>(buf) + byte_offset,
+        v8::kExternalUnsignedByteArray, byte_length);
+
+    args.This()->Set(v8::String::New("buffer"),
+                     buffer,
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+    args.This()->Set(v8::String::New("byteOffset"),
+                     v8::Integer::NewFromUnsigned(byte_offset),
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+    args.This()->Set(v8::String::New("byteLength"),
+                     v8::Integer::NewFromUnsigned(byte_length),
+                     (v8::PropertyAttribute)(v8::ReadOnly|v8::DontDelete));
+    return args.This();
+  }
+
+  // TODO(deanm): This isn't beautiful or optimal.
+  static void swizzle(char* buf, size_t len) {
+    for (size_t i = 0; i < len / 2; ++i) {
+      char t = buf[i];
+      buf[i] = buf[len - i - 1];
+      buf[len - i - 1] = t;
+    }
+  }
+
+  template <typename T>
+  static T getValue(void* ptr, unsigned int index, bool swiz) {
+    char buf[sizeof(T)];
+    memcpy(buf, reinterpret_cast<char*>(ptr) + index, sizeof(T));
+    if (swiz)
+      swizzle(buf, sizeof(T));
+    T val;
+    memcpy(&val, buf, sizeof(T));
+    return val;
+  }
+
+  template <typename T>
+  static void setValue(void* ptr, unsigned int index, T val, bool swiz) {
+    char buf[sizeof(T)];
+    memcpy(buf, &val, sizeof(T));
+    if (swiz)
+      swizzle(buf, sizeof(T));
+    memcpy(reinterpret_cast<char*>(ptr) + index, buf, sizeof(T));
+  }
+
+  template <typename T>
+  static v8::Handle<v8::Value> getGeneric(const v8::Arguments& args) {
+    if (args.Length() < 1)
+      return ThrowError("Wrong number of arguments.");
+
+    unsigned int index = args[0]->Uint32Value();
+    bool little_endian = args[1]->BooleanValue();
+    // TODO(deanm): All of these things should be cacheable.
+    int element_size = v8_typed_array::SizeOfArrayElementForType(
+        args.This()->GetIndexedPropertiesExternalArrayDataType());
+    int size = args.This()->GetIndexedPropertiesExternalArrayDataLength() *
+               element_size;
+
+    if (index + sizeof(T) > (unsigned)size)  // TODO(deanm): integer overflow.
+      return ThrowError("Index out of range.");
+
+    void* ptr = args.This()->GetIndexedPropertiesExternalArrayData();
+    return cTypeToValue<T>(getValue<T>(ptr, index, !little_endian));
+  }
+
+  template <typename T>
+  static v8::Handle<v8::Value> setGeneric(const v8::Arguments& args) {
+    if (args.Length() < 2)
+      return ThrowError("Wrong number of arguments.");
+
+    unsigned int index = args[0]->Int32Value();
+    bool little_endian = args[2]->BooleanValue();
+    // TODO(deanm): All of these things should be cacheable.
+    int element_size = v8_typed_array::SizeOfArrayElementForType(
+        args.This()->GetIndexedPropertiesExternalArrayDataType());
+    int size = args.This()->GetIndexedPropertiesExternalArrayDataLength() *
+               element_size;
+
+    if (index + sizeof(T) > (unsigned)size)  // TODO(deanm): integer overflow.
+      return ThrowError("Index out of range.");
+
+    void* ptr = args.This()->GetIndexedPropertiesExternalArrayData();
+    setValue<T>(ptr, index, valueToCType<T>(args[1]), !little_endian);
+    return v8::Undefined();
+  }
+
+  static v8::Handle<v8::Value> getUint8(const v8::Arguments& args) {
+    return getGeneric<unsigned char>(args);
+  }
+
+  static v8::Handle<v8::Value> getInt8(const v8::Arguments& args) {
+    return getGeneric<char>(args);
+  }
+
+  static v8::Handle<v8::Value> getUint16(const v8::Arguments& args) {
+    return getGeneric<unsigned short>(args);
+  }
+
+  static v8::Handle<v8::Value> getInt16(const v8::Arguments& args) {
+    return getGeneric<short>(args);
+  }
+
+  static v8::Handle<v8::Value> getUint32(const v8::Arguments& args) {
+    return getGeneric<unsigned int>(args);
+  }
+
+  static v8::Handle<v8::Value> getInt32(const v8::Arguments& args) {
+    return getGeneric<int>(args);
+  }
+
+  static v8::Handle<v8::Value> getFloat32(const v8::Arguments& args) {
+    return getGeneric<float>(args);
+  }
+
+  static v8::Handle<v8::Value> getFloat64(const v8::Arguments& args) {
+    return getGeneric<double>(args);
+  }
+
+  static v8::Handle<v8::Value> setUint8(const v8::Arguments& args) {
+    return setGeneric<unsigned char>(args);
+  }
+
+  static v8::Handle<v8::Value> setInt8(const v8::Arguments& args) {
+    return setGeneric<char>(args);
+  }
+
+  static v8::Handle<v8::Value> setUint16(const v8::Arguments& args) {
+    return setGeneric<unsigned short>(args);
+  }
+
+  static v8::Handle<v8::Value> setInt16(const v8::Arguments& args) {
+    return setGeneric<short>(args);
+  }
+
+  static v8::Handle<v8::Value> setUint32(const v8::Arguments& args) {
+    return setGeneric<unsigned int>(args);
+  }
+
+  static v8::Handle<v8::Value> setInt32(const v8::Arguments& args) {
+    return setGeneric<int>(args);
+  }
+
+  static v8::Handle<v8::Value> setFloat32(const v8::Arguments& args) {
+    return setGeneric<float>(args);
+  }
+
+  static v8::Handle<v8::Value> setFloat64(const v8::Arguments& args) {
+    return setGeneric<double>(args);
+  }
+};
+
+
+}  // namespace
+
+namespace v8_typed_array {
+
+void AttachBindings(v8::Handle<v8::Object> obj) {
+  obj->Set(v8::String::New("ArrayBuffer"),
+           ArrayBuffer::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Int8Array"),
+           Int8Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Uint8Array"),
+           Uint8Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Int16Array"),
+           Int16Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Uint16Array"),
+           Uint16Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Int32Array"),
+           Int32Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Uint32Array"),
+           Uint32Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Float32Array"),
+           Float32Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("Float64Array"),
+           Float64Array::GetTemplate()->GetFunction());
+  obj->Set(v8::String::New("DataView"),
+           DataView::GetTemplate()->GetFunction());
+}
+
+int SizeOfArrayElementForType(v8::ExternalArrayType type) {
+  switch (type) {
+    case v8::kExternalByteArray:
+    case v8::kExternalUnsignedByteArray:
+      return 1;
+    case v8::kExternalShortArray:
+    case v8::kExternalUnsignedShortArray:
+      return 2;
+    case v8::kExternalIntArray:
+    case v8::kExternalUnsignedIntArray:
+    case v8::kExternalFloatArray:
+      return 4;
+    case v8::kExternalDoubleArray:
+      return 8;
+    default:
+      return 0;
+  }
+}
+
+}  // namespace v8_typed_array
diff --git a/src/legacy/v8_typed_array.h b/src/legacy/v8_typed_array.h
new file mode 100644
index 0000000..a95b29a
--- /dev/null
+++ b/src/legacy/v8_typed_array.h
@@ -0,0 +1,35 @@
+// V8 Typed Array implementation.
+// (c) Dean McNamee <dean@gmail.com>, 2011.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#ifndef V8_TYPED_ARRAY_H_
+#define V8_TYPED_ARRAY_H_
+
+#include <v8.h>
+
+namespace v8_typed_array {
+
+void AttachBindings(v8::Handle<v8::Object> obj);
+
+int SizeOfArrayElementForType(v8::ExternalArrayType type);
+
+}  // namespace v8_typed_array
+
+#endif  // V8_TYPED_ARRAY_H_

From 9ed0cda6188932ef23cb215a42e7127a40384ad6 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sat, 2 Feb 2019 16:21:30 -0800
Subject: [PATCH 10/38] Hint ICU

---
 src/bindings.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index a4952dc..16e1e8d 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -24,6 +24,7 @@ void start_v8_isolate(){
   static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
   V8::InitializePlatform(platform.get());
   V8::Initialize();
+  //V8::InitializeICU();
   Isolate::CreateParams create_params;
   create_params.array_buffer_allocator =
     ArrayBuffer::Allocator::NewDefaultAllocator();

From 70713f27c24590e50c99f24e382546ca0599e83d Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sun, 3 Feb 2019 19:38:53 +0100
Subject: [PATCH 11/38] Fix legacy

---
 R/onLoad.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/onLoad.R b/R/onLoad.R
index 869c541..0f10c04 100644
--- a/R/onLoad.R
+++ b/R/onLoad.R
@@ -1,5 +1,6 @@
 .onLoad <- function(libname, pkgname){
-  start_v8_isolate()
+  if(is.function(start_v8_isolate))
+    start_v8_isolate()
   # Test for development
   # ct <- v8()
   # ct$source(system.file("js/underscore.js", package = pkgname))

From 7d8a550f5de45a2ce7d86862c5609162baedae86 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sun, 3 Feb 2019 19:43:15 +0100
Subject: [PATCH 12/38] Fix

---
 .travis.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7320b46..f3e9a60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,18 @@
 language: r
 cache: packages
+latex: false
 
 matrix:
   include:
-    - os: linux
-      dist: precise
-      sudo: false
     - os: linux
       dist: trusty
-      env: R_CODECOV=true
       r_check_args: '--use-valgrind'
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode9.4
       brew_packages: v8@3.15
-      latex: false
     - os: osx
       osx_image: xcode8.3
       disable_homebrew: true
-      latex: false
     - os: osx
       osx_image: xcode7.3
       disable_homebrew: true

From ad49815711d558f3f051efa628c8d88a54407371 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 06:04:59 +0100
Subject: [PATCH 13/38] Move init call

---
 .travis.yml         |  1 +
 R/RcppExports.R     |  4 ----
 R/onLoad.R          |  2 --
 src/RcppExports.cpp | 15 +++++----------
 src/bindings.cpp    |  2 +-
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f3e9a60..2f4313e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ matrix:
     - os: osx
       osx_image: xcode9.4
       brew_packages: v8@3.15
+      before_install: brew link --force v8@3.15
     - os: osx
       osx_image: xcode8.3
       disable_homebrew: true
diff --git a/R/RcppExports.R b/R/RcppExports.R
index 4c867d1..877b07d 100644
--- a/R/RcppExports.R
+++ b/R/RcppExports.R
@@ -1,10 +1,6 @@
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 
-start_v8_isolate <- function() {
-    invisible(.Call('_V8_start_v8_isolate', PACKAGE = 'V8'))
-}
-
 version <- function() {
     .Call('_V8_version', PACKAGE = 'V8')
 }
diff --git a/R/onLoad.R b/R/onLoad.R
index 0f10c04..42a776f 100644
--- a/R/onLoad.R
+++ b/R/onLoad.R
@@ -1,6 +1,4 @@
 .onLoad <- function(libname, pkgname){
-  if(is.function(start_v8_isolate))
-    start_v8_isolate()
   # Test for development
   # ct <- v8()
   # ct$source(system.file("js/underscore.js", package = pkgname))
diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index c5b48d0..25138a0 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -6,15 +6,6 @@
 
 using namespace Rcpp;
 
-// start_v8_isolate
-void start_v8_isolate();
-RcppExport SEXP _V8_start_v8_isolate() {
-BEGIN_RCPP
-    Rcpp::RNGScope rcpp_rngScope_gen;
-    start_v8_isolate();
-    return R_NilValue;
-END_RCPP
-}
 // version
 std::string version();
 RcppExport SEXP _V8_version() {
@@ -83,18 +74,22 @@ BEGIN_RCPP
 END_RCPP
 }
 
+RcppExport SEXP _V8_start_v8_isolate();
+
 static const R_CallMethodDef CallEntries[] = {
-    {"_V8_start_v8_isolate", (DL_FUNC) &_V8_start_v8_isolate, 0},
     {"_V8_version", (DL_FUNC) &_V8_version, 0},
     {"_V8_context_eval", (DL_FUNC) &_V8_context_eval, 2},
     {"_V8_context_validate", (DL_FUNC) &_V8_context_validate, 2},
     {"_V8_context_null", (DL_FUNC) &_V8_context_null, 1},
     {"_V8_make_context", (DL_FUNC) &_V8_make_context, 1},
     {"_V8_context_enable_typed_arrays", (DL_FUNC) &_V8_context_enable_typed_arrays, 1},
+    {"_V8_start_v8_isolate",            (DL_FUNC) &_V8_start_v8_isolate,            0},
     {NULL, NULL, 0}
 };
 
+void start_v8_isolate();
 RcppExport void R_init_V8(DllInfo *dll) {
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
     R_useDynamicSymbols(dll, FALSE);
+    start_v8_isolate(dll);
 }
diff --git a/src/bindings.cpp b/src/bindings.cpp
index 16e1e8d..cac5ce9 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -19,7 +19,7 @@ static Local<String> ToJSString(const char * str){
   return String::NewFromUtf8(isolate, str, NewStringType::kNormal).ToLocalChecked();
 }
 
-// [[Rcpp::export]]
+// [[Rcpp::init]]
 void start_v8_isolate(){
   static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
   V8::InitializePlatform(platform.get());

From f35ea24002e7c1d238bb9b3c0f39f72eb99e4d8b Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 06:08:58 +0100
Subject: [PATCH 14/38] Fix compiler warning

---
 src/RcppExports.cpp | 5 +----
 src/bindings.cpp    | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index 25138a0..7a520df 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -74,8 +74,6 @@ BEGIN_RCPP
 END_RCPP
 }
 
-RcppExport SEXP _V8_start_v8_isolate();
-
 static const R_CallMethodDef CallEntries[] = {
     {"_V8_version", (DL_FUNC) &_V8_version, 0},
     {"_V8_context_eval", (DL_FUNC) &_V8_context_eval, 2},
@@ -83,11 +81,10 @@ static const R_CallMethodDef CallEntries[] = {
     {"_V8_context_null", (DL_FUNC) &_V8_context_null, 1},
     {"_V8_make_context", (DL_FUNC) &_V8_make_context, 1},
     {"_V8_context_enable_typed_arrays", (DL_FUNC) &_V8_context_enable_typed_arrays, 1},
-    {"_V8_start_v8_isolate",            (DL_FUNC) &_V8_start_v8_isolate,            0},
     {NULL, NULL, 0}
 };
 
-void start_v8_isolate();
+void start_v8_isolate(void *dll);
 RcppExport void R_init_V8(DllInfo *dll) {
     R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
     R_useDynamicSymbols(dll, FALSE);
diff --git a/src/bindings.cpp b/src/bindings.cpp
index cac5ce9..9f76a3c 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -20,7 +20,7 @@ static Local<String> ToJSString(const char * str){
 }
 
 // [[Rcpp::init]]
-void start_v8_isolate(){
+void start_v8_isolate(void *dll){
   static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
   V8::InitializePlatform(platform.get());
   V8::Initialize();

From 2f3d4db09e39bd966041687e1152cf66dd0b6a14 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 06:20:06 +0100
Subject: [PATCH 15/38] Add onAttach message

---
 NAMESPACE  | 1 +
 R/V8.R     | 8 ++++++++
 R/onLoad.R | 4 ++++
 man/V8.Rd  | 3 +++
 4 files changed, 16 insertions(+)

diff --git a/NAMESPACE b/NAMESPACE
index fb61b4e..02efbc7 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -6,6 +6,7 @@ S3method("[[",V8)
 S3method(names,V8)
 S3method(print,V8)
 export(JS)
+export(engine_info)
 export(new_context)
 export(v8)
 importFrom(Rcpp,sourceCpp)
diff --git a/R/V8.R b/R/V8.R
index b2a4b31..0c74155 100644
--- a/R/V8.R
+++ b/R/V8.R
@@ -289,3 +289,11 @@ stop <- function(x, ..., call. = FALSE){
     base::stop(x, ...)
   base::stop(x, ..., call. = call.)
 }
+
+#' @rdname V8
+#' @export
+engine_info <- function(){
+  list (
+    version = version()
+  )
+}
diff --git a/R/onLoad.R b/R/onLoad.R
index 42a776f..8b88225 100644
--- a/R/onLoad.R
+++ b/R/onLoad.R
@@ -1,3 +1,7 @@
+.onAttach <- function(libname, pkg){
+  packageStartupMessage(paste("Using to V8 engine", version()))
+}
+
 .onLoad <- function(libname, pkgname){
   # Test for development
   # ct <- v8()
diff --git a/man/V8.Rd b/man/V8.Rd
index 4a51aa8..893a15c 100644
--- a/man/V8.Rd
+++ b/man/V8.Rd
@@ -4,9 +4,12 @@
 \alias{V8}
 \alias{v8}
 \alias{new_context}
+\alias{engine_info}
 \title{Run JavaScript in a V8 context}
 \usage{
 v8(global = "global", console = TRUE, typed_arrays = TRUE)
+
+engine_info()
 }
 \arguments{
 \item{global}{character vector indicating name(s) of the global environment. Use NULL for no name.}

From 1e88348c02e0cbc711e92da76ee6461b4bb2f2af Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 06:21:43 +0100
Subject: [PATCH 16/38] Update Travis

---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f4313e..6231c98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,14 @@ latex: false
 
 matrix:
   include:
-    - os: linux
-      dist: trusty
+    - dist: trusty
+    - dist: xenial
       r_check_args: '--use-valgrind'
     - os: osx
       osx_image: xcode9.4
-      brew_packages: v8@3.15
-      before_install: brew link --force v8@3.15
+      before_install:
+        - brew install v8@3.15
+        - brew link --force v8@3.15
     - os: osx
       osx_image: xcode8.3
       disable_homebrew: true

From 79d58a3db34d613cb8339653dd9fe701352d7858 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 10:24:49 +0100
Subject: [PATCH 17/38] Tweak test for Debian libnode-dev

---
 configure      | 19 ++++++++++++-------
 tools/test.cpp |  4 ++++
 2 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 tools/test.cpp

diff --git a/configure b/configure
index 275b3e6..a34b694 100755
--- a/configure
+++ b/configure
@@ -15,11 +15,21 @@ PKG_LIBS_LEGACY="-lv8"
 PKG_LIBS_STATIC="-lv8_{base,snapshot} -lpreparser_lib"
 PKG_CFLAGS="-I/usr/include/v8-3.14"
 
+# Find compiler
+CXX11=$(${R_HOME}/bin/R CMD config CXX11)
+CXXCPP=$(${R_HOME}/bin/R CMD config CXXCPP)
+CXXFLAGS=$(${R_HOME}/bin/R CMD config CXXFLAGS)
+CPPFLAGS=$(${R_HOME}/bin/R CMD config CPPFLAGS)
+
 # Special case for Debian libnode-dev
-if [ -e /usr/include/nodejs/deps/v8/include/v8.h ] && [ -e /usr/lib/x86_64-linux-gnu/libnode.so ]; then
-PKG_CFLAGS="-I/usr/include/nodejs/deps/v8/include"
+NODEJS_INCLUDE="/usr/include/nodejs/deps/v8/include"
+if [ -e "${NODEJS_INCLUDE}/v8.h" ]; then
+${CXX11} "-I${NODEJS_INCLUDE}" tools/test.cpp -lnode >/dev/null
+if [ $? -eq 0 ]; then
+PKG_CFLAGS="-I${NODEJS_INCLUDE}"
 PKG_LIBS="-lnode"
 fi
+fi
 
 # Check for custom locations
 if [ "$INCLUDE_DIR" ] || [ "$LIB_DIR" ]; then
@@ -41,11 +51,6 @@ fi
 echo "Using PKG_CFLAGS=$PKG_CFLAGS"
 echo "Using PKG_LIBS=$PKG_LIBS"
 
-# Find compiler
-CXXCPP=$(${R_HOME}/bin/R CMD config CXXCPP)
-CXXFLAGS=$(${R_HOME}/bin/R CMD config CXXFLAGS)
-CPPFLAGS=$(${R_HOME}/bin/R CMD config CPPFLAGS)
-
 # Test for libv8
 echo "#include $PKG_TEST_HEADER" | ${CXXCPP} ${CPPFLAGS} ${PKG_CFLAGS} ${CXXFLAGS} -xc++ - >/dev/null 2>&1
 if [ $? -ne 0 ]; then
diff --git a/tools/test.cpp b/tools/test.cpp
new file mode 100644
index 0000000..145e8f7
--- /dev/null
+++ b/tools/test.cpp
@@ -0,0 +1,4 @@
+#include <v8.h>
+int main(){
+  V8::Initialize();
+}

From 60c7c7f0d9172fd6f2982641f904e776538ba093 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 10:33:02 +0100
Subject: [PATCH 18/38] Tweak test

---
 tools/test.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/test.cpp b/tools/test.cpp
index 145e8f7..d8560ae 100644
--- a/tools/test.cpp
+++ b/tools/test.cpp
@@ -1,4 +1,7 @@
+#include <libplatform/libplatform.h>
 #include <v8.h>
+using namespace v8;
+
 int main(){
   V8::Initialize();
 }

From 69fc9ddbb16e396a2a40aaa84f5724f8c63231e3 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 23:04:58 +0100
Subject: [PATCH 19/38] Fix code for V8 6.2

---
 src/bindings.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index 9f76a3c..fe7905a 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -21,8 +21,8 @@ static Local<String> ToJSString(const char * str){
 
 // [[Rcpp::init]]
 void start_v8_isolate(void *dll){
-  static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
-  V8::InitializePlatform(platform.get());
+  //static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
+  V8::InitializePlatform(v8::platform::CreateDefaultPlatform());
   V8::Initialize();
   //V8::InitializeICU();
   Isolate::CreateParams create_params;

From 7f8eb7112146e46fdad29f00eb7e90863f4102cf Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Mon, 4 Feb 2019 23:49:14 +0100
Subject: [PATCH 20/38] More 6.2 fixes

---
 src/bindings.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index fe7905a..93fa982 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -79,12 +79,15 @@ void r_callback(std::string fun, const v8::FunctionCallbackInfo<v8::Value>& args
     if(args[1]->IsUndefined()){
       out = r_call(fun);
     } else if(args[2]->IsUndefined()) {
-      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
+      Local<Object> obj1 = Local<Object>::Cast(args[1]);
+      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
       Rcpp::String json(ToCString(arg1));
       out = r_call(fun, json);
     } else {
-      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[1]).ToLocalChecked());
-      String::Utf8Value arg2(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), args[2]).ToLocalChecked());
+      Local<Object> obj1 = Local<Object>::Cast(args[1]);
+      Local<Object> obj2 = Local<Object>::Cast(args[2]);
+      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
+      String::Utf8Value arg2(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj2).ToLocalChecked());
       Rcpp::String val(ToCString(arg1));
       Rcpp::String json(ToCString(arg2));
       out = r_call(fun, val, json);

From dc1c7d76917b4f5103c64d679a730b98368bb48a Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 01:25:00 +0100
Subject: [PATCH 21/38] Fix Windows / MacOS legacy builds

---
 configure              |  2 +-
 src/Makevars.win       | 13 ++++---------
 src/legacy/Makevars.in |  4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index a34b694..95fbce9 100755
--- a/configure
+++ b/configure
@@ -8,7 +8,7 @@
 PKG_DEB_NAME="libnode-dev / libv8-dev"
 PKG_RPM_NAME="v8-314-devel (formerly: v8-devel)"
 PKG_CSW_NAME="libv8_dev"
-PKG_BREW_NAME="v8"
+PKG_BREW_NAME="v8@3.15"
 PKG_TEST_HEADER="<v8.h>"
 PKG_LIBS="-lv8 -lv8_libplatform"
 PKG_LIBS_LEGACY="-lv8"
diff --git a/src/Makevars.win b/src/Makevars.win
index 8ab9fdf..9607ff8 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,22 +1,17 @@
 COMPILED_BY ?= gcc-4.6.3
-PKG_CPPFLAGS= -I../windows/libv8-3.15.10/include
+PKG_CPPFLAGS= -Ilegacy -I../windows/libv8-3.15.10/include
 PKG_CXXFLAGS=-DV8_DISABLE_DEPRECATIONS
 PKG_LIBS= -L../windows/libv8-3.15.10/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
 	-lv8_base -lpreparser_lib -lv8_snapshot -lws2_32 -lwinmm
 
+OBJECTS = legacy/V8.o legacy/v8_typed_array.o legacy/RcppExports.o
+
 all: clean winlibs
 
 clean:
-	rm -f v8.dll $(OBJECTS)
+	rm -f $(SHLIB) $(OBJECTS)
 
 winlibs:
 	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" --vanilla "../tools/winlibs.R"
 
-# Hack for windows XP
-# The msvcr100.dll file is in: Microsoft Visual C++ 2010 Redistributable
-# https://www.microsoft.com/en-us/download/confirmation.aspx?id=5555
-ifeq "$(ALLUSERSPROFILE)" "C:\Documents and Settings\All Users"
-PKG_LIBS += -lmsvcr100
-endif
-
 .PHONY: all winlibs clean
diff --git a/src/legacy/Makevars.in b/src/legacy/Makevars.in
index d60d00b..4c3b463 100644
--- a/src/legacy/Makevars.in
+++ b/src/legacy/Makevars.in
@@ -2,9 +2,9 @@ PKG_CXXFLAGS=-DV8_DISABLE_DEPRECATIONS $(C_VISIBILITY)
 PKG_CPPFLAGS=@cflags@ -Ilegacy
 PKG_LIBS=@libs@
 
+OBJECTS = legacy/V8.o legacy/v8_typed_array.o legacy/RcppExports.o
+
 all: clean
 
 clean:
 	rm -f $(SHLIB) $(OBJECTS)
-
-OBJECTS = legacy/V8.o legacy/v8_typed_array.o legacy/RcppExports.o

From f575b6f15f2b66a0990f8e3ee370a784f9864648 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 09:13:19 +0100
Subject: [PATCH 22/38] Windows: update libv8

---
 src/Makevars.win | 19 +++++++++++--------
 tools/winlibs.R  | 17 +++++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/Makevars.win b/src/Makevars.win
index 9607ff8..f4c19c6 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,10 +1,13 @@
-COMPILED_BY ?= gcc-4.6.3
-PKG_CPPFLAGS= -Ilegacy -I../windows/libv8-3.15.10/include
-PKG_CXXFLAGS=-DV8_DISABLE_DEPRECATIONS
-PKG_LIBS= -L../windows/libv8-3.15.10/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
-	-lv8_base -lpreparser_lib -lv8_snapshot -lws2_32 -lwinmm
-
-OBJECTS = legacy/V8.o legacy/v8_typed_array.o legacy/RcppExports.o
+VERSION = 6.2.414.50
+CXX_STD = CXX11
+RWINLIB =../windows/libv8-$(VERSION)
+PKG_CPPFLAGS = -I$(RWINLIB)/include
+PKG_LIBS = \
+	-L$(RWINLIB)/lib${subst gcc ,-,${R_COMPILED_BY}}${R_ARCH} \
+	-L$(RWINLIB)/lib${R_ARCH} \
+	-lv8_base -lv8_libplatform  -lv8_nosnapshot \
+	-lv8_libbase -lv8_libsampler -lv8_builtins_setup -lv8_builtins_generators \
+	-lws2_32 -lwinmm -ldbghelp -lshlwapi
 
 all: clean winlibs
 
@@ -12,6 +15,6 @@ clean:
 	rm -f $(SHLIB) $(OBJECTS)
 
 winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" --vanilla "../tools/winlibs.R"
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" --vanilla "../tools/winlibs.R" $(VERSION)
 
 .PHONY: all winlibs clean
diff --git a/tools/winlibs.R b/tools/winlibs.R
index 4d6c2fc..b95831e 100644
--- a/tools/winlibs.R
+++ b/tools/winlibs.R
@@ -1,8 +1,13 @@
-# Build against mingw-w64 build of libv8 3.15.10
-if(!file.exists("../windows/libv8-3.15.10/include/v8.h")){
-  if(getRversion() < "3.3.0") setInternet2()
-  download.file("https://github.com/rwinlib/libv8/archive/v3.15.10.zip", "lib.zip", quiet = TRUE)
+# Build against mingw-w64 build of libv8
+VERSION <- commandArgs(TRUE)
+LIBDIR <- paste0("../windows/libv8-", VERSION)
+if(!file.exists(paste0(LIBDIR, "/include/v8.h"))){
+  if(getRversion() < "3.3.0") stop("This library requires R 3.3 or newer")
+  download.file(sprintf("https://github.com/rwinlib/libv8/archive/v%s.zip", VERSION), "v8.zip", quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)
-  unzip("lib.zip", exdir = "../windows")
-  unlink("lib.zip")
+  unzip("v8.zip", exdir = "../windows")
+  setwd(LIBDIR)
+  unzip("lib-4.9.3.zip")
+  if(getRversion() >= "3.6.0") unzip("lib.zip")
+  unlink("v8.zip")
 }

From e09d596fd9cae22965d0e895a598a58955cd68d7 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 09:29:29 +0100
Subject: [PATCH 23/38] Fix autobrew

---
 configure | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 95fbce9..68b9668 100755
--- a/configure
+++ b/configure
@@ -11,7 +11,6 @@ PKG_CSW_NAME="libv8_dev"
 PKG_BREW_NAME="v8@3.15"
 PKG_TEST_HEADER="<v8.h>"
 PKG_LIBS="-lv8 -lv8_libplatform"
-PKG_LIBS_LEGACY="-lv8"
 PKG_LIBS_STATIC="-lv8_{base,snapshot} -lpreparser_lib"
 PKG_CFLAGS="-I/usr/include/v8-3.14"
 
@@ -70,8 +69,8 @@ fi
 ${CXXCPP} ${CPPFLAGS} ${PKG_CFLAGS} ${CXXFLAGS} src/legacy/test.cpp >/dev/null 2>&1
 if [ $? -eq 0 ]; then
   echo "Found legacy version of libv8"
-  echo "Using PKG_LIBS=$PKG_LIBS_LEGACY"
-  sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS_LEGACY|" src/legacy/Makevars.in > src/Makevars
+  PKG_LIBS=$(echo "$PKG_LIBS" | sed -e "s/-lv8_libplatform//")
+  sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS|" src/legacy/Makevars.in > src/Makevars
   exit 0
 fi
 

From d77c72f5e361cd1a67a9110722aa6c08b0ff6fee Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 11:38:33 +0100
Subject: [PATCH 24/38] Fixes for V8 version 7

---
 src/bindings.cpp | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index 93fa982..8dbe6b4 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -16,7 +16,8 @@ static const char* ToCString(const v8::String::Utf8Value& value) {
 }
 
 static Local<String> ToJSString(const char * str){
-  return String::NewFromUtf8(isolate, str, NewStringType::kNormal).ToLocalChecked();
+  MaybeLocal<String> out = String::NewFromUtf8(isolate, str, NewStringType::kNormal);
+  return out.IsEmpty() ? Local<String>() : out.ToLocalChecked();
 }
 
 // [[Rcpp::init]]
@@ -34,10 +35,13 @@ void start_v8_isolate(void *dll){
 }
 
 /* Helper fun that compiles JavaScript source code */
-static Local<Script> compile_source(std::string src){
-  Local<String> source = String::NewFromUtf8(isolate, src.c_str(), NewStringType::kNormal).ToLocalChecked();
-  Local<Script> script = Script::Compile(source);
-  return script;
+static Local<Script> compile_source(std::string src, Local<Context> context){
+  Local<String> source = ToJSString(src.c_str());
+  if(source.IsEmpty()){
+    return Local<Script>();
+  }
+  MaybeLocal<Script> script = Script::Compile(context, source);
+  return script.IsEmpty() ? Local<Script>() : script.ToLocalChecked();
 }
 
 /* console.log */
@@ -73,21 +77,21 @@ static void ConsoleError(const v8::FunctionCallbackInfo<v8::Value>& args) {
 void r_callback(std::string fun, const v8::FunctionCallbackInfo<v8::Value>& args) {
   try {
     Rcpp::Function r_call = Rcpp::Environment::namespace_env("V8")[fun];
-    String::Utf8Value arg0(args[0]);
+    String::Utf8Value arg0(args.GetIsolate(), args[0]);
     Rcpp::String fun(*arg0);
     Rcpp::CharacterVector out;
     if(args[1]->IsUndefined()){
       out = r_call(fun);
     } else if(args[2]->IsUndefined()) {
       Local<Object> obj1 = Local<Object>::Cast(args[1]);
-      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
+      String::Utf8Value arg1(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
       Rcpp::String json(ToCString(arg1));
       out = r_call(fun, json);
     } else {
       Local<Object> obj1 = Local<Object>::Cast(args[1]);
       Local<Object> obj2 = Local<Object>::Cast(args[2]);
-      String::Utf8Value arg1(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
-      String::Utf8Value arg2(v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj2).ToLocalChecked());
+      String::Utf8Value arg1(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
+      String::Utf8Value arg2(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj2).ToLocalChecked());
       Rcpp::String val(ToCString(arg1));
       Rcpp::String json(ToCString(arg2));
       out = r_call(fun, val, json);
@@ -139,21 +143,22 @@ Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Conte
 
   // Compile source code
   TryCatch trycatch(isolate);
-  Handle<Script> script = compile_source(src);
+  Handle<Script> script = compile_source(src, ctx.checked_get()->Get(isolate));
   if(script.IsEmpty()) {
     v8::String::Utf8Value exception(isolate, trycatch.Exception());
     throw std::invalid_argument(ToCString(exception));
   }
 
   // Run the script to get the result.
-  Handle<Value> result = script->Run();
+  MaybeLocal<Value> res = script->Run(ctx.checked_get()->Get(isolate));
+  Handle<Value> result = res.IsEmpty() ? Handle<Value>() : res.ToLocalChecked();
   if(result.IsEmpty()){
     v8::String::Utf8Value exception(isolate, trycatch.Exception());
     throw std::runtime_error(ToCString(exception));
   }
 
   // Convert result to UTF8.
-  String::Utf8Value utf8(result);
+  String::Utf8Value utf8(isolate, result);
   Rcpp::String out(*utf8);
   out.set_encoding(CE_UTF8);
   return out;
@@ -176,7 +181,7 @@ bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context>
 
   // Try to compile, catch errors
   TryCatch trycatch(isolate);
-  Handle<Script> script = compile_source(src);
+  Handle<Script> script = compile_source(src, ctx.checked_get()->Get(isolate));
   return !script.IsEmpty();
 }
 

From efba8e82ea9a1bb95f26ad62e3821aabb75961cd Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 12:55:28 +0100
Subject: [PATCH 25/38] Factor out template

---
 src/bindings.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index 8dbe6b4..90f0db7 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -2,6 +2,12 @@
 #include "V8_types.h"
 using namespace v8;
 
+/* Note: ToLocalChecked() aborts if x is empty */
+template <typename T>
+Local<T> safe_to_local(MaybeLocal<T> x){
+  return x.IsEmpty() ? Local<T>() : x.ToLocalChecked();
+}
+
 void ctx_finalizer( Persistent<Context>* context ){
   if(context)
     context->Reset();
@@ -17,7 +23,7 @@ static const char* ToCString(const v8::String::Utf8Value& value) {
 
 static Local<String> ToJSString(const char * str){
   MaybeLocal<String> out = String::NewFromUtf8(isolate, str, NewStringType::kNormal);
-  return out.IsEmpty() ? Local<String>() : out.ToLocalChecked();
+  return safe_to_local(out);
 }
 
 // [[Rcpp::init]]
@@ -37,11 +43,8 @@ void start_v8_isolate(void *dll){
 /* Helper fun that compiles JavaScript source code */
 static Local<Script> compile_source(std::string src, Local<Context> context){
   Local<String> source = ToJSString(src.c_str());
-  if(source.IsEmpty()){
-    return Local<Script>();
-  }
   MaybeLocal<Script> script = Script::Compile(context, source);
-  return script.IsEmpty() ? Local<Script>() : script.ToLocalChecked();
+  return safe_to_local(script);
 }
 
 /* console.log */
@@ -151,7 +154,7 @@ Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Conte
 
   // Run the script to get the result.
   MaybeLocal<Value> res = script->Run(ctx.checked_get()->Get(isolate));
-  Handle<Value> result = res.IsEmpty() ? Handle<Value>() : res.ToLocalChecked();
+  Handle<Value> result = safe_to_local(res);
   if(result.IsEmpty()){
     v8::String::Utf8Value exception(isolate, trycatch.Exception());
     throw std::runtime_error(ToCString(exception));

From 650324b2f9ac02ffa9e3cb75824e81171f3487cc Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 13:16:56 +0100
Subject: [PATCH 26/38] Wording

---
 DESCRIPTION | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index cb9629e..d6fff08 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -5,16 +5,16 @@ Version: 1.9000
 Author: Jeroen Ooms
 Maintainer: Jeroen Ooms <jeroen@berkeley.edu>
 Description: An R interface to Google's open source JavaScript engine. This 
-    package can now be compiled either with V8 version 6.8 (LTS) or with the 
-    legacy 3.14/3.15 version of V8. In the latter case, only ECMAScript v5 
-    is supported, hence promises and async functionality won't work.
+    package can now be compiled either with V8 version 6 (LTS) from nodejs
+    or with the legacy 3.14/3.15 version of V8. In the latter case, only 
+    ECMAScript v5 is supported, hence no promises or async.
 License: MIT + file LICENSE
 URL: https://github.com/jeroen/v8 (devel)
   https://developers.google.com/v8/intro (upstream)
 BugReports: https://github.com/jeroen/v8/issues
-SystemRequirements: V8 version 6.8 or 3.14. On Ubuntu/Debian: either libv8-dev
-    or libnode-dev should work. On Fedora v8-314-devel (rpm), v8-3.14 (arch, 
-    from AUR), v8@3.15 (homebrew)
+SystemRequirements: V8 version 6 or 7 is recommended, but 3.14 (legacy) is 
+    still supported. On Ubuntu/Debian: either libv8-dev or libnode-dev. On
+    Fedora v8-314-devel (rpm), v8-3.14 (arch, from AUR), v8@3.15 (homebrew)
 NeedsCompilation: yes
 VignetteBuilder: knitr
 Imports:

From 10060f926892409c468db73a12b129a86fca0d29 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 13:58:36 +0100
Subject: [PATCH 27/38] Update docs

---
 R/V8.R | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/V8.R b/R/V8.R
index 0c74155..eca8417 100644
--- a/R/V8.R
+++ b/R/V8.R
@@ -43,8 +43,8 @@
 #' @export v8 new_context
 #' @param global character vector indicating name(s) of the global environment. Use NULL for no name.
 #' @param console expose \code{console} API (\code{console.log}, \code{console.warn}, \code{console.error}).
-#' @param typed_arrays enable support for typed arrays (part of ECMA6). This adds a bunch of additional
-#' functions to the global namespace.
+#' @param typed_arrays used to enable support for typed arrays in legacy libv8. This is enabled by default
+#' in recent versions of libv8.
 #' @aliases V8 v8 new_context
 #' @rdname V8
 #' @name V8

From 2ca01598b48d6b51fed2eb802df537e910d2b8b5 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 14:18:57 +0100
Subject: [PATCH 28/38] Make namespace explicit

---
 src/RcppExports.cpp |  4 +--
 src/bindings.cpp    | 88 ++++++++++++++++++++++-----------------------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/RcppExports.cpp b/src/RcppExports.cpp
index 7a520df..5443e42 100644
--- a/src/RcppExports.cpp
+++ b/src/RcppExports.cpp
@@ -41,12 +41,12 @@ BEGIN_RCPP
 END_RCPP
 }
 // context_null
-bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx);
+bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context>> ctx);
 RcppExport SEXP _V8_context_null(SEXP ctxSEXP) {
 BEGIN_RCPP
     Rcpp::RObject rcpp_result_gen;
     Rcpp::RNGScope rcpp_rngScope_gen;
-    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context> > >::type ctx(ctxSEXP);
+    Rcpp::traits::input_parameter< Rcpp::XPtr< v8::Persistent<v8::Context>> >::type ctx(ctxSEXP);
     rcpp_result_gen = Rcpp::wrap(context_null(ctx));
     return rcpp_result_gen;
 END_RCPP
diff --git a/src/bindings.cpp b/src/bindings.cpp
index 90f0db7..0b6aea4 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -1,14 +1,14 @@
 #include <libplatform/libplatform.h>
 #include "V8_types.h"
-using namespace v8;
 
-/* Note: ToLocalChecked() aborts if x is empty */
+
+/* Note: Tov8::LocalChecked() aborts if x is empty */
 template <typename T>
-Local<T> safe_to_local(MaybeLocal<T> x){
-  return x.IsEmpty() ? Local<T>() : x.ToLocalChecked();
+v8::Local<T> safe_to_local(v8::MaybeLocal<T> x){
+  return x.IsEmpty() ? v8::Local<T>() : x.ToLocalChecked();
 }
 
-void ctx_finalizer( Persistent<Context>* context ){
+void ctx_finalizer( v8::Persistent<v8::Context>* context ){
   if(context)
     context->Reset();
   delete context;
@@ -21,29 +21,29 @@ static const char* ToCString(const v8::String::Utf8Value& value) {
   return *value ? *value : "<string conversion failed>";
 }
 
-static Local<String> ToJSString(const char * str){
-  MaybeLocal<String> out = String::NewFromUtf8(isolate, str, NewStringType::kNormal);
+static v8::Local<v8::String> ToJSString(const char * str){
+  v8::MaybeLocal<v8::String> out = v8::String::NewFromUtf8(isolate, str, v8::NewStringType::kNormal);
   return safe_to_local(out);
 }
 
 // [[Rcpp::init]]
 void start_v8_isolate(void *dll){
   //static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
-  V8::InitializePlatform(v8::platform::CreateDefaultPlatform());
-  V8::Initialize();
+  v8::V8::InitializePlatform(v8::platform::CreateDefaultPlatform());
+  v8::V8::Initialize();
   //V8::InitializeICU();
-  Isolate::CreateParams create_params;
+  v8::Isolate::CreateParams create_params;
   create_params.array_buffer_allocator =
-    ArrayBuffer::Allocator::NewDefaultAllocator();
-  isolate = Isolate::New(create_params);
+    v8::ArrayBuffer::Allocator::NewDefaultAllocator();
+  isolate = v8::Isolate::New(create_params);
   if(!isolate)
     throw std::runtime_error("Failed to initiate V8 isolate");
 }
 
 /* Helper fun that compiles JavaScript source code */
-static Local<Script> compile_source(std::string src, Local<Context> context){
-  Local<String> source = ToJSString(src.c_str());
-  MaybeLocal<Script> script = Script::Compile(context, source);
+static v8::Local<v8::Script> compile_source(std::string src, v8::Local<v8::Context> context){
+  v8::Local<v8::String> source = ToJSString(src.c_str());
+  v8::MaybeLocal<v8::Script> script = v8::Script::Compile(context, source);
   return safe_to_local(script);
 }
 
@@ -80,21 +80,21 @@ static void ConsoleError(const v8::FunctionCallbackInfo<v8::Value>& args) {
 void r_callback(std::string fun, const v8::FunctionCallbackInfo<v8::Value>& args) {
   try {
     Rcpp::Function r_call = Rcpp::Environment::namespace_env("V8")[fun];
-    String::Utf8Value arg0(args.GetIsolate(), args[0]);
+    v8::String::Utf8Value arg0(args.GetIsolate(), args[0]);
     Rcpp::String fun(*arg0);
     Rcpp::CharacterVector out;
     if(args[1]->IsUndefined()){
       out = r_call(fun);
     } else if(args[2]->IsUndefined()) {
-      Local<Object> obj1 = Local<Object>::Cast(args[1]);
-      String::Utf8Value arg1(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
+      v8::Local<v8::Object> obj1 = v8::Local<v8::Object>::Cast(args[1]);
+      v8::String::Utf8Value arg1(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
       Rcpp::String json(ToCString(arg1));
       out = r_call(fun, json);
     } else {
-      Local<Object> obj1 = Local<Object>::Cast(args[1]);
-      Local<Object> obj2 = Local<Object>::Cast(args[2]);
-      String::Utf8Value arg1(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
-      String::Utf8Value arg2(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj2).ToLocalChecked());
+      v8::Local<v8::Object> obj1 = v8::Local<v8::Object>::Cast(args[1]);
+      v8::Local<v8::Object> obj2 = v8::Local<v8::Object>::Cast(args[2]);
+      v8::String::Utf8Value arg1(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj1).ToLocalChecked());
+      v8::String::Utf8Value arg2(args.GetIsolate(), v8::JSON::Stringify(args.GetIsolate()->GetCurrentContext(), obj2).ToLocalChecked());
       Rcpp::String val(ToCString(arg1));
       Rcpp::String json(ToCString(arg2));
       out = r_call(fun, val, json);
@@ -134,7 +134,7 @@ std::string version(){
 Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context> > ctx){
   // Test if context still exists
   if(!ctx)
-    throw std::runtime_error("Context has been disposed.");
+    throw std::runtime_error("v8::Context has been disposed.");
 
   //converts input to UTF8 if needed
   src.set_encoding(CE_UTF8);
@@ -145,23 +145,23 @@ Rcpp::String context_eval(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Conte
   v8::Context::Scope context_scope(ctx.checked_get()->Get(isolate));
 
   // Compile source code
-  TryCatch trycatch(isolate);
-  Handle<Script> script = compile_source(src, ctx.checked_get()->Get(isolate));
+  v8::TryCatch trycatch(isolate);
+  v8::Handle<v8::Script> script = compile_source(src, ctx.checked_get()->Get(isolate));
   if(script.IsEmpty()) {
     v8::String::Utf8Value exception(isolate, trycatch.Exception());
     throw std::invalid_argument(ToCString(exception));
   }
 
   // Run the script to get the result.
-  MaybeLocal<Value> res = script->Run(ctx.checked_get()->Get(isolate));
-  Handle<Value> result = safe_to_local(res);
+  v8::MaybeLocal<v8::Value> res = script->Run(ctx.checked_get()->Get(isolate));
+  v8::Handle<v8::Value> result = safe_to_local(res);
   if(result.IsEmpty()){
     v8::String::Utf8Value exception(isolate, trycatch.Exception());
     throw std::runtime_error(ToCString(exception));
   }
 
   // Convert result to UTF8.
-  String::Utf8Value utf8(isolate, result);
+  v8::String::Utf8Value utf8(isolate, result);
   Rcpp::String out(*utf8);
   out.set_encoding(CE_UTF8);
   return out;
@@ -172,7 +172,7 @@ bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context>
 
   // Test if context still exists
   if(!ctx)
-    throw std::runtime_error("Context has been disposed.");
+    throw std::runtime_error("v8::Context has been disposed.");
 
   //converts input to UTF8 if needed
   src.set_encoding(CE_UTF8);
@@ -183,13 +183,13 @@ bool context_validate(Rcpp::String src, Rcpp::XPtr< v8::Persistent<v8::Context>
   v8::Context::Scope context_scope(ctx.checked_get()->Get(isolate));
 
   // Try to compile, catch errors
-  TryCatch trycatch(isolate);
-  Handle<Script> script = compile_source(src, ctx.checked_get()->Get(isolate));
+  v8::TryCatch trycatch(isolate);
+  v8::Handle<v8::Script> script = compile_source(src, ctx.checked_get()->Get(isolate));
   return !script.IsEmpty();
 }
 
 // [[Rcpp::export]]
-bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
+bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context>> ctx) {
   // Test if context still exists
   return(!ctx);
 }
@@ -198,29 +198,29 @@ bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context> > ctx) {
 ctxptr make_context(bool set_console){
   v8::Isolate::Scope isolate_scope(isolate);
   v8::HandleScope handle_scope(isolate);
-  Local<ObjectTemplate> global = ObjectTemplate::New(isolate);
+  v8::Local<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate);
 
   if(set_console){
-    Local<ObjectTemplate> console = ObjectTemplate::New(isolate);
+    v8::Local<v8::ObjectTemplate> console = v8::ObjectTemplate::New(isolate);
     global->Set(ToJSString("console"), console);
-    console->Set(ToJSString("log"), FunctionTemplate::New(isolate, ConsoleLog));
-    console->Set(ToJSString("warn"), FunctionTemplate::New(isolate, ConsoleWarn));
-    console->Set(ToJSString("error"), FunctionTemplate::New(isolate, ConsoleError));
+    console->Set(ToJSString("log"), v8::FunctionTemplate::New(isolate, ConsoleLog));
+    console->Set(ToJSString("warn"), v8::FunctionTemplate::New(isolate, ConsoleWarn));
+    console->Set(ToJSString("error"), v8::FunctionTemplate::New(isolate, ConsoleError));
 
     // emscripted assumes a print function
-    global->Set(ToJSString("print"), FunctionTemplate::New(isolate, ConsoleLog));
+    global->Set(ToJSString("print"), v8::FunctionTemplate::New(isolate, ConsoleLog));
 
     // R callback interface
-    Local<ObjectTemplate> console_r = ObjectTemplate::New(isolate);
+    v8::Local<v8::ObjectTemplate> console_r = v8::ObjectTemplate::New(isolate);
     console->Set(ToJSString("r"), console_r);
-    console_r->Set(ToJSString("call"), FunctionTemplate::New(isolate, console_r_call));
-    console_r->Set(ToJSString("get"), FunctionTemplate::New(isolate, console_r_get));
-    console_r->Set(ToJSString("eval"), FunctionTemplate::New(isolate, console_r_eval));
-    console_r->Set(ToJSString("assign"), FunctionTemplate::New(isolate, console_r_assign));
+    console_r->Set(ToJSString("call"), v8::FunctionTemplate::New(isolate, console_r_call));
+    console_r->Set(ToJSString("get"), v8::FunctionTemplate::New(isolate, console_r_get));
+    console_r->Set(ToJSString("eval"), v8::FunctionTemplate::New(isolate, console_r_eval));
+    console_r->Set(ToJSString("assign"), v8::FunctionTemplate::New(isolate, console_r_assign));
 
   }
   // initialize the context
-  Persistent<Context> *ptr = new Persistent<Context>(isolate, Context::New(isolate, NULL, global));
+  v8::Persistent<v8::Context> *ptr = new v8::Persistent<v8::Context>(isolate, v8::Context::New(isolate, NULL, global));
   return ctxptr(ptr);
 }
 

From ef042c029d43101cd9cfa0f31412a70c5d9dd602 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 16:38:36 +0100
Subject: [PATCH 29/38] Try to fix Fedora: unset window.console before setting

---
 src/bindings.cpp | 44 +++++++++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index 0b6aea4..5c0c93e 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -194,33 +194,43 @@ bool context_null(Rcpp::XPtr< v8::Persistent<v8::Context>> ctx) {
   return(!ctx);
 }
 
+v8::Local<v8::Object> console_template(){
+  v8::Local<v8::ObjectTemplate> console = v8::ObjectTemplate::New(isolate);
+  console->Set(ToJSString("log"), v8::FunctionTemplate::New(isolate, ConsoleLog));
+  console->Set(ToJSString("warn"), v8::FunctionTemplate::New(isolate, ConsoleWarn));
+  console->Set(ToJSString("error"), v8::FunctionTemplate::New(isolate, ConsoleError));
+
+  // R callback interface
+  v8::Local<v8::ObjectTemplate> console_r = v8::ObjectTemplate::New(isolate);
+  console->Set(ToJSString("r"), console_r);
+  console_r->Set(ToJSString("call"), v8::FunctionTemplate::New(isolate, console_r_call));
+  console_r->Set(ToJSString("get"), v8::FunctionTemplate::New(isolate, console_r_get));
+  console_r->Set(ToJSString("eval"), v8::FunctionTemplate::New(isolate, console_r_eval));
+  console_r->Set(ToJSString("assign"), v8::FunctionTemplate::New(isolate, console_r_assign));
+  return console->NewInstance();
+}
+
 // [[Rcpp::export]]
 ctxptr make_context(bool set_console){
   v8::Isolate::Scope isolate_scope(isolate);
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate);
 
+  // initialize the context
+  v8::Local<v8::Context> context = v8::Context::New(isolate, NULL, global);
+  v8::Context::Scope context_scope(context);
+  v8::Persistent<v8::Context> *ptr = new v8::Persistent<v8::Context>(isolate, context);
+
   if(set_console){
-    v8::Local<v8::ObjectTemplate> console = v8::ObjectTemplate::New(isolate);
-    global->Set(ToJSString("console"), console);
-    console->Set(ToJSString("log"), v8::FunctionTemplate::New(isolate, ConsoleLog));
-    console->Set(ToJSString("warn"), v8::FunctionTemplate::New(isolate, ConsoleWarn));
-    console->Set(ToJSString("error"), v8::FunctionTemplate::New(isolate, ConsoleError));
+    // need to unset if preset
+    if(context->Global()->Has(ToJSString("console"))){
+      context->Global()->Delete(ToJSString("console"));
+    }
+    context->Global()->Set(ToJSString("console"), console_template());
 
-    // emscripted assumes a print function
+    // emscripted also assumes a print function
     global->Set(ToJSString("print"), v8::FunctionTemplate::New(isolate, ConsoleLog));
-
-    // R callback interface
-    v8::Local<v8::ObjectTemplate> console_r = v8::ObjectTemplate::New(isolate);
-    console->Set(ToJSString("r"), console_r);
-    console_r->Set(ToJSString("call"), v8::FunctionTemplate::New(isolate, console_r_call));
-    console_r->Set(ToJSString("get"), v8::FunctionTemplate::New(isolate, console_r_get));
-    console_r->Set(ToJSString("eval"), v8::FunctionTemplate::New(isolate, console_r_eval));
-    console_r->Set(ToJSString("assign"), v8::FunctionTemplate::New(isolate, console_r_assign));
-
   }
-  // initialize the context
-  v8::Persistent<v8::Context> *ptr = new v8::Persistent<v8::Context>(isolate, v8::Context::New(isolate, NULL, global));
   return ctxptr(ptr);
 }
 

From 6317f638b39b572d313ae9030f39351ff4a521e3 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 16:43:49 +0100
Subject: [PATCH 30/38] Comments

---
 src/bindings.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index 5c0c93e..63bd28c 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -219,10 +219,10 @@ ctxptr make_context(bool set_console){
   // initialize the context
   v8::Local<v8::Context> context = v8::Context::New(isolate, NULL, global);
   v8::Context::Scope context_scope(context);
-  v8::Persistent<v8::Context> *ptr = new v8::Persistent<v8::Context>(isolate, context);
 
+  // need to unset windows.console otherwise it crashes in some V8 versions (e.g. Fedora)
+  // See: https://stackoverflow.com/questions/49620965/v8-cannot-set-objecttemplate-with-name-console
   if(set_console){
-    // need to unset if preset
     if(context->Global()->Has(ToJSString("console"))){
       context->Global()->Delete(ToJSString("console"));
     }
@@ -231,6 +231,7 @@ ctxptr make_context(bool set_console){
     // emscripted also assumes a print function
     global->Set(ToJSString("print"), v8::FunctionTemplate::New(isolate, ConsoleLog));
   }
+  v8::Persistent<v8::Context> *ptr = new v8::Persistent<v8::Context>(isolate, context);
   return ctxptr(ptr);
 }
 

From d0859ffb6f8b720c3aec0c807ff9a135f7cb10d9 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 16:45:29 +0100
Subject: [PATCH 31/38] Formatting

---
 src/bindings.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index 63bd28c..4c09258 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -220,7 +220,7 @@ ctxptr make_context(bool set_console){
   v8::Local<v8::Context> context = v8::Context::New(isolate, NULL, global);
   v8::Context::Scope context_scope(context);
 
-  // need to unset windows.console otherwise it crashes in some V8 versions (e.g. Fedora)
+  // need to unset global.console, or it will crash in some V8 versions (e.g. Fedora)
   // See: https://stackoverflow.com/questions/49620965/v8-cannot-set-objecttemplate-with-name-console
   if(set_console){
     if(context->Global()->Has(ToJSString("console"))){

From e405e53743c8f4760fc7903553b262a6b7ebd2f0 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Tue, 5 Feb 2019 18:15:19 +0100
Subject: [PATCH 32/38] Fix print function

---
 src/bindings.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index 4c09258..a6c3666 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -216,7 +216,8 @@ ctxptr make_context(bool set_console){
   v8::HandleScope handle_scope(isolate);
   v8::Local<v8::ObjectTemplate> global = v8::ObjectTemplate::New(isolate);
 
-  // initialize the context
+  // emscripted requires a print function
+  global->Set(ToJSString("print"), v8::FunctionTemplate::New(isolate, ConsoleLog));
   v8::Local<v8::Context> context = v8::Context::New(isolate, NULL, global);
   v8::Context::Scope context_scope(context);
 
@@ -228,8 +229,6 @@ ctxptr make_context(bool set_console){
     }
     context->Global()->Set(ToJSString("console"), console_template());
 
-    // emscripted also assumes a print function
-    global->Set(ToJSString("print"), v8::FunctionTemplate::New(isolate, ConsoleLog));
   }
   v8::Persistent<v8::Context> *ptr = new v8::Persistent<v8::Context>(isolate, context);
   return ctxptr(ptr);

From bd38ab8c888bfb7fc5fb6af16f214f9ebfc227e5 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 6 Feb 2019 05:39:18 +0100
Subject: [PATCH 33/38] Recommend recent v8 on Fedora

---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 68b9668..3aee29f 100755
--- a/configure
+++ b/configure
@@ -6,7 +6,7 @@
 # R CMD INSTALL --configure-vars='INCLUDE_DIR=/.../include LIB_DIR=/.../lib'
 
 PKG_DEB_NAME="libnode-dev / libv8-dev"
-PKG_RPM_NAME="v8-314-devel (formerly: v8-devel)"
+PKG_RPM_NAME="v8-devel"
 PKG_CSW_NAME="libv8_dev"
 PKG_BREW_NAME="v8@3.15"
 PKG_TEST_HEADER="<v8.h>"

From 663c77536aa3251c8322cdb0c936a731d22d1f59 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 6 Feb 2019 05:50:05 +0100
Subject: [PATCH 34/38] Update readme

---
 README.md | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 78f5d70..5b8c2d9 100644
--- a/README.md
+++ b/README.md
@@ -57,16 +57,20 @@ Binary packages for __OS-X__ or __Windows__ can be installed directly from CRAN:
 install.packages("V8")
 ```
 
-Installation from source on Linux requires [`libv8`](https://developers.google.com/v8/intro) 3.14 or 3.15 (no newer!). On __Debian__ or __Ubuntu__ use [libv8-3.14-dev](https://packages.debian.org/testing/libv8-3.14-dev):
+Installation from source on Linux requires [`libv8`](https://developers.google.com/v8/intro) 3.14 or 3.15 (no newer!). On __Debian__ or __Ubuntu__ use [libv8-dev](https://packages.ubuntu.com/bionic/libv8-dev) OR [linode-dev](https://packages.debian.org/testing/libnode-dev):
 
 ```
-sudo apt-get install -y libv8-3.14-dev
+# Most versions of Debian and Ubuntu
+sudo apt-get install -y libv8-dev
+
+# Alternatively for Debian Buster
+sudo apt-get install libnode-dev
 ```
 
-On __Fedora__ we need [v8-314-devel](https://apps.fedoraproject.org/packages/v8-314):
+On __Fedora__ we need [v8-devel](https://apps.fedoraproject.org/packages/v8):
 
 ```
-sudo yum install v8-314-devel
+sudo yum install v8-devel
 ````
 
 On __CentOS / RHEL__ we install [v8-devel](https://apps.fedoraproject.org/packages/v8-devel) via EPEL:
@@ -76,11 +80,11 @@ sudo yum install epel-release
 sudo yum install v8-devel
 ```
 
-On __OS-X__ use [v8@3.15](https://github.com/Homebrew/homebrew-core/blob/master/Formula/v8@3.15.rb) (**not** regular v8) from Homebrew:
+On __OS-X__ use [v8](https://github.com/Homebrew/homebrew-core/blob/master/Formula/v8) from Homebrew:
 
 ```
-brew install v8@3.15
+brew install v8
 ```
 
-On other systems you might need to install libv8 from source. A compatible version of V8 3.14 is available from https://github.com/v8-314/v8. Build instructions are in the `build` directory.
+On other systems you might need to install libv8 from source.
 

From bc681c0cb380387966e203377c843e08c981790c Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 6 Feb 2019 05:52:22 +0100
Subject: [PATCH 35/38] More readme

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 5b8c2d9..1dcb5c0 100644
--- a/README.md
+++ b/README.md
@@ -57,9 +57,9 @@ Binary packages for __OS-X__ or __Windows__ can be installed directly from CRAN:
 install.packages("V8")
 ```
 
-Installation from source on Linux requires [`libv8`](https://developers.google.com/v8/intro) 3.14 or 3.15 (no newer!). On __Debian__ or __Ubuntu__ use [libv8-dev](https://packages.ubuntu.com/bionic/libv8-dev) OR [linode-dev](https://packages.debian.org/testing/libnode-dev):
+Installation from source on Linux requires [`libv8`](https://developers.google.com/v8/intro). On __Debian__ or __Ubuntu__ use either [libv8-dev](https://packages.ubuntu.com/bionic/libv8-dev) or for recent Debian you need [linode-dev](https://packages.debian.org/testing/libnode-dev):
 
-```
+```sh
 # Most versions of Debian and Ubuntu
 sudo apt-get install -y libv8-dev
 
@@ -69,20 +69,20 @@ sudo apt-get install libnode-dev
 
 On __Fedora__ we need [v8-devel](https://apps.fedoraproject.org/packages/v8):
 
-```
+```sh
 sudo yum install v8-devel
 ````
 
 On __CentOS / RHEL__ we install [v8-devel](https://apps.fedoraproject.org/packages/v8-devel) via EPEL:
 
-```
+```sh
 sudo yum install epel-release
 sudo yum install v8-devel
 ```
 
 On __OS-X__ use [v8](https://github.com/Homebrew/homebrew-core/blob/master/Formula/v8) from Homebrew:
 
-```
+```sh
 brew install v8
 ```
 

From 6011919df0addd331db8f01f6b749d572a4a95e0 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 6 Feb 2019 06:26:00 +0100
Subject: [PATCH 36/38] Temp fix

---
 tools/winlibs.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/winlibs.R b/tools/winlibs.R
index b95831e..6b2574a 100644
--- a/tools/winlibs.R
+++ b/tools/winlibs.R
@@ -3,7 +3,7 @@ VERSION <- commandArgs(TRUE)
 LIBDIR <- paste0("../windows/libv8-", VERSION)
 if(!file.exists(paste0(LIBDIR, "/include/v8.h"))){
   if(getRversion() < "3.3.0") stop("This library requires R 3.3 or newer")
-  download.file(sprintf("https://github.com/rwinlib/libv8/archive/v%s.zip", VERSION), "v8.zip", quiet = TRUE)
+  download.file(sprintf("https://github.com/rwinlib/libv8/archive/v%s.zip", VERSION), "v8.zip", quiet = TRUE, method = 'libcurl')
   dir.create("../windows", showWarnings = FALSE)
   unzip("v8.zip", exdir = "../windows")
   setwd(LIBDIR)

From 2307d6fe5b5c4f45341d4ce65525e94e37e2ab41 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 6 Feb 2019 13:14:54 +0100
Subject: [PATCH 37/38] MacOS: upgrade v8 bottle

---
 .travis.yml |  8 +++-----
 NEWS        | 11 ++++++++++-
 configure   |  4 ++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6231c98..19e00eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: r
 cache: packages
 latex: false
+fortran: false
 
 matrix:
   include:
@@ -8,17 +9,14 @@ matrix:
     - dist: xenial
       r_check_args: '--use-valgrind'
     - os: osx
-      osx_image: xcode9.4
+      brew_packages: v8
+    - os: osx
       before_install:
         - brew install v8@3.15
         - brew link --force v8@3.15
-    - os: osx
-      osx_image: xcode8.3
-      disable_homebrew: true
     - os: osx
       osx_image: xcode7.3
       disable_homebrew: true
-      latex: false
 
 addons:
   apt:
diff --git a/NEWS b/NEWS
index 1864a61..0e8dcd4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,13 @@
-1.6
+2.0
+ - Major upgrade: now support libv8 version 6.x and up. Note that this means
+   we move to ES2015+ adding support for promises, async, etc. This may change
+   the behavior of certain JavaScript libraries.
+ - For now we also still stupport building with legacy V8 (3.14)
+ - Debian Buster: support building with libnode-dev
+ - Fedora: support building with v8-devel (V8 6.7.17)
+ - MacOS: update binary package to V8 7.2.502.24
+
+1.6 (unreleased)
  - Let Rcpp generated R_init_V8()
  - Add unit test for the exception problem on OSX 10.11
 
diff --git a/configure b/configure
index 3aee29f..8ff1218 100755
--- a/configure
+++ b/configure
@@ -8,10 +8,10 @@
 PKG_DEB_NAME="libnode-dev / libv8-dev"
 PKG_RPM_NAME="v8-devel"
 PKG_CSW_NAME="libv8_dev"
-PKG_BREW_NAME="v8@3.15"
+PKG_BREW_NAME="v8"
 PKG_TEST_HEADER="<v8.h>"
 PKG_LIBS="-lv8 -lv8_libplatform"
-PKG_LIBS_STATIC="-lv8_{base,snapshot} -lpreparser_lib"
+PKG_LIBS_STATIC="-lv8_{base,libplatform,nosnapshot,libbase,libsampler,initializers,init} -ltorque_{base,generated_initializers}"
 PKG_CFLAGS="-I/usr/include/v8-3.14"
 
 # Find compiler

From 61f56e1611776ad17094afbc4616edd14895bfba Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Wed, 6 Feb 2019 13:58:21 +0100
Subject: [PATCH 38/38] Fix for Homebrew V8: initiate bundled ICU data

---
 src/bindings.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/bindings.cpp b/src/bindings.cpp
index a6c3666..2a004e2 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -1,6 +1,11 @@
 #include <libplatform/libplatform.h>
 #include "V8_types.h"
 
+/* used for setting icu data below */
+#ifdef __APPLE__
+#define V8_ICU_DATA_PATH "/usr/local/opt/v8/libexec/icudtl.dat"
+#include <unistd.h>
+#endif
 
 /* Note: Tov8::LocalChecked() aborts if x is empty */
 template <typename T>
@@ -28,10 +33,14 @@ static v8::Local<v8::String> ToJSString(const char * str){
 
 // [[Rcpp::init]]
 void start_v8_isolate(void *dll){
-  //static std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
+#ifdef V8_ICU_DATA_PATH
+  // Needed if V8 is built with bundled ICU. Check CRAN package 'dagitty' to test.
+  if( access( V8_ICU_DATA_PATH, F_OK ) != -1 ) {
+    v8::V8::InitializeICUDefaultLocation(V8_ICU_DATA_PATH);
+  }
+#endif
   v8::V8::InitializePlatform(v8::platform::CreateDefaultPlatform());
   v8::V8::Initialize();
-  //V8::InitializeICU();
   v8::Isolate::CreateParams create_params;
   create_params.array_buffer_allocator =
     v8::ArrayBuffer::Allocator::NewDefaultAllocator();