--- a/absyntax_utils/absyntax_utils.hh	Thu Oct 25 18:27:23 2012 +0100
+++ b/absyntax_utils/absyntax_utils.hh	Thu Oct 25 18:51:55 2012 +0100
@@ -112,7 +112,6 @@
 #include "decompose_var_instance_name.hh"
 #include "search_varfb_instance_type.hh"
 #include "search_constant_type.hh"
-#include "search_il_operand_type.hh"
 #include "add_en_eno_param_decl.hh"
 #include "get_sizeof_datatype.hh"
 #include "search_il_label.hh"

--- a/absyntax_utils/search_il_operand_type.cc	Thu Oct 25 18:27:23 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- *  matiec - a compiler for the programming languages defined in IEC 61131-3
- *
- *  Copyright (C) 2003-2011  Mario de Sousa (msousa@fe.up.pt)
- *  Copyright (C) 2007-2011  Laurent Bessard and Edouard Tisserant
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * This code is made available on the understanding that it will not be
- * used in safety-critical situations without a full and competent review.
- */
-
-/*
- * An IEC 61131-3 compiler.
- *
- * Based on the
- * FINAL DRAFT - IEC 61131-3, 2nd Ed. (2001-12-10)
- *
- */
-
-
-
-
-/* Returns the data type of an il_operand.
- *
- * Note that the il_operand may be a variable, in which case
- * we return the type of the variable instance.
- * The il_operand may also be a constant, in which case
- * we return the data type of that constant.
- *
- * The variable instance may be a member of a structured variable,
- * or an element in an array, or any combination of the two.
- *
- * The class constructor must be given the search scope
- * (function, function block or program within which
- * the possible il_operand variable instance was declared).
- */
-
-#include "absyntax_utils.hh"
-
-symbol_c *search_il_operand_type_c::get_type(symbol_c *il_operand) {
-  symbol_c *res;
-
-  /* We first assume that it is a constant... */
-  res = search_constant_type.get_type(il_operand);
-  if (res != NULL) return res;
-
-  /* Nope, now we assume it is a variable, and determine its type... */
-  res = search_varfb_instance_type.get_type(il_operand);
-  if (NULL != res) return res;
-
-  /* not found */
-  return NULL;
-}

--- a/absyntax_utils/search_il_operand_type.hh	Thu Oct 25 18:27:23 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- *  matiec - a compiler for the programming languages defined in IEC 61131-3
- *
- *  Copyright (C) 2003-2011  Mario de Sousa (msousa@fe.up.pt)
- *  Copyright (C) 2007-2011  Laurent Bessard and Edouard Tisserant
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- * This code is made available on the understanding that it will not be
- * used in safety-critical situations without a full and competent review.
- */
-
-/*
- * An IEC 61131-3 compiler.
- *
- * Based on the
- * FINAL DRAFT - IEC 61131-3, 2nd Ed. (2001-12-10)
- *
- */
-
-/* Returns the data type of an il_operand.
- *
- * Note that the il_operand may be a variable, in which case
- * we return the type of the variable instance.
- * The il_operand may also be a constant, in which case
- * we return the data type of that constant.
- *
- * The variable instance may be a member of a structured variable,
- * or an element in an array, or any combination of the two.
- *
- * The class constructor must be given the search scope
- * (function, function block or program within which
- * the possible il_operand variable instance was declared).
- */
-
-class search_il_operand_type_c {
-
-  private:
-    search_varfb_instance_type_c search_varfb_instance_type;
-    search_constant_type_c search_constant_type;
-
-  public:
-    search_il_operand_type_c(symbol_c *search_scope): search_varfb_instance_type(search_scope) {}
-
-  public:
-    symbol_c *get_type(symbol_c *il_operand);
-};