Call binary_relation_exprt directly

Joel Allred · Joel Allred · commit fbd21bb9318e · 2019-05-03T10:08:28.000+01:00
Type-check is redundant for these functions.
diff --git a/src/util/string_expr.h b/src/util/string_expr.h
@@ -31,7 +31,7 @@ inline binary_relation_exprt greater_than(const exprt &lhs, const exprt &rhs)
 
 inline binary_relation_exprt greater_than(const exprt &lhs, mp_integer i)
 {
-  return greater_than(lhs, from_integer(i, lhs.type()));
+  return binary_relation_exprt(from_integer(i, lhs.type()), ID_lt, lhs);
 }
 
 inline binary_relation_exprt
@@ -44,7 +44,7 @@ less_than_or_equal_to(const exprt &lhs, const exprt &rhs)
 inline binary_relation_exprt
 less_than_or_equal_to(const exprt &lhs, mp_integer i)
 {
-  return less_than_or_equal_to(lhs, from_integer(i, lhs.type()));
+  return binary_relation_exprt(lhs, ID_le, from_integer(i, lhs.type()));
 }
 
 inline equal_exprt equal_to(const exprt &lhs, const exprt &rhs)
@@ -55,7 +55,7 @@ inline equal_exprt equal_to(const exprt &lhs, const exprt &rhs)
 
 inline equal_exprt equal_to(const exprt &lhs, mp_integer i)
 {
-  return equal_to(lhs, from_integer(i, lhs.type()));
+  return equal_exprt(lhs, from_integer(i, lhs.type()));
 }
 
 // Representation of strings as arrays

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ inline binary_relation_exprt greater_than(const exprt &lhs, const exprt &rhs)`
`31`	`31`
`32`	`32`	`inline binary_relation_exprt greater_than(const exprt &lhs, mp_integer i)`
`33`	`33`	`{`
`34`		`- return greater_than(lhs, from_integer(i, lhs.type()));`
	`34`	`+ return binary_relation_exprt(from_integer(i, lhs.type()), ID_lt, lhs);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`inline binary_relation_exprt`
`@@ -44,7 +44,7 @@ less_than_or_equal_to(const exprt &lhs, const exprt &rhs)`
`44`	`44`	`inline binary_relation_exprt`
`45`	`45`	`less_than_or_equal_to(const exprt &lhs, mp_integer i)`
`46`	`46`	`{`
`47`		`- return less_than_or_equal_to(lhs, from_integer(i, lhs.type()));`
	`47`	`+ return binary_relation_exprt(lhs, ID_le, from_integer(i, lhs.type()));`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`inline equal_exprt equal_to(const exprt &lhs, const exprt &rhs)`
`@@ -55,7 +55,7 @@ inline equal_exprt equal_to(const exprt &lhs, const exprt &rhs)`
`55`	`55`
`56`	`56`	`inline equal_exprt equal_to(const exprt &lhs, mp_integer i)`
`57`	`57`	`{`
`58`		`- return equal_to(lhs, from_integer(i, lhs.type()));`
	`58`	`+ return equal_exprt(lhs, from_integer(i, lhs.type()));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// Representation of strings as arrays`