--- a/stage4/generate_cc/search_expression_type.cc	Sat Jul 07 11:07:26 2007 +0200
+++ b/stage4/generate_cc/search_expression_type.cc	Sat Jul 07 11:34:21 2007 +0200
@@ -127,8 +127,7 @@
       return is_real_type(type_symbol) || is_integer_type(type_symbol);
     }
 
-    bool is_binary_type(symbol_c *type_symbol) {
-      if (typeid(*type_symbol) == typeid(bool_type_name_c)) {return true;}
+    bool is_nbinary_type(symbol_c *type_symbol) {
       if (typeid(*type_symbol) == typeid(byte_type_name_c)) {return true;}
       if (typeid(*type_symbol) == typeid(word_type_name_c)) {return true;}
       if (typeid(*type_symbol) == typeid(dword_type_name_c)) {return true;}
@@ -136,6 +135,11 @@
       if (typeid(*type_symbol) == typeid(constant_int_type_name_c)) {return true;}
       return false;
     }
+
+    bool is_binary_type(symbol_c *type_symbol) {
+      if (typeid(*type_symbol) == typeid(bool_type_name_c)) {return true;}
+      return is_nbinary_type(type_symbol);
+    }
     
     bool is_same_type(symbol_c *first_type, symbol_c *second_type) {
       if (typeid(*first_type) == typeid(*second_type)) {return true;}