Static-check fixes from @lespea #1657, batch 4/n

docs/src/miller-as-library/main3.go

@@ -89,10 +89,10 @@ func convert_csv_to_json(fileNames []string) error {
 		case ierr := <-inputErrorChannel:
 			retval = ierr
 			break
-		case _ = <-dataProcessingErrorChannel:
+		case <-dataProcessingErrorChannel:
 			retval = errors.New("exiting due to data error") // details already printed
 			break
-		case _ = <-doneWritingChannel:
+		case <-doneWritingChannel:
 			done = true
 			break
 		}

pkg/bifs/arithmetic.go

@@ -834,7 +834,7 @@
 // a=F | min=a min=a
 // a=T | min=b min=b
 func min_b_bb(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
-	if input1.AcquireBoolValue() == false {
+	if !input1.AcquireBoolValue() {
 		return input1
 	} else {
 		return input2
@@ -946,8 +946,8 @@
 	}
 	// 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
 		}
@@ -1004,7 +1004,7 @@
 // a=F | max=a max=b
 // a=T | max=a max=b
 func max_b_bb(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
-	if input2.AcquireBoolValue() == false {
+	if !input2.AcquireBoolValue() {
 		return input1
 	} else {
 		return input2
@@ -1116,7 +1116,7 @@
 	}
 	// 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

pkg/bifs/cmp.go

@@ -246,7 +246,7 @@ func eq_b_aa(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
 	for i := range a {
 		eq := BIF_equals(a[i], b[i])
 		lib.InternalCodingErrorIf(eq.Type() != mlrval.MT_BOOL)
-		if eq.AcquireBoolValue() == false {
+		if !eq.AcquireBoolValue() {
 			return mlrval.FALSE
 		}
 	}

pkg/bifs/regex.go

@@ -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 {

pkg/bifs/stats.go

@@ -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])
 		}

pkg/bifs/types.go

@@ -37,7 +37,7 @@ func float_to_int(input1 *mlrval.Mlrval) *mlrval.Mlrval {
 }
 
 func bool_to_int(input1 *mlrval.Mlrval) *mlrval.Mlrval {
-	if input1.AcquireBoolValue() == true {
+	if input1.AcquireBoolValue() {
 		return mlrval.FromInt(1)
 	} else {
 		return mlrval.FromInt(0)
@@ -92,7 +92,7 @@ func float_to_int_with_base(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
 }
 
 func bool_to_int_with_base(input1, input2 *mlrval.Mlrval) *mlrval.Mlrval {
-	if input1.AcquireBoolValue() == true {
+	if input1.AcquireBoolValue() {
 		return mlrval.FromInt(1)
 	} else {
 		return mlrval.FromInt(0)
@@ -146,7 +146,7 @@ func int_to_float(input1 *mlrval.Mlrval) *mlrval.Mlrval {
 }
 
 func bool_to_float(input1 *mlrval.Mlrval) *mlrval.Mlrval {
-	if input1.AcquireBoolValue() == true {
+	if input1.AcquireBoolValue() {
 		return mlrval.FromFloat(1.0)
 	} else {
 		return mlrval.FromFloat(0.0)

pkg/climain/mlrcli_parse.go

@@ -295,7 +295,7 @@ func parseCommandLinePassTwo(
 		rc := cli.FLAG_TABLE.Parse(args, argc, &argi, options)
 
 		// Should have been parsed OK in pass one.
-		lib.InternalCodingErrorIf(rc != true)
+		lib.InternalCodingErrorIf(!rc)
 		// Make sure we consumed the entire flag sequence as parsed by pass one.
 		lib.InternalCodingErrorIf(argi != argc)
 	}

pkg/dsl/cst/builtin_function_manager.go

@@ -2595,7 +2595,7 @@ func (manager *BuiltinFunctionManager) getBuiltinFunctionClasses() []string {
 	classesList := make([]string, 0)
 	for _, builtinFunctionInfo := range *manager.lookupTable {
 		class := string(builtinFunctionInfo.class)
-		if classesSeen[class] == false {
+		if !classesSeen[class] {
 			classesList = append(classesList, class)
 			classesSeen[class] = true
 		}

pkg/dsl/cst/builtin_functions.go

@@ -945,7 +945,7 @@ func (node *StandardTernaryOperatorNode) Evaluate(
 	}
 
 	// Short-circuit: defer evaluation unless needed
-	if boolValue == true {
+	if boolValue {
 		return node.b.Evaluate(state)
 	} else {
 		return node.c.Evaluate(state)

pkg/dsl/cst/cond.go

@@ -66,7 +66,7 @@ func (node *CondBlockNode) Execute(
 		)
 	}
 
-	if boolValue == true {
+	if boolValue {
 		blockExitPayload, err := node.statementBlockNode.Execute(state)
 		if err != nil {
 			return nil, err

pkg/dsl/cst/for.go

@@ -902,7 +902,7 @@ func (node *TripleForLoopNode) Execute(state *runtime.State) (*BlockExitPayload,
 					dsl.TokenToLocationInfo(node.continuationExpressionToken),
 				)
 			}
-			if boolValue == false {
+			if !boolValue {
 				break
 			}
 		}

pkg/dsl/cst/if.go

@@ -134,7 +134,7 @@ func (node *IfChainNode) Execute(state *runtime.State) (*BlockExitPayload, error
 				dsl.TokenToLocationInfo(ifItem.conditionToken),
 			)
 		}
-		if boolValue == true {
+		if boolValue {
 			blockExitPayload, err := ifItem.statementBlockNode.Execute(state)
 			if err != nil {
 				return nil, err

pkg/dsl/cst/while.go

@@ -64,7 +64,7 @@ func (node *WhileLoopNode) Execute(state *runtime.State) (*BlockExitPayload, err
 				dsl.TokenToLocationInfo(node.conditionToken),
 			)
 		}
-		if boolValue != true {
+		if !boolValue {
 			break
 		}
 		blockExitPayload, err := node.statementBlockNode.Execute(state)
@@ -161,7 +161,7 @@ func (node *DoWhileLoopNode) Execute(state *runtime.State) (*BlockExitPayload, e
 				dsl.TokenToLocationInfo(node.conditionToken),
 			)
 		}
-		if boolValue == false {
+		if !boolValue {
 			break
 		}
 	}

pkg/input/line_reader.go

@@ -201,7 +201,7 @@ func channelizedLineReader(
 		// quickly, as it should.
 		if i%recordsPerBatch == 0 {
 			select {
-			case _ = <-downstreamDoneChannel:
+			case <-downstreamDoneChannel:
 				done = true
 				break
 			default:

pkg/input/pseudo_reader_gen.go

@@ -96,7 +96,7 @@ func (reader *PseudoReaderGen) process(
 			// avoid goroutine-scheduler thrash.
 			eof := false
 			select {
-			case _ = <-downstreamDoneChannel:
+			case <-downstreamDoneChannel:
 				eof = true
 				break
 			default:

pkg/input/record_reader_csv.go

@@ -158,7 +158,7 @@ func channelizedCSVRecordScanner(
 		// quickly, as it should.
 		if i%recordsPerBatch == 0 {
 			select {
-			case _ = <-downstreamDoneChannel:
+			case <-downstreamDoneChannel:
 				done = true
 				break
 			default:

pkg/input/record_reader_json.go

@@ -99,7 +99,7 @@ func (reader *RecordReaderJSON) processHandle(
 		i++
 		if i%recordsPerBatch == 0 {
 			select {
-			case _ = <-downstreamDoneChannel:
+			case <-downstreamDoneChannel:
 				eof = true
 				break
 			default:

pkg/input/record_reader_pprint.go

@@ -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
 			}

pkg/input/record_reader_xtab.go

@@ -202,7 +202,7 @@ func channelizedStanzaScanner(
 		// quickly, as it should.
 		if numStanzasSeen%recordsPerBatch == 0 {
 			select {
-			case _ = <-downstreamDoneChannel:
+			case <-downstreamDoneChannel:
 				done = true
 				break
 			default:

pkg/lib/util.go

@@ -14,7 +14,7 @@ func BooleanXOR(a, b bool) bool {
 }
 
 func BoolToInt(b bool) int64 {
-	if b == false {
+	if !b {
 		return 0
 	} else {
 		return 1

pkg/mlrval/mlrval_is.go

@@ -112,10 +112,10 @@ func (mv *Mlrval) IsBool() bool {
 }
 
 func (mv *Mlrval) IsTrue() bool {
-	return mv.Type() == MT_BOOL && mv.intf.(bool) == true
+	return mv.Type() == MT_BOOL && mv.intf.(bool)
 }
 func (mv *Mlrval) IsFalse() bool {
-	return mv.Type() == MT_BOOL && mv.intf.(bool) == false
+	return mv.Type() == MT_BOOL && !mv.intf.(bool)
 }
 
 func (mv *Mlrval) IsArray() bool {

pkg/mlrval/mlrval_new.go

@@ -289,7 +289,7 @@ func FromPrevalidatedFloatString(input string, floatval float64) *Mlrval {
 }
 
 func FromBool(input bool) *Mlrval {
-	if input == true {
+	if input {
 		return TRUE
 	} else {
 		return FALSE

pkg/mlrval/mlrval_output.go

@@ -87,7 +87,7 @@ func (mv *Mlrval) setPrintRep() {
 			mv.printrep = strconv.FormatFloat(mv.intf.(float64), 'f', -1, 64)
 
 		case MT_BOOL:
-			if mv.intf.(bool) == true {
+			if mv.intf.(bool) {
 				mv.printrep = "true"
 			} else {
 				mv.printrep = "false"
@@ -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()
 		}
 

pkg/output/file_output_handlers.go

@@ -399,13 +399,11 @@ func (handler *FileOutputHandler) Close() (retval error) {
 		done := false
 		for !done {
 			select {
-			case _ = <-handler.recordErroredChannel:
+			case <-handler.recordErroredChannel:
 				done = true
 				retval = errors.New("exiting due to data error") // details already printed
-				break
-			case _ = <-handler.recordDoneChannel:
+			case <-handler.recordDoneChannel:
 				done = true
-				break
 			}
 		}
 	}

pkg/platform/getargs_windows.go

@@ -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 {

pkg/stream/stream.go

@@ -95,13 +95,10 @@ func Stream(
 		select {
 		case ierr := <-inputErrorChannel:
 			retval = ierr
-			break
-		case _ = <-dataProcessingErrorChannel:
+		case <-dataProcessingErrorChannel:
 			retval = errors.New("exiting due to data error") // details already printed
-			break
-		case _ = <-doneWritingChannel:
+		case <-doneWritingChannel:
 			done = true
-			break
 		}
 	}
 

pkg/terminals/repl/session.go

@@ -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