diff --git a/.gitignore b/.gitignore
index c76193a96fdb3cfc91cc1dc833b59b2f2ad958b8..a802e48da2abc144607ae279b91f24d64ec38c7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ META-INF
build.properties
.cproject
.settings/
+*.pdf
diff --git a/common/new.cc b/common/new.cc
index 66962f7e76143a3b434118deafc53833ce6b76cd..d9552aeea3ffb5f945e2e4c81ddb51fa984e668f 100644
--- a/common/new.cc
+++ b/common/new.cc
@@ -34,11 +34,21 @@ void operator delete(void *ptr) throw()
Free(ptr);
}
+void operator delete(void *ptr, std::size_t) throw()
+{
+ Free(ptr);
+}
+
void operator delete[](void *ptr) throw()
{
if (ptr != static_cast<void*>(&dummy)) Free(ptr);
}
+void operator delete[](void *ptr, std::size_t) throw()
+{
+ if (ptr != static_cast<void*>(&dummy)) Free(ptr);
+}
+
/**************************************************************************/
#ifdef MEMORY_DEBUG
diff --git a/common/pattern_p.y b/common/pattern_p.y
index 34864cbb1f9981e531a1caf1066420394a437b21..37a6673d754737e642e5aa482ede9a5183206388 100644
--- a/common/pattern_p.y
+++ b/common/pattern_p.y
@@ -71,11 +71,11 @@
static void pattern_yyerror(const char *error_str);
/** Creates the POSIX equivalent of literal character \a c using the
* appropriate escape sequence when needed. */
- static char *translate_character(char c);
+ static char *translate_character(unsigned char c);
/** Returns the printable equivalent of character \a c */
- static char *print_character(char c);
+ static char *print_character(unsigned char c);
/** Returns the printable equivalent of range \a lower .. \a upper */
- static char *print_range(char lower, char upper);
+ static char *print_range(unsigned char lower, unsigned char upper);
/** structure for manipulating character sets */
struct character_set;
/** allocates, initializes and returns a new empty set */
@@ -89,16 +89,16 @@
/** returns whether set \a set contains all characters in range 1..127 */
static int set_is_full(const character_set *set);
/** returns whether set \a set contains the character \a c */
- static int set_has_char(const character_set *set, char c);
+ static int set_has_char(const character_set *set, unsigned char c);
/** adds character \a c to set \a set */
- static void set_add_char(character_set *set, char c);
+ static void set_add_char(character_set *set, unsigned char c);
/** removes character \a c to set \a set */
- static void set_remove_char(character_set *set, char c);
+ static void set_remove_char(character_set *set, unsigned char c);
/** returns whether set \a set contains at least one character in the range
* \a lower .. \a upper */
- static int set_has_range(const character_set *set, char lower, char upper);
+ static int set_has_range(const character_set *set, unsigned char lower, unsigned char upper);
/** adds range \a lower .. \a upper to set \a set */
- static void set_add_range(character_set *set, char lower, char upper);
+ static void set_add_range(character_set *set, unsigned char lower, unsigned char upper);
/** returns whether set \a set1 and \a set2 has non-empty intersect */
static int set_has_intersect(const character_set *set1,
const character_set *set2);
@@ -139,7 +139,7 @@ static void yyprint(FILE *file, int type, const YYSTYPE& value);
%union {
int b; /* boolean */
- char c; /* single character */
+ unsigned char c; /* single character */
char *s; /* character string */
unsigned long int u; /* unsigned integer */
struct character_set *set; // used by nonterminals in pattern_p.y
@@ -686,7 +686,7 @@ void pattern_yyerror(const char *error_str)
* @param c plain character
* @return a newly allocated string which must be Free() 'd
*/
-char *translate_character(char c)
+char *translate_character(unsigned char c)
{
int escape_needed = 0;
switch (c) {
@@ -710,7 +710,7 @@ char *translate_character(char c)
else return mputc(NULL, c);
}
-char *print_character(char c)
+char *print_character(unsigned char c)
{
switch (c) {
case '\t':
@@ -723,7 +723,7 @@ char *print_character(char c)
}
}
-char *print_range(char lower, char upper)
+char *print_range(unsigned char lower, unsigned char upper)
{
char *range_str = print_character(lower);
range_str = mputc(range_str, '-');
@@ -775,24 +775,24 @@ int set_is_full(const character_set *set)
return 1;
}
-int set_has_char(const character_set *set, char c)
+int set_has_char(const character_set *set, unsigned char c)
{
if (set->set_members[c / CS_BITS_PER_ELEM] & 1UL << c % CS_BITS_PER_ELEM)
return 1;
else return 0;
}
-void set_add_char(character_set *set, char c)
+void set_add_char(character_set *set, unsigned char c)
{
set->set_members[c / CS_BITS_PER_ELEM] |= 1UL << c % CS_BITS_PER_ELEM;
}
-void set_remove_char(character_set *set, char c)
+void set_remove_char(character_set *set, unsigned char c)
{
set->set_members[c / CS_BITS_PER_ELEM] &= ~(1UL << c % CS_BITS_PER_ELEM);
}
-int set_has_range(const character_set *set, char lower, char upper)
+int set_has_range(const character_set *set, unsigned char lower, unsigned char upper)
{
for (size_t i = lower; i <= static_cast<unsigned char>(upper); i++)
if (set->set_members[i / CS_BITS_PER_ELEM] & 1UL << i % CS_BITS_PER_ELEM)
@@ -800,7 +800,7 @@ int set_has_range(const character_set *set, char lower, char upper)
return 0;
}
-void set_add_range(character_set *set, char lower, char upper)
+void set_add_range(character_set *set, unsigned char lower, unsigned char upper)
{
for (size_t i = lower; i <= static_cast<unsigned char>(upper); i++)
set->set_members[i / CS_BITS_PER_ELEM] |= 1UL << i % CS_BITS_PER_ELEM;
@@ -832,10 +832,10 @@ void set_report_duplicates(const character_set *set1,
for (i++; i <= 127; i++)
if (set_has_char(set2, i) && set_has_char(set1, i)) break;
if (i > 127) break;
- char lower = i;
+ unsigned char lower = i;
for (i++; i <= 127; i++)
if (!set_has_char(set2, i) || !set_has_char(set1, i)) break;
- char upper = i - 1;
+ unsigned char upper = static_cast<unsigned char>(i - 1);
if (lower < upper) {
char *range_str = print_range(lower, upper);
TTCN_pattern_warning("Duplicate range `%s' in the character set.",
diff --git a/common/pattern_uni.y b/common/pattern_uni.y
index aa860dd7511e3b03bc0174d62f4ad5e0130f07c4..a7929b7ac2dc6ce73c9133c15a9833b56bd714da 100644
--- a/common/pattern_uni.y
+++ b/common/pattern_uni.y
@@ -95,7 +95,7 @@ static void yyprint(FILE *file, int type, const YYSTYPE& value);
%union {
int b; /* boolean */
- char c; /* single character */
+ unsigned char c; /* single character */
char *s; /* character string */
unsigned long int u; /* unsigned integer */
struct character_set *set; // used by nonterminals in pattern_p.y
diff --git a/compiler2/Setting.cc b/compiler2/Setting.cc
index 79561dfe2556fa2f90c6cff938f26771e5b11466..5c0b1933b8ec4874d2ab6010a125d01a03926efc 100644
--- a/compiler2/Setting.cc
+++ b/compiler2/Setting.cc
@@ -78,7 +78,7 @@ namespace Common {
yyloc.last_column = 0;
}
- void Location::set_location(const char *p_filename, int p_lineno)
+ void Location::set_location(const char *p_filename, size_t p_lineno)
{
filename = p_filename;
yyloc.first_line = p_lineno;
@@ -103,8 +103,8 @@ namespace Common {
yyloc.last_column = p_lastloc.last_column;
}
- void Location::set_location(const char *p_filename, int p_first_line,
- int p_first_column, int p_last_line, int p_last_column)
+ void Location::set_location(const char *p_filename, size_t p_first_line,
+ size_t p_first_column, size_t p_last_line, size_t p_last_column)
{
filename = p_filename;
yyloc.first_line = p_first_line;
@@ -142,51 +142,51 @@ namespace Common {
if (output_only_linenum || (yyloc.first_line == yyloc.last_line &&
yyloc.first_column <= 0 && yyloc.last_column <= 0)) {
// print only the first line
- fprintf(fp, "%d", yyloc.first_line);
+ fprintf(fp, "%lu", yyloc.first_line);
} else if (yyloc.last_line > yyloc.first_line) {
// multi-line area
if (yyloc.first_column >= 0 && yyloc.last_column >= 0) {
// all line/column fields are valid
if (gcc_compat) {
- fprintf(fp, "%d:%d", yyloc.first_line, yyloc.first_column + 1);
+ fprintf(fp, "%lu:%lu", yyloc.first_line, yyloc.first_column + 1);
}
else {
- fprintf(fp, "%d.%d-%d.%d", yyloc.first_line,
+ fprintf(fp, "%lu.%lu-%lu.%lu", yyloc.first_line,
yyloc.first_column + 1, yyloc.last_line, yyloc.last_column);
}
} else {
// only the line numbers are valid
if (gcc_compat) {
- fprintf(fp, "%d", yyloc.first_line);
+ fprintf(fp, "%lu", yyloc.first_line);
}
else {
- fprintf(fp, "%d-%d", yyloc.first_line, yyloc.last_line);
+ fprintf(fp, "%lu-%lu", yyloc.first_line, yyloc.last_line);
}
}
} else if (yyloc.first_line == yyloc.last_line) {
// single line area
if (yyloc.first_column >= 0 && yyloc.last_column > yyloc.first_column) {
if (gcc_compat) {
- fprintf(fp, "%d:%d", yyloc.first_line, yyloc.first_column + 1);
+ fprintf(fp, "%lu:%lu", yyloc.first_line, yyloc.first_column + 1);
}
else {
if (yyloc.last_column > yyloc.first_column + 1) {
// more characters are covered
- fprintf(fp, "%d.%d-%d", yyloc.first_line, yyloc.first_column + 1,
+ fprintf(fp, "%lu.%lu-%lu", yyloc.first_line, yyloc.first_column + 1,
yyloc.last_column);
} else {
// only a single character is covered
- fprintf(fp, "%d.%d", yyloc.first_line, yyloc.first_column + 1);
+ fprintf(fp, "%lu.%lu", yyloc.first_line, yyloc.first_column + 1);
}
}
} else {
// the column information is invalid, print the line number only
- fprintf(fp, "%d", yyloc.first_line);
+ fprintf(fp, "%lu", yyloc.first_line);
}
} else {
// the last line is smaller than the first line
// print only the first line
- fprintf(fp, "%d", yyloc.first_line);
+ fprintf(fp, "%lu", yyloc.first_line);
}
} else {
// line information is not available
@@ -244,11 +244,11 @@ namespace Common {
: "TTCN_Location_Statistics current_location(\"");
str = Code::translate_string(str, filename);
str = mputprintf(str,
- !tcov_enabled ? "\", %d, TTCN_Location::LOCATION_%s, \"%s\");\n"
- : "\", %d, TTCN_Location_Statistics::LOCATION_%s, \"%s\");\n", yyloc.first_line, entitytype, entityname);
+ !tcov_enabled ? "\", %lu, TTCN_Location::LOCATION_%s, \"%s\");\n"
+ : "\", %lu, TTCN_Location_Statistics::LOCATION_%s, \"%s\");\n", yyloc.first_line, entitytype, entityname);
if (tcov_enabled) {
effective_module_lines =
- mputprintf(effective_module_lines, "%s%d",
+ mputprintf(effective_module_lines, "%s%lu",
(effective_module_lines ? ", " : ""), yyloc.first_line);
effective_module_functions =
mputprintf(effective_module_functions, "%s\"%s\"",
@@ -263,7 +263,7 @@ namespace Common {
char* file_name2 = mcopystrn(filename, file_name_len);
str = mputprintf(str,
"TTCN3_Stack_Depth stack_depth;\n"
- "ttcn3_prof.enter_function(\"%s\", %d);\n", file_name2, yyloc.first_line);
+ "ttcn3_prof.enter_function(\"%s\", %lu);\n", file_name2, yyloc.first_line);
insert_profiler_code_line(file_name2,
(0 == strcmp(entitytype, "CONTROLPART") ? "control" : entityname),
yyloc.first_line);
@@ -277,7 +277,7 @@ namespace Common {
{
if (filename && yyloc.first_line > 0) {
if (include_location_info && !transparency) {
- str = mputprintf(str, "current_location.update_lineno(%d);\n",
+ str = mputprintf(str, "current_location.update_lineno(%lu);\n",
yyloc.first_line);
const char* file_name = get_filename();
if (is_file_profiled(file_name)) {
@@ -287,24 +287,24 @@ namespace Common {
file_name_len -= 2;
}
char* file_name2 = mcopystrn(file_name, file_name_len);
- str = mputprintf(str, "ttcn3_prof.execute_line(\"%s\", %d);\n",
+ str = mputprintf(str, "ttcn3_prof.execute_line(\"%s\", %lu);\n",
file_name2, yyloc.first_line);
insert_profiler_code_line(file_name2, NULL, yyloc.first_line);
Free(file_name2);
}
if (tcov_file_name && in_tcov_files(file_name)) {
effective_module_lines =
- mputprintf(effective_module_lines, "%s%d",
+ mputprintf(effective_module_lines, "%s%lu",
(effective_module_lines ? ", " : ""), yyloc.first_line);
}
if (debugger_active) {
- str = mputprintf(str, "ttcn3_debugger.breakpoint_entry(%d);\n", yyloc.first_line);
+ str = mputprintf(str, "ttcn3_debugger.breakpoint_entry(%lu);\n", yyloc.first_line);
}
}
if (include_line_info)
- str = mputprintf(str, "#line %d \"%s\"\n", yyloc.first_line, filename);
- else str = mputprintf(str, "/* %s, line %d */\n", filename,
+ str = mputprintf(str, "#line %lu \"%s\"\n", yyloc.first_line, filename);
+ else str = mputprintf(str, "/* %s, line %lu */\n", filename,
yyloc.first_line);
}
return str;
@@ -1001,8 +1001,8 @@ namespace Common {
if (errors.size() < *err_stack.top())
FATAL_ERROR("Common::ReferenceChain::prev_error_state()");
- int state = static_cast<int>(*err_stack.top());
- for (int i = static_cast<int>(errors.size()) - 1; i >= state; --i) {
+ int state = static_cast<int>(*err_stack.top());
+ for (int i = static_cast<int>(errors.size()) - 1; i >= state; --i) {
errors.remove(i);
}
delete err_stack.pop();
diff --git a/compiler2/Setting.hh b/compiler2/Setting.hh
index 2fd37243d61e81fae7de784a3b97acd74452e52c..198261d087fc85e121ad2a0f552fbf829e0e29a5 100644
--- a/compiler2/Setting.hh
+++ b/compiler2/Setting.hh
@@ -39,10 +39,10 @@
#if ! defined (YYLTYPE) && ! defined (YYLTYPE_IS_DECLARED)
typedef struct YYLTYPE
{
- int first_line;
- int first_column;
- int last_line;
- int last_column;
+ size_t first_line;
+ size_t first_column;
+ size_t last_line;
+ size_t last_column;
} YYLTYPE;
# define YYLTYPE_IS_DECLARED 1
# define YYLTYPE_IS_TRIVIAL 1
@@ -134,7 +134,7 @@ namespace Common {
/** Constructor with filename and just a line number.
* Sets \c yyloc.first_line and \c yyloc.last_line to \p p_lineno,
* and the columns to zero. */
- Location(const char *p_filename, int p_lineno=0)
+ Location(const char *p_filename, size_t p_lineno=0)
{ set_location(p_filename, p_lineno); }
/** Constructor with filename and full location information.
@@ -162,15 +162,15 @@ namespace Common {
* Stores the filename, and the line/column info in the appropriate
* members of \c yyloc.
*/
- Location(const char *p_filename, int p_first_line, int p_first_column,
- int p_last_line, int p_last_column)
+ Location(const char *p_filename, size_t p_first_line, size_t p_first_column,
+ size_t p_last_line, size_t p_last_column)
{ set_location(p_filename, p_first_line, p_first_column,
p_last_line, p_last_column); }
/** Setter with filename and full location information.
* Copies \p p_yyloc into \p yyloc.
*/
- void set_location(const char *p_filename, int p_lineno=0);
+ void set_location(const char *p_filename, size_t p_lineno=0);
/** Setter with filename and full location information.
* Copies \p p_yyloc into \p yyloc.
*/
@@ -192,8 +192,8 @@ namespace Common {
* Stores the filename, and the line/column info in the appropriate
* members of \c yyloc.
*/
- void set_location(const char *p_filename, int p_first_line,
- int p_first_column, int p_last_line, int p_last_column);
+ void set_location(const char *p_filename, size_t p_first_line,
+ size_t p_first_column, size_t p_last_line, size_t p_last_column);
/** Copies the stored location information from \a p. */
void set_location(const Location& p) { *this = p; }
@@ -204,15 +204,15 @@ namespace Common {
/** Returns the attribute filename. */
const char *get_filename() const { return filename; }
/** Returns the line number, for backward compatibility */
- int get_lineno() const { return yyloc.first_line; }
+ size_t get_lineno() const { return yyloc.first_line; }
/** Returns the first line attribute */
- int get_first_line() const { return yyloc.first_line; }
+ size_t get_first_line() const { return yyloc.first_line; }
/** Returns the last line attribute */
- int get_last_line() const { return yyloc.last_line; }
+ size_t get_last_line() const { return yyloc.last_line; }
/** Returns the first column attribute */
- int get_first_column() const { return yyloc.first_column; }
+ size_t get_first_column() const { return yyloc.first_column; }
/** Returns the last column attribute */
- int get_last_column() const { return yyloc.last_column; }
+ size_t get_last_column() const { return yyloc.last_column; }
private:
/** Prints the line/column information stored in \a this into file \a fp.
diff --git a/compiler2/Value.cc b/compiler2/Value.cc
index c04aebbf43b6fc65eaea158cf3f2de1471704b2f..3d69ee615fb8a64b99db4fe20c98e026c3eda2d6 100644
--- a/compiler2/Value.cc
+++ b/compiler2/Value.cc
@@ -9572,14 +9572,14 @@ void Value::chk_expr_operand_execute_refd(Value *v1,
Free(t_filepath);
break; }
case MACRO_LINENUMBER: {
- int t_lineno = get_first_line();
+ size_t t_lineno = get_first_line();
if (t_lineno <= 0)
FATAL_ERROR("Value::evaluate_macro(): line number is not set");
set_val_str(new string(Int2string(t_lineno)));
valuetype = V_CSTR;
break; }
case MACRO_LINENUMBER_C: {
- int t_lineno = get_first_line();
+ size_t t_lineno = get_first_line();
if (t_lineno <= 0)
FATAL_ERROR("Value::evaluate_macro(): line number is not set");
u.val_Int = new int_val_t(t_lineno);
diff --git a/compiler2/asn1/TokenBuf.cc b/compiler2/asn1/TokenBuf.cc
index 0e29774d02a7553c96d5f2baca45626ec589a27e..2ae766930367fb073a7a967ff824f742227588ad 100644
--- a/compiler2/asn1/TokenBuf.cc
+++ b/compiler2/asn1/TokenBuf.cc
@@ -27,7 +27,7 @@ extern int asn1_yylex();
extern const char *asn1_infile;
extern int asn1_yylineno;
#define yylineno asn1_yylineno
-extern int asn1_plineno;
+extern size_t asn1_plineno;
#define plineno asn1_plineno
extern YYLTYPE asn1_yylloc;
#define yylloc asn1_yylloc
diff --git a/compiler2/asn1/asn1p.y b/compiler2/asn1/asn1p.y
index a042d0557cc3a8b7b1c7baba680818b1e12f2303..f71d2a9dcce7f94aefed3fe30fb8bf60762bba0d 100644
--- a/compiler2/asn1/asn1p.y
+++ b/compiler2/asn1/asn1p.y
@@ -66,7 +66,7 @@ extern FILE *asn1_yyin;
#define yyin asn1_yyin
extern int asn1_yylineno;
#define yylineno asn1_yylineno
-int asn1_plineno;
+size_t asn1_plineno;
#define plineno asn1_plineno
/* copy-paste from xxxxx.yy.cc */
#define YY_BUF_SIZE 16384
diff --git a/compiler2/ttcn3/ILT.cc b/compiler2/ttcn3/ILT.cc
index 89debaa3647e5c19666c5802c04c8e316bf4da1e..ef40640d5a6051cbac15d31d818bafc85e437b18 100644
--- a/compiler2/ttcn3/ILT.cc
+++ b/compiler2/ttcn3/ILT.cc
@@ -201,10 +201,10 @@ namespace Ttcn {
str = mputstr(str, "TTCN_error(\"None of the branches can be chosen in the "
"interleave statement in file ");
str = Code::translate_string(str, il->get_filename());
- int first_line = il->get_first_line(), last_line = il->get_last_line();
+ size_t first_line = il->get_first_line(), last_line = il->get_last_line();
if (first_line < last_line) str = mputprintf(str,
- " between lines %d and %d", first_line, last_line);
- else str = mputprintf(str, ", line %d", first_line);
+ " between lines %lu and %lu", first_line, last_line);
+ else str = mputprintf(str, ", line %lu", first_line);
str = mputprintf(str, ".\");\n"
"%s_newsnapshot:\n"
"TTCN_Snapshot::take_new(TRUE);\n"
diff --git a/compiler2/ttcn3/Statement.cc b/compiler2/ttcn3/Statement.cc
index 503eea6bc5cc4198712e9e274892224836afcc13..57ee993f30a78ae01c81d5b3ea6069089f8c0f05 100644
--- a/compiler2/ttcn3/Statement.cc
+++ b/compiler2/ttcn3/Statement.cc
@@ -6835,10 +6835,10 @@ error:
str = mputprintf(str, "if (alt_flag == ALT_NO && default_flag == ALT_NO) "
"TTCN_error(\"Stand-alone %s statement failed in file ", get_stmt_name());
str = Code::translate_string(str, get_filename());
- int first_line = get_first_line(), last_line = get_last_line();
+ size_t first_line = get_first_line(), last_line = get_last_line();
if (first_line < last_line) str = mputprintf(str,
- " between lines %d and %d", first_line, last_line);
- else str = mputprintf(str, ", line %d", first_line);
+ " between lines %lu and %lu", first_line, last_line);
+ else str = mputprintf(str, ", line %lu", first_line);
str = mputstr(str, ".\");\n"
"TTCN_Snapshot::take_new(TRUE);\n"
"}\n");
@@ -14041,10 +14041,10 @@ error:
"TTCN_error(\"None of the branches can be chosen in the alt "
"statement in file ", label_str);
str = Code::translate_string(str, loc.get_filename());
- int first_line = loc.get_first_line(), last_line = loc.get_last_line();
+ size_t first_line = loc.get_first_line(), last_line = loc.get_last_line();
if (first_line < last_line) str = mputprintf(str,
- " between lines %d and %d", first_line, last_line);
- else str = mputprintf(str, ", line %d", first_line);
+ " between lines %lu and %lu", first_line, last_line);
+ else str = mputprintf(str, ", line %lu", first_line);
str = mputstr(str, ".\");\n"
"TTCN_Snapshot::take_new(TRUE);\n");
}
@@ -14272,10 +14272,10 @@ error:
str = mputstr(str, ") TTCN_error(\"None of the branches can be chosen in "
"the response and exception handling part of call statement in file ");
str = Code::translate_string(str, loc.get_filename());
- int first_line = loc.get_first_line(), last_line = loc.get_last_line();
+ size_t first_line = loc.get_first_line(), last_line = loc.get_last_line();
if (first_line < last_line) str = mputprintf(str,
- " between lines %d and %d", first_line, last_line);
- else str = mputprintf(str, ", line %d", first_line);
+ " between lines %lu and %lu", first_line, last_line);
+ else str = mputprintf(str, ", line %lu", first_line);
str = mputstr(str, ".\");\n"
"TTCN_Snapshot::take_new(TRUE);\n"
"}\n"); // (1) for
diff --git a/compiler2/ttcn3/Templatestuff.cc b/compiler2/ttcn3/Templatestuff.cc
index 6838235230884ffcdfa64d60d13900bf82ec1972..eaf15110859c4ff9f90b002d6cdfd0f89366785a 100644
--- a/compiler2/ttcn3/Templatestuff.cc
+++ b/compiler2/ttcn3/Templatestuff.cc
@@ -1082,7 +1082,7 @@ namespace Ttcn {
}
}
- void ParsedActualParameters::set_location(const char *p_filename, int p_lineno)
+ void ParsedActualParameters::set_location(const char *p_filename, size_t p_lineno)
{
Location ::set_location(p_filename, p_lineno);
if (namedpart)
@@ -1109,8 +1109,8 @@ namespace Ttcn {
unnamedpart->set_location(p_filename, p_firstloc, p_lastloc);
}
- void ParsedActualParameters::set_location(const char *p_filename, int p_first_line,
- int p_first_column, int p_last_line, int p_last_column)
+ void ParsedActualParameters::set_location(const char *p_filename, size_t p_first_line,
+ size_t p_first_column, size_t p_last_line, size_t p_last_column)
{
Location ::set_location(p_filename, p_first_line, p_first_column,
p_last_line, p_last_column);
diff --git a/compiler2/ttcn3/Templatestuff.hh b/compiler2/ttcn3/Templatestuff.hh
index e4dcdaf282590e331019ab0ed3e84bb4e791bf6c..0c1b1f7dfb7e77864b63a3db5c8e27ceb3d4d32f 100644
--- a/compiler2/ttcn3/Templatestuff.hh
+++ b/compiler2/ttcn3/Templatestuff.hh
@@ -388,12 +388,12 @@ namespace Ttcn {
virtual void set_fullname(const string& p_fullname);
virtual void set_my_scope(Scope *p_scope);
Scope* get_my_scope() const { return my_scope; }
- void set_location(const char *p_filename, int p_lineno=0);
+ void set_location(const char *p_filename, size_t p_lineno=0);
void set_location(const char *p_filename, const YYLTYPE& p_yyloc);
void set_location(const char *p_filename, const YYLTYPE& p_firstloc,
const YYLTYPE& p_lastloc);
- void set_location(const char *p_filename, int p_first_line,
- int p_first_column, int p_last_line, int p_last_column);
+ void set_location(const char *p_filename, size_t p_first_line,
+ size_t p_first_column, size_t p_last_line, size_t p_last_column);
virtual void dump(unsigned int level) const;
// @}
diff --git a/compiler2/ttcn3/charstring_la.l b/compiler2/ttcn3/charstring_la.l
index 0e154ce3bc80a5b6dd4cd9b82121c3b0cce82f11..b1f8d90014a5ed410a8029e56c0a00b9bf9bebd7 100644
--- a/compiler2/ttcn3/charstring_la.l
+++ b/compiler2/ttcn3/charstring_la.l
@@ -44,7 +44,7 @@ static void add_char(char*& string_ptr, size_t& string_len,
#define ADD_CHAR(c) add_char(string_ptr, string_len, string_size, c)
#define YY_DECL static string *yylex(const char *current_file, \
- int current_line, int current_column)
+ size_t current_line, size_t current_column)
%}
diff --git a/compiler2/ttcn3/coding_attrib_la.l b/compiler2/ttcn3/coding_attrib_la.l
index 05569867932b631374293ea5331205870ca54ec6..262888204f7fc90ed420ca6be0549fd0ee0c4182 100644
--- a/compiler2/ttcn3/coding_attrib_la.l
+++ b/compiler2/ttcn3/coding_attrib_la.l
@@ -48,7 +48,7 @@ extern YYLTYPE yylloc;
const char *coding_attrib_infile;
/** always points to the first character of the regexp to be recognized */
-static int current_line, current_column;
+static size_t current_line, current_column;
/** the actual size of state condition stack */
static size_t stack_size = 0;
diff --git a/compiler2/ttcn3/compiler.l b/compiler2/ttcn3/compiler.l
index 66a42b80e544200f6e7be17635f65c234c511f4e..56afedbbb9a5950a7c041b69d3f09b0c2897ad67 100644
--- a/compiler2/ttcn3/compiler.l
+++ b/compiler2/ttcn3/compiler.l
@@ -78,7 +78,7 @@ extern YYLTYPE yylloc;
extern bool is_erroneous_parsed;
/* always points to the first character of the regexp to be recognized */
-static int current_line, current_column;
+static size_t current_line, current_column;
/* when reporting an error in linemarker or preprocessor
* directive the real file name and line number is needed */
@@ -204,9 +204,9 @@ TITAN "$#&&&(#TITANERRONEOUS$#&&^#% "
%%
/* local variables of yylex() */
- int start_line = 0, start_column = 0; /**< used by block comments and
+ size_t start_line = 0, start_column = 0; /**< used by block comments and
string literals */
- int dot_line = 0, dot_column = 0; /**< location of the previous '.' token */
+ size_t dot_line = 0, dot_column = 0; /**< location of the previous '.' token */
/* variables used when processing binary strings */
expstring_t binstr = NULL; /**< the string itself */
bool valid_bit = false, /**< binstr is valid bitstring */
@@ -1164,7 +1164,7 @@ void init_ttcn3_lex()
MD5_Init(&md5_ctx);
}
-void init_erroneous_lex(const char* p_infile, int p_line, int p_column)
+void init_erroneous_lex(const char* p_infile, size_t p_line, size_t p_column)
{
infile = p_infile;
current_line = p_line;
diff --git a/compiler2/ttcn3/compiler.y b/compiler2/ttcn3/compiler.y
index 578b5577aacdb89812c2f14f91ae571cd013cab1..3a818e72f092a566cd600d8bbbc335eae26e5256 100644
--- a/compiler2/ttcn3/compiler.y
+++ b/compiler2/ttcn3/compiler.y
@@ -99,7 +99,7 @@ extern void init_ttcn3_lex();
extern void free_ttcn3_lex();
extern void set_md5_checksum(Ttcn::Module *m);
-extern void init_erroneous_lex(const char* p_infile, int p_line, int p_column);
+extern void init_erroneous_lex(const char* p_infile, size_t p_line, size_t p_column);
struct yy_buffer_state;
extern int ttcn3_lex_destroy(void);
extern yy_buffer_state *ttcn3__scan_string(const char *yy_str);
@@ -11375,7 +11375,7 @@ Ttcn::ErroneousAttributeSpec* ttcn3_parse_erroneous_attr_spec_string(
is_erroneous_parsed = true;
act_ttcn3_erroneous_attr_spec = NULL;
string titan_err_str("$#&&&(#TITANERRONEOUS$#&&^#% ");
- int hack_str_len = static_cast<int>(titan_err_str.size());
+ size_t hack_str_len = titan_err_str.size();
string *parsed_string = parse_charstring_value(p_str, str_loc);
titan_err_str += *parsed_string;
delete parsed_string;
diff --git a/compiler2/ttcn3/comptype_attrib_la.l b/compiler2/ttcn3/comptype_attrib_la.l
index 9af1305817f5f23dbf690da2159773c8ba84c5cf..9fcd51146bf060b1d4e21ae8ef8590c22db43ca6 100644
--- a/compiler2/ttcn3/comptype_attrib_la.l
+++ b/compiler2/ttcn3/comptype_attrib_la.l
@@ -40,7 +40,7 @@ enum extension_attr_parser_state_t {
};
#define YY_DECL static int yylex(Common::CompTypeRefList*& attr_comp_refs, \
-int current_line, int current_column, const char *current_file)
+size_t current_line, size_t current_column, const char *current_file)
#define FATAL_ERROR_INVALID_STATE \
FATAL_ERROR("comptype_attr.l: invalid parser state");
@@ -89,8 +89,8 @@ LINECOMMENT "//"[^\r\n]*{NEWLINE}
%%
Common::Identifier *id=0;
YYLTYPE id_loc;
- int start_line = 0;
- int start_column = 0;
+ size_t start_line = 0;
+ size_t start_column = 0;
extension_attr_parser_state_t parser_state = INITIAL_STATE;
BEGIN(INITIAL);
diff --git a/compiler2/ttcn3/pstring_la.l b/compiler2/ttcn3/pstring_la.l
index e4e8292fd8474822c5cbc38554e79491f618df01..c88eb91bcbbdb4d96e7bed7f72aacac2ccfd90fc 100644
--- a/compiler2/ttcn3/pstring_la.l
+++ b/compiler2/ttcn3/pstring_la.l
@@ -123,14 +123,14 @@ if (in_set) {
bool error = false;
Ttcn::Reference *ref = 0;
size_t last = 0; // last "consumed" index into yytext
- int old_column = 0, old_line = 0; // the beginning of the entire reference
+ size_t old_column = 0, old_line = 0; // the beginning of the entire reference
for (size_t i = 0; i < num_id; ++i) {
const string & id_str = *identifiers[i];
const size_t & id_beg = *beginnings [i];
if (Identifier::is_reserved_word(id_str, Identifier::ID_TTCN)) {
UPDATE_LOCATION(last, id_beg); // consume before identifier
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(id_beg, id_beg+id_str.size()); // consume identifier
Location loc(current_file, first_line, first_column, current_line,
current_column); // location covers the identifier
@@ -199,7 +199,7 @@ if (in_set) {
}
"{"[^}]*"}" {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -218,7 +218,7 @@ if (in_set) {
Identifier::ID_TTCN, id_str));
ps->addRef(ref, TRUE);
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -241,7 +241,7 @@ if (in_set) {
Identifier::ID_TTCN, id_str));
ps->addRef(ref, TRUE);
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -253,7 +253,7 @@ if (in_set) {
}
"\\N"{WS}"{"[^}]*"}" {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -390,7 +390,7 @@ if (in_set) {
}
"\\q"({WS}"{"[^}]*"}")? {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -462,7 +462,7 @@ if (in_set) {
}
"\\"(.|{NEWLINE}) {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -474,7 +474,7 @@ if (in_set) {
}
"#"{WS}[0-9] {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
if (in_set) {
Location loc(current_file, first_line, first_column, current_line,
@@ -489,7 +489,7 @@ if (in_set) {
"#"{WS}"("{WS}{NUMBER}{WS}")" {
if (in_set) {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -514,7 +514,7 @@ if (in_set) {
}
"#"{WS}"("{WS}{NUMBER}{WS}","{WS}{NUMBER}{WS}")" {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
if (in_set) {
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
@@ -569,7 +569,7 @@ if (in_set) {
"#"{WS}"("{WS}{NUMBER}{WS}","{WS}")" {
if (in_set) {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -597,7 +597,7 @@ if (in_set) {
"#"{WS}"("{WS}","{WS}{NUMBER}{WS}")" {
if (in_set) {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
@@ -623,7 +623,7 @@ if (in_set) {
}
"#"{WS}"("{WS}","{WS}")" {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
if (in_set) {
Location loc(current_file, first_line, first_column, current_line,
@@ -634,7 +634,7 @@ if (in_set) {
}
"#"{WS}"("[^)]*")" {
- int first_line = current_line, first_column = current_column;
+ size_t first_line = current_line, first_column = current_column;
UPDATE_LOCATION(0, yyleng);
Location loc(current_file, first_line, first_column, current_line,
current_column);
diff --git a/compiler2/ttcn3/rawAST.l b/compiler2/ttcn3/rawAST.l
index 368671233c684157ce808e993f4d625c5c4011fa..79aa0cd557a07b47cbb418ee47badaa1128b2ac5 100644
--- a/compiler2/ttcn3/rawAST.l
+++ b/compiler2/ttcn3/rawAST.l
@@ -75,7 +75,7 @@ extern int rawAST_debug;
extern YYLTYPE yylloc;
/* always points to the first character of the regexp to be recognized */
-static int current_line, current_column;
+static size_t current_line, current_column;
static void update_lloc()
{
diff --git a/compiler2/ustring.hh b/compiler2/ustring.hh
index 02acb2598714776403047e5fb89df33b713587c0..0df60ceaa34d410c658670db028218bc7071cf1e 100644
--- a/compiler2/ustring.hh
+++ b/compiler2/ustring.hh
@@ -21,6 +21,7 @@
#define _Common_ustring_HH
#include <string.h>
+#include <limits.h>
class string;
@@ -53,9 +54,9 @@ private:
public:
- /** The largest possible value of type size_t. That is, size_t(-1). */
+ /** The largest possible string length that can theoretically fit into the memory. */
static const size_t max_string_len =
- (-1 - sizeof(ustring_struct)) / sizeof(universal_char) + 1;
+ (UINT_MAX - sizeof(ustring_struct)) / sizeof(universal_char) + 1;
/** Constructs an empty string. */
ustring() : val_ptr(0) { init_struct(0); }
diff --git a/help/info/BNF.html b/help/info/BNF.html
index 6a56b14923c0834eb8b6a914cf42e68a934ff56d..1a3eebea9ecd8c480a0a174f473d8fa1e74fea15 100644
--- a/help/info/BNF.html
+++ b/help/info/BNF.html
@@ -877,7 +877,7 @@ This ABNF browser was generated from file <mockup_bnf.txt> on Tue Jul 20 1
<TD>
<P><A NAME="componentdef"></a><A HREF="#Xref.ComponentDef">ComponentDef</A>
<TD VALIGN=TOP>=</TD>
- <TD><A HREF="#componentkeyword">ComponentKeyword</A> <A HREF="#componenttypeidentifier">ComponentTypeIdentifier</A> <A HREF="#beginchar">BeginChar</A> [<A HREF="#componentdeflist">ComponentDefList</A>]
+ <TD><A HREF="#componentkeyword">ComponentKeyword</A> <A HREF="#componenttypeidentifier">ComponentTypeIdentifier</A> [<A HREF="#extendskeyword">ExtendsKeyword</A> <A HREF="#componenttypeidentifier">ComponentTypeIdentifier</A>] <A HREF="#beginchar">BeginChar</A> [<A HREF="#componentdeflist">ComponentDefList</A>]
<A HREF="#endchar">EndChar</A></TD>
</TR>
<TR VALIGN=TOP>
@@ -894,6 +894,16 @@ This ABNF browser was generated from file <mockup_bnf.txt> on Tue Jul 20 1
<TD></TD>
<TD></TD>
</TR>
+ <TR VALIGN=TOP>
+ <TD>
+ <P><A NAME="extendskeyword"></a><A HREF="#Xref.ExtendsKeyword">ExtendsKeyword</A>
+ <TD VALIGN=TOP>=</TD>
+ <TD>"<FONT COLOR="black">extends</FONT>"</TD>
+ </TR>
+ <TR VALIGN=TOP>
+ <TD></TD>
+ <TD></TD>
+ </TR>
<TR VALIGN=TOP>
<TD>
<P><A NAME="componenttype"></a><A HREF="#Xref.ComponentType">ComponentType</A>
@@ -5766,6 +5776,10 @@ This ABNF browser was generated from file <mockup_bnf.txt> on Tue Jul 20 1
<TD><A NAME="Xref.ExtendedFieldReference"></a><A HREF="#extendedfieldreference">ExtendedFieldReference</A></TD>
<TD><A HREF="#variableref">VariableRef</A>, <A HREF="#referencedtype">ReferencedType</A>, <A HREF="#referencedvalue">ReferencedValue</A></TD>
</TR>
+ <TR VALIGN=TOP>
+ <TD><A NAME="Xref.ExtendsKeyword"></a><A HREF="#extendskeyword">ExtendsKeyword</A></TD>
+ <TD><A HREF="#componentdef">ComponentDef</A></TD>
+ </TR>
<TR VALIGN=TOP>
<TD><A NAME="Xref.ExtensionKeyword"></a><A HREF="#extensionkeyword">ExtensionKeyword</A></TD>
<TD><A HREF="#attribkeyword">AttribKeyword</A></TD>
diff --git a/help/info/component.html b/help/info/component.html
index 994ec98cf8d547495d199cd835112187fee8985c..4d6c27b6587f90633d60e477b98cf4a8ba88cd35 100644
--- a/help/info/component.html
+++ b/help/info/component.html
@@ -46,6 +46,7 @@
<p>Related keywords:</p>
<ul>
<li><a href="type.html"><b><font face="Courier New" color="#003258" size="4">type</font></b></a></li>
+ <li><a href="extends.html"><b><font face="Courier New" color="#003258" size="4">extends</font></b></a></li>
<li><a href="port.html"><b><font face="Courier New" color="#003258" size="4">port</font></b></a></li>
<li><a href="const.html"><b><font face="Courier New" color="#003258" size="4">const</font></b></a></li>
<li><a href="var.html"><b><font face="Courier New" color="#003258" size="4">var</font></b></a></li>
diff --git a/help/info/extends.html b/help/info/extends.html
new file mode 100644
index 0000000000000000000000000000000000000000..68856f9d5fab436e1f9b5a1235e7cf85b6c266a5
--- /dev/null
+++ b/help/info/extends.html
@@ -0,0 +1,105 @@
+<!--
+ Copyright (c) 2000-2020 Ericsson Telecom AB
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v2.0
+ which accompanies this distribution, and is available at
+ https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+
+ Contributors:
+ Baji, Laszlo
+ Balasko, Jeno
+ Farkas, Laszlo
+ Szabados, Kristof
+ Lenard, Nagy
+-->
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Language" content="en-us">
+<title>extends</title>
+</head>
+<body bgcolor="#DAD3C5" vlink="#0094D2" link="#003258">
+<table align="left" border="0" cellspacing="0" cellpadding="0" valign=top>
+ <tr>
+ <td width=105 height=40><a href="https://projects.eclipse.org/projects/tools.titan"><img src="../images/titan_transparent.gif" border=0 width=105 height=40 align="left" alt="Titan"></a></td>
+ </tr>
+</table>
+<table border="0" align="right" cellpadding="0" cellspacing="0">
+ <tr>
+ <td><a href="../titan_main.html" alt="contents"><img border="0" src="../images/ao.jpg" width="53" height="40"></a></td>
+ <td><a href="../titan_index.html" alt="index"><img border="0" src="../images/up.jpg" width="53" height="40"></a></td>
+ <td><a href="complement.html" alt="previous"><img border="0" src="../images/left.jpg" width="53" height="40"></a></td>
+ <td><a href="connect.html" alt="next"><img border="0" src="../images/right.jpg" width="53" height="40"></a></td>
+ </tr>
+</table>
+<p><br clear="all">
+</p>
+<hr>
+<h1>extends</h1>
+<hr align="left" width="75%">
+<p>The keyword is used to specify the parent component type on which the new component type is based.</p>
+<p>In such a definition, the new type definition is referred to as the extended type, and the type definition following the
+ extends keyword is referred to as the parent type. The effect of this definition is that the extended type will implicitly
+ also contain all definitions from the parent type. It is called the effective type definition.</p>
+<p> It is allowed to have one component type extending several parent types in one definition, which have to be specified as
+ a comma-separated list of types in the definition. Any of the parent types may also be defined by means of extension.
+ The effective component type definition of the extended type is obtained as the collection of all constant, variable,
+ template, timer and port definitions contributed by the parent types (determined recursively if a parent type is also
+ defined by means of an extension) and the definitions declared in the extended type directly. The effective component
+ type definition shall be name clash free.</p>
+<p>Related keywords:</p>
+<ul>
+ <li><a href="type.html"><b><font face="Courier New" color="#003258" size="4">type</font></b></a></li>
+ <li><a href="component.html"><b><font face="Courier New" color="#003258" size="4">component</font></b></a></li>
+</ul>
+<hr align="left" width="50%">
+<div align="center">
+<center>
+<table border="0" width="90%" bgcolor="#FFB599" cellpadding="4">
+ <tr>
+ <td width="100%">
+ <h3 align="center"><font face="Courier New" color="#003258" size="5"><b>type component </b></font> <i>component_identifier </i> <font face="Courier New" color="#003258" size="5"><b>extends</b></font> <i>parent_component_type_identifier</i> <font face="Courier New" color="#003258" size="5"><b>{</b></font>
+ [ <i>port_instance</i><font face="Courier New" color="#003258" size="5"><b>;</b></font> ] [ <i>const_def</i><font face="Courier New" color="#003258" size="5"><b>;</b></font> ] [ <i>var_instance</i><font
+ face="Courier New" color="#003258" size="5"><b>;</b></font> ] [ <i>timer_instance</i><font face="Courier New" color="#003258" size="5"><b>;</b></font> ] <font face="Courier New"
+ color="#003258" size="5"><b>};</b></font></h3>
+ </td>
+ </tr>
+</table>
+</center>
+</div>
+<ul>
+ <li>
+ <p>The <i>parent_component_type_identifier</i> specifies the component type to be extended</p>
+ </li>
+</ul>
+<p></p>
+<hr align="left" width="50%">
+<p>Example 1:
+<p><font face="Courier New">type component MyParentComponentType_CT {<br>
+ port MyMessagePortType_PT P1_PCO;<br>
+ const bitstring c_MyConst := ’1001’B; <br>
+ var integer v_MyVar; <br>
+ timer T_MyTimer := 1.0; <br>
+}
+</p>
+
+<p><font face="Courier New">type component MyExtendedComponentType_CT extends MyParentComponentType_CT {<br>
+ port MyOtherMessagePortType_PT P2_PCO;<br>
+ const bitstring c_MyOtherConst := ’0110’B; <br>
+ var integer v_MyOtherVar; <br>
+ timer T_MyOtherTimer := 2.0; <br>
+ }
+</p>
+
+
+</font>
+<p>The component called MyExtendedComponentType_CT is declared by extending MyParentComponentType_CT. <br>
+The resulting extended component contains two ports (P1_PCO,P2_PCO) of type MyMessagePortType_PT, <br>
+two constants called c_MyConst and c_MyOtherConst, <br>
+two variables called v_MyVar and v_MyOtherVar <br>
+and two timers called T_MyTimer and T_MyOtherTimer.</p>
+<hr align="left" width="25%">
+<hr align="left" width="25%">
+<p><a HREF="BNF.html#componentdef">BNF definition</a> of <font face="Courier New"> extends</font></p>
+</body>
+</html>