awk: numeric string are compared as numbers

grisenti · grisenti · commit 22bd929a9894 · 2024-09-12T17:05:21.000+02:00
diff --git a/awk/src/interpreter/mod.rs b/awk/src/interpreter/mod.rs
@@ -1222,7 +1222,11 @@ macro_rules! compare_op {
                 $stack.push_value(bool_to_f64(lhs $op rhs))?;
             }
             (AwkValueVariant::String(lhs), AwkValueVariant::String(rhs)) => {
-                $stack.push_value(bool_to_f64(lhs.as_str() $op rhs.as_str()))?;
+              	if lhs.is_numeric && rhs.is_numeric {
+									$stack.push_value(bool_to_f64(strtod(lhs) $op strtod(rhs)))?;
+              	} else {
+                	$stack.push_value(bool_to_f64(lhs.as_str() $op rhs.as_str()))?;
+              	}
             }
             (AwkValueVariant::Number(lhs), AwkValueVariant::UninitializedScalar) => {
                 $stack.push_value(bool_to_f64(*lhs $op 0.0))?;

Original file line number	Diff line number	Diff line change
`@@ -1222,7 +1222,11 @@ macro_rules! compare_op {`
`1222`	`1222`	`$stack.push_value(bool_to_f64(lhs $op rhs))?;`
`1223`	`1223`	`}`
`1224`	`1224`	`(AwkValueVariant::String(lhs), AwkValueVariant::String(rhs)) => {`
`1225`		`- $stack.push_value(bool_to_f64(lhs.as_str() $op rhs.as_str()))?;`
	`1225`	`+ if lhs.is_numeric && rhs.is_numeric {`
	`1226`	`+ $stack.push_value(bool_to_f64(strtod(lhs) $op strtod(rhs)))?;`
	`1227`	`+ } else {`
	`1228`	`+ $stack.push_value(bool_to_f64(lhs.as_str() $op rhs.as_str()))?;`
	`1229`	`+ }`
`1226`	`1230`	`}`
`1227`	`1231`	`(AwkValueVariant::Number(lhs), AwkValueVariant::UninitializedScalar) => {`
`1228`	`1232`	`$stack.push_value(bool_to_f64(*lhs $op 0.0))?;`