Merge branch 'v0.2-beta' into 'main'

V0.2.36 beta

See merge request mech-lang/mech!106

Author: cmontella

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mech"
-version = "0.2.35"
+version = "0.2.36"
 authors = ["Corey Montella <[email protected]>"]
 description = "Mech is a reactive programming language for building robots, games, and animations."
 documentation = "https://mech-lang.org/docs"
@@ -18,29 +18,29 @@ gitlab = { repository = "mech-lang/mech", branch = "main" }
 maintenance = { status = "actively-developed" }
 
 [dependencies]
-mech-core = "0.2.35"
-mech-syntax = "0.2.35"
-mech-interpreter = "0.2.35"
+mech-core = "0.2.36"
+mech-syntax = "0.2.36"
+mech-interpreter = "0.2.36"
 
-clap = {version = "4.5.30", features = ["cargo"]}
+clap = {version = "4.5.32", features = ["cargo"]}
 colored = "3.0.0"
-bincode = "2.0.0"
-serde = "1.0.218"
-serde_derive = "1.0.218"
+bincode = "2.0.1"
+serde = "1.0.219"
+serde_derive = "1.0.219"
 serde_json = "1.0.140"
 crossbeam-channel = "0.5.14"
 crossterm = "0.28.1"
 lazy_static = "1.5.0"
 tabled = "0.18.0"
 nalgebra = "0.33.2"
-indexmap = {version = "2.7.1", features = ["serde"]}
+indexmap = {version = "2.8.0", features = ["serde"]}
 nom = "7.1.3"
 ctrlc = "3.4.5"
 csv = "1.3.1"
-reqwest = {version = "0.12.12", features = ["blocking"]}
+reqwest = {version = "0.12.15", features = ["blocking"]}
 chrono = "0.4.40"
 warp = {version = "0.3.7", features = ["compression"]}
-tokio = { version = "1.43.0", features = ["full"] }
+tokio = { version = "1.44.1", features = ["full"] }
 base64 = "0.22.1"
 rand = "0.8.5"
 notify = "8.0.0"

README.md

