4 Commits

Author SHA1 Message Date
amery a2da12be7a reflection: add initial New() validating type and triggering a scan
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-02 00:10:47 +00:00
amery 1e95acf21d reflection: introduce InvalidUnmarshalError{}
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-09-01 23:54:14 +00:00
amery 2b5dcec64d lexer: add Hint to Error, which is expanded as "%s" instead of "%q"
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-31 20:11:58 +00:00
amery 4aa6233e4f lexer: refactor Error.Error()'s prefix generator
Signed-off-by: Alejandro Mery <amery@jpi.io>
2023-08-31 20:11:34 +00:00
4 changed files with 106 additions and 5 deletions
+21 -5
View File
@@ -25,17 +25,29 @@ type Error struct {
Column int Column int
Content string Content string
Hint string
Err error Err error
} }
func (err Error) prefix() string {
switch {
case err.Line > 0 || err.Column > 0:
if err.Filename != "" {
return fmt.Sprintf("%s:%v:%v", err.Filename, err.Line, err.Column)
}
return fmt.Sprintf("%v:%v", err.Line, err.Column)
default:
return err.Filename
}
}
func (err Error) Error() string { func (err Error) Error() string {
var s []string var s []string
switch { prefix := err.prefix()
case err.Line > 0 || err.Column > 0: if prefix != "" {
s = append(s, fmt.Sprintf("%s:%v:%v", err.Filename, err.Line, err.Column)) s = append(s, prefix)
case err.Filename != "":
s = append(s, err.Filename)
} }
if err.Err != nil { if err.Err != nil {
@@ -46,6 +58,10 @@ func (err Error) Error() string {
s = append(s, fmt.Sprintf("%q", err.Content)) s = append(s, fmt.Sprintf("%q", err.Content))
} }
if err.Hint != "" {
s = append(s, err.Hint)
}
return strings.Join(s, ": ") return strings.Join(s, ": ")
} }
+44
View File
@@ -0,0 +1,44 @@
package reflection
import (
"bytes"
"fmt"
"reflect"
)
// An InvalidUnmarshalError describes an invalid argument passed to New.
// (It must be a non-nil pointer.)
type InvalidUnmarshalError struct {
Method string
Prefix string
reflect.Type
}
func (e *InvalidUnmarshalError) Error() string {
var buf bytes.Buffer
if e.Prefix != "" {
_, _ = fmt.Fprintf(&buf, "%s: ", e.Prefix)
}
method := e.Method
if method == "" {
method = "New"
}
_, _ = fmt.Fprintf(&buf, "%s(", method)
switch {
case e.Type == nil:
_, _ = buf.WriteString("nil")
case e.Type.Kind() != reflect.Pointer:
_, _ = fmt.Fprintf(&buf, "%s %s", "non-pointer", e.Type.String())
default:
_, _ = fmt.Fprintf(&buf, "%s %s", "nil", e.Type.String())
}
_, _ = buf.WriteString(")")
return buf.String()
}
+36
View File
@@ -0,0 +1,36 @@
// Package reflection helps Marshalling/Unmarshalling data to structs
package reflection
import (
"reflect"
)
// Reflection provides Marshalling/Unmarshalling oriented view
// of a value
type Reflection[T any] struct {
rv reflect.Value
rt reflect.Type
}
// Value returns the object it reflects
func (r *Reflection[T]) Value() *T {
return r.rv.Interface().(*T)
}
// New creates a Reflection of the given pointer
func New[T any](v *T) (*Reflection[T], error) {
if v == nil {
err := &InvalidUnmarshalError{Type: reflect.TypeOf(v)}
return nil, err
}
r := &Reflection[T]{
rv: reflect.ValueOf(v),
rt: reflect.TypeOf(v),
}
if err := r.scan(); err != nil {
return nil, err
}
return r, nil
}
+5
View File
@@ -0,0 +1,5 @@
package reflection
func (*Reflection[T]) scan() error {
return nil
}