More renaming of conditionls

This commit is contained in:
Alex Yatskov 2016-02-13 13:01:05 -08:00
parent eff8fa0abd
commit 4614524ccb

16
task.go
View File

@ -28,12 +28,12 @@ import (
) )
type task struct { type task struct {
Deps []string Deps []string
Links [][]string Links [][]string
Cmds [][]string Cmds [][]string
Envs [][]string Envs [][]string
WTrue [][]string Accepts [][]string
WFalse [][]string Rejects [][]string
} }
func (t *task) deps(conf *config) []string { func (t *task) deps(conf *config) []string {
@ -64,13 +64,13 @@ func (t *task) process(conf *config) error {
if conf.flags&flagNoCmds == 0 { if conf.flags&flagNoCmds == 0 {
CmdLoop: CmdLoop:
for { for {
for _, currCnd := range t.WTrue { for _, currCnd := range t.Accepts {
if err := processCmd(currCnd, false, conf); err != nil { if err := processCmd(currCnd, false, conf); err != nil {
break CmdLoop break CmdLoop
} }
} }
for _, currCnd := range t.WFalse { for _, currCnd := range t.Rejects {
if err := processCmd(currCnd, false, conf); err == nil { if err := processCmd(currCnd, false, conf); err == nil {
break CmdLoop break CmdLoop
} }