@@ -24,6 +24,12 @@ cd mech
 cargo build --bin mech --release
 ```
 
+Alternatively, you can install Mech directly via Rust's [Cargo](https://crates.io/crates/mech) utility:
+
+```bash
+cargo install mech
+```
+
 ## 📚 Documentation
 
 New to Mech? Start with [Learn Mech in Fifteen Minutes](https://gitlab.com/mech-lang/docs/-/raw/v0.2-beta/III.guides/MechFifteen.mec).

examples

@@ -44,20 +44,20 @@ body {
 }
 
 .mech-toc::-webkit-scrollbar {
-    width: 8px; /* Adjust width as needed */
+    width: 8px; 
 }
 
 .mech-toc::-webkit-scrollbar-track {
-    background: transparent; /* Makes the track invisible */
+    background: transparent; 
 }
 
 .mech-toc::-webkit-scrollbar-thumb {
-    background: rgba(128, 128, 128, 0.7); /* Grey with some transparency */
-    border-radius: 10px; /* Rounds the scrollbar */
+    background: rgba(128, 128, 128, 0.7); 
+    border-radius: 10px; 
 }
 
 .mech-toc::-webkit-scrollbar-thumb:hover {
-    background: rgba(128, 128, 128, 0.9); /* Slightly darker on hover */
+    background: rgba(128, 128, 128, 0.9); 
 }
 
 /* For Firefox */
@@ -218,6 +218,20 @@ h4:before{
     margin-top: 5px; 
 }
 
+.mech-program h3 a {
+    color: #f2ead9;
+    text-decoration: none;
+}
+
+.mech-program h3 {
+    font-family: 'FiraCodeRegular', monospace;
+    color: #f2ead9;
+    font-size: 14pt;
+    font-weight: bold;
+    margin-bottom: 10px;
+    letter-spacing: 1px;
+}
+
 .mech-program h4 a {
     color: #f2ead9;
     text-decoration: none;
@@ -280,6 +294,73 @@ h4:before{
     scrollbar-width: thin;
 }
 
+.mech-grammar {
+    background-color: #171D21;
+    color: #ada594;
+    font-family: 'FiraCodeLight', monospace;
+    font-size: 12pt;
+    line-height: 18px;
+    border-radius: 0px;
+    padding: 30px;
+    border-radius: 10px;
+    overflow-x: auto;
+}
+
+.mech-grammar::-webkit-scrollbar {
+    height: 8px; /* Horizontal scrollbar height */
+}
+
+.mech-grammar::-webkit-scrollbar-track {
+    background: transparent;
+}
+
+.mech-grammar::-webkit-scrollbar-thumb {
+    background: rgba(128, 128, 128, 0.7);
+    border-radius: 10px;
+}
+
+.mech-grammar::-webkit-scrollbar-thumb:hover {
+    background: rgba(128, 128, 128, 0.9);
+}
+
+/* Firefox */
+.mech-grammar {
+    scrollbar-color: rgba(128, 128, 128, 0.7) transparent;
+    scrollbar-width: thin;
+}
+
+.mech-grammar-identifier {
+    color: #ccbbc2;
+}
+
+.mech-grammar-definition {
+    color: #ccbbc2;
+}
+
+.mech-grammar-definition a {
+    color: #ccbbc2;
+    text-decoration: none;
+}
+
+.mech-grammar-definition a:hover {
+    color: #ccbbc2;
+    text-decoration: underline;
+}
+
+.mech-grammar-choice {
+    margin-left: 20px;
+}
+
+.mech-grammar-sequence {
+    margin-left: 20px;
+}
+
+
+.mech-grammar-terminal {
+    color: #ef5f90;
+}
+
+
 .mech-code {
 }
 
@@ -618,4 +699,74 @@ li p {
 }
 
 .mech-table-row {
+}
+
+.mech-table {
+    width: 100%;
+    border-collapse: collapse;
+    background-color: #2F353B;
+    color: #f2ead9; 
+}
+
+.mech-table thead {
+    background-color: #171D21;
+}
+
+.mech-table .mech-table-header-cell {
+    color: #f2ead9; 
+    padding: 10px;
+    text-align: left;
+    font-weight: bold;
+    border-bottom: 2px solid #333; 
+}
+
+.mech-table .mech-table-row-even {
+    background-color: #232A30; 
+}
+
+.mech-table .mech-table-row-odd {
+    background-color: #171D21; 
+}
+
+.mech-table .mech-table-cell {
+    padding: 10px;
+    border-bottom: 1px solid #333; 
+    text-align: left;
+}
+
+.mech-table tbody tr:hover {
+    background-color: #3A4148; 
+}
+
+.mech-table a {
+    color: #ee6262; 
+    text-decoration: none;
+}
+
+.mech-table a:hover {
+    color: #f2ead9;
+}
+
+.mech-block-quote {
+    background-color: #232A30; 
+    border-left: 5px solid #ee6262; 
+    padding: 15px 20px;
+    color: #f2ead9; 
+    font-style: italic; 
+    margin: 20px 0;
+    border-radius: 5px;
+}
+
+.mech-block-quote blockquote {
+    margin: 0;
+    padding: 0;
+    font-size: 1.2em;
+}
+
+.mech-thematic-break {
+    border: 0;
+    border-top: 2px solid #7e8892;
+    margin: 30px 0;
+    width: 100%;
+    opacity: 0.7;
 }

include/style.css

@@ -130,8 +130,9 @@ async fn main() -> Result<(), MechError> {
 
   let mut intrp = Interpreter::new();
 
+  // --------------------------------------------------------------------------
   // Serve
-  // ----------------------------------------------------------------
+  // --------------------------------------------------------------------------
   if let Some(matches) = matches.subcommand_matches("serve") {
 
     let port: String = matches.get_one::<String>("port").cloned().unwrap_or("8081".to_string());
@@ -146,16 +147,17 @@ async fn main() -> Result<(), MechError> {
     server.serve().await?;
 
   }
+  // --------------------------------------------------------------------------
   // Format
-  // ----------------------------------------------------------------
+  // --------------------------------------------------------------------------
   if let Some(matches) = matches.subcommand_matches("format") {
     let html_flag = matches.get_flag("html");
     let stylesheet_url = matches.get_one::<String>("stylesheet").cloned().unwrap_or("https://gitlab.com/mech-lang/mech/-/raw/v0.2-beta/include/style.css?ref_type=heads".to_string());
     let output_path = PathBuf::from(matches.get_one::<String>("output_path").cloned().unwrap_or(".".to_string()));
 
     let mech_paths: Vec<String> = matches.get_many::<String>("mech_format_file_paths").map_or(vec![], |files| files.map(|file| file.to_string()).collect());
     let mut mechfs = MechFileSystem::new();
-
+    
     // open file or url. If it's a local file load it from disk, if it's a url fetch it from internet
     let stylesheet = if stylesheet_url.starts_with("http") {
       match reqwest::get(&stylesheet_url).await {
@@ -245,8 +247,9 @@ async fn main() -> Result<(), MechError> {
     return Ok(());
   }
 
+  // --------------------------------------------------------------------------
   // Run
-  // ----------------------------------------------------------------
+  // --------------------------------------------------------------------------
   let mut paths = if let Some(m) = matches.get_many::<String>("mech_paths") {
     m.map(|s| s.to_string()).collect()
   } else { repl_flag = true; vec![] };
@@ -309,8 +312,9 @@ async fn main() -> Result<(), MechError> {
     print_prompt();
   }).expect("Error setting Ctrl-C handler");
 
+  // --------------------------------------------------------------------------
   // REPL
-  // ----------------------------------------------------------------
+  // --------------------------------------------------------------------------
   'REPL: loop {
     {
       let mut ci = caught_inturrupts.lock().unwrap();

src/bin/mech.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mech-core"
-version = "0.2.35"
+version = "0.2.36"
 authors = ["Corey Montella <[email protected]>"]
 description = "The Mech language runtime."
 documentation = "http://docs.mech-lang.org"
@@ -60,32 +60,31 @@ VectorD = []
 MatrixD = []
 
 [dependencies]
+base64 = "0.22.1"
+bincode = {version = "2.0.1", features = ["serde"]}
+brotli = "7.0.0"
 hashbrown = "0.15.2"
-serde = {version = "1.0.218", default-features = false, features = ["alloc", "derive"] }
-serde_derive = "1.0.218"
-rlibc = { version = "=1.0", optional = true }
+indexmap = {version = "2.8.0", features = ["serde"]}
 lazy_static = "1.5.0"
+libm = "0.2.11"
+nalgebra = "0.33.2"
+paste = "1.0.15"
+rayon = {version = "1.10.0", optional = true}
+rlibc = { version = "=1.0", optional = true }
 seahash = "4.1.0"
+serde = {version = "1.0.219", default-features = false, features = ["alloc", "derive"] }
+serde_derive = "1.0.219"
 serde_json = "1.0.140"
-indexmap = {version = "2.7.0", features = ["serde"]}
-rayon = {version = "1.10.0", optional = true}
-time = {version = "0.3.37", optional = true}
-ed25519-dalek = {version = "2.1.1", default-features = false, features = ["rand_core"]}
-getrandom = { version = "0.2.15", features = ["js"]}
-rand = "0.8.5"
-tinyrand = "0.5.0"
-rand_core = {version = "0.6.4"}
-wasm-bindgen = {version = "0.2.100", optional = true}
-nalgebra = "0.33.2"
-simba = "0.9.0"
-libm = "0.2.11"
 tabled = "0.18.0"
-paste = "1.0.15"
-rkyv = "0.8.10"
-bytemuck = "1.21.0"
-bincode = {version = "2.0.0", features = ["serde"]}
-base64 = "0.22.1"
-brotli = "7.0.0"
+wasm-bindgen = {version = "0.2.100", optional = true}
+#time = {version = "0.3.40", optional = true}
+#ed25519-dalek = {version = "2.1.1", default-features = false, features = ["rand_core"]}
+#rand = "0.9.0"
+#tinyrand = "0.5.0"
+#rand_core = {version = "0.9.3"}
+#simba = "0.9.0"
+#rkyv = "0.8.10"
+#bytemuck = "1.22.0"
 
 [dependencies.web-sys]
 version = "0.3.77"

src/core/Cargo.toml

@@ -24,9 +24,8 @@ extern crate hashbrown;
 extern crate serde_derive;
 extern crate serde;
 extern crate num_traits;
-extern crate ed25519_dalek;
-extern crate rand;
-extern crate getrandom;
+//extern crate ed25519_dalek;
+//extern crate rand;
 
 extern crate seahash;
 extern crate indexmap;