Elara6331/scpt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up ParseValue()

Browse Source
This commit is contained in:
Elara 2021-03-02 00:27:28 -08:00
parent 412079c20a
commit 1196942801
1 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scpt.go
View File

@ -98,16 +98,24 @@ func ParseValue(val *Value) (interface{}, error) {
// Return value of provided key // Return value of provided key
return Vars[*val.VarVal], nil return Vars[*val.VarVal], nil
} else if val.Expr != nil { } else if val.Expr != nil {
// Return evaluated expression
return evalExpr(*val.Expr)
}
return nil, nil
}
// Evaluate given expression, returning its value and optionally an error
func evalExpr(expression Expression) (interface{}, error) {
// Parse value of left side of expression // Parse value of left side of expression
left, _ := callIfFunc(ParseValue(val.Expr.Left)) left, _ := callIfFunc(ParseValue(expression.Left))
// If value is string, requote // If value is string, requote
if isStr(left) { if isStr(left) {
left = requoteStr(left.(string)) left = requoteStr(left.(string))
} }
// Create new nil string // Create new nil string
var right string var right string
// For every right segment // For every right gsegment
for _, segment := range val.Expr.RightSegs { for _, segment := range expression.RightSegs {
// Parse value of right segment, calling it if it is a function // Parse value of right segment, calling it if it is a function
rVal, _ := callIfFunc(ParseValue(segment.Right)) rVal, _ := callIfFunc(ParseValue(segment.Right))
// If value is string, requote // If value is string, requote
@ -139,8 +147,6 @@ func ParseValue(val *Value) (interface{}, error) {
} }
// Return expression output value // Return expression output value
return out, nil return out, nil
}
return nil, nil
} }
// Add quotes to an unquoted string // Add quotes to an unquoted string