Rename dir 'src' to 'python'. Rust: Use conditional compilation attributes to automatically generate InEvent+OutEvent WASM bindings when compiling for wasm32.

README.md

@@ -60,8 +60,8 @@ python -m sccd.test.cmd.to_rust path/to/model.xml [--output DIRNAME]
 
 The following environment variables can be set to change the behavior of the runtime. These options can be set while running the tests, or while running one of the examples.
 
-* `SCCDDEBUG`: When set, additional debug information is printed, such as a trace of the individual transitions taken.
-* `SCCDTIMINGS`: When set, at exit, the runtime will print information about how much time in total was spent during various parts of its execution, such as loading the model, generating transition candidates, executing transitions, executing actions, and more.
+* `SCCDDEBUG`: When set to 1, additional debug information is printed, such as a trace of the individual transitions taken.
+* `SCCDTIMINGS`: When set to 1, at exit, the runtime will print information about how much time in total was spent during various parts of its execution, such as loading the model, generating transition candidates, executing transitions, executing actions, and more.
 
 ## Included tools
 

examples/digitalwatch/webassembly/codegen/Cargo.toml

@@ -4,8 +4,11 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-sccd = { path = "/home/maestro/thesis/repos/SCCD/src/sccd/../../rust" }
-wasm-bindgen = "*"
+sccd = { path = "/home/maestro/thesis/repos/SCCD/python/sccd/../../rust" }
+
+# Only depend on wasm-bindgen when building for wasm32 architecture
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+wasm-bindgen = "0.2"
 
 [lib]
 name = "digitalwatch"

examples/digitalwatch/webassembly/codegen/digitalwatch.rs

@@ -9,6 +9,7 @@
 #![allow(unused_mut)]
 #![allow(unused_imports)]
 
+#[cfg(target_arch = "wasm32")]
 use wasm_bindgen::prelude::*;
 
 use std::ops::Deref;
@@ -23,6 +24,7 @@ use sccd::statechart::EventLifeline;
 type Timers<TimerId> = [TimerId; 11];
 
 // Input Events
