@tishlang/tish-lint 3.14.0 → 3.15.1

package/crates/tish/src/main.rs

@@ -1090,6 +1090,16 @@ fn build_file(
     } else {
         tishlang_native::NativeBuildConfig::desktop()
     };
+    // Release builds name the triple so the binary targets the platform baseline instead of the
+    // build machine's CPU, and so one host can build each slice of a universal binary.
+    let mut build_config = build_config;
+    if build_config.cargo_target.is_none() {
+        if let Ok(triple) = std::env::var("TISH_NATIVE_CARGO_TARGET") {
+            if !triple.is_empty() {
+                build_config.cargo_target = Some(triple);
+            }
+        }
+    }
 
     if is_js {
         let source = fs::read_to_string(&input_path).map_err(|e| format!("{}", e))?;

package/crates/tish_bytecode/src/compiler.rs

@@ -3086,8 +3086,9 @@ impl<'a> Compiler<'a> {
         props: &[JsxProp],
         children: &[JsxChild],
     ) -> Result<(), CompileError> {
-        let h_idx = self.name_idx(&Arc::from("h"));
-        self.emit_u16(Opcode::LoadGlobal, h_idx);
+        // `h`, `Fragment` and component tags resolve lexically (imports, module `fn`s, locals)
+        // and fall back to globals, so embedder-injected `h` via `set_global` still works.
+        self.emit_var_load(&Arc::from("h"));
         let tag_str = tag.as_ref();
         let is_component = tag_str
             .chars()
@@ -3095,8 +3096,7 @@ impl<'a> Compiler<'a> {
             .map(|c| c.is_uppercase())
             .unwrap_or(false);
         if is_component {
-            let tag_idx = self.name_idx(tag);
-            self.emit_u16(Opcode::LoadGlobal, tag_idx);
+            self.emit_var_load(tag);
         } else {
             let tag_const = self.constant_idx(Constant::String(Arc::from(tag_str)));
             self.emit(Opcode::LoadConst);
@@ -3109,10 +3109,8 @@ impl<'a> Compiler<'a> {
     }
 
     fn compile_jsx_fragment(&mut self, children: &[JsxChild]) -> Result<(), CompileError> {
-        let h_idx = self.name_idx(&Arc::from("h"));
-        self.emit_u16(Opcode::LoadGlobal, h_idx);
-        let fragment_idx = self.name_idx(&Arc::from("Fragment"));
-        self.emit_u16(Opcode::LoadGlobal, fragment_idx);
+        self.emit_var_load(&Arc::from("h"));
+        self.emit_var_load(&Arc::from("Fragment"));
         let null_idx = self.constant_idx(Constant::Null);
         self.emit(Opcode::LoadConst);
         self.chunk.write_u16(null_idx);

package/crates/tish_lint/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tishlang_lint"
-version = "3.14.0"
+version = "3.15.1"
 edition = "2021"
 description = "AST-based linter for Tish"
 license-file = { workspace = true }

package/crates/tish_native/src/build.rs

@@ -225,12 +225,16 @@ pub fn build_via_cargo_with_config(
     };
 
     // mimalloc as the program's global allocator — binary output only (a staticlib does not own the
-    // allocator), native only (don't cross-compile mimalloc's C). Adds one cached dep + a global_alloc
+    // allocator), native or another macOS slice only (the host clang builds mimalloc's C for both
+    // Mac architectures; other cross targets are skipped). Adds one cached dep + a global_alloc
     // statement; semantically transparent. `TISH_NATIVE_FAST_ALLOC=0` opts out.
     let use_fast_alloc = fast_alloc_enabled()
         && build_config.artifact != NativeArtifact::StaticLib
         && build_config.artifact != NativeArtifact::FfiModule
-        && build_config.cargo_target.is_none();
+        && build_config
+            .cargo_target
+            .as_deref()
+            .map_or(true, |t| cfg!(target_os = "macos") && t.ends_with("-apple-darwin"));
     if build_config.artifact == NativeArtifact::FfiModule {
         let guest_path = Path::new(&runtime_path)
             .parent()

package/crates/tish_native/src/lib.rs

@@ -107,7 +107,12 @@ pub fn compile_to_native_with_config(
                     ios_runtime_features(f)
                 }
             };
-            let cross_cap = build_config.cargo_target.as_ref().map(|_| {
+            // A desktop triple (one slice of a universal macOS build) is not a restricted target.
+            let capped = build_config
+                .cargo_target
+                .as_deref()
+                .filter(|t| is_gba || !t.ends_with("-apple-darwin"));
+            let cross_cap = capped.map(|_| {
                 cap(features)
                     .into_iter()
                     .collect::<std::collections::HashSet<_>>()
@@ -130,7 +135,7 @@ pub fn compile_to_native_with_config(
                     message: e.to_string(),
                 })?;
 
-            let features_for_cargo = if build_config.cargo_target.is_some() {
+            let features_for_cargo = if capped.is_some() {
                 cap(&effective_features)
             } else {
                 effective_features

package/crates/tish_vm/tests/jsx_lexical_resolution.rs

@@ -0,0 +1,42 @@
+//! Bytecode JSX resolves `h`, `Fragment` and component tags lexically, falling back to globals.
+
+use tishlang_bytecode::compile;
+use tishlang_vm::run;
+
+fn run_src(src: &str) {
+    let program = tishlang_parser::parse(src).expect("parse");
+    let chunk = compile(&program).expect("compile");
+    run(&chunk).expect("run");
+}
+
+#[test]
+fn component_tag_resolves_script_level_fn() {
+    run_src(
+        r#"
+fn h(tag, props, children) {
+  if (typeof tag === "function") { return tag(props) }
+  return { tag: tag, props: props, children: children }
+}
+fn Row(props) { return <item title={props.title} /> }
+let tree = <list><Row title="a" /></list>
+let row = tree.children[0]
+if (row.tag !== "item" || row.props.title !== "a") { throw "component tag did not resolve" }
+"#,
+    );
+}
+
+#[test]
+fn h_and_fragment_resolve_from_enclosing_scope() {
+    run_src(
+        r#"
+fn render() {
+  let Fragment = "frag"
+  let h = (tag, props, children) => typeof tag === "function" ? tag(props) : { tag: tag, children: children }
+  fn Inner(p) { return <leaf /> }
+  return <><Inner /></>
+}
+let t = render()
+if (t.tag !== "frag" || t.children[0].tag !== "leaf") { throw "local h/Fragment/component not used" }
+"#,
+    );
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tishlang/tish-lint",
-  "version": "3.14.0",
+  "version": "3.15.1",
   "description": "Tish code linter",
   "license": "PIF",
   "repository": {