@tishlang/tish 1.7.0 → 1.9.0

package/crates/tish_native/src/build.rs

@@ -6,7 +6,8 @@ use std::path::Path;
 use tishlang_compile::ResolvedNativeModule;
 
 /// `tishlang_runtime` Cargo feature names (subset of CLI / compile feature names).
-const RUNTIME_CARGO_FEATURES: &[&str] = &["http", "fs", "process", "regex", "ws"];
+const RUNTIME_CARGO_FEATURES: &[&str] =
+    &["http", "http-hyper", "http-io-uring", "fs", "process", "regex", "ws"];
 
 /// Map CLI/compile features to flags passed to `tishlang_runtime` in the temp crate's Cargo.toml.
 /// `full` enables every optional runtime capability (matches `tish build --feature full` / LANGUAGE.md).
@@ -122,7 +123,7 @@ path = "src/main.rs"
 strip = true
 panic = "abort"
 codegen-units = 1
-lto = "thin"
+lto = "fat"
 
 [dependencies]
 tishlang_runtime = {{ path = {:?}{} }}

package/crates/tish_native/src/lib.rs

@@ -90,7 +90,9 @@ pub fn compile_to_native(
                 message: e.to_string(),
             })?;
             let program = {
-                let prog = tishlang_compile::merge_modules(modules).map_err(|e| NativeError {
+                let prog = tishlang_compile::merge_modules(modules)
+                    .map(|m| m.program)
+                    .map_err(|e| NativeError {
                     message: e.to_string(),
                 })?;
                 if optimize {
@@ -133,7 +135,9 @@ pub fn compile_to_native(
                 message: e.to_string(),
             })?;
             let program = {
-                let prog = tishlang_compile::merge_modules(modules).map_err(|e| NativeError {
+                let prog = tishlang_compile::merge_modules(modules)
+                    .map(|m| m.program)
+                    .map_err(|e| NativeError {
                     message: e.to_string(),
                 })?;
                 if optimize {

package/crates/tish_opt/src/lib.rs

@@ -25,12 +25,14 @@ fn optimize_statement(stmt: &Statement) -> Statement {
         }
         Statement::VarDecl {
             name,
+            name_span,
             mutable,
             type_ann,
             init,
             span,
         } => Statement::VarDecl {
             name: Arc::clone(name),
+            name_span: *name_span,
             mutable: *mutable,
             type_ann: type_ann.clone(),
             init: init.as_ref().map(optimize_expr),
@@ -101,11 +103,13 @@ fn optimize_statement(stmt: &Statement) -> Statement {
         },
         Statement::ForOf {
             name,
+            name_span,
             iterable,
             body,
             span,
         } => Statement::ForOf {
             name: Arc::clone(name),
+            name_span: *name_span,
             iterable: optimize_expr(iterable),
             body: Box::new(optimize_statement(body)),
             span: *span,
@@ -119,6 +123,7 @@ fn optimize_statement(stmt: &Statement) -> Statement {
         Statement::FunDecl {
             async_,
             name,
+            name_span,
             params,
             rest_param,
             return_type,
@@ -127,6 +132,7 @@ fn optimize_statement(stmt: &Statement) -> Statement {
         } => Statement::FunDecl {
             async_: *async_,
             name: Arc::clone(name),
+            name_span: *name_span,
             params: params.clone(),
             rest_param: rest_param.clone(),
             return_type: return_type.clone(),
@@ -159,19 +165,25 @@ fn optimize_statement(stmt: &Statement) -> Statement {
         Statement::Try {
             body,
             catch_param,
+            catch_param_span,
             catch_body,
             finally_body,
             span,
         } => Statement::Try {
             body: Box::new(optimize_statement(body)),
             catch_param: catch_param.clone(),
+            catch_param_span: *catch_param_span,
             catch_body: catch_body.as_ref().map(|b| Box::new(optimize_statement(b))),
             finally_body: finally_body
                 .as_ref()
                 .map(|b| Box::new(optimize_statement(b))),
             span: *span,
         },
-        Statement::Import { .. } | Statement::Export { .. } => stmt.clone(),
+        Statement::Import { .. }
+        | Statement::Export { .. }
+        | Statement::TypeAlias { .. }
+        | Statement::DeclareVar { .. }
+        | Statement::DeclareFun { .. } => stmt.clone(),
     }
 }
 
@@ -354,7 +366,10 @@ fn optimize_expr(expr: &Expr) -> Expr {
         } => {
             let opt_obj = optimize_expr(object);
             let opt_prop = match prop {
-                tishlang_ast::MemberProp::Name(n) => tishlang_ast::MemberProp::Name(Arc::clone(n)),
+                tishlang_ast::MemberProp::Name { name, span } => tishlang_ast::MemberProp::Name {
+                    name: Arc::clone(name),
+                    span: *span,
+                },
                 tishlang_ast::MemberProp::Expr(e) => {
                     tishlang_ast::MemberProp::Expr(Box::new(optimize_expr(e)))
                 }

package/crates/tish_parser/src/lib.rs

@@ -174,7 +174,7 @@ mod tests {
             Expr::New { callee, args, .. } => {
                 assert!(matches!(
                     callee.as_ref(),
-                    Expr::Member { prop: tishlang_ast::MemberProp::Name(p), .. } if p.as_ref() == "AudioContext"
+                    Expr::Member { prop: tishlang_ast::MemberProp::Name { name, .. }, .. } if name.as_ref() == "AudioContext"
                 ));
                 assert!(args.is_empty());
             }
@@ -214,10 +214,10 @@ mod tests {
         match e {
             Expr::Member {
                 object,
-                prop: tishlang_ast::MemberProp::Name(p),
+                prop: tishlang_ast::MemberProp::Name { name, .. },
                 ..
             } => {
-                assert_eq!(p.as_ref(), "bar");
+                assert_eq!(name.as_ref(), "bar");
                 match object.as_ref() {
                     Expr::New { callee, args, .. } => {
                         assert!(
@@ -245,4 +245,11 @@ mod tests {
             _ => panic!("expected New"),
         }
     }
+
+    #[test]
+    fn stdlib_builtins_d_tish_parses() {
+        const SRC: &str = include_str!("../../../stdlib/builtins.d.tish");
+        parse(SRC).expect("stdlib/builtins.d.tish should parse");
+    }
+
 }