Merged in feature/s3integration (pull request #47)
Set Up S3 integration * cfginterfaceandfirsts3funcs * addlocalstack * generallypassesfullsuite * addedmultipleattemptedpings * cleanup * stabiliseplusskip
This commit is contained in:
+5
-4
@@ -6,6 +6,7 @@ import (
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
// ConstVariable a model to record a const variable
|
||||
@@ -60,7 +61,7 @@ func EvaluateEscapedString(text string) string {
|
||||
i++
|
||||
char, err := strconv.ParseInt(text[i:i+4], 16, 32)
|
||||
if err == nil {
|
||||
result = AppendUtf8Rune(result, rune(char))
|
||||
result = utf8.AppendRune(result, rune(char))
|
||||
}
|
||||
i += 3
|
||||
} else if c, ok := escapedChars[text[i]]; ok {
|
||||
@@ -404,7 +405,7 @@ func EvaluateUnary(x interface{}, operator token.Token, xtype ast.Expr) (interfa
|
||||
func EvaluateBinary(x, y interface{}, operator token.Token, xtype, ytype ast.Expr) (interface{}, ast.Expr) {
|
||||
if operator == token.SHR || operator == token.SHL {
|
||||
var rightOperand uint64
|
||||
yValue := CanIntegerValue{reflect.ValueOf(y)}
|
||||
yValue := reflect.ValueOf(y)
|
||||
if yValue.CanUint() {
|
||||
rightOperand = yValue.Uint()
|
||||
} else if yValue.CanInt() {
|
||||
@@ -467,8 +468,8 @@ func EvaluateBinary(x, y interface{}, operator token.Token, xtype, ytype ast.Exp
|
||||
evalType = ytype
|
||||
}
|
||||
|
||||
xValue := CanIntegerValue{reflect.ValueOf(x)}
|
||||
yValue := CanIntegerValue{reflect.ValueOf(y)}
|
||||
xValue := reflect.ValueOf(x)
|
||||
yValue := reflect.ValueOf(y)
|
||||
if xValue.Kind() == reflect.String && yValue.Kind() == reflect.String {
|
||||
return xValue.String() + yValue.String(), evalType
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user