From 110ddab670cbf477488cceeea2842c980942d7b8 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 10 Jun 2018 00:32:04 +0200 Subject: Add deno2 prototype from external repo. --- deno2/main.cc | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 deno2/main.cc (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc new file mode 100644 index 000000000..b5c703b55 --- /dev/null +++ b/deno2/main.cc @@ -0,0 +1,33 @@ +// Copyright 2018 Ryan Dahl +// All rights reserved. MIT License. +#include +#include + +#include "v8/include/v8.h" + +#include "./deno.h" +#include "natives_deno.cc" +#include "snapshot_deno.cc" + +int main(int argc, char** argv) { + v8_init(); + + auto natives_blob = *StartupBlob_natives(); + printf("natives_blob %d bytes\n", natives_blob.raw_size); + + auto snapshot_blob = *StartupBlob_snapshot(); + printf("snapshot_blob %d bytes\n", snapshot_blob.raw_size); + + v8::V8::SetNativesDataBlob(&natives_blob); + v8::V8::SetSnapshotDataBlob(&snapshot_blob); + + Deno* d = deno_from_snapshot(&snapshot_blob, NULL, NULL); + int r = deno_load(d, "main2.js", "foo();"); + if (r != 0) { + printf("Error! %s\n", deno_last_exception(d)); + exit(1); + } + + const char* v = v8::V8::GetVersion(); + printf("Hello World. V8 version %s\n", v); +} -- cgit v1.2.3 From 092ec213818c1c3f94e4750f80bf1186703944d9 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 10 Jun 2018 02:24:34 +0200 Subject: Wrap deno library in a namespace. --- deno2/main.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc index b5c703b55..5d8263d28 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -10,7 +10,7 @@ #include "snapshot_deno.cc" int main(int argc, char** argv) { - v8_init(); + deno::v8_init(); auto natives_blob = *StartupBlob_natives(); printf("natives_blob %d bytes\n", natives_blob.raw_size); @@ -21,10 +21,10 @@ int main(int argc, char** argv) { v8::V8::SetNativesDataBlob(&natives_blob); v8::V8::SetSnapshotDataBlob(&snapshot_blob); - Deno* d = deno_from_snapshot(&snapshot_blob, NULL, NULL); - int r = deno_load(d, "main2.js", "foo();"); + deno::Deno* d = deno::deno_from_snapshot(&snapshot_blob, NULL, NULL); + int r = deno::deno_load(d, "main2.js", "foo();"); if (r != 0) { - printf("Error! %s\n", deno_last_exception(d)); + printf("Error! %s\n", deno::deno_last_exception(d)); exit(1); } -- cgit v1.2.3 From 3062039ffe5563cab1f80b2d7da2d9c7e468c462 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 10 Jun 2018 04:55:31 +0200 Subject: First pass at libdeno. --- deno2/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc index 5d8263d28..5139e01be 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -5,7 +5,7 @@ #include "v8/include/v8.h" -#include "./deno.h" +#include "include/deno.h" #include "natives_deno.cc" #include "snapshot_deno.cc" -- cgit v1.2.3 From ff48eca5403140b134a3e6a772ffb6f8905fae3e Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 10 Jun 2018 05:34:03 +0200 Subject: Expose deno::from_snapshot() constructor --- deno2/main.cc | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc index 5139e01be..29aacc4e6 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -3,31 +3,15 @@ #include #include -#include "v8/include/v8.h" - #include "include/deno.h" -#include "natives_deno.cc" -#include "snapshot_deno.cc" int main(int argc, char** argv) { deno::v8_init(); - auto natives_blob = *StartupBlob_natives(); - printf("natives_blob %d bytes\n", natives_blob.raw_size); - - auto snapshot_blob = *StartupBlob_snapshot(); - printf("snapshot_blob %d bytes\n", snapshot_blob.raw_size); - - v8::V8::SetNativesDataBlob(&natives_blob); - v8::V8::SetSnapshotDataBlob(&snapshot_blob); - - deno::Deno* d = deno::deno_from_snapshot(&snapshot_blob, NULL, NULL); + deno::Deno* d = deno::from_snapshot(NULL, NULL); int r = deno::deno_load(d, "main2.js", "foo();"); if (r != 0) { printf("Error! %s\n", deno::deno_last_exception(d)); exit(1); } - - const char* v = v8::V8::GetVersion(); - printf("Hello World. V8 version %s\n", v); } -- cgit v1.2.3 From 9296b21b87eec3f01bee465fcb2b64c4ea14514b Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 10 Jun 2018 14:18:15 +0200 Subject: Use C linkage in deno.h --- deno2/main.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc index 29aacc4e6..d16dd44ba 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -6,12 +6,12 @@ #include "include/deno.h" int main(int argc, char** argv) { - deno::v8_init(); + deno_init(); - deno::Deno* d = deno::from_snapshot(NULL, NULL); - int r = deno::deno_load(d, "main2.js", "foo();"); + Deno* d = deno_new(NULL, NULL); + int r = deno_load(d, "main2.js", "foo();"); if (r != 0) { - printf("Error! %s\n", deno::deno_last_exception(d)); + printf("Error! %s\n", deno_last_exception(d)); exit(1); } } -- cgit v1.2.3 From 7d972b453434b4d2e5d3bcb4733f7f2c5e1a9354 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Mon, 11 Jun 2018 22:29:34 +0200 Subject: Fix deno executable --- deno2/main.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc index d16dd44ba..4ea843bbb 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -9,9 +9,10 @@ int main(int argc, char** argv) { deno_init(); Deno* d = deno_new(NULL, NULL); - int r = deno_load(d, "main2.js", "foo();"); - if (r != 0) { + bool r = deno_execute(d, "deno_main.js", "denoMain();"); + if (!r) { printf("Error! %s\n", deno_last_exception(d)); exit(1); } + deno_dispose(d); } -- cgit v1.2.3 From 64d41a72f1c5a5974bb3e9aafbf3176759e00ee1 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Mon, 11 Jun 2018 22:36:14 +0200 Subject: deno_dispose -> deno_delete --- deno2/main.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc index 4ea843bbb..820f15a09 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -14,5 +14,5 @@ int main(int argc, char** argv) { printf("Error! %s\n", deno_last_exception(d)); exit(1); } - deno_dispose(d); + deno_delete(d); } -- cgit v1.2.3 From 36f657c0d2961a8a798b0f209ff40aabd169b766 Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Tue, 12 Jun 2018 17:38:47 +0200 Subject: deno2/main: add missing #include --- deno2/main.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'deno2/main.cc') diff --git a/deno2/main.cc b/deno2/main.cc index 820f15a09..2c0b1b298 100644 --- a/deno2/main.cc +++ b/deno2/main.cc @@ -2,6 +2,7 @@ // All rights reserved. MIT License. #include #include +#include #include "include/deno.h" -- cgit v1.2.3