diff --git a/Cargo.lock b/Cargo.lock index ca9243c30a..4393ae3db2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1438,10 +1438,8 @@ dependencies = [ name = "leo-wasm" version = "1.2.0" dependencies = [ - "leo-asg", "leo-ast", "leo-grammar", - "leo-imports", "serde", "wasm-bindgen", "wasm-bindgen-test", diff --git a/wasm/.resources/basic/expected_ast.json b/wasm/.resources/basic/expected_ast.json index dec3baf947..5703033471 100644 --- a/wasm/.resources/basic/expected_ast.json +++ b/wasm/.resources/basic/expected_ast.json @@ -8,7 +8,7 @@ "identifier": "{\"name\":\"main\",\"span\":\"{\\\"text\\\":\\\" function main() {\\\",\\\"line\\\":1,\\\"start\\\":10,\\\"end\\\":14}\"}", "input": [], "output": null, - "block": { + "block" : { "statements": [ { "Return": { @@ -27,6 +27,7 @@ ] } }, + "op": "Add", "right": { "Value": { "Implicit": [ @@ -40,7 +41,6 @@ ] } }, - "op": "Add", "span": { "text": " return 1 + 1", "line": 2, @@ -49,7 +49,7 @@ } } }, - "span": { + "span" : { "text": " return 1 + 1", "line": 2, "start": 5, @@ -58,18 +58,18 @@ } } ], - "span": { - "text": " function main() {", - "line": 1, - "start": 17, - "end": 2 + "span" : { + "text": " return 1 + 1", + "line": 2, + "start": 5, + "end": 17 } }, "span": { "text": " function main() {", "line": 1, "start": 1, - "end": 2 + "end": 1 } } }, diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml index 100b210dc5..efad2a57fa 100644 --- a/wasm/Cargo.toml +++ b/wasm/Cargo.toml @@ -21,9 +21,9 @@ edition = "2018" crate-type = ["cdylib", "rlib"] [dependencies] -leo-asg = { path = "../asg", version = "1.2.0" } +#leo-asg = { path = "../asg", version = "1.2.0" } leo-ast = { path = "../ast", version = "1.2.0" } -leo-imports = { path = "../imports", version = "1.2.0" } +#leo-imports = { path = "../imports", version = "1.2.0" } leo-grammar = { path = "../grammar", version = "1.2.0" } serde = { version = "1.0", features = ["derive"] } diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs index c1808960b3..d457955975 100644 --- a/wasm/src/lib.rs +++ b/wasm/src/lib.rs @@ -13,9 +13,9 @@ // You should have received a copy of the GNU General Public License // along with the Leo library. If not, see . - -pub mod asg; -pub use asg::*; +// +// pub mod asg; +// pub use asg::*; pub mod ast; pub use ast::*;