+#[cfg(target_arch = "wasm32")]
 #[wasm_bindgen]
 #[derive(Copy, Clone, Debug)]
 pub enum InEvent {
@@ -75,6 +77,7 @@ struct Internal {
 type InternalLifeline = statechart::NextRoundLifeline<Internal>;
 
 // Output Events
+#[cfg(target_arch = "wasm32")]
 #[wasm_bindgen]
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum OutEvent {

examples/digitalwatch/webassembly/wasm/Cargo.lock

@@ -18,16 +18,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8d976903543e0c48546a91908f21588a680a8c8f984df9a5d69feccb2b2a211"
-dependencies = [
- "cfg-if 0.1.10",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "digitalwatch"
 version = "0.1.0"
@@ -94,7 +84,6 @@ checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
 name = "wasm"
 version = "0.1.0"
 dependencies = [
- "console_error_panic_hook",
  "digitalwatch",
  "sccd",
  "wasm-bindgen",

examples/digitalwatch/webassembly/wasm/Cargo.toml

@@ -6,13 +6,13 @@ edition = "2018"
 [dependencies]
 digitalwatch = { path = "../codegen" }
 sccd = { path = "/home/maestro/thesis/repos/SCCD/src/sccd/../../rust" }
-wasm-bindgen = "^0.2"
+wasm-bindgen = "0.2"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
 # code size when deploying.
-console_error_panic_hook = { version = "0.1.6", optional = true }
+# console_error_panic_hook = { version = "0.1.6", optional = true }
 
 # `wee_alloc` is a tiny allocator for wasm that is only ~1K in code size
 # compared to the default allocator's ~10K. It is slower than the default
@@ -26,8 +26,5 @@ name = "dwatch"
 path = "lib.rs"
 crate-type = ["cdylib", "rlib"]
 
-[features]
-default = ["console_error_panic_hook"]
-
-[profile.release]
-opt-level = 3
+# [features]
+# default = ["console_error_panic_hook"]

src/sccd/statechart/codegen/rust.py

@@ -7,7 +7,6 @@ from sccd.statechart.static.statechart import *
 from sccd.statechart.static.globals import *
 from sccd.statechart.static import priority
 from sccd.util.indenting_writer import *
-from sccd.util.wasm import *
 
 # Hardcoded limit on number of sub-rounds of combo and big step to detect never-ending superrounds.
 # TODO: make this a model parameter, also allowing for +infinity
@@ -354,23 +353,11 @@ class StatechartRustGenerator(ActionLangRustGenerator):
             sc.semantics.internal_event_lifeline == InternalEventLifeline.REMAINDER or
             sc.semantics.internal_event_lifeline == InternalEventLifeline.SAME)
 
-        # Until we implement event parameters, event types are just empty structs
-
         self.w.writeln("// Input Events")
-        # for event_name in input_event_names:
-        #     if WASM:
-        #         self.w.writeln("#[wasm_bindgen]")
-        #     self.w.writeln("#[derive(Copy, Clone, Debug)]")
-        #     self.w.writeln("pub struct %s {" % ident_event_type(event_name))
-        #     self.w.writeln("  // TODO: input event parameters")
-        #     self.w.writeln("}")
-
-        if WASM:
-            self.w.writeln("#[wasm_bindgen]")
+        self.w.writeln("#[cfg_attr(target_arch = \"wasm32\", wasm_bindgen)]")
         self.w.writeln("#[derive(Copy, Clone, Debug)]")
         self.w.writeln("pub enum InEvent {")
         for event_name in input_event_names:
-            # self.w.writeln("  %s(%s)," % (ident_event_enum_variant(event_name), ident_event_type(event_name)))
             self.w.writeln("  %s," % (ident_event_enum_variant(event_name)))
         self.w.writeln("}")
         self.w.writeln()
@@ -401,20 +388,10 @@ class StatechartRustGenerator(ActionLangRustGenerator):
         # Output events
         output_event_names = self.globals.out_events.names
         self.w.writeln("// Output Events")
-        # for event_name in output_event_names:
-        #     if WASM:
-        #         self.w.writeln("#[wasm_bindgen]")
-        #     self.w.writeln("#[derive(Copy, Clone, Debug, PartialEq, Eq)]")
-        #     self.w.writeln("pub struct %s {" % ident_event_type(event_name))
-        #     self.w.writeln("  // TODO: output event parameters")
-        #     self.w.writeln("}")
-
-        if WASM:
-            self.w.writeln("#[wasm_bindgen]")
+        self.w.writeln("#[cfg_attr(target_arch = \"wasm32\", wasm_bindgen)]")
         self.w.writeln("#[derive(Copy, Clone, Debug, PartialEq, Eq)]")
         self.w.writeln("pub enum OutEvent {")
         for event_name in output_event_names:
-            # self.w.writeln("  %s(%s)," % (ident_event_enum_variant(event_name), ident_event_type(event_name)))
             self.w.writeln("  %s," % (ident_event_enum_variant(event_name)))
         self.w.writeln("}")
         self.w.writeln()

src/sccd/test/codegen/write_crate.py

@@ -2,7 +2,6 @@ from sccd.cd.parser.xml import *
 from sccd.test.parser.xml import *
 from sccd.util.indenting_writer import *
 from functools import partial
-from sccd.util.wasm import *
 
 import sccd
 RUST_DIR = os.path.dirname(sccd.__file__) + "/../../rust"
@@ -42,9 +41,9 @@ def write_crate(src, target):
         w.writeln("#![allow(unused_imports)]")
         w.writeln()
 
-        if WASM:
-            w.writeln("use wasm_bindgen::prelude::*;")
-            w.writeln()
+        w.writeln("#[cfg(target_arch = \"wasm32\")]")
+        w.writeln("use wasm_bindgen::prelude::*;")
+        w.writeln()
 
         if isinstance(parsed, Statechart):
             from sccd.statechart.codegen.rust import StatechartRustGenerator
@@ -69,8 +68,10 @@ def write_crate(src, target):
         w.writeln()
         w.writeln("[dependencies]")
         w.writeln("sccd = { path = \"%s\" }" % RUST_DIR)
-        if WASM:
-            w.writeln("wasm-bindgen = \"*\"")
+        w.writeln()
+        w.writeln("# Only depend on wasm-bindgen when building for wasm32 architecture")
+        w.writeln("[target.'cfg(target_arch = \"wasm32\")'.dependencies]")
+        w.writeln("wasm-bindgen = \"0.2\"")
         w.writeln()
         if isinstance(parsed, Test):
             # Tests are compiled to binaries

src/sccd/util/wasm.py

@@ -1,6 +0,0 @@
-import os
-
-try:
-  WASM = bool(os.environ['SCCDWASM']=="1")
-except KeyError:
-  WASM = False