updated to zig 0.14.1
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
.zig-cache
|
||||
zig-out
|
||||
@@ -0,0 +1 @@
|
||||
-[------->+<]>-.-[->+++++<]>++.+++++++..+++.[->+++++<]>+.------------.---[->+++<]>.-[--->+<]>---.+++.------.--------.-[--->+<]>.[--->+<]>-.
|
||||
@@ -1,70 +1,29 @@
|
||||
const std = @import("std");
|
||||
|
||||
// Although this function looks imperative, note that its job is to
|
||||
// declaratively construct a build graph that will be executed by an external
|
||||
// runner.
|
||||
pub fn build(b: *std.Build) void {
|
||||
// Standard target options allows the person running `zig build` to choose
|
||||
// what target to build for. Here we do not override the defaults, which
|
||||
// means any target is allowed, and the default is native. Other options
|
||||
// for restricting supported target set are available.
|
||||
const target = b.standardTargetOptions(.{});
|
||||
|
||||
// Standard optimization options allow the person running `zig build` to select
|
||||
// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not
|
||||
// set a preferred release mode, allowing the user to decide how to optimize.
|
||||
const optimize = b.standardOptimizeOption(.{});
|
||||
|
||||
const exe = b.addExecutable(.{
|
||||
.name = "bfz",
|
||||
// In this case the main source file is merely a path, however, in more
|
||||
// complicated build scripts, this could be a generated file.
|
||||
.root_source_file = .{ .path = "src/main.zig" },
|
||||
const exe_mod = b.createModule(.{
|
||||
.root_source_file = b.path("src/main.zig"),
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
|
||||
// This declares intent for the executable to be installed into the
|
||||
// standard location when the user invokes the "install" step (the default
|
||||
// step when running `zig build`).
|
||||
const exe = b.addExecutable(.{
|
||||
.name = "bfz",
|
||||
.root_module = exe_mod,
|
||||
});
|
||||
|
||||
b.installArtifact(exe);
|
||||
|
||||
// This *creates* a Run step in the build graph, to be executed when another
|
||||
// step is evaluated that depends on it. The next line below will establish
|
||||
// such a dependency.
|
||||
const run_cmd = b.addRunArtifact(exe);
|
||||
|
||||
// By making the run step depend on the install step, it will be run from the
|
||||
// installation directory rather than directly from within the cache directory.
|
||||
// This is not necessary, however, if the application depends on other installed
|
||||
// files, this ensures they will be present and in the expected location.
|
||||
run_cmd.step.dependOn(b.getInstallStep());
|
||||
|
||||
// This allows the user to pass arguments to the application in the build
|
||||
// command itself, like this: `zig build run -- arg1 arg2 etc`
|
||||
if (b.args) |args| {
|
||||
run_cmd.addArgs(args);
|
||||
}
|
||||
|
||||
// This creates a build step. It will be visible in the `zig build --help` menu,
|
||||
// and can be selected like this: `zig build run`
|
||||
// This will evaluate the `run` step rather than the default, which is "install".
|
||||
const run_step = b.step("run", "Run the app");
|
||||
run_step.dependOn(&run_cmd.step);
|
||||
|
||||
// Creates a step for unit testing. This only builds the test executable
|
||||
// but does not run it.
|
||||
const unit_tests = b.addTest(.{
|
||||
.root_source_file = .{ .path = "src/main.zig" },
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
|
||||
const run_unit_tests = b.addRunArtifact(unit_tests);
|
||||
|
||||
// Similar to creating the run step earlier, this exposes a `test` step to
|
||||
// the `zig build --help` menu, providing a way for the user to request
|
||||
// running the unit tests.
|
||||
const test_step = b.step("test", "Run unit tests");
|
||||
test_step.dependOn(&run_unit_tests.step);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
.{
|
||||
// This is the default name used by packages depending on this one. For
|
||||
// example, when a user runs `zig fetch --save <url>`, this field is used
|
||||
// as the key in the `dependencies` table. Although the user can choose a
|
||||
// different name, most users will stick with this provided value.
|
||||
//
|
||||
// It is redundant to include "zig" in this name because it is already
|
||||
// within the Zig package namespace.
|
||||
.name = .bfz,
|
||||
|
||||
// This is a [Semantic Version](https://semver.org/).
|
||||
// In a future version of Zig it will be used for package deduplication.
|
||||
.version = "0.0.0",
|
||||
|
||||
// Together with name, this represents a globally unique package
|
||||
// identifier. This field is generated by the Zig toolchain when the
|
||||
// package is first created, and then *never changes*. This allows
|
||||
// unambiguous detection of one package being an updated version of
|
||||
// another.
|
||||
//
|
||||
// When forking a Zig project, this id should be regenerated (delete the
|
||||
// field and run `zig build`) if the upstream project is still maintained.
|
||||
// Otherwise, the fork is *hostile*, attempting to take control over the
|
||||
// original project's identity. Thus it is recommended to leave the comment
|
||||
// on the following line intact, so that it shows up in code reviews that
|
||||
// modify the field.
|
||||
.fingerprint = 0x3765925f0c6b2cc2, // Changing this has security and trust implications.
|
||||
|
||||
// Tracks the earliest Zig version that the package considers to be a
|
||||
// supported use case.
|
||||
.minimum_zig_version = "0.14.1",
|
||||
|
||||
// This field is optional.
|
||||
// Each dependency must either provide a `url` and `hash`, or a `path`.
|
||||
// `zig build --fetch` can be used to fetch all dependencies of a package, recursively.
|
||||
// Once all dependencies are fetched, `zig build` no longer requires
|
||||
// internet connectivity.
|
||||
.dependencies = .{
|
||||
// See `zig fetch --save <url>` for a command-line interface for adding dependencies.
|
||||
//.example = .{
|
||||
// // When updating this field to a new URL, be sure to delete the corresponding
|
||||
// // `hash`, otherwise you are communicating that you expect to find the old hash at
|
||||
// // the new URL. If the contents of a URL change this will result in a hash mismatch
|
||||
// // which will prevent zig from using it.
|
||||
// .url = "https://example.com/foo.tar.gz",
|
||||
//
|
||||
// // This is computed from the file contents of the directory of files that is
|
||||
// // obtained after fetching `url` and applying the inclusion rules given by
|
||||
// // `paths`.
|
||||
// //
|
||||
// // This field is the source of truth; packages do not come from a `url`; they
|
||||
// // come from a `hash`. `url` is just one of many possible mirrors for how to
|
||||
// // obtain a package matching this `hash`.
|
||||
// //
|
||||
// // Uses the [multihash](https://multiformats.io/multihash/) format.
|
||||
// .hash = "...",
|
||||
//
|
||||
// // When this is provided, the package is found in a directory relative to the
|
||||
// // build root. In this case the package's hash is irrelevant and therefore not
|
||||
// // computed. This field and `url` are mutually exclusive.
|
||||
// .path = "foo",
|
||||
//
|
||||
// // When this is set to `true`, a package is declared to be lazily
|
||||
// // fetched. This makes the dependency only get fetched if it is
|
||||
// // actually used.
|
||||
// .lazy = false,
|
||||
//},
|
||||
},
|
||||
|
||||
// Specifies the set of files and directories that are included in this package.
|
||||
// Only files and directories listed here are included in the `hash` that
|
||||
// is computed for this package. Only files listed here will remain on disk
|
||||
// when using the zig package manager. As a rule of thumb, one should list
|
||||
// files required for compilation plus any license(s).
|
||||
// Paths are relative to the build root. Use the empty string (`""`) to refer to
|
||||
// the build root itself.
|
||||
// A directory listed here means that all files within, recursively, are included.
|
||||
.paths = .{
|
||||
"build.zig",
|
||||
"build.zig.zon",
|
||||
"src",
|
||||
// For example...
|
||||
//"LICENSE",
|
||||
//"README.md",
|
||||
},
|
||||
}
|
||||
+24
-29
@@ -39,7 +39,7 @@ const bf_machine = struct {
|
||||
allocator:std.mem.Allocator,
|
||||
|
||||
pub fn init(allocator:std.mem.Allocator, program:[]const u8) !Self {
|
||||
var mem = try allocator.alloc(u8, size);
|
||||
const mem = try allocator.alloc(u8, size);
|
||||
for(mem) |*x| { // allocator doesn't make sure any of this is actually zero
|
||||
x.* = 0;
|
||||
}
|
||||
@@ -51,19 +51,19 @@ const bf_machine = struct {
|
||||
};
|
||||
}
|
||||
|
||||
pub fn bracket_check(program:[]const u8) bool {
|
||||
var pos = 0;
|
||||
var open = 0;
|
||||
var closed = 0;
|
||||
while(pos < program.len-1) {
|
||||
switch(program[pos]) {
|
||||
'[' => {open += 1;},
|
||||
']' => {closed += 1;},
|
||||
else => {},
|
||||
}
|
||||
}
|
||||
if(open == closed) return false else return true;
|
||||
}
|
||||
// pub fn bracket_check(program:[]const u8) bool {
|
||||
// var pos = 0;
|
||||
// var open = 0;
|
||||
// var closed = 0;
|
||||
// while(pos < program.len-1) {
|
||||
// switch(program[pos]) {
|
||||
// '[' => {open += 1;},
|
||||
// ']' => {closed += 1;},
|
||||
// else => {},
|
||||
// }
|
||||
// }
|
||||
// if(open == closed) return false else return true;
|
||||
// }
|
||||
|
||||
pub fn execute(self:*Self, param:exeParam) !usize {
|
||||
var program_pos = param.program_pos;
|
||||
@@ -71,11 +71,11 @@ const bf_machine = struct {
|
||||
switch(self.program[program_pos]) {
|
||||
'>' => {self.pos += 1; program_pos += 1;},
|
||||
'<' => {self.pos -= 1; program_pos += 1;},
|
||||
'+' => {self.mem[self.pos] += 1; program_pos += 1;},
|
||||
'-' => {self.mem[self.pos] -= 1; program_pos += 1;},
|
||||
'+' => {self.mem[self.pos] = @addWithOverflow(self.mem[self.pos], 1)[0]; program_pos += 1;},
|
||||
'-' => {self.mem[self.pos] = @subWithOverflow(self.mem[self.pos], 1)[0]; program_pos += 1;},
|
||||
'.' => {try stdout.print("{c}", .{self.mem[self.pos]}); program_pos += 1;},
|
||||
',' => {
|
||||
var i:u8 = try stdin.readByte();
|
||||
const i:u8 = try stdin.readByte();
|
||||
self.mem[self.pos] = i;
|
||||
program_pos += 1;
|
||||
},
|
||||
@@ -105,27 +105,22 @@ const bf_machine = struct {
|
||||
pub fn main() !void {
|
||||
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
|
||||
const allocator = gpa.allocator();
|
||||
// Basic read from input code
|
||||
// var program:std.ArrayList(u8) = std.ArrayList(u8).init(allocator);
|
||||
// defer program.deinit();
|
||||
// var input:[1]u8 = undefined;
|
||||
// while(try stdin.readAll(&input) > 0) try program.append(input[0]);
|
||||
// var bf = try bf_machine.init(allocator, program.items);
|
||||
// defer bf.deinit();
|
||||
// _ = try bf.execute(.{});
|
||||
const args = try std.process.argsAlloc(allocator);
|
||||
defer std.process.argsFree(allocator, args);
|
||||
|
||||
if(args.len != 2) {
|
||||
try stdout.print("Filename as first argument required!\n", .{});
|
||||
} else {
|
||||
var f = try std.fs.openFileAbsolute(args[1], .{});
|
||||
var f = try std.fs.cwd().openFile(args[1], .{});
|
||||
defer f.close();
|
||||
var s = try f.stat();
|
||||
var d = try allocator.alloc(u8, s.size);
|
||||
const s = try f.stat();
|
||||
const d = try allocator.alloc(u8, s.size);
|
||||
defer allocator.free(d);
|
||||
|
||||
_ = try f.readAll(d);
|
||||
if(try f.readAll(d)<=0) {
|
||||
std.debug.print("File is Empty!\n", .{});
|
||||
return;
|
||||
}
|
||||
|
||||
var bf = try bf_machine.init(allocator, d);
|
||||
defer bf.deinit();
|
||||
|
||||
Reference in New Issue
Block a user