@@ -166,20 +166,20 @@ def parse_cond(cond_str: str) -> Tuple[UnaryCheck, str]:
166
166
if m := r_code .match (cond_str ):
167
167
value = parse_value (m .group (1 ))
168
168
cond = make_eq (value )
169
- expr_template = "{} == " + str ( value )
169
+ expr_template = "{} == " + m . group ( 1 )
170
170
elif m := r_gt .match (cond_str ):
171
171
value = parse_value (m .group (1 ))
172
172
cond = make_gt (value )
173
- expr_template = "{} > " + str ( value )
173
+ expr_template = "{} > " + m . group ( 1 )
174
174
elif m := r_lt .match (cond_str ):
175
175
value = parse_value (m .group (1 ))
176
176
cond = make_lt (value )
177
- expr_template = "{} < " + str ( value )
177
+ expr_template = "{} < " + m . group ( 1 )
178
178
elif m := r_either_code .match (cond_str ):
179
179
v1 = parse_value (m .group (1 ))
180
180
v2 = parse_value (m .group (2 ))
181
181
cond = make_or (make_eq (v1 ), make_eq (v2 ))
182
- expr_template = "{} == " + str ( v1 ) + " or {} == " + str ( v2 )
182
+ expr_template = "{} == " + m . group ( 1 ) + " or {} == " + m . group ( 2 )
183
183
elif cond_str in ["finite" , "a finite number" ]:
184
184
cond = math .isfinite
185
185
expr_template = "isfinite({})"
@@ -217,12 +217,12 @@ def parse_cond(cond_str: str) -> Tuple[UnaryCheck, str]:
217
217
def parse_result (result_str : str ) -> Tuple [UnaryCheck , str ]:
218
218
if m := r_code .match (result_str ):
219
219
value = parse_value (m .group (1 ))
220
- check_result = make_eq (value )
221
- expr = str ( value )
220
+ check_result = make_eq (value ) # type: ignore
221
+ expr = m . group ( 1 )
222
222
elif m := r_approx_value .match (result_str ):
223
223
value = parse_value (m .group (1 ))
224
- check_result = make_rough_eq (value )
225
- expr = f"~ { value } "
224
+ check_result = make_rough_eq (value ) # type: ignore
225
+ expr = f"roughly { m . group ( 1 ) } "
226
226
elif "positive" in result_str :
227
227
228
228
def check_result (result : float ) -> bool :
0 commit comments