Merge remote-tracking branch 'upstream/master'

This commit is contained in:
2023-03-25 19:37:15 +00:00

View File

@@ -88,12 +88,6 @@ func translateVal(code UNPARSEcode, index int, codelines []UNPARSEcode, isLine i
} else if isFactorial(code) { } else if isFactorial(code) {
return parseFactorial(code, index, codelines) return parseFactorial(code, index, codelines)
} }
if isCall(code) {
resp, worked, err, i = parseCall(code, index, codelines)
if worked {
return resp, worked, err, i
}
}
if isVariable(code) { if isVariable(code) {
return parseVariable(code) return parseVariable(code)
} }
@@ -103,6 +97,20 @@ func translateVal(code UNPARSEcode, index int, codelines []UNPARSEcode, isLine i
return resp, worked, err, i return resp, worked, err, i
} }
} }
{
operation, worked, err, step := parseOperations(code, index, codelines)
if worked {
return operation, worked, err, step
} else if err.EXISTS {
return nil, worked, err, step
}
}
if isCall(code) {
resp, worked, err, i = parseCall(code, index, codelines)
if worked {
return resp, worked, err, i
}
}
if isMapGet(code) { if isMapGet(code) {
return mapGetParse(code, index, codelines) return mapGetParse(code, index, codelines)
} }
@@ -112,14 +120,6 @@ func translateVal(code UNPARSEcode, index int, codelines []UNPARSEcode, isLine i
return resp, worked, err, i return resp, worked, err, i
} }
} }
{
operation, worked, err, step := parseOperations(code, index, codelines)
if worked {
return operation, worked, err, step
} else if err.EXISTS {
return nil, worked, err, step
}
}
return resp, worked, err, i return resp, worked, err, i
} }