# HG changeset patch # User Catarina Boucinha # Date 1246530385 -3600 # Node ID e657008f43d03d6d36547b3160c7b055240e7047 # Parent 1c0c7a664fc26ae9768e6b39fde77ec05dc69011 Introducing the search_il_operand_type files in the absyntax_utils folder. The Makefile from absyntax_utils folder and the generate_c_il.cc from the stage4/generate_c folder was also modified to work with the new search_il_operand_type file. diff -r 1c0c7a664fc2 -r e657008f43d0 absyntax_utils/Makefile --- a/absyntax_utils/Makefile Fri Jun 19 13:27:26 2009 +0200 +++ b/absyntax_utils/Makefile Thu Jul 02 11:26:25 2009 +0100 @@ -14,6 +14,7 @@ SEARCH_UTIL_FILES += search_constant_type.o SEARCH_UTIL_FILES += search_fb_instance_decl.o SEARCH_UTIL_FILES += search_fb_typedecl.o +SEARCH_UTIL_FILES += search_il_operand_type.o SEARCH_UTIL_FILES += search_varfb_instance_type.o SEARCH_UTIL_FILES += search_var_instance_decl.o SEARCH_UTIL_FILES += spec_init_separator.o diff -r 1c0c7a664fc2 -r e657008f43d0 absyntax_utils/search_il_operand_type.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/absyntax_utils/search_il_operand_type.cc Thu Jul 02 11:26:25 2009 +0100 @@ -0,0 +1,58 @@ +/* + * (c) 2003 Mario de Sousa + * + * Offered to the public under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 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. + * + * 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 IL and ST 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). + */ + + + +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; +} diff -r 1c0c7a664fc2 -r e657008f43d0 absyntax_utils/search_il_operand_type.hh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/absyntax_utils/search_il_operand_type.hh Thu Jul 02 11:26:25 2009 +0100 @@ -0,0 +1,51 @@ +/* + * (c) 2003 Mario de Sousa + * + * Offered to the public under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 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. + * + * 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 IL and ST 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); +}; diff -r 1c0c7a664fc2 -r e657008f43d0 stage4/generate_c/generate_c_il.cc --- a/stage4/generate_c/generate_c_il.cc Fri Jun 19 13:27:26 2009 +0200 +++ b/stage4/generate_c/generate_c_il.cc Thu Jul 02 11:26:25 2009 +0100 @@ -54,31 +54,7 @@ * 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) { - 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; - } -}; +#include "../../absyntax_utils/search_il_operand_type.hh"