Skip to content

Commit 953dcf0

Browse files
committed
all: use question-mark operator for exceptional forwarding
1 parent 14c1cd9 commit 953dcf0

Some content is hidden

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

63 files changed

+429
-429
lines changed

std/bufio/scan.jule

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ impl Scanner {
219219
self.start = 0
220220
}
221221
// Finally we can read some input
222-
n := self.r.Read(self.buf[self.end:]) else { error(error) }
222+
n := self.r.Read(self.buf[self.end:])?
223223
if n == io::EOF {
224224
// Read buffer should not be empty.
225225
// So, by documentation of the io::Reader,

std/encoding/ascii85/ascii85.jule

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ impl io::WriteCloser for encoder {
227227
ret
228228
}
229229
nout := Encode(self.out, self.buf)
230-
self.w.Write(self.out[:nout]) else { error(error) }
230+
self.w.Write(self.out[:nout])?
231231
self.nbuf = 0
232232
}
233233

@@ -240,7 +240,7 @@ impl io::WriteCloser for encoder {
240240
nn -= nn % 4
241241
if nn > 0 {
242242
nout := Encode(self.out, dest[:nn])
243-
self.w.Write(self.out[:nout]) else { error(error) }
243+
self.w.Write(self.out[:nout])?
244244
}
245245
n += nn
246246
unsafe { *(&dest) = (*(&dest))[nn:] }
@@ -260,7 +260,7 @@ impl io::WriteCloser for encoder {
260260
if self.nbuf > 0 {
261261
nout := Encode(self.out, self.buf[:self.nbuf])
262262
self.nbuf = 0
263-
self.w.Write(self.out[:nout]) else { error(error) }
263+
self.w.Write(self.out[:nout])?
264264
}
265265
}
266266
}
@@ -303,7 +303,7 @@ impl io::Reader for decoder {
303303
// Decode leftover input from last read.
304304
mut nn, mut nsrc, mut ndst := 0, 0, 0
305305
if self.nbuf > 0 {
306-
ndst, nsrc = Decode(self.outbuf, self.buf[:self.nbuf], true) else { error(error) }
306+
ndst, nsrc = Decode(self.outbuf, self.buf[:self.nbuf], true)?
307307
if ndst > 0 {
308308
self.out = self.outbuf[:ndst]
309309
self.nbuf = copy(self.buf, self.buf[nsrc:self.nbuf])
@@ -328,7 +328,7 @@ impl io::Reader for decoder {
328328
}
329329

330330
// Read more data.
331-
nn = self.r.Read(self.buf[self.nbuf:]) else { error(error) }
331+
nn = self.r.Read(self.buf[self.nbuf:])?
332332
if nn == io::EOF {
333333
self.eof = true
334334
} else {

std/encoding/csv/reader.jule

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ impl Reader {
221221
// between multiple calls to read.
222222
fn Read(mut *self)!: (record: []str) {
223223
if self.ReuseRecord {
224-
record = self.readRecord(self.lastRecord) else { error(error) }
224+
record = self.readRecord(self.lastRecord)?
225225
self.lastRecord = record
226226
} else {
227-
record = self.readRecord(nil) else { error(error) }
227+
record = self.readRecord(nil)?
228228
}
229229
ret
230230
}
@@ -249,7 +249,7 @@ impl Reader {
249249
// Each record is a slice of fields.
250250
fn ReadAll(mut *self)!: (records: [][]str) {
251251
for {
252-
mut record := self.readRecord(nil) else { error(error) }
252+
mut record := self.readRecord(nil)?
253253
if len(record) == 0 {
254254
break
255255
}
@@ -262,7 +262,7 @@ impl Reader {
262262
// If EOF is hit without a trailing endline, it will be omitted.
263263
// The result is only valid until the next call to readLine.
264264
fn readLine(mut *self)!: []byte {
265-
mut line := self.r.readSlice('\n') else { error(error) }
265+
mut line := self.r.readSlice('\n')?
266266
mut readSize := len(line)
267267
if readSize > 0 {
268268
// For backwards compatibility, drop trailing \r before EOF.
@@ -291,7 +291,7 @@ impl Reader {
291291
// Read line (automatically skipping past empty lines and any comments).
292292
let mut line: []byte
293293
for {
294-
line = self.readLine() else { error(error) }
294+
line = self.readLine()?
295295
if len(line) == 0 {
296296
ret nil
297297
}
@@ -404,7 +404,7 @@ impl Reader {
404404
// Hit end of line (copy all data so far).
405405
self.recordBuffer = append(self.recordBuffer, line...)
406406
pos.col += len(line)
407-
line = self.readLine() else { error(error) }
407+
line = self.readLine()?
408408
if len(line) > 0 {
409409
pos.line++
410410
pos.col = 1
@@ -512,7 +512,7 @@ impl bufreader {
512512
copy(buf, self.buf)
513513
self.buf = buf
514514
}
515-
w := self.rd.Read(self.buf[self.r+n:]) else { error(error) }
515+
w := self.rd.Read(self.buf[self.r+n:])?
516516
if w == io::EOF {
517517
line = self.buf[self.r:self.w]
518518
self.r = self.w

std/encoding/csv/writer.jule

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl Writer {
116116
if n > 0 {
117117
mut bytes := make([]byte, utf8::UTFMax)
118118
j := utf8::EncodeRune(bytes, self.Comma)
119-
self.w.Write(bytes[:j]) else { error(error) }
119+
self.w.Write(bytes[:j])?
120120
}
121121

122122
// Use fb instead of field to avoid copying.
@@ -125,11 +125,11 @@ impl Writer {
125125
// If we don't have to have a quoted field then just
126126
// write out the field and continue to the next field.
127127
if !self.fieldNeedsQuotes(fb) {
128-
self.w.Write(fb) else { error(error) }
128+
self.w.Write(fb)?
129129
continue
130130
}
131131

132-
self.w.Write(['"']) else { error(error) }
132+
self.w.Write(['"'])?
133133

134134
for len(fb) > 0 {
135135
// Search for special characters.
@@ -139,42 +139,42 @@ impl Writer {
139139
}
140140

141141
// Copy verbatim everything before the special character.
142-
self.w.Write(fb[:i]) else { error(error) }
142+
self.w.Write(fb[:i])?
143143
fb = fb[i:]
144144

145145
// Encode the special character.
146146
if len(fb) > 0 {
147147
match fb[0] {
148148
| '"':
149-
self.w.Write(unsafe::StrBytes(`""`)) else { error(error) }
149+
self.w.Write(unsafe::StrBytes(`""`))?
150150
| '\r':
151151
if !self.UseCRLF {
152-
self.w.Write(['\r']) else { error(error) }
152+
self.w.Write(['\r'])?
153153
}
154154
| '\n':
155155
if self.UseCRLF {
156-
self.w.Write(unsafe::StrBytes("\r\n")) else { error(error) }
156+
self.w.Write(unsafe::StrBytes("\r\n"))?
157157
} else {
158-
self.w.Write(unsafe::StrBytes("\n")) else { error(error) }
158+
self.w.Write(unsafe::StrBytes("\n"))?
159159
}
160160
}
161161
fb = fb[1:]
162162
}
163163
}
164164

165-
self.w.Write(unsafe::StrBytes("\"")) else { error(error) }
165+
self.w.Write(unsafe::StrBytes("\""))?
166166
}
167167
if self.UseCRLF {
168-
self.w.Write(unsafe::StrBytes("\r\n")) else { error(error) }
168+
self.w.Write(unsafe::StrBytes("\r\n"))?
169169
} else {
170-
self.w.Write(unsafe::StrBytes("\n")) else { error(error) }
170+
self.w.Write(unsafe::StrBytes("\n"))?
171171
}
172172
}
173173

174174
// Writes multiple CSV records using [Writer.Write].
175175
fn WriteAll(mut *self, records: [][]str)! {
176176
for _, record in records {
177-
self.Write(record) else { error(error) }
177+
self.Write(record)?
178178
}
179179
}
180180
}

0 commit comments

Comments
 (0)