Skip to content

Commit

Permalink
Initial parser implementation in Rust (#3341)
Browse files Browse the repository at this point in the history
  • Loading branch information
wdanilo authored May 17, 2022
1 parent 0b34346 commit 9e219d6
Show file tree
Hide file tree
Showing 98 changed files with 5,098 additions and 14,347 deletions.
183 changes: 118 additions & 65 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ members = [
"build/enso-formatter",
"build/rust-scripts",
"lib/rust/*",
"lib/rust/parser/src/syntax/tree/visitor",
"lib/rust/parser/src/syntax/tree/builder",
"lib/rust/profiler/data",
"integration-test"
]
Expand Down
1 change: 1 addition & 0 deletions app/gui/src/integration_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ use crate::config::InitialView;
use crate::executor::web::EventLoopExecutor;
use crate::initializer::setup_global_executor;
use crate::Ide;

use enso_frp::future::EventOutputExt;
use enso_web::Closure;
use enso_web::HtmlDivElement;
Expand Down
1 change: 0 additions & 1 deletion app/gui/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
use wasm_bindgen::prelude::*;



// ==============
// === Export ===
// ==============
Expand Down
8 changes: 1 addition & 7 deletions app/gui/view/component-browser/component-group/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,9 @@ use ensogl_text as text;
// === Export ===
// ==============

pub mod entry;
pub mod wide;



// ==============
// === Export ===
// ==============

pub mod entry;
pub use entry::View as Entry;


Expand Down
2 changes: 1 addition & 1 deletion build/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ commands.build.rust = async function (argv) {
console.log('Minimizing the WASM binary.')
await gzip(paths.wasm.main, paths.wasm.mainGz)

const releaseLimitMb = 4.36
const releaseLimitMb = 4.37
let limitMb = releaseLimitMb + allowExtraMb
await checkWasmSize(paths.wasm.mainGz, limitMb)
}
Expand Down
4 changes: 2 additions & 2 deletions lib/rust/automata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2021"

description = "A finite-automata-based lexing engine."
readme = "README.md"
homepage = "https://github.com/enso-org/rust-lib/src/automata"
repository = "https://github.com/enso-org/rust-lib"
homepage = "https://github.com/enso-org/enso/lib/rust/automata"
repository = "https://github.com/enso-org/enso"
license-file = "../../LICENSE"

keywords = ["lexer", "finite-automata"]
Expand Down
6 changes: 3 additions & 3 deletions lib/rust/data-structures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2021"

description = "A collection of useful data structures."
readme = "README.md"
homepage = "https://github.com/enso-org/rust-lib/src/data"
repository = "https://github.com/enso-org/rust-lib"
homepage = "https://github.com/enso-org/enso/lib/rust/data"
repository = "https://github.com/enso-org/enso"
license-file = "../../LICENSE"

keywords = []
Expand All @@ -23,7 +23,7 @@ enso-prelude = { version = "^0.2.1", path = "../prelude" }
serde = { version = "1.0" , features = ["derive"] }
typenum = { version = "1.11.2" }
rustversion = { version = "1.0" }

failure = { version = "0.1.6" }

[dev-dependencies]
itertools = "0.9.0"
Expand Down
8 changes: 4 additions & 4 deletions lib/rust/data-structures/src/hash_map_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ pub type Branches<K, V, S> = HashMap<K, HashMapTree<K, V, S>, S>;
/// more branches accessible by the given key type.
#[derive(Derivative)]
#[derivative(Clone)]
#[derivative(Debug(bound = "K:Eq+Hash+Debug , V:Debug , S:BuildHasher"))]
#[derivative(Default(bound = "K:Eq+Hash , V:Default , S:BuildHasher+Default"))]
#[derivative(PartialEq(bound = "K:Eq+Hash , V:PartialEq , S:BuildHasher"))]
#[derivative(Eq(bound = "K:Eq+Hash , V:Eq , S:BuildHasher"))]
#[derivative(Debug(bound = "K:Eq+Hash+Debug, V:Debug, S:BuildHasher"))]
#[derivative(Default(bound = "K:Eq+Hash, V:Default, S:BuildHasher+Default"))]
#[derivative(PartialEq(bound = "K:Eq+Hash, V:PartialEq, S:BuildHasher"))]
#[derivative(Eq(bound = "K:Eq+Hash, V:Eq, S:BuildHasher"))]
pub struct HashMapTree<K, V, S = RandomState> {
/// Value of the current tree node.
pub value: V,
Expand Down
Loading

0 comments on commit 9e219d6

Please sign in to comment.