mirror of
https://github.com/johnkerl/miller.git
synced 2026-01-23 02:14:13 +00:00
* Static-check fixes from @lespea #1657, batch 2/n * Static-check fixes from @lespea #1657, batch 3/n * Static-check fixes from @lespea #1657, batch 4/n
This commit is contained in:
parent
04a9b9decd
commit
8c791f5466
14 changed files with 20 additions and 20 deletions
|
|
@ -946,7 +946,7 @@ func BIF_minlen_variadic(mlrvals []*mlrval.Mlrval) *mlrval.Mlrval {
|
|||
}
|
||||
// Do the bulk arithmetic on native ints not Mlrvals, to avoid unnecessary allocation.
|
||||
retval := lib.UTF8Strlen(mlrvals[0].OriginalString())
|
||||
for i, _ := range mlrvals {
|
||||
for i := range mlrvals {
|
||||
clen := lib.UTF8Strlen(mlrvals[i].OriginalString())
|
||||
if clen < retval {
|
||||
retval = clen
|
||||
|
|
@ -1116,7 +1116,7 @@ func BIF_maxlen_variadic(mlrvals []*mlrval.Mlrval) *mlrval.Mlrval {
|
|||
}
|
||||
// Do the bulk arithmetic on native ints not Mlrvals, to avoid unnecessary allocation.
|
||||
retval := lib.UTF8Strlen(mlrvals[0].OriginalString())
|
||||
for i, _ := range mlrvals {
|
||||
for i := range mlrvals {
|
||||
clen := lib.UTF8Strlen(mlrvals[i].OriginalString())
|
||||
if clen > retval {
|
||||
retval = clen
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ func BIF_strmatchx(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
|
|||
captures_array := make([]*mlrval.Mlrval, len(captures))
|
||||
|
||||
if len(captures) > 0 {
|
||||
for i, _ := range captures {
|
||||
for i := range captures {
|
||||
if i == 0 {
|
||||
results.PutReference("full_capture", mlrval.FromString(captures[i]))
|
||||
} else {
|
||||
|
|
@ -156,7 +156,7 @@ func BIF_strmatchx(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
|
|||
}
|
||||
|
||||
starts_array := make([]*mlrval.Mlrval, len(starts))
|
||||
for i, _ := range starts {
|
||||
for i := range starts {
|
||||
if i == 0 {
|
||||
results.PutReference("full_start", mlrval.FromInt(int64(starts[i])))
|
||||
} else {
|
||||
|
|
@ -165,7 +165,7 @@ func BIF_strmatchx(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
|
|||
}
|
||||
|
||||
ends_array := make([]*mlrval.Mlrval, len(ends))
|
||||
for i, _ := range ends {
|
||||
for i := range ends {
|
||||
if i == 0 {
|
||||
results.PutReference("full_end", mlrval.FromInt(int64(ends[i])))
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -636,7 +636,7 @@ func bif_percentiles_impl(
|
|||
|
||||
outputs := make([]*mlrval.Mlrval, len(ps))
|
||||
|
||||
for i, _ := range ps {
|
||||
for i := range ps {
|
||||
p, ok := ps[i].GetNumericToFloatValue()
|
||||
if !ok {
|
||||
outputs[i] = type_error_named_argument(funcname, "numeric", "percentile", ps[i])
|
||||
|
|
@ -655,7 +655,7 @@ func bif_percentiles_impl(
|
|||
return mlrval.FromArray(outputs)
|
||||
} else {
|
||||
m := mlrval.NewMlrmap()
|
||||
for i, _ := range ps {
|
||||
for i := range ps {
|
||||
sp := ps[i].String()
|
||||
m.PutCopy(sp, outputs[i])
|
||||
}
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ func channelizedLineReader(
|
|||
// quickly, as it should.
|
||||
if i%recordsPerBatch == 0 {
|
||||
select {
|
||||
case _ = <-downstreamDoneChannel:
|
||||
case <-downstreamDoneChannel:
|
||||
done = true
|
||||
break
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ func (reader *PseudoReaderGen) process(
|
|||
// avoid goroutine-scheduler thrash.
|
||||
eof := false
|
||||
select {
|
||||
case _ = <-downstreamDoneChannel:
|
||||
case <-downstreamDoneChannel:
|
||||
eof = true
|
||||
break
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ func channelizedCSVRecordScanner(
|
|||
// quickly, as it should.
|
||||
if i%recordsPerBatch == 0 {
|
||||
select {
|
||||
case _ = <-downstreamDoneChannel:
|
||||
case <-downstreamDoneChannel:
|
||||
done = true
|
||||
break
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ func (reader *RecordReaderJSON) processHandle(
|
|||
i++
|
||||
if i%recordsPerBatch == 0 {
|
||||
select {
|
||||
case _ = <-downstreamDoneChannel:
|
||||
case <-downstreamDoneChannel:
|
||||
eof = true
|
||||
break
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ func getRecordBatchExplicitPprintHeader(
|
|||
continue
|
||||
}
|
||||
fields := make([]string, npad-2)
|
||||
for i, _ := range paddedFields {
|
||||
for i := range paddedFields {
|
||||
if i == 0 || i == npad-1 {
|
||||
continue
|
||||
}
|
||||
|
|
@ -361,7 +361,7 @@ func getRecordBatchImplicitPprintHeader(
|
|||
paddedFields := reader.fieldSplitter.Split(line)
|
||||
npad := len(paddedFields)
|
||||
fields := make([]string, npad-2)
|
||||
for i, _ := range paddedFields {
|
||||
for i := range paddedFields {
|
||||
if i == 0 || i == npad-1 {
|
||||
continue
|
||||
}
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ func channelizedStanzaScanner(
|
|||
// quickly, as it should.
|
||||
if numStanzasSeen%recordsPerBatch == 0 {
|
||||
select {
|
||||
case _ = <-downstreamDoneChannel:
|
||||
case <-downstreamDoneChannel:
|
||||
done = true
|
||||
break
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ func (mv *Mlrval) StringifyValuesRecursively() {
|
|||
switch mv.mvtype {
|
||||
|
||||
case MT_ARRAY:
|
||||
for i, _ := range mv.intf.([]*Mlrval) {
|
||||
for i := range mv.intf.([]*Mlrval) {
|
||||
mv.intf.([]*Mlrval)[i].StringifyValuesRecursively()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ func GetArgs() []string {
|
|||
//printArgs(retargs, "NEW")
|
||||
|
||||
globbed := make([]string, 0)
|
||||
for i, _ := range retargs {
|
||||
for i := range retargs {
|
||||
// Expand things like *.csv
|
||||
matches, err := filepath.Glob(retargs[i])
|
||||
if matches != nil && err == nil {
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ func (repl *Repl) handleSession(istream *os.File) error {
|
|||
doneDraining := false
|
||||
for {
|
||||
select {
|
||||
case _ = <-repl.appSignalNotificationChannel:
|
||||
case <-repl.appSignalNotificationChannel:
|
||||
line = "" // Ignore any partially-entered line -- a ^C should do that
|
||||
default:
|
||||
doneDraining = true
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ func (tr *TransformerTee) Transform(
|
|||
// But 'mlr cut -f foo then tee bar.txt then head -n 10' -- one does expect
|
||||
// bar.txt to have all the output from cut.
|
||||
select {
|
||||
case _ = <-inputDownstreamDoneChannel:
|
||||
case <-inputDownstreamDoneChannel:
|
||||
// Do not write this to the coutputDownstreamDoneChannel, as other transformers do
|
||||
break
|
||||
default:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue