clean up error imports for strvals pkg

Signed-off-by: James Sheppard <jgsheppa@protonmail.com>
pull/12063/head
James Sheppard 2 years ago
parent 5a8a42e398
commit 73fe5802df

@ -102,7 +102,7 @@ func (t *literalParser) key(data map[string]interface{}, nestedNameLevel int) (r
if len(key) == 0 { if len(key) == 0 {
return err return err
} }
return errors.Errorf("key %q has no value", string(key)) return fmt.Errorf("key %q has no value", string(key))
case lastRune == '=': case lastRune == '=':
// found end of key: swallow the '=' and get the value // found end of key: swallow the '=' and get the value
@ -129,7 +129,7 @@ func (t *literalParser) key(data map[string]interface{}, nestedNameLevel int) (r
// recurse on sub-tree with remaining data // recurse on sub-tree with remaining data
err := t.key(inner, nestedNameLevel) err := t.key(inner, nestedNameLevel)
if err == nil && len(inner) == 0 { if err == nil && len(inner) == 0 {
return errors.Errorf("key map %q has no value", string(key)) return fmt.Errorf("key map %q has no value", string(key))
} }
if len(inner) != 0 { if len(inner) != 0 {
set(data, string(key), inner) set(data, string(key), inner)
@ -178,7 +178,7 @@ func (t *literalParser) listItem(list []interface{}, i, nestedNameLevel int) ([]
switch key, lastRune, err := runesUntilLiteral(t.sc, stop); { switch key, lastRune, err := runesUntilLiteral(t.sc, stop); {
case len(key) > 0: case len(key) > 0:
return list, errors.Errorf("unexpected data at end of array index: %q", key) return list, fmt.Errorf("unexpected data at end of array index: %q", key)
case err != nil: case err != nil:
return list, err return list, err
@ -233,7 +233,7 @@ func (t *literalParser) listItem(list []interface{}, i, nestedNameLevel int) ([]
return setIndex(list, i, list2) return setIndex(list, i, list2)
default: default:
return nil, errors.Errorf("parse error: unexpected token %v", lastRune) return nil, fmt.Errorf("parse error: unexpected token %v", lastRune)
} }
} }

@ -189,7 +189,7 @@ func (t *parser) key(data map[string]interface{}, nestedNameLevel int) (reterr e
if len(k) == 0 { if len(k) == 0 {
return err return err
} }
return errors.Errorf("key %q has no value", string(k)) return fmt.Errorf("key %q has no value", string(k))
//set(data, string(k), "") //set(data, string(k), "")
//return err //return err
case last == '[': case last == '[':
@ -261,7 +261,7 @@ func (t *parser) key(data map[string]interface{}, nestedNameLevel int) (reterr e
case last == ',': case last == ',':
// No value given. Set the value to empty string. Return error. // No value given. Set the value to empty string. Return error.
set(data, string(k), "") set(data, string(k), "")
return errors.Errorf("key %q has no value (cannot end with ,)", string(k)) return fmt.Errorf("key %q has no value (cannot end with ,)", string(k))
case last == '.': case last == '.':
// Check value name is within the maximum nested name level // Check value name is within the maximum nested name level
nestedNameLevel++ nestedNameLevel++
@ -278,7 +278,7 @@ func (t *parser) key(data map[string]interface{}, nestedNameLevel int) (reterr e
// Recurse // Recurse
e := t.key(inner, nestedNameLevel) e := t.key(inner, nestedNameLevel)
if e == nil && len(inner) == 0 { if e == nil && len(inner) == 0 {
return errors.Errorf("key map %q has no value", string(k)) return fmt.Errorf("key map %q has no value", string(k))
} }
if len(inner) != 0 { if len(inner) != 0 {
set(data, string(k), inner) set(data, string(k), inner)
@ -339,7 +339,7 @@ func (t *parser) listItem(list []interface{}, i, nestedNameLevel int) ([]interfa
stop := runeSet([]rune{'[', '.', '='}) stop := runeSet([]rune{'[', '.', '='})
switch k, last, err := runesUntil(t.sc, stop); { switch k, last, err := runesUntil(t.sc, stop); {
case len(k) > 0: case len(k) > 0:
return list, errors.Errorf("unexpected data at end of array index: %q", k) return list, fmt.Errorf("unexpected data at end of array index: %q", k)
case err != nil: case err != nil:
return list, err return list, err
case last == '=': case last == '=':
@ -430,7 +430,7 @@ func (t *parser) listItem(list []interface{}, i, nestedNameLevel int) ([]interfa
} }
return setIndex(list, i, inner) return setIndex(list, i, inner)
default: default:
return nil, errors.Errorf("parse error: unexpected token %v", last) return nil, fmt.Errorf("parse error: unexpected token %v", last)
} }
} }

Loading…
Cancel
Save