Skip to content

Commit

Permalink
Update nectarcpp as submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
adrien-thierry committed Dec 1, 2020
1 parent 0bb9501 commit 2e4acb5
Show file tree
Hide file tree
Showing 71 changed files with 119 additions and 8,975 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "compiler/native/nectarcpp"]
path = compiler/native/nectarcpp
url = https://github.com/nectar-lang/NectarCPP
2 changes: 1 addition & 1 deletion compiler/native/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ function Compiler()
{
if((!CLI.cli["--profile"]) || CLI.cli["--profile"].argument != "use")
{
copyDirSync(path.join(__dirname, "src"), _folder, true);
copyDirSync(path.join(__dirname, "nectarcpp", "src"), _folder, true);
}
};

Expand Down
2 changes: 2 additions & 0 deletions compiler/native/env/arduino.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ var ARDUINO =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
2 changes: 2 additions & 0 deletions compiler/native/env/esp32.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ var ESP32 =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
2 changes: 2 additions & 0 deletions compiler/native/env/ios.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ var IOS =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
2 changes: 2 additions & 0 deletions compiler/native/env/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ var NODE =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
4 changes: 3 additions & 1 deletion compiler/native/env/std.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var STD =
name: "std",
main: "std.cpp",
compiler: "g++",
stdlib: ["console", {bind:"performance", module:"Performance"}, "RegExp", "Number", "Object", "Math", "JSON", "Array", "Date"],
stdlib: ["console", {bind:"performance", module:"Performance"}, "Error", "RegExp", "Number", "Object", "Math", "JSON", "Array", "Date"],
check:
{
"env":
Expand Down Expand Up @@ -64,6 +64,8 @@ var STD =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
2 changes: 2 additions & 0 deletions compiler/native/env/stm32.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ var STM32 =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
2 changes: 2 additions & 0 deletions compiler/native/env/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ var TEST =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
2 changes: 2 additions & 0 deletions compiler/native/env/wasm.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ var WASM =
"__Nectar_THIS": false,
"__Nectar_instanceof": false,
"__Nectar_delete": false,
"__Nectar_EQUAL_VALUE_AND_TYPE": false,
"__Nectar_NOT_EQUAL_VALUE_AND_TYPE": false,
"JSON": false,
"Object": false,
"isNaN": false,
Expand Down
1 change: 1 addition & 0 deletions compiler/native/nectarcpp
Submodule nectarcpp added at a6ed46
2 changes: 2 additions & 0 deletions compiler/native/squel/std.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@

{DECL}

var window; // browser check

int main(int argc, char* argv[])
{
var __NJS_ARGS = __NJS_Create_Array();
Expand Down
Loading

0 comments on commit 2e4acb5

Please sign in to comment.