diff --git a/README.cygwin b/README.cygwin
index 97bfdb62953bb32e31a28c89f8fc5a8a1d63ba25..5e709025ee64a778d6ca8d8c7ab6aa5b5dbed1c0 100644
--- a/README.cygwin
+++ b/README.cygwin
@@ -14,7 +14,7 @@ Please be aware that due to the incompatibility of EPL and GPL licenses, one may
and distribute the result. ( see https://mmilinkov.wordpress.com/2010/04/06/epl-gpl-commentary/). However
from pure technical standpoint Titan can be compiled on GPL-licensed Cygwin as detailed below.
-Last tested cygwin version: 3.2.0
+Last tested cygwin version: 3.3.4
Cygwin setup
- If Cygwin is installed already, refresh your Cygwin installation
@@ -118,6 +118,7 @@ Cygwin setup
using cygwin commands, insert the Windows equivalent path of cygwin folders "/bin" or/and "/usr/bin"
into the Windows environment variable "Path". For example if the cygwin root is "C:\cygwin64" then
Path should contain "C:\cygwin64\bin;C:\cygwin64\usr\bin".
+ (I2)If you are working with Titan plugins for Eclipse and you should insert Titan related paths into the Windows environment variables: LD_LIBRARY_PATH, TTCN3_DIR, and PATH. For example: "LD_LIBRARY_PATH" = "C:\titan.core\Install\lib", "TTCN3_DIR" = "C:\titan.core\Install" and "PATH" sould contain "C:\titan.core\Install\bin".
(J)Using the binary Titan package:
Download the Titan package from
diff --git a/common/version.h b/common/version.h
index c2530265279723e92c1f785483d2d04936a6d9e2..0222f5cb4cd20e4dd225c3fd44b4a41f4dcc945a 100644
--- a/common/version.h
+++ b/common/version.h
@@ -165,6 +165,6 @@ public:
#undef FN
/* Enum to identify version types */
-enum version_t { UNKNOWN, LEGACY_CRL, LEGACY_CAX, DOT_SEPARATED /*current*/ };
+enum version_t { UNKNOWN_VERSION_TYPE, LEGACY_CRL, LEGACY_CAX, DOT_SEPARATED /*current*/ };
#endif
diff --git a/compiler2/AST.cc b/compiler2/AST.cc
index adf3babb09116cf2dba3cbdb1471730da4892323..adbba85eb36cdf3edd9e2fc3b08b76b66ba07273 100644
--- a/compiler2/AST.cc
+++ b/compiler2/AST.cc
@@ -1320,7 +1320,7 @@ namespace Common {
control_ns_prefix(p_mt == MOD_ASN ? mcopystr("asn1") : NULL),
// only ASN.1 modules have default control namespace (X.693 amd1, 16.9)
used_namespaces(), type_conv_v(), product_number(NULL),
- suffix(0), release(UINT_MAX), patch(UINT_MAX), build(UINT_MAX), extra(NULL), version_type(UNKNOWN)
+ suffix(0), release(UINT_MAX), patch(UINT_MAX), build(UINT_MAX), extra(NULL), version_type(UNKNOWN_VERSION_TYPE)
{
if(!p_modid)
FATAL_ERROR("NULL parameter: Common::Module::Module()");
diff --git a/compiler2/AST.hh b/compiler2/AST.hh
index da35f6c065fbec08cfddd7a53e9414057fadb34b..24665ccfacc6c8a997f415e4956857fbe9b61dc6 100644
--- a/compiler2/AST.hh
+++ b/compiler2/AST.hh
@@ -371,7 +371,7 @@ namespace Common {
void write_checksum();
static char* get_product_identifier(const char* product_number,
const unsigned int suffix, unsigned int release, unsigned int patch,
- unsigned int build, const char* extra=NULL, enum version_t version_type = UNKNOWN);
+ unsigned int build, const char* extra=NULL, enum version_t version_type = UNKNOWN_VERSION_TYPE);
ModuleVersion getVersion() const;
protected: // *::Module need access
/** Collects the set of visible modules into \a visible_mods. */
diff --git a/compiler2/ttcn3/Ttcnstuff.cc b/compiler2/ttcn3/Ttcnstuff.cc
index ee5c6d9de26159bcba074ca17b234d64c11b9d38..566b7f19e9618ad1fedce67c2c35a22e6be34f5a 100644
--- a/compiler2/ttcn3/Ttcnstuff.cc
+++ b/compiler2/ttcn3/Ttcnstuff.cc
@@ -2749,7 +2749,7 @@ namespace Ttcn {
value_.version_.extra_ = NULL;
break;
- case UNKNOWN:
+ case UNKNOWN_VERSION_TYPE:
case LEGACY_CRL:
case LEGACY_CAX:
check_product_number(ABCClass, type_number, sequence);
@@ -2794,7 +2794,7 @@ namespace Ttcn {
value_.version_.extra_ = NULL;
break;
- case UNKNOWN:
+ case UNKNOWN_VERSION_TYPE:
case LEGACY_CRL:
case LEGACY_CAX:
check_product_number(ABCClass, type_number, sequence);
@@ -2841,7 +2841,7 @@ namespace Ttcn {
value_.version_.extra_ = NULL;
break;
- case UNKNOWN:
+ case UNKNOWN_VERSION_TYPE:
case LEGACY_CRL:
case LEGACY_CAX:
check_product_number(ABCClass, type_number, sequence);
diff --git a/compiler2/ttcn3/Ttcnstuff.hh b/compiler2/ttcn3/Ttcnstuff.hh
index 1321e00cb942acf8270041081e7a418d293b2f3f..9b5c9c51beb9cd785efcc17f8db0d8ef9fb947ba 100644
--- a/compiler2/ttcn3/Ttcnstuff.hh
+++ b/compiler2/ttcn3/Ttcnstuff.hh
@@ -723,7 +723,7 @@ private:
unsigned int patch_; ///< patch
unsigned int build_; ///< build number
char* extra_; ///< extra junk at the end, for titansim
- enum version_t version_type_; ///< possible values: UNKNOWN, LEGACY_CRL, LEGACY_CAX and DOT_SEPARATED for the current version
+ enum version_t version_type_; ///< possible values: UNKNOWN_VERSION_TYPE, LEGACY_CRL, LEGACY_CAX and DOT_SEPARATED for the current version
} version_;
PrintingType *pt_;
} value_;
diff --git a/compiler2/ttcn3/coding_attrib_p.y b/compiler2/ttcn3/coding_attrib_p.y
index f731593b6c7f20ee6e7217a06eccf38a4ae88eec..eba712daabc9c16077a22834b9510a438e2731a3 100644
--- a/compiler2/ttcn3/coding_attrib_p.y
+++ b/compiler2/ttcn3/coding_attrib_p.y
@@ -307,7 +307,7 @@ ExtensionAttribute:
VersionAttribute:
VersionKeyword IDentifier
{ // version R2D2
- $$ = new ExtensionAttribute(NULL, 0, 0, 0, $2, UNKNOWN); // VERSION
+ $$ = new ExtensionAttribute(NULL, 0, 0, 0, $2, UNKNOWN_VERSION_TYPE); // VERSION
$$->set_location(coding_attrib_infile, @$);
if ($$->get_type() == ExtensionAttribute::NONE) {
$$->error("Incorrect version data '%s'", $2->get_name().c_str());
@@ -329,7 +329,7 @@ VersionKeyword IDentifier
}
| VersionKeyword IDentifier Number Number IDentifier
{ // version CNL 113 200 R2D2
- $$ = new ExtensionAttribute($2->get_dispname().c_str(), $3, $4, 0, $5, UNKNOWN); // VERSION
+ $$ = new ExtensionAttribute($2->get_dispname().c_str(), $3, $4, 0, $5, UNKNOWN_VERSION_TYPE); // VERSION
$$->set_location(coding_attrib_infile, @$);
if ($$->get_type() == ExtensionAttribute::NONE) {
$$->error("Incorrect version data '%s %d %d %s'",
@@ -407,7 +407,7 @@ VersionKeyword IDentifier
RequiresAttribute:
RequiresKeyword IDentifier IDentifier
{ // module R1B
- $$ = new ExtensionAttribute($2, NULL, 0, 0, 0, $3, UNKNOWN); // REQUIRES
+ $$ = new ExtensionAttribute($2, NULL, 0, 0, 0, $3, UNKNOWN_VERSION_TYPE); // REQUIRES
$$->set_location(coding_attrib_infile, @$);
if ($$->get_type() == ExtensionAttribute::NONE) {
/* parsing the version has failed */
@@ -420,7 +420,7 @@ RequiresKeyword IDentifier IDentifier
}
| RequiresKeyword IDentifier IDentifier Number Number IDentifier
{ // module CNL xxx xxx R1A
- $$ = new ExtensionAttribute($2, $3->get_dispname().c_str(), $4, $5, 0, $6, UNKNOWN); // REQUIRES
+ $$ = new ExtensionAttribute($2, $3->get_dispname().c_str(), $4, $5, 0, $6, UNKNOWN_VERSION_TYPE); // REQUIRES
$$->set_location(coding_attrib_infile, @$);
if ($$->get_type() == ExtensionAttribute::NONE) {
$$->error("Incorrect version data '%s %d %d %s'",
@@ -473,7 +473,7 @@ RequiresKeyword IDentifier IDentifier
}
| ReqTitanKeyword IDentifier
{ // R1A
- $$ = new ExtensionAttribute(NULL, 0, 0, 0, $2, ExtensionAttribute::REQ_TITAN, UNKNOWN);
+ $$ = new ExtensionAttribute(NULL, 0, 0, 0, $2, ExtensionAttribute::REQ_TITAN, UNKNOWN_VERSION_TYPE);
$$->set_location(coding_attrib_infile, @$);
if ($$->get_type() == ExtensionAttribute::NONE) {
/* parsing the version has failed */
@@ -485,7 +485,7 @@ RequiresKeyword IDentifier IDentifier
}
| ReqTitanKeyword IDentifier Number Number IDentifier
{ // CRL 113 200 R1A
- $$ = new ExtensionAttribute($2->get_dispname().c_str(), $3, $4, 0, $5, ExtensionAttribute::REQ_TITAN, UNKNOWN);
+ $$ = new ExtensionAttribute($2->get_dispname().c_str(), $3, $4, 0, $5, ExtensionAttribute::REQ_TITAN, UNKNOWN_VERSION_TYPE);
$$->set_location(coding_attrib_infile, @$);
if ($$->get_type() == ExtensionAttribute::NONE) {
$$->error("Incorrect version data '%s %d %d %s'",