Skip to content

Commit 3918e76

Browse files
andrewrkandrewrk
authoredJun 1, 2018
Merge pull request #1032 from ziglang/pointer-reform
 use * for pointer type instead of &
·
0.15.20.3.0
2 parents 717ac85 + e29d12d commit 3918e76

File tree

150 files changed

+2438
-2350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+2438
-2350
lines changed
 

‎build.zig‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const ArrayList = std.ArrayList;
1010
const Buffer = std.Buffer;
1111
const io = std.io;
1212

13-
pub fn build(b: &Builder) !void {
13+
pub fn build(b: *Builder) !void {
1414
const mode = b.standardReleaseOptions();
1515

1616
var docgen_exe = b.addExecutable("docgen", "doc/docgen.zig");
@@ -132,7 +132,7 @@ pub fn build(b: &Builder) !void {
132132
test_step.dependOn(tests.addGenHTests(b, test_filter));
133133
}
134134

135-
fn dependOnLib(lib_exe_obj: &std.build.LibExeObjStep, dep: &const LibraryDep) void {
135+
fn dependOnLib(lib_exe_obj: *std.build.LibExeObjStep, dep: *const LibraryDep) void {
136136
for (dep.libdirs.toSliceConst()) |lib_dir| {
137137
lib_exe_obj.addLibPath(lib_dir);
138138
}
@@ -147,7 +147,7 @@ fn dependOnLib(lib_exe_obj: &std.build.LibExeObjStep, dep: &const LibraryDep) vo
147147
}
148148
}
149149

150-
fn addCppLib(b: &Builder, lib_exe_obj: &std.build.LibExeObjStep, cmake_binary_dir: []const u8, lib_name: []const u8) void {
150+
fn addCppLib(b: *Builder, lib_exe_obj: *std.build.LibExeObjStep, cmake_binary_dir: []const u8, lib_name: []const u8) void {
151151
const lib_prefix = if (lib_exe_obj.target.isWindows()) "" else "lib";
152152
lib_exe_obj.addObjectFile(os.path.join(b.allocator, cmake_binary_dir, "zig_cpp", b.fmt("{}{}{}", lib_prefix, lib_name, lib_exe_obj.target.libFileExt())) catch unreachable);
153153
}
@@ -159,7 +159,7 @@ const LibraryDep = struct {
159159
includes: ArrayList([]const u8),
160160
};
161161

162-
fn findLLVM(b: &Builder, llvm_config_exe: []const u8) !LibraryDep {
162+
fn findLLVM(b: *Builder, llvm_config_exe: []const u8) !LibraryDep {
163163
const libs_output = try b.exec([][]const u8{
164164
llvm_config_exe,
165165
"--libs",
@@ -217,7 +217,7 @@ fn findLLVM(b: &Builder, llvm_config_exe: []const u8) !LibraryDep {
217217
return result;
218218
}
219219

220-
pub fn installStdLib(b: &Builder, stdlib_files: []const u8) void {
220+
pub fn installStdLib(b: *Builder, stdlib_files: []const u8) void {
221221
var it = mem.split(stdlib_files, ";");
222222
while (it.next()) |stdlib_file| {
223223
const src_path = os.path.join(b.allocator, "std", stdlib_file) catch unreachable;
@@ -226,7 +226,7 @@ pub fn installStdLib(b: &Builder, stdlib_files: []const u8) void {
226226
}
227227
}
228228

229-
pub fn installCHeaders(b: &Builder, c_header_files: []const u8) void {
229+
pub fn installCHeaders(b: *Builder, c_header_files: []const u8) void {
230230
var it = mem.split(c_header_files, ";");
231231
while (it.next()) |c_header_file| {
232232
const src_path = os.path.join(b.allocator, "c_headers", c_header_file) catch unreachable;
@@ -235,7 +235,7 @@ pub fn installCHeaders(b: &Builder, c_header_files: []const u8) void {
235235
}
236236
}
237237

238-
fn nextValue(index: &usize, build_info: []const u8) []const u8 {
238+
fn nextValue(index: *usize, build_info: []const u8) []const u8 {
239239
const start = index.*;
240240
while (true) : (index.* += 1) {
241241
switch (build_info[index.*]) {

‎doc/docgen.zig‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const Tokenizer = struct {
104104
};
105105
}
106106

107-
fn next(self: &Tokenizer) Token {
107+
fn next(self: *Tokenizer) Token {
108108
var result = Token{
109109
.id = Token.Id.Eof,
110110
.start = self.index,
@@ -196,7 +196,7 @@ const Tokenizer = struct {
196196
line_end: usize,
197197
};
198198

199-
fn getTokenLocation(self: &Tokenizer, token: &const Token) Location {
199+
fn getTokenLocation(self: *Tokenizer, token: *const Token) Location {
200200
var loc = Location{
201201
.line = 0,
202202
.column = 0,
@@ -221,7 +221,7 @@ const Tokenizer = struct {
221221
}
222222
};
223223

224-
fn parseError(tokenizer: &Tokenizer, token: &const Token, comptime fmt: []const u8, args: ...) error {
224+
fn parseError(tokenizer: *Tokenizer, token: *const Token, comptime fmt: []const u8, args: ...) error {
225225
const loc = tokenizer.getTokenLocation(token);
226226
warn("{}:{}:{}: error: " ++ fmt ++ "\n", tokenizer.source_file_name, loc.line + 1, loc.column + 1, args);
227227
if (loc.line_start <= loc.line_end) {
@@ -244,13 +244,13 @@ fn parseError(tokenizer: &Tokenizer, token: &const Token, comptime fmt: []const
244244
return error.ParseError;
245245
}
246246

247-
fn assertToken(tokenizer: &Tokenizer, token: &const Token, id: Token.Id) !void {
247+
fn assertToken(tokenizer: *Tokenizer, token: *const Token, id: Token.Id) !void {
248248
if (token.id != id) {
249249
return parseError(tokenizer, token, "expected {}, found {}", @tagName(id), @tagName(token.id));
250250
}
251251
}
252252

253-
fn eatToken(tokenizer: &Tokenizer, id: Token.Id) !Token {
253+
fn eatToken(tokenizer: *Tokenizer, id: Token.Id) !Token {
254254
const token = tokenizer.next();
255255
try assertToken(tokenizer, token, id);
256256
return token;
@@ -317,7 +317,7 @@ const Action = enum {
317317
Close,
318318
};
319319

320-
fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
320+
fn genToc(allocator: *mem.Allocator, tokenizer: *Tokenizer) !Toc {
321321
var urls = std.HashMap([]const u8, Token, mem.hash_slice_u8, mem.eql_slice_u8).init(allocator);
322322
errdefer urls.deinit();
323323

@@ -546,7 +546,7 @@ fn genToc(allocator: &mem.Allocator, tokenizer: &Tokenizer) !Toc {
546546
};
547547
}
548548

549-
fn urlize(allocator: &mem.Allocator, input: []const u8) ![]u8 {
549+
fn urlize(allocator: *mem.Allocator, input: []const u8) ![]u8 {
550550
var buf = try std.Buffer.initSize(allocator, 0);
551551
defer buf.deinit();
552552

@@ -566,7 +566,7 @@ fn urlize(allocator: &mem.Allocator, input: []const u8) ![]u8 {
566566
return buf.toOwnedSlice();
567567
}
568568

569-
fn escapeHtml(allocator: &mem.Allocator, input: []const u8) ![]u8 {
569+
fn escapeHtml(allocator: *mem.Allocator, input: []const u8) ![]u8 {
570570
var buf = try std.Buffer.initSize(allocator, 0);
571571
defer buf.deinit();
572572

@@ -608,7 +608,7 @@ test "term color" {
608608
assert(mem.eql(u8, result, "A<span class=\"t32\">green</span>B"));
609609
}
610610

611-
fn termColor(allocator: &mem.Allocator, input: []const u8) ![]u8 {
611+
fn termColor(allocator: *mem.Allocator, input: []const u8) ![]u8 {
612612
var buf = try std.Buffer.initSize(allocator, 0);
613613
defer buf.deinit();
614614

@@ -688,7 +688,7 @@ fn termColor(allocator: &mem.Allocator, input: []const u8) ![]u8 {
688688
return buf.toOwnedSlice();
689689
}
690690

691-
fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var, zig_exe: []const u8) !void {
691+
fn genHtml(allocator: *mem.Allocator, tokenizer: *Tokenizer, toc: *Toc, out: var, zig_exe: []const u8) !void {
692692
var code_progress_index: usize = 0;
693693
for (toc.nodes) |node| {
694694
switch (node) {
@@ -1036,7 +1036,7 @@ fn genHtml(allocator: &mem.Allocator, tokenizer: &Tokenizer, toc: &Toc, out: var
10361036
}
10371037
}
10381038

1039-
fn exec(allocator: &mem.Allocator, args: []const []const u8) !os.ChildProcess.ExecResult {
1039+
fn exec(allocator: *mem.Allocator, args: []const []const u8) !os.ChildProcess.ExecResult {
10401040
const result = try os.ChildProcess.exec(allocator, args, null, null, max_doc_file_size);
10411041
switch (result.term) {
10421042
os.ChildProcess.Term.Exited => |exit_code| {

0 commit comments

Comments
 (0)
Please sign in to comment.