Merge pull request #204 from lumen/lumen_web

lumen_web

Author: KronicDeth

.circleci/Dockerfile

@@ -1,4 +1,4 @@
-FROM circleci/rust
+FROM circleci/rust:latest-browsers
 
 RUN rustup default nightly
 

.circleci/config.yml

@@ -43,6 +43,7 @@ jobs:
             - liblumen_syntax
             - lumen
             - lumen_runtime
+            - lumen_web
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
@@ -92,6 +93,7 @@ jobs:
             - liblumen_syntax
             - lumen
             - lumen_runtime
+            - lumen_web
             - target/debug/.fingerprint
             - target/debug/build
             - target/debug/deps
@@ -113,6 +115,32 @@ jobs:
           command: |
             rustfmt --version
             cargo fmt -- --check
+  chrome_examples_spawn_chain_test:
+    docker:
+      # `kronicdeth` is temporary until we get a DockerHub organization
+      - image: kronicdeth/lumen-development
+    environment:
+      CARGO_HOME: cargo
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Run all tests
+          working_directory: "examples/spawn-chain"
+          command: wasm-pack test --chrome --headless
+  firefox_examples_spawn_chain_test:
+    docker:
+      # `kronicdeth` is temporary until we get a DockerHub organization
+      - image: kronicdeth/lumen-development
+    environment:
+      CARGO_HOME: cargo
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Run all tests
+          working_directory: "examples/spawn-chain"
+          command: wasm-pack test --firefox --headless
   x86_64_examples_spawn_chain_test:
     docker:
       # `kronicdeth` is temporary until we get a DockerHub organization
@@ -242,6 +270,10 @@ jobs:
       - run:
           name: Run all tests
           working_directory: "liblumen_eir_interpreter"
+          command: cargo test --locked
+      - run:
+          name: Fibonacci
+          working_directory: "liblumen_eir_interpreter"
           command: cargo run -- --ident fib:run/0 fib.erl
   x86_64_liblumen_syntax_test:
     docker:
@@ -283,6 +315,7 @@ jobs:
           name: Run all tests
           working_directory: "lumen_runtime"
           command: cargo test --locked
+
 workflows:
   version: 2
   primary:
@@ -331,4 +364,11 @@ workflows:
       - x86_64_lumen_runtime_test:
           requires:
             - x86_64_build
+      - chrome_examples_spawn_chain_test:
+          requires:
+            - wasm32_build
+      - firefox_examples_spawn_chain_test:
+          requires:
+            - wasm32_build
+
 

Cargo.lock

@@ -15,6 +15,7 @@ members = [
   "liblumen_diagnostics",
   "liblumen_syntax",
   "liblumen_eir_interpreter",
+  "lumen_web",
 ]
 
 [profile.release]

Cargo.toml

@@ -20,6 +20,7 @@ console_error_panic_hook = { version = "0.1.1", optional = true }
 
 liblumen_alloc = { path = "../../liblumen_alloc" }
 lumen_runtime = { path = "../../lumen_runtime" }
+lumen_web = { path = "../../lumen_web" }
 num-bigint = "0.2.2"
 wasm-bindgen = "0.2"
 

examples/spawn-chain/Cargo.toml

@@ -2,15 +2,14 @@ use std::convert::TryInto;
 use std::sync::Arc;
 
 use liblumen_alloc::erts::exception::runtime;
-use liblumen_alloc::erts::process::code::stack::frame::Frame;
+use liblumen_alloc::erts::process::code::stack::frame::Placement;
 use liblumen_alloc::erts::process::code::Result;
 use liblumen_alloc::erts::process::ProcessControlBlock;
 use liblumen_alloc::erts::term::{Atom, Term, TypedTerm};
-use liblumen_alloc::erts::ModuleFunctionArity;
 
 use crate::elixir;
 
-pub fn apply(arc_process: &Arc<ProcessControlBlock>) -> Result {
+pub fn code(arc_process: &Arc<ProcessControlBlock>) -> Result {
     let module_term = arc_process.stack_pop().unwrap();
     let function_term = arc_process.stack_pop().unwrap();
 
@@ -43,40 +42,57 @@ pub fn apply(arc_process: &Arc<ProcessControlBlock>) -> Result {
 
     match module.name() {
         "Elixir.Chain" => match function.name() {
-            "counter" => match arity {
+            "console" => match arity {
                 1 => {
-                    let module_function_arity = Arc::new(ModuleFunctionArity {
-                        module,
-                        function,
-                        arity,
-                    });
+                    elixir::chain::console_1::place_frame_with_arguments(
+                        arc_process,
+                        Placement::Replace,
+                        argument_vec[0],
+                    )?;
 
-                    // Elixir.Chain.counter is a user function and not a BIF, so it is a `Code` and
-                    // run in a frame instead of directly
-                    let chain_counter_frame =
-                        Frame::new(module_function_arity, elixir::chain::counter_0_code);
-                    arc_process.stack_push(argument_vec[0])?;
-                    arc_process.replace_frame(chain_counter_frame);
+                    // don't count finding the function as a reduction if it is found, only on
+                    // exception in `undef`, so that each path is at least one reduction.
+                    ProcessControlBlock::call_code(arc_process)
+                }
+                _ => undef(arc_process, module_term, function_term, argument_list),
+            },
+            "counter" => match arity {
+                2 => {
+                    elixir::chain::counter_2::place_frame_with_arguments(
+                        arc_process,
+                        Placement::Replace,
+                        argument_vec[0],
+                        argument_vec[1],
+                    )?;
+
+                    // don't count finding the function as a reduction if it is found, only on
+                    // exception in `undef`, so that each path is at least one reduction.
+                    ProcessControlBlock::call_code(arc_process)
+                }
+                _ => undef(arc_process, module_term, function_term, argument_list),
+            },
+            "create_processes" => match arity {
+                2 => {
+                    elixir::chain::create_processes_2::place_frame_with_arguments(
+                        arc_process,
+                        Placement::Replace,
+                        argument_vec[0],
+                        argument_vec[1],
+                    )?;
 
                     // don't count finding the function as a reduction if it is found, only on
                     // exception in `undef`, so that each path is at least one reduction.
                     ProcessControlBlock::call_code(arc_process)
                 }
                 _ => undef(arc_process, module_term, function_term, argument_list),
             },
-            "run" => match arity {
+            "dom" => match arity {
                 1 => {
-                    let module_function_arity = Arc::new(ModuleFunctionArity {
-                        module,
-                        function,
-                        arity,
-                    });
-                    // Elixir.Chain.run is a user function and not a BIF, so it is a `Code` and
-                    // run in a frame instead of directly
-                    let chain_run_frame =
-                        Frame::new(module_function_arity, elixir::chain::run_0_code);
-                    arc_process.stack_push(argument_vec[0])?;
-                    arc_process.replace_frame(chain_run_frame);
+                    elixir::chain::dom_1::place_frame_with_arguments(
+                        arc_process,
+                        Placement::Replace,
+                        argument_vec[0],
+                    )?;
 
                     // don't count finding the function as a reduction if it is found, only on
                     // exception in `undef`, so that each path is at least one reduction.