Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace interface{} with any #113

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace interface{} with any #113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 20 additions & 25 deletions pkl/evaluator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ type Evaluator interface {

// EvaluateExpression evaluates the provided expression on the given module source, and writes
// the result into the value pointed by out.
EvaluateExpression(ctx context.Context, source *ModuleSource, expr string, out interface{}) error
EvaluateExpression(ctx context.Context, source *ModuleSource, expr string, out any) error

// EvaluateExpressionRaw evaluates the provided module, and returns the underlying value's raw
// bytes.
Expand Down Expand Up @@ -94,7 +94,7 @@ func (e *evaluator) EvaluateOutputFiles(ctx context.Context, source *ModuleSourc
return out, err
}

func (e *evaluator) EvaluateExpression(ctx context.Context, source *ModuleSource, expr string, out interface{}) error {
func (e *evaluator) EvaluateExpression(ctx context.Context, source *ModuleSource, expr string, out any) error {
bytes, err := e.EvaluateExpressionRaw(ctx, source, expr)
if err != nil {
return err
Expand All @@ -120,7 +120,7 @@ func (e *evaluator) EvaluateExpressionRaw(ctx context.Context, source *ModuleSou
}
select {
case <-ctx.Done():
return nil, nil
return nil, ctx.Err()
case err := <-interrupted:
return nil, err
case resp := <-ch:
Expand Down Expand Up @@ -149,7 +149,11 @@ func (e *evaluator) handleEvaluateResponse(resp *msgapi.EvaluateResponse) {
log.Default().Printf("warn: received a message for an unknown request id: %d", resp.RequestId)
return
}
ch := c.(chan *msgapi.EvaluateResponse)
ch, ok := c.(chan *msgapi.EvaluateResponse)
if !ok {
log.Default().Printf("warn: unexpected type in pendingRequests for request id: %d", resp.RequestId)
return
}
ch <- resp
close(ch)
e.pendingRequests.Delete(resp.RequestId)
Expand All @@ -175,13 +179,7 @@ func (e *evaluator) handleReadResource(msg *msgapi.ReadResource) {
e.manager.impl.outChan() <- response
return
}
var reader ResourceReader
for _, r := range e.resourceReaders {
if r.Scheme() == u.Scheme {
reader = r
break
}
}
reader := e.findResourceReader(u.Scheme)
if reader == nil {
response.Error = fmt.Sprintf("No resource reader found for scheme `%s`", u.Scheme)
e.manager.impl.outChan() <- response
Expand All @@ -203,13 +201,7 @@ func (e *evaluator) handleReadModule(msg *msgapi.ReadModule) {
e.manager.impl.outChan() <- response
return
}
var reader ModuleReader
for _, r := range e.moduleReaders {
if r.Scheme() == u.Scheme {
reader = r
break
}
}
reader := e.findModuleReader(u.Scheme)
if reader == nil {
response.Error = fmt.Sprintf("No module reader found for scheme `%s`", u.Scheme)
e.manager.impl.outChan() <- response
Expand Down Expand Up @@ -267,6 +259,15 @@ func (e *evaluator) findResourceReader(scheme string) ResourceReader {
return nil
}

func (e *evaluator) findModuleReader(scheme string) ModuleReader {
for _, r := range e.moduleReaders {
if r.Scheme() == scheme {
return r
}
}
return nil
}

func (e *evaluator) handleListModules(msg *msgapi.ListModules) {
response := &msgapi.ListModulesResponse{EvaluatorId: e.evaluatorId, RequestId: msg.RequestId}
u, err := url.Parse(msg.Uri)
Expand All @@ -275,13 +276,7 @@ func (e *evaluator) handleListModules(msg *msgapi.ListModules) {
e.manager.impl.outChan() <- response
return
}
var reader ModuleReader
for _, r := range e.moduleReaders {
if r.Scheme() == u.Scheme {
reader = r
break
}
}
reader := e.findModuleReader(u.Scheme)
if reader == nil {
response.Error = fmt.Sprintf("No module reader found for scheme `%s`", u.Scheme)
e.manager.impl.outChan() <- response
Expand Down