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.