Working on having the compiler in wasm, it compiles and loads #47

mangolang · May 12, 2018 · 4098b1b · 4098b1b
1 parent bfc94fd
commit 4098b1b
Show file tree

Hide file tree

Showing 12 changed files with 99 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,3 +17,18 @@ string-interner = "0.6.*"
 lazy_static = "1.0.*"
 derive-new = "0.5.*"
 cargo-wasm = "0.4.*"
+
+[profile.release]
+lto = true
+
+[lib]
+name = "mango"
+path = "src/lib.rs"
+
+[[bin]]
+name = "mango"
+path = "src/mango/ui/cli/main.rs"
+
+#[[bin]]
+#name = "mango-webi"
+#path = "src/mango/ui/webi/compile_str.rs"
diff --git a/Web.toml b/Web.toml
@@ -0,0 +1,13 @@
+default-target = "wasm32-unknown-emscripten"
+#prepend-js = ["src/runtime.js", "src/mango/ui/webi/static/prepend-general.js"]
+
+[cargo-web]
+minimum-version = "0.6.0"
+
+[target.wasm32-unknown-emscripten]
+prepend-js = ["src/mango/ui/webi/static/prepend-general.js", "src/mango/ui/webi/static/prepend-emscripten.js"]
+link-args = ["-s", "USE_SDL=2", "-s", "EXPORTED_FUNCTIONS=['_compile_string']"]
+
+## You can also specify the target by its full name.
+#[target.wasm32-unknown-unknown]
+#prepend-js = "src/native_runtime.js"
diff --git a/src/lib.rs b/src/lib.rs
@@ -8,8 +8,8 @@ extern crate derive_new;
 
 pub mod mango {
     // Utilities
-    pub mod cli;
     pub mod jit;
+    pub mod ui;
     pub mod util;
 
     // Types

diff --git a/src/mango/token/collect/stream.rs b/src/mango/token/collect/stream.rs
@@ -20,11 +20,12 @@ pub struct MemoryTokenStream {
 }
 
 impl MemoryTokenStream {
-    #[allow(dead_code)]
+    #[allow(dead_code)] // TODO: for now
     pub fn new(tokens: Vec<Tokens>) -> MemoryTokenStream {
         MemoryTokenStream { index: 0, tokens }
     }
 
+    #[allow(dead_code)] // TODO: for now
     pub fn to_text(&self) -> String {
         format!(
             " {}",

diff --git a/src/mango/ui/cli/main.rs b/src/mango/ui/cli/main.rs
@@ -0,0 +1,3 @@
+pub fn main() {
+    println!("welcome to Mango CLI!");
+}
diff --git a/src/mango/cli/mod.rs → src/mango/ui/cli/mod.rs b/src/mango/cli/mod.rs → src/mango/ui/cli/mod.rs
diff --git a/src/mango/ui/mod.rs b/src/mango/ui/mod.rs
@@ -0,0 +1,5 @@
+pub mod cli;
+pub use self::cli::*;
+
+pub mod webi;
+pub use self::webi::*;
diff --git a/src/mango/ui/webi/compile_str.rs b/src/mango/ui/webi/compile_str.rs
@@ -0,0 +1,21 @@
+use std::ffi::CStr;
+use std::ffi::CString;
+use std::os::raw::c_char;
+
+// Convert a c-string, e.g. from javascript, into a Rust String.
+fn str_to_rust(external_str: *const c_char) -> String {
+    unsafe { CStr::from_ptr(external_str).to_string_lossy().into_owned() }
+}
+
+// Convert a Rust string into a c-string.
+fn str_from_rust(internal_str: String) -> *mut c_char {
+    CString::new(internal_str.as_str()).unwrap().into_raw()
+}
+
+#[no_mangle]
+pub fn compile_string(codechrs: *const c_char) -> *mut c_char {
+    let code = str_to_rust(codechrs);
+    // TODO
+    println!("compiling {}", code);
+    str_from_rust(code)
+}
diff --git a/src/mango/ui/webi/mod.rs b/src/mango/ui/webi/mod.rs
@@ -0,0 +1,2 @@
+pub mod compile_str;
+pub use self::compile_str::compile_string;
diff --git a/src/mango/ui/webi/static/prepend-emscripten.js b/src/mango/ui/webi/static/prepend-emscripten.js
@@ -0,0 +1,3 @@
+/**
+ * Mango: Javascript prefix for emscripten target.
+ */
diff --git a/src/mango/ui/webi/static/prepend-general.js b/src/mango/ui/webi/static/prepend-general.js
@@ -0,0 +1,3 @@
+/**
+ * Mango: General javascript prefix.
+ */
diff --git a/static/index.html b/static/index.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=1" name="viewport" />
+    <script>
+        var Module = {};
+        var __cargo_web = {};
+        Object.defineProperty( Module, 'canvas', {
+            get: function() {
+                if( __cargo_web.canvas ) {
+                    return __cargo_web.canvas;
+                }
+
+                var canvas = document.createElement( 'canvas' );
+                document.querySelector( 'body' ).appendChild( canvas );
+                __cargo_web.canvas = canvas;
+
+                return canvas;
+            }
+        });
+    </script>
+</head>
+<body>
+    <script src="mango.js"></script>
+	<script>
+
+	</script>
+</body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		pub mod compile_str;
		pub use self::compile_str::compile_string;