merge

fix backup/restore functions: now also backup/restore programs instantiated to run inside tasks.

add include <time.h>, required for time_t

improve performance of some extensible Standard Functions (ADD, MUL, AND, OR, XOR) -- increase hardcoded limit to 499

improve performance of some extensible Standard Functions (ADD, MUL, AND, OR, XOR) -- Add comments!!

improve performance of some extensible Standard Functions (ADD, MUL, AND, OR, XOR)"

Fix method ./configure uses to determine bison version (did not work in bourne shell) (submitted by anonymous)"

fix bug: allow variables with names starting with 'var' to be used in the first line of POU body

Abort compilation when finding R_EDGE or F_EDGE

Fix bug: XOR operator was broken for ANY_BIT types. No XOR__[DL]WORD__[DL]WORD functions were generated.

Add some comments to code regarding backup/restore functions

fix initialization of variable (was not following ISO C++ rules)

make generating backup/restore functions a command line option (off by default).

add support for generating functions to backup/restore the internal state of the PLC.

delete unused variable.

handle POUs with no VAR .. END_VAR blocks

fix bug introduced in previous commit (matiec was unable to parse SFC code)

Fix tracking of line numbers in IL code (error messages were previously indicating incorrect line number).

Fix bug in datatype narrowing algorithm affecting IL code.

Set the symbol->token member in symbolic_variables_c objects.

Debugging helper class: print value of tokens in debugging output.

Fix bug: allow global variables of type DT (initial values for DT are not const!)

Add comment stating how to enable debug option in flex.

merge

Print error message when FB/Struct initial value contains other strcuts/FB/arrays (not yet supported by C code generator).

Do datatype checking of initial values for structures and FBs, and print error messages when compiling erroneuos source code.

fix bug in symbol_c::find_element()

Acceept structure_element_declaration_c symbol as a possible (non base type) data type

Add token references in structure_element_declaration_c

Add token reference to all symbol_c, and add list_c::find_element()

remove debug code left in by mistake in previous commit

Access elements[] in list_c through a new get_element() method.

Start implementation of datatype checking of initial values for structures and FBs.

fix wrong common_ticktime if task interval is greater than 4.3 seconds

Allow use of GLOBAL/EXTERNAL variables as control variable of FOR loop.

Start adding support for explicit initialization of FB instances. Currently only allows initializing FB variables of elementary types.

merge

merge

merge

Fix date conversion function (seconds to Date_and_Time). First day of month was falling on previous month.

Fix error locations messed up in previous commit.

fix compilation of SFC transitions written in IL (compiler was entering endless loop)

fix SFC timed qualifier (D, L, ...) with variable time (was generating wrong C code)

Fix segmentation fault bug introduced by previous commit

Correcty determine the datatype (TIME) of the parameters of SFC actions with timed qualifiers

Check that flex is installed during ./configure

Fix code generation for XOR expressions in ST (add parenthesis)

merge

make autogenerated functions to be 'static inline' instead of 'inline'

This fixes link issue and compile warning, for more details about this
issue look at
https://bitbucket.org/mjsousa/matiec/issues/53/c-compiler-warning-if-iec-function-is-used

Merged mjsousa/matiec into default

merge

Merged mjsousa/matiec into default

fix bug introduced by commit 91bef6704b44 (parsing SFCs with transitions in ST and leading whitespace => endless loop)

Only allow function invocation outside ST expressions when command line option is activated.

Ignore pragmas inside IL code when handling inline function calls.

Fix bug: correctly handle formal function calls in IL with no parameters.

Add support for functions returning VOID (i.e. non-standard extension, allowing functions that do not return any data)

Add -warn flag when running flex -> warn of potential bugs

Add support for non-standard VOID datatype. May ony be used to define functions returning VOID.

Delete the YY_NO_UNPUT define, as we do use the unput() function.

Add support for non standard feature: allow POUs with no in, out and inout parameters

Add option to not add the EN and ENO parameters to every function and FB (generated C code becomes smaller, and uses less memory for function invocations)

Correctly identify errors when parsing erroneous code (make sure flex goes back to INITIAL state when code contains errors that do not allow determining whether ST or IL is being parsed)

Created new branch fix_compilation_warnings

fix compilation error about missing braces

IEC_TIMESPEC has two fields tv_sec and tv_nsec.

Compilation error:
./build/POUS.c:600:45: error: missing braces around initializer [-Werror=missing-braces]
static const STEP temp_step = {{0, 0}, 0, {0, 0}};
^
compilation terminated due to -Wfatal-errors.

fix warning about overflow if matiec is running on 64-bit platform,
but the generated C code will cross-compiled for 32-bit platform

For example:
./build/config.c:29:39: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
unsigned long greatest_tick_count__ = 18446744073709551611UL; /*tick*/
^
compilation terminated due to -Wfatal-errors.
cc1: all warnings being treated as errors

fix C compilation warning about function prototype in __SET_EXTERNAL

Example warning:
./POUS.c:1220:3: error: function declaration isn't a prototype [-Werror=strict-prototypes]
__SET_EXTERNAL(data__->,KN_AUT,,__GET_VAR(data__->KEY_AUT.STATE_OUT));
^
compilation terminated due to -Wfatal-errors.
cc1: all warnings being treated as errors

fix C compilation warning from gcc about /* inside of comment section.


./beremiz/iec_std_lib.h:240:1: error: "/*" within comment [-Werror=comment]
/*
^
compilation terminated due to -Wfatal-errors.
cc1: all warnings being treated as errors

Update README.build file with instructions for crosscompiling to win32

Delete commented out code.

Fix FB calls in IL (FB variable name was showing up extraneously before the C function that initializes the POU containing the FB call)

Delete unused code.

Add check for repeated elements in a CASE statement. Emit warnings (and not errors) if found.

transform CASE into if()..else if().. -> fixes 2 bugs (1)case within case statements, and (2)repeated elements in case options

Initialise arrays to their correct default values - Fix bug introduced in commit 477393b00f95 (2014-11-16)

Fixed reset of current_varqualifier when generating global initializers, causin RETAIN and other option to be ORed and applied to all subsequent global variables.

Do fill/narrow datatype analysis algorithm for derived_datatype_identifier_c (fixes bug related to arrays of arrays that was generating incorrect C code).

Better identification of error location in some error messages.

Fix bug introduced in 2014/10/19, while adding support for REF() opertors -> datatype checking was not catching datatype inconsistency errors!

merge

Re-write and fix the logic of SFC action modifiers.

Correct the number given to actions in the #define's

Do not allow constant_propagation algorithm go into infinite loop when analysing code with circular references.

Do constant propagation of FBs instantiated in other FB or Programs, so that variable sized arrays can be declared in FBs too.

Do constant propagation of instantiated FBs, so that variable sized arrays can be declared in FBs too.

Let get_datatype_info_c handle variable sized arrays, even if constant folding is not yet done.

Correctly analyse external<->global var compatibility when using variable sized arrays (TODO: does not yet work for FBs!)

Add comment about bug that needs to be fixed later on.

Break constant_folding_c in two classes: constant_folding_c and constant_propagation_c

Add check whether the same constant var_external variable is initialised with two (or more) different constant values.

Change algorithm for propagating VAR_GLOBAL constant values to corresponding VAR_EXTERNAL.

Disable constant propagation again (still not working correctly)

Make support for use of variables in array size declarations a command line option (off by default)

Add debug_c::print(const_value_c) for printing of const values.

Add is_undefined() method to const_value_c

Make error message more informative.

Add comments.

Add checks for use of non constant value in subranges, and lower_limit > upper_limit.

Fix previous commit (symtable operator[] must return a reference to the stored value!)

Do constant propagation of configuration/resource variables, taking into account scope of variables.

Change dsymbtable_c -> use design pattern used by C++ standard library (STL)

Change symbtable_c -> use design pattern used by C++ standard library (STL)

Remove debugging code left in by mistake.

Do constant propagation inside Configurations and Resources (required for support of extension: array [1..max] OF int); (Resources is still buggy)

Do constant folding of default initial values of datatypes.

Do constant propagation to symbolic_variables, and correctly handle constant folding and propagation of variable declarations.

When generating C code, use the const_value of a symbolic_variable when it is used in a subrange.

Small code re-organization of how const values are stored in symbol_c (can now be accessed through member functions, instead of macros)

Fix bugs introduced in previous commit (once again do constant folding of all literals in type declarations)

Do constant folding of variable's initial value (allows correct C code generation with variables in the subrange of an array declaration: ARRAY [1..max] of INT).

Delete un-used declaration.

merge

Allow variables to be used when declaring the dimension of an array.

Fix C code generation when forward references (-p command line option) is on.

Add a new pou_typename_c object to the AST to store references to previously declared Functions, FB, and Programs.

Delete unused file.

Make use of pre-parser a command line option.

Fix AST generated by parsing with preparsing switched OFF (typo in array datatypes, and fix parsing of POUs).

Fix AST generated by parsing with preparsing switched on, and allow parsing to work with preparsing off.

Fix bug introduced when adding support for relaxed datatype model: change derived_datatype_identifier_c to identifier_c when used as an identifier

Add a pre-parsing phase to stage1_2 (allows source code that references POUs and datatypes before they are declared)

Comment out unused and buggy code.

Update the comments in source code.

Fix bug introduced when adding support for relaxed datatype model. Code cleanup.

Fix main state machine in flex (states were being pushed without being poped from the stack)

merge

Make the relaxed datatype model a runtime option (off by default)

Add support for relaxed datatype model for array datatypes.

fix bug introduced a few commits ago: do not print the first char ('%') of a direct_variable_c (e.g. skip % in %IW4.2)

fix code generation when dereferencing pointers (ref_to) to arrays (ref_to_array^[5])

Fix bug: set the scope annotation in deref_operators used inside structs

Editing of error message to make it more clear.

Filling of symbol->scope annotation moved from narrow to fill_candidate_datatypes_c (became possible because narrowing of struct, array and symbolic variables is now done directly in fill_candidate_datatypes_c)

fill_candidate_datatypes_c now uses search_varinstance_decl_c instead of search_varfb_instance_type_c (moving towards deprecation of search_varfb_instance_type_c)

Do the full fill_candidate/narrow_datatype algorithm for all fields of a structured variable in the fill_candidate_datatypes_c
Allows us to remove temporary code from the search_varfb_decl_c

Fix bug with multple dereferencing (bool_var := bool_ptr_ptr^^;)

Fix bug: Add support for de-referencing pointers to struct (struct_ptr^.elem1) when used inside FB.
Note that multiple de-referencing of structs (struct_ptr_ptr^^.elem) is not supported inside FB code (this would need BIG changes to the compiler!)

Fix bug: add support for dereferencing of REF_TO to REF_TO xxx (e.g.: bool_var := ref_to_ref_to_bool^^;)

Turn support of derefencing operator '^' an option (default is not supported).

Add support for de-referencing of REF_TO datatypes (Note: dereferencing of arrays and structs not yet supported!)

Add support for REF_TO inside arrays and structs (a non-standard feature!)

Code cleanup: with the introduction of anotation_map[], generate_c_vardecl_c can now derive directly from generate_c_base_c

Fix typos in comments

Add comments, and make get_datatype_id_str_c equivalent to get_datatype_id_c

Fix calling of functions whose parameters are of an implicitly declared datatype (currently only makes sense for REF_TO datatypes, but may make sense to other datatypes too if the datatype model is changed in the future).

fix indentations.

in lvalue, add check for REF() fucntion invocation, and the NULL literal

Initialise REF_TO variables to NULL.

Make support for REF_TO ANY a command line option.

Add support for non standard REF_TO ANY (equivalent to void *)

Update some comments. (No changes to code)

Introduce absyntax class for keyword ANY, and use REF_TO(ANY) as datatype of NULL literal.

Fix bug (introduced a few commits ago) when generating SFC actions that are mapped onto variables --> Make generate_sfcdecl_c stateless (i.e. does not depend on order by which it is called).

Add support for the 'NULL' keyword, defined in version 3 of IEC 61131-3.

for option '-Op' (generate <pouname>.h/c): add '#include <pouname>.h' to the .c file, and '#ifdef <pouname>_H' to the .h file

Ass include of iec_std_lib.h in POUS.h file.

Add support for implicitly declared REF_TO datatypes.

With -Op option --> Place implicitly defined datatypes in the .h file corresponding to the POU where they are used.

Add name of POU as prefix to names of implicitly defined datatypes

Implicitly defined array datatypes use new naming method (greatly simplifies stage 4 code).

array_specification_c may be used as a datatype! Add it to spec_init_separator_c

Change REF() operator to return the correct REF_TO datatype datatype.

Narrow array subscripts correctly, even in the presence of other datatype errors (so we do not generate error messages for array subscripts that do not contain errors).

Add support for REF_TO derived datatypes (along with datatype verification)

Add option to place each POU in a distinct .c and .h file pair.

code re-organisation. Preparing for the changes to come in the next commit (one C file for each POU)

Remove un-used parameter from class constructor.

Move standard FBs to a pre-converted C file, insted of converting them every time along with the IEC source.

Move library files compiled to C to their own subdiectory.

Fix stupid mistake in previous commit (use 'long double' instead of 'ld' in istandard library macro)

merge

Update build/compile instructions to reflect the fact that autoconf needs to be executed.

Fix time conversion function in std library, and change into macro (so it may be used in variable initialisations)

Add support for the stepname.T syntax.

Change the name of the variable with the step state to stepname.X (in the generated VARIABLES.csv file)

Add support for Stepname.X syntax.

Remove dead code previously left in by mistake.

Add error message for invalid datatype of transition condition. Generalize datatype narrowing algorithm for transition conditions.

merge

closed temporary fix branch

Check VAR_EXTERN variables declared in FBs instantiated in a Program (and recursively too - FBs in FBs).

Fix typo in as yet dormant code (related to REF_TO keyword, that is not yet active)

Fix compilation error on platforms where real64_t is mapped onto 'long double'

Correctly handle structured variables that include FB and external FBs (example: FB1.FB2.extFB3.FB4.extFB5.extFB6.structvar.field1 := 42;) (this commit fixes only ST code. TODO: IL and SFC)

Remove call to type_is_complex() in ST code generation.

A little code cleanup (reduce number of possible variable generation states)

Finish: Change order of SET_xxx() macros. (this will allow me to simplify the print_setter() methods later on)

Change order of SET_xxx() macros. (this will allow me to simplify the print_setter() methods later on)

More static declarations in POUS.c in order to avoid conflicting symbol definitions with new POUS.c inclusion scheme

Fix multiple resources support, POUS.c now only contain static definitions. POUS.c is included in configuration C code as well as in resources to allow GLOBAL FBs to be declared in configurations

Disable stage4 options with on windows since getsuboptr isn't supported in mingw

merge

Track of line number correctly when input file has code with very long lines.

Fix memory leak in lexical parser.

Make generation of #line directives optional.

Insert #line directives in generated C code.

Add support for parsing of REF_TO keyword (defined in IEC61131-3 v3). This support is currently inactive (in flex) until we get to add C code generation later on.

Update files to be ignored by mercurial: ignore files generated by autoconf, directory test/, and *.orig

Fix bug: do not print IL 'label' when generating inline functions (JMPxx label was generating erroneous C code)

Add limited support for the REF() operator (defined in v3 of IEC 61131-3)

Remove assertion being failed by IL labels (IL labels do not yet have specific datatypes).

Added stage1_2/Makefile.am weird rule to keep compatible with previous version of automake

Merge

fix definition of pragma.

Fix the state machine that became broken 2 commits ago (when adding support for nested comments)

Add option to control support for nested comments (default is off, as defined in IEC 61131-3 v2)

Add support for nested comments

Fix bug: when checking compatibility between GLOBAL and EXTERNAL variables, must only enforce GLOBAL CONSTANT => EXTERNAL CONSTANT.
Reverse CONSTANT implication is not enforced, and neither is RETAIN compatibility.

merge

Fix bug: correctly generate code when accessing external variables declared inside FBs as a structured variable (realvar := fb1.fb2.extvar1.realvar)

Fix bug in standard: standard does not allow multiple VAR_GLOBAL ... END_VAR constructs in configurations and resources. This is probably a bug, so we allow it.

Code cleanup (part 3): generate_c_typedecl_c is no longer needed for code generation in POUS.c It is now only needed for datatype declaration in POUS.h

Code cleanup (part 2): generate_typedecl_c now only prints to POUS.h !

Code cleanup (part 1): subrange check functions are now declared in POUS.h (as static inline functions or #define)

Fix get_datatype_info_c::is_subrange(), which did not work when using base type! (we now use get_equivtype() instead of get_base_type() )

fix a couple of typos.

Fix bug - correctly declare struct members whose type is a directly defined array (e.g.: STRUCT x: ARRAY of XXX; END_STRUCT)

Start using the called_fb_declaration annotation when generating C code from FB calls in ST.

Code cleanup: move datatype analysis to get_datatype_info_c

Fix bug-fix of previous commit.

Fix bug: allow use, as lvalues, structures/arrays inside FBs (e.g. fb1.struct1.r := 33.3).

Fix bug/issue #33 (correctly access struct/array variables declared inside a FB -> r:=FB1.FB2.struct1.array1[3] )

Add assertion suggested by Manuele.

merge

Use get_datatype_info_c::is_type_valid() to determine datatype validity
(some datatype bugs in source code were going unreported!)

Recursively check the datatype compatibility of values/expressions passed in function/FB invocations.

Change error message text so as to become more suitable to where they might occur in the source code.

Add code to check if an IN_OUT variable is being passed an IL list in formal IL FB/function invocations.

Generate correct error message when encountering IL lists embedded in IL formal invocations.

Fill in the 'datatype' anotation in the identifiers of symbolic variables.
(even though currently it is not being used).

Fix C code generation of FB invocation in IL.

Fix detection of datatype errors on IL conditional flow control operators (JMPC, RETC, ...)

Allow array_dimension_iterator to accept an array_spec_init_c.
Fixes bug activated by generating C code from IL code containing array variables.

Small code cleanup (move common code to a function)

Fix datatype analysis of conditional IL operators (CALC, CALCN, RETC, RETCN, JMPC, JMPCN, S and R)

Fix datatype analyses of S and R IL operators.

make sure all IL operands are narrowed (datatype checking algorithm)

cosmetic change only - fix code alignment.

Add support for FB call semantics of 'S' and 'R' IL operators!
Remove segfaults when analysing buggy IL code (IL operators with no operands).

Stop lvalue check from segfaulting when coming across buggy IL code (IL operator with no operand!)

Allow get_datatype_info_c to be called with NULL parameters.

Do lvalue check of function output parameters (since they may contain expressions inside array subscripts!)

Handle buggy source code gracefully (do not bork when non-array variable is used as an array. e.g: int_var[42]:= 33)

Delete debugging messages left in by mistake.

Fix segfault when doing lvalue check of buggy IEC 61131-3 source code

Fix datatype analysis of structured variables that contain arrays in their fields (e.g. var.x1[var2 + 42].y1).

Add capability of returning array subscript list while decomposing a struct/array variable.

Code cleanup: Remove unused option = Delete dead code.

merge

Declare that YYLSTYPE is not the default trivial datatype used by bison. (was causing compile errors in bison ver >= 2.7)

Fix build on Ubuntu 13.10

Fixed warning when compiling generated program containing external variable assignments

Enlarged flex buffer size in order to accept larger C pragmas

Missing braces arround extern declarartions in __SET_EXTERNAL define was making problem with GCC in switch case statements

Moved __INIT_* defines within type definition headers files

Fixed warning in accessor __SET_EXTERNAL