Merge pull request #51 from BenceJanosSzabo/master

Added any2unistr (artf724008)

diff --git a/common/version.h b/common/version.h
index 1401e2d48d57be3f00a97288f69fe2279cc79f01..2fea8f489e84c335d5457de5023678ff3b925d7d 100644 (file)
--- a/common/version.h
+++ b/common/version.h
@@ -23,8 +23,8 @@
 
 /* Version numbers */
 #define TTCN3_MAJOR 5
-#define TTCN3_MINOR 4
-#define TTCN3_PATCHLEVEL 3
+#define TTCN3_MINOR 5
+#define TTCN3_PATCHLEVEL 0
 //#define TTCN3_BUILDNUMBER 0
 
 /* The aggregated version number must be set manually since some stupid
@@ -35,7 +35,7 @@
  * TTCN3_VERSION = TTCN3_MAJOR * 1000000 + TTCN3_MINOR * 10000 +
  *                 TTCN3_PATCHLEVEL * 100 + TTCN3_BUILDNUMBER
  */
-#define TTCN3_VERSION 50403
+#define TTCN3_VERSION 50500
 
 /* A monotonically increasing version number.
  * An official release is deemed to have the highest possible build number (99)

diff --git a/compiler2/ttcn3/TtcnTemplate.cc b/compiler2/ttcn3/TtcnTemplate.cc
index 382bb944d026d1b7aa3b47065b88516a1204319d..caeec80b215fc782d03d627dbb8578766f55e81c 100644 (file)
--- a/compiler2/ttcn3/TtcnTemplate.cc
+++ b/compiler2/ttcn3/TtcnTemplate.cc
@@ -3053,8 +3053,9 @@ end:
       warning("Don't know how to init PERMUT");
       str = mputprintf(str, "/* FIXME: PERMUT goes here, name=%s*/\n", name);
       break;
-    case TEMPLATE_ERROR:
     case TEMPLATE_NOTUSED:
+      break;
+    case TEMPLATE_ERROR:
       // "default"
       FATAL_ERROR("Template::generate_code_init()");
     }
@@ -4536,6 +4537,7 @@ compile_time:
     case OSTR_PATTERN:
     case CSTR_PATTERN:
     case USTR_PATTERN:
+    case TEMPLATE_NOTUSED:
       return false;
     case TEMPLATE_LIST:
       // temporary reference is needed if the template has at least one
@@ -4564,7 +4566,6 @@ compile_time:
     case SUBSET_MATCH:
       return true;
     case TEMPLATE_ERROR:
-    case TEMPLATE_NOTUSED:
       FATAL_ERROR("Template::needs_temp_ref()");
     case PERMUTATION_MATCH:
       // FIXME
@@ -4586,6 +4587,7 @@ compile_time:
     case OSTR_PATTERN:
     case CSTR_PATTERN:
     case USTR_PATTERN:
+    case TEMPLATE_NOTUSED:
       return true;
     case SPECIFIC_VALUE:
       return u.specific_value->has_single_expr();

diff --git a/compiler2/ttcn3/compiler.y b/compiler2/ttcn3/compiler.y
index 32ce893a1c8951b469cb79139a61e4f15f0f4f69..435af7d73994973088bc1d32eb46be5546c6b36d 100644 (file)
--- a/compiler2/ttcn3/compiler.y
+++ b/compiler2/ttcn3/compiler.y
@@ -5557,7 +5557,7 @@ DisconnectStatement: // 335
   }
 | DisconnectKeyword SingleOrMultiConnectionSpec
   {
-    if ($2.compref1 && $2.portref1 && $2.compref1 && $2.compref2) {
+    if ($2.portref1 && $2.portref2 && $2.compref1 && $2.compref2) {
       $$ = new Statement(Statement::S_DISCONNECT,
        $2.compref1, $2.portref1, $2.compref2, $2.portref2);
     } else {

diff --git a/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn b/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn
index fa78a90fb53250b1bfcbc1597f0568a07bab4fee..a137b6f2379bdee6c53f58fbe7e1ec49d8869662 100644 (file)
--- a/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn
+++ b/function_test/Semantic_Analyser/ver/high_titan_SE.ttcn
@@ -24,8 +24,8 @@ with {
   // check for the more general /R\d[A-HJ-NS-VX-Z](\d{1,2})?/
 
   /* Test needs to be adjusted for every release !!!!!!! */
-  extension "requiresTITAN CRL 113 200/5 R4A"; /* This one must just pass, the next one must just fail */
-  extension "requiresTITAN CRL 113 200/5 R5A01"; //^error: This module needs to be compiled with TITAN version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? or higher; version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? detected//
+  extension "requiresTITAN CRL 113 200/5 R5A"; /* This one must just pass, the next one must just fail */
+  extension "requiresTITAN CRL 113 200/5 R6A01"; //^error: This module needs to be compiled with TITAN version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? or higher; version (C[RN]L \d+ \d+\/\d+ )?R\d{1,2}[A-HJ-NS-VX-Z](\d{1,2})? detected//
 
   /* The old style RnXnn, without the CRL 113 200 and the suffix, implies major version 1
    * Now that Titan is at version 2, the following will always pass:

diff --git a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
index cce9403a234ebd3ad63e079696eebca5804cbf7a..987bd6461651ac296630ed087a3e4704cc4241a9 100644 (file)
--- a/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin/prj2mk.pl
@@ -98,7 +98,8 @@ system("ln -s @symlinkfiles ./");
 map { s!.+/!!g } @files;
 
 # Generate the makefile
-print("$ENV{TTCN3_DIR}/bin/ttcn3_makefilegen -gs $split $rt2 -e XmlTest @files");
+print("LD_LIBRARY_PATH is $ENV{LD_LIBRARY_PATH}\n");#temporary debug printout
+print("$ENV{TTCN3_DIR}/bin/ttcn3_makefilegen -gs $split $rt2 -e XmlTest @files\n");
 
 system(   "\$TTCN3_DIR/bin/ttcn3_makefilegen -gs $split $rt2 -e XmlTest -o Makefile.1 @files");
 

diff --git a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
index 6fff1c7f7b5541304ef0e88445d96d74f0ed8be7..4627d299784f04b36ec5f161302849801c01c977 100644 (file)
--- a/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
+++ b/regression_test/XML/XmlWorkflow/bin2/prj2mk.pl
@@ -95,7 +95,7 @@ system("ln -s @symlinkfiles ./");
 map { s!.+/!!g } @files;
 
 # Generate the makefile
-print("$ENV{TTCN3_DIR}/bin/ttcn3_makefilegen -gs $split $rt2 -e XmlTest @files");
+print("$ENV{TTCN3_DIR}/bin/ttcn3_makefilegen -gs $split $rt2 -e XmlTest @files\n");
 
 system(   "\$TTCN3_DIR/bin/ttcn3_makefilegen -gs $split $rt2 -e XmlTest -o Makefile.1 @files");
 

diff --git a/usrguide/apiguide.doc b/usrguide/apiguide.doc
index 697b42e51e1aef9e0adf0b62153f885d38ff7728..bde8b0c4445a8d3e4af061bf2a875cdcfe6fc6c6 100644 (file)
Binary files a/usrguide/apiguide.doc and b/usrguide/apiguide.doc differ

diff --git a/usrguide/installationguide.doc b/usrguide/installationguide.doc
index 097275b5d01b2a416a66ab2f1aa42e68e9db2874..dce18ce06279c327adb7689d562bf69ed2bec93c 100644 (file)
Binary files a/usrguide/installationguide.doc and b/usrguide/installationguide.doc differ

diff --git a/usrguide/referenceguide.doc b/usrguide/referenceguide.doc
index ab39bebf3e1d51cf20152dcc8d9aa2ebbfd16489..e3f879b085398c344d8e1cec0c3cab7849511efb 100644 (file)
Binary files a/usrguide/referenceguide.doc and b/usrguide/referenceguide.doc differ

diff --git a/usrguide/userguide.doc b/usrguide/userguide.doc
index e57a2ff381c090d2866b0b42f6e61c55dfdc7ab5..94c04f97e01ffcf102fd872dc696db9c2ed57e29 100644 (file)
Binary files a/usrguide/userguide.doc and b/usrguide/userguide.doc differ