lure
/
lure
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 13 Activity

Remove unneeded WriteFunc() function

This commit is contained in:
Elara 2022-09-26 14:07:13 -07:00
parent a0fcc46718
commit cd6990fe45
1 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
internal/shutils/decoder/decoder.go
View File

@ -22,7 +22,6 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"io"
"reflect" "reflect"
"runtime" "runtime"
"strings" "strings"
@ -37,13 +36,12 @@ import (
var ErrInvalidType = errors.New("val must be a pointer to a struct") var ErrInvalidType = errors.New("val must be a pointer to a struct")
type NotFoundError struct { type VarNotFoundError struct {
stype string name string
name string
} }
func (nfe NotFoundError) Error() string { func (nfe VarNotFoundError) Error() string {
return "required " + nfe.stype + " '" + nfe.name + "' could not be found" return "required variable '" + nfe.name + "' could not be found"
} }
// Decoder provides methods for decoding variable values // Decoder provides methods for decoding variable values
@ -63,7 +61,7 @@ func New(info *distro.OSRelease, runner *interp.Runner) *Decoder {
func (d *Decoder) DecodeVar(name string, val any) error { func (d *Decoder) DecodeVar(name string, val any) error {
variable := d.getVar(name) variable := d.getVar(name)
if variable == nil { if variable == nil {
return NotFoundError{"variable", name} return VarNotFoundError{name}
} }
dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{ dec, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
@ -128,7 +126,7 @@ func (d *Decoder) DecodeVars(val any) error {
newVal := reflect.New(field.Type()) newVal := reflect.New(field.Type())
err := d.DecodeVar(name, newVal.Interface()) err := d.DecodeVar(name, newVal.Interface())
if _, ok := err.(NotFoundError); ok && !required { if _, ok := err.(VarNotFoundError); ok && !required {
continue continue
} else if err != nil { } else if err != nil {
return err return err
@ -158,31 +156,6 @@ func (d *Decoder) GetFunc(name string) (ScriptFunc, bool) {
}, true }, true
} }
// WriteFunc writes the contents of a bash function to w.
func (d *Decoder) WriteFunc(name string, w io.Writer) error {
fn := d.getFunc(name)
if fn == nil {
return NotFoundError{"function", name}
}
printer := syntax.NewPrinter()
// Print individual statements instead of the entire block
block := fn.Cmd.(*syntax.Block)
for _, stmt := range block.Stmts {
err := printer.Print(w, stmt)
if err != nil {
return err
}
_, err = io.WriteString(w, "\n")
if err != nil {
return err
}
}
return nil
}
func (d *Decoder) getFunc(name string) *syntax.Stmt { func (d *Decoder) getFunc(name string) *syntax.Stmt {
names := d.genPossibleNames(name) names := d.genPossibleNames(name)
for _, fnName := range names { for _, fnName := range names {