Merge pull request #1892 from diffblue/remove-OPERANDS_IN_GETSUB

remove OPERANDS_IN_GETSUB define, which is now simply the only option

Author: tautschnig

src/util/expr.h

@@ -10,8 +10,6 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_UTIL_EXPR_H
 #define CPROVER_UTIL_EXPR_H
 
-#define OPERANDS_IN_GETSUB
-
 #include <functional>
 #include "type.h"
 
@@ -67,18 +65,10 @@ class exprt:public irept
   { return !operands().empty(); }
 
   operandst &operands()
-  #ifdef OPERANDS_IN_GETSUB
   { return (operandst &)get_sub(); }
-  #else
-  { return (operandst &)(add(ID_operands).get_sub()); }
-  #endif
 
   const operandst &operands() const
-  #ifdef OPERANDS_IN_GETSUB
   { return (const operandst &)get_sub(); }
-  #else
-  { return (const operandst &)(find(ID_operands).get_sub()); }
-  #endif
 
   exprt &op0()
   { return operands().front(); }

src/util/irep_ids.def

@@ -5,7 +5,6 @@ IREP_ID_TWO(empty_string, )
 IREP_ID_ONE(let)
 IREP_ID_ONE(nil)
 IREP_ID_ONE(type)
-IREP_ID_ONE(operands)
 IREP_ID_ONE(bool)
 IREP_ID_ONE(c_bool)
 IREP_ID_ONE(proper_bool)