From 66ea1a6dda2523ed660559d574357dc1109493fc Mon Sep 17 00:00:00 2001 From: ObserverOfTime Date: Tue, 26 Aug 2025 22:50:27 +0300 Subject: [PATCH] style(zig): reformat files --- .editorconfig | 3 + build.zig | 190 +++++++++++++++++++++++++------------------------- build.zig.zon | 134 +++++++++++++++++------------------ 3 files changed, 165 insertions(+), 162 deletions(-) diff --git a/.editorconfig b/.editorconfig index 53780b34..0b70460a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,9 @@ insert_final_newline = true [*.rs] indent_size = 4 +[*.{zig,zon}] +indent_size = 4 + [Makefile] indent_style = tab indent_size = 8 diff --git a/build.zig b/build.zig index b4adbd3b..afbf8f64 100644 --- a/build.zig +++ b/build.zig @@ -1,117 +1,117 @@ const std = @import("std"); pub fn build(b: *std.Build) !void { - const target = b.standardTargetOptions(.{}); - const optimize = b.standardOptimizeOption(.{}); + const target = b.standardTargetOptions(.{}); + const optimize = b.standardOptimizeOption(.{}); - const wasm = b.option(bool, "enable-wasm", "Enable Wasm support") orelse false; - const shared = b.option(bool, "build-shared", "Build a shared library") orelse false; - const amalgamated = b.option(bool, "amalgamated", "Build using an amalgamated source") orelse false; + const wasm = b.option(bool, "enable-wasm", "Enable Wasm support") orelse false; + const shared = b.option(bool, "build-shared", "Build a shared library") orelse false; + const amalgamated = b.option(bool, "amalgamated", "Build using an amalgamated source") orelse false; - const lib: *std.Build.Step.Compile = b.addLibrary(.{ - .name = "tree-sitter", - .linkage = if (shared) .dynamic else .static, - .root_module = b.createModule(.{ - .target = target, - .optimize = optimize, - .link_libc = true, - .pic = if (shared) true else null, - }), - }); - - if (amalgamated) { - lib.addCSourceFile(.{ - .file = b.path("lib/src/lib.c"), - .flags = &.{"-std=c11"}, + const lib: *std.Build.Step.Compile = b.addLibrary(.{ + .name = "tree-sitter", + .linkage = if (shared) .dynamic else .static, + .root_module = b.createModule(.{ + .target = target, + .optimize = optimize, + .link_libc = true, + .pic = if (shared) true else null, + }), }); - } else { - const files = try findSourceFiles(b); - defer b.allocator.free(files); - lib.addCSourceFiles(.{ - .root = b.path("lib/src"), - .files = files, - .flags = &.{"-std=c11"}, - }); - } - lib.addIncludePath(b.path("lib/include")); - lib.addIncludePath(b.path("lib/src")); - lib.addIncludePath(b.path("lib/src/wasm")); - - lib.root_module.addCMacro("_POSIX_C_SOURCE", "200112L"); - lib.root_module.addCMacro("_DEFAULT_SOURCE", ""); - - if (wasm) { - if (b.lazyDependency(wasmtimeDep(target.result), .{})) |wasmtime| { - lib.root_module.addCMacro("TREE_SITTER_FEATURE_WASM", ""); - lib.addSystemIncludePath(wasmtime.path("include")); - lib.addLibraryPath(wasmtime.path("lib")); - if (shared) lib.linkSystemLibrary("wasmtime"); + if (amalgamated) { + lib.addCSourceFile(.{ + .file = b.path("lib/src/lib.c"), + .flags = &.{"-std=c11"}, + }); + } else { + const files = try findSourceFiles(b); + defer b.allocator.free(files); + lib.addCSourceFiles(.{ + .root = b.path("lib/src"), + .files = files, + .flags = &.{"-std=c11"}, + }); } - } - lib.installHeadersDirectory(b.path("lib/include"), ".", .{}); + lib.addIncludePath(b.path("lib/include")); + lib.addIncludePath(b.path("lib/src")); + lib.addIncludePath(b.path("lib/src/wasm")); - b.installArtifact(lib); + lib.root_module.addCMacro("_POSIX_C_SOURCE", "200112L"); + lib.root_module.addCMacro("_DEFAULT_SOURCE", ""); + + if (wasm) { + if (b.lazyDependency(wasmtimeDep(target.result), .{})) |wasmtime| { + lib.root_module.addCMacro("TREE_SITTER_FEATURE_WASM", ""); + lib.addSystemIncludePath(wasmtime.path("include")); + lib.addLibraryPath(wasmtime.path("lib")); + if (shared) lib.linkSystemLibrary("wasmtime"); + } + } + + lib.installHeadersDirectory(b.path("lib/include"), ".", .{}); + + b.installArtifact(lib); } /// Get the name of the wasmtime dependency for this target. pub fn wasmtimeDep(target: std.Target) []const u8 { - const arch = target.cpu.arch; - const os = target.os.tag; - const abi = target.abi; - return switch (os) { - .linux => switch (arch) { - .x86_64 => switch (abi) { - .gnu => "wasmtime_c_api_x86_64_linux", - .musl => "wasmtime_c_api_x86_64_musl", - .android => "wasmtime_c_api_x86_64_android", - else => null - }, - .aarch64 => switch (abi) { - .gnu => "wasmtime_c_api_aarch64_linux", - .android => "wasmtime_c_api_aarch64_android", - else => null - }, - .s390x => "wasmtime_c_api_s390x_linux", - .riscv64 => "wasmtime_c_api_riscv64gc_linux", - else => null - }, - .windows => switch (arch) { - .x86_64 => switch (abi) { - .gnu => "wasmtime_c_api_x86_64_mingw", - .msvc => "wasmtime_c_api_x86_64_windows", - else => null - }, - else => null - }, - .macos => switch (arch) { - .x86_64 => "wasmtime_c_api_x86_64_macos", - .aarch64 => "wasmtime_c_api_aarch64_macos", - else => null - }, - else => null - } orelse std.debug.panic( - "Unsupported target for wasmtime: {s}-{s}-{s}", - .{ @tagName(arch), @tagName(os), @tagName(abi) } - ); + const arch = target.cpu.arch; + const os = target.os.tag; + const abi = target.abi; + return switch (os) { + .linux => switch (arch) { + .x86_64 => switch (abi) { + .gnu => "wasmtime_c_api_x86_64_linux", + .musl => "wasmtime_c_api_x86_64_musl", + .android => "wasmtime_c_api_x86_64_android", + else => null, + }, + .aarch64 => switch (abi) { + .gnu => "wasmtime_c_api_aarch64_linux", + .android => "wasmtime_c_api_aarch64_android", + else => null, + }, + .s390x => "wasmtime_c_api_s390x_linux", + .riscv64 => "wasmtime_c_api_riscv64gc_linux", + else => null, + }, + .windows => switch (arch) { + .x86_64 => switch (abi) { + .gnu => "wasmtime_c_api_x86_64_mingw", + .msvc => "wasmtime_c_api_x86_64_windows", + else => null, + }, + else => null, + }, + .macos => switch (arch) { + .x86_64 => "wasmtime_c_api_x86_64_macos", + .aarch64 => "wasmtime_c_api_aarch64_macos", + else => null, + }, + else => null, + } orelse std.debug.panic( + "Unsupported target for wasmtime: {s}-{s}-{s}", + .{ @tagName(arch), @tagName(os), @tagName(abi) }, + ); } fn findSourceFiles(b: *std.Build) ![]const []const u8 { - var sources: std.ArrayListUnmanaged([]const u8) = .empty; + var sources: std.ArrayListUnmanaged([]const u8) = .empty; - var dir = try b.build_root.handle.openDir("lib/src", .{ .iterate = true }); - var iter = dir.iterate(); - defer dir.close(); + var dir = try b.build_root.handle.openDir("lib/src", .{ .iterate = true }); + var iter = dir.iterate(); + defer dir.close(); - while (try iter.next()) |entry| { - if (entry.kind != .file) continue; - const file = entry.name; - const ext = std.fs.path.extension(file); - if (std.mem.eql(u8, ext, ".c") and !std.mem.eql(u8, file, "lib.c")) { - try sources.append(b.allocator, b.dupe(file)); + while (try iter.next()) |entry| { + if (entry.kind != .file) continue; + const file = entry.name; + const ext = std.fs.path.extension(file); + if (std.mem.eql(u8, ext, ".c") and !std.mem.eql(u8, file, "lib.c")) { + try sources.append(b.allocator, b.dupe(file)); + } } - } - return sources.toOwnedSlice(b.allocator); + return sources.toOwnedSlice(b.allocator); } diff --git a/build.zig.zon b/build.zig.zon index a2ce02ec..111054ea 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,71 +1,71 @@ .{ - .name = .tree_sitter, - .fingerprint = 0x841224b447ac0d4f, - .version = "0.26.0", - .minimum_zig_version = "0.14.1", - .paths = .{ - "build.zig", - "build.zig.zon", - "lib/src", - "lib/include", - "README.md", - "LICENSE", - }, - .dependencies = .{ - .wasmtime_c_api_aarch64_android = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-aarch64-android-c-api.tar.xz", - .hash = "N-V-__8AAC3KCQZMd5ea2CkcbjldaVqCT7BT_9_rLMId6V__", - .lazy = true, + .name = .tree_sitter, + .fingerprint = 0x841224b447ac0d4f, + .version = "0.26.0", + .minimum_zig_version = "0.14.1", + .paths = .{ + "build.zig", + "build.zig.zon", + "lib/src", + "lib/include", + "README.md", + "LICENSE", }, - .wasmtime_c_api_aarch64_linux = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-aarch64-linux-c-api.tar.xz", - .hash = "N-V-__8AAGUY3gU6jj2CNJAYb7HiMNVPV1FIcTCI6RSSYwXu", - .lazy = true, + .dependencies = .{ + .wasmtime_c_api_aarch64_android = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-aarch64-android-c-api.tar.xz", + .hash = "N-V-__8AAC3KCQZMd5ea2CkcbjldaVqCT7BT_9_rLMId6V__", + .lazy = true, + }, + .wasmtime_c_api_aarch64_linux = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-aarch64-linux-c-api.tar.xz", + .hash = "N-V-__8AAGUY3gU6jj2CNJAYb7HiMNVPV1FIcTCI6RSSYwXu", + .lazy = true, + }, + .wasmtime_c_api_aarch64_macos = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-aarch64-macos-c-api.tar.xz", + .hash = "N-V-__8AAM1GMARD6LGQebhVsSZ0uePUoo3Fw5nEO2L764vf", + .lazy = true, + }, + .wasmtime_c_api_riscv64gc_linux = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-riscv64gc-linux-c-api.tar.xz", + .hash = "N-V-__8AAN2cuQadBwMc8zJxv0sMY99Ae1Nc1dZcZAK9b4DZ", + .lazy = true, + }, + .wasmtime_c_api_s390x_linux = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-s390x-linux-c-api.tar.xz", + .hash = "N-V-__8AAPevngYz99mwT0KQY9my2ax1p6APzgLEJeV4II9U", + .lazy = true, + }, + .wasmtime_c_api_x86_64_android = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-android-c-api.tar.xz", + .hash = "N-V-__8AABHIEgaTyzPfjgnnCy0dwJiXoDiJFblCkYOJsQvy", + .lazy = true, + }, + .wasmtime_c_api_x86_64_linux = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-linux-c-api.tar.xz", + .hash = "N-V-__8AALUN5AWSEDRulL9u-OJJ-l0_GoT5UFDtGWZayEIq", + .lazy = true, + }, + .wasmtime_c_api_x86_64_macos = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-macos-c-api.tar.xz", + .hash = "N-V-__8AANUeXwSPh13TqJCSSFdi87GEcHs8zK6FqE4v_TjB", + .lazy = true, + }, + .wasmtime_c_api_x86_64_mingw = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-mingw-c-api.zip", + .hash = "N-V-__8AALundgW-p1ffOnd7bsYyL8SY5OziDUZu7cXio2EL", + .lazy = true, + }, + .wasmtime_c_api_x86_64_musl = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-musl-c-api.tar.xz", + .hash = "N-V-__8AALMZ5wXJWW5qY-3MMjTAYR0MusckvzCsmg-69ALH", + .lazy = true, + }, + .wasmtime_c_api_x86_64_windows = .{ + .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-windows-c-api.zip", + .hash = "N-V-__8AAG-uVQVEDMsB1ymJzxpHcoiXo1_I3TFnPM5Zjy1i", + .lazy = true, + }, }, - .wasmtime_c_api_aarch64_macos = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-aarch64-macos-c-api.tar.xz", - .hash = "N-V-__8AAM1GMARD6LGQebhVsSZ0uePUoo3Fw5nEO2L764vf", - .lazy = true, - }, - .wasmtime_c_api_riscv64gc_linux = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-riscv64gc-linux-c-api.tar.xz", - .hash = "N-V-__8AAN2cuQadBwMc8zJxv0sMY99Ae1Nc1dZcZAK9b4DZ", - .lazy = true, - }, - .wasmtime_c_api_s390x_linux = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-s390x-linux-c-api.tar.xz", - .hash = "N-V-__8AAPevngYz99mwT0KQY9my2ax1p6APzgLEJeV4II9U", - .lazy = true, - }, - .wasmtime_c_api_x86_64_android = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-android-c-api.tar.xz", - .hash = "N-V-__8AABHIEgaTyzPfjgnnCy0dwJiXoDiJFblCkYOJsQvy", - .lazy = true, - }, - .wasmtime_c_api_x86_64_linux = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-linux-c-api.tar.xz", - .hash = "N-V-__8AALUN5AWSEDRulL9u-OJJ-l0_GoT5UFDtGWZayEIq", - .lazy = true, - }, - .wasmtime_c_api_x86_64_macos = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-macos-c-api.tar.xz", - .hash = "N-V-__8AANUeXwSPh13TqJCSSFdi87GEcHs8zK6FqE4v_TjB", - .lazy = true, - }, - .wasmtime_c_api_x86_64_mingw = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-mingw-c-api.zip", - .hash = "N-V-__8AALundgW-p1ffOnd7bsYyL8SY5OziDUZu7cXio2EL", - .lazy = true, - }, - .wasmtime_c_api_x86_64_musl = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-musl-c-api.tar.xz", - .hash = "N-V-__8AALMZ5wXJWW5qY-3MMjTAYR0MusckvzCsmg-69ALH", - .lazy = true, - }, - .wasmtime_c_api_x86_64_windows = .{ - .url = "https://github.com/bytecodealliance/wasmtime/releases/download/v29.0.1/wasmtime-v29.0.1-x86_64-windows-c-api.zip", - .hash = "N-V-__8AAG-uVQVEDMsB1ymJzxpHcoiXo1_I3TFnPM5Zjy1i", - .lazy = true, - }, - } }