|
@@ -145,6 +145,7 @@ func (s *SingleItem) nvNotIn(slice []ItemValue) bool {
|
|
func (s *SingleItem) inSlice(slice []ItemValue, v ItemValue) bool {
|
|
func (s *SingleItem) inSlice(slice []ItemValue, v ItemValue) bool {
|
|
for _, s2 := range slice {
|
|
for _, s2 := range slice {
|
|
s1 := s.transVar(s2)
|
|
s1 := s.transVar(s2)
|
|
|
|
+ println(s1)
|
|
if s1 == v {
|
|
if s1 == v {
|
|
return true
|
|
return true
|
|
}
|
|
}
|
|
@@ -184,6 +185,8 @@ func (s *SingleItem) transVar(v ItemValue) ItemValue {
|
|
}
|
|
}
|
|
|
|
|
|
func (s *SingleItem) compare(r string, v string) bool {
|
|
func (s *SingleItem) compare(r string, v string) bool {
|
|
|
|
+ println(r)
|
|
|
|
+ println(v)
|
|
if strings.Index(r, "...") > -1 {
|
|
if strings.Index(r, "...") > -1 {
|
|
return s.compareRange(r, v)
|
|
return s.compareRange(r, v)
|
|
} else if strings.Index(r, " ") > 1 {
|
|
} else if strings.Index(r, " ") > 1 {
|
|
@@ -319,19 +322,22 @@ func (s *SingleItem) calc(v string) string {
|
|
}
|
|
}
|
|
|
|
|
|
func (s *SingleItem) compareLogic(r string, v string) bool {
|
|
func (s *SingleItem) compareLogic(r string, v string) bool {
|
|
|
|
+ println(r)
|
|
|
|
+ println(v)
|
|
|
|
+
|
|
rl := strings.Split(r, " ")
|
|
rl := strings.Split(r, " ")
|
|
if len(rl) != 2 {
|
|
if len(rl) != 2 {
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
|
|
|
|
- var ri, vi int64 = 0, 0
|
|
|
|
- if tri, err := strconv.ParseInt(strings.TrimSpace(rl[1]), 10, 64); err == nil {
|
|
|
|
|
|
+ var ri, vi float64 = 0, 0
|
|
|
|
+ if tri, err := strconv.ParseFloat(strings.TrimSpace(rl[1]), 64); err == nil {
|
|
ri = tri
|
|
ri = tri
|
|
} else {
|
|
} else {
|
|
return false
|
|
return false
|
|
}
|
|
}
|
|
|
|
|
|
- if tvi, err := strconv.ParseInt(strings.TrimSpace(v), 10, 64); err == nil {
|
|
|
|
|
|
+ if tvi, err := strconv.ParseFloat(strings.TrimSpace(v), 64); err == nil {
|
|
vi = tvi
|
|
vi = tvi
|
|
} else {
|
|
} else {
|
|
return false
|
|
return false
|