completed list-type to array-type conversion and fixed common test module
This commit is contained in:
+3
-3
@@ -46,7 +46,7 @@ func equals(a, b any, deepCmp kern.DeepFuncTemplate) (eq bool, err error) {
|
||||
eq = cmp == 0
|
||||
}
|
||||
}
|
||||
} else if deepCmp != nil && array.IsList(a) && array.IsList(b) {
|
||||
} else if deepCmp != nil && array.IsArray(a) && array.IsArray(b) {
|
||||
eq, err = deepCmp(a, b)
|
||||
} else {
|
||||
eq = reflect.DeepEqual(a, b)
|
||||
@@ -119,7 +119,7 @@ func lessThan(self *scan.Term, a, b any) (isLess bool, err error) {
|
||||
rs, _ := b.(string)
|
||||
isLess = ls < rs
|
||||
// Inclusion test
|
||||
} else if array.IsList(a) && array.IsList(b) {
|
||||
} else if array.IsArray(a) && array.IsArray(b) {
|
||||
aList, _ := a.(*array.ArrayType)
|
||||
bList, _ := b.(*array.ArrayType)
|
||||
isLess = len(*aList) < len(*bList) && bList.Contains(aList)
|
||||
@@ -154,7 +154,7 @@ func newLessEqualTerm(tk *scan.Token) (inst *scan.Term) {
|
||||
func lessThanOrEqual(self *scan.Term, a, b any) (isLessEq bool, err error) {
|
||||
if isLessEq, err = lessThan(self, a, b); err == nil {
|
||||
if !isLessEq {
|
||||
if array.IsList(a) && array.IsList(b) {
|
||||
if array.IsArray(a) && array.IsArray(b) {
|
||||
isLessEq, err = array.SameContent(a, b)
|
||||
} else {
|
||||
isLessEq, err = equals(a, b, nil)
|
||||
|
||||
Reference in New Issue
Block a user