error handling for unsupported o/p data in struct

19 files changed, 73 insertions, 14 deletions

diff --git a/help/en_US/master_help.xml b/help/en_US/master_help.xml
index b69c571..df6b1f8 100644
--- a/help/en_US/master_help.xml
+++ b/help/en_US/master_help.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book [
 <!--Begin Entities-->
-<!ENTITY a6cc3dc89e25a63d5d5def95b52cbd1c1 SYSTEM "/home/shagun/Desktop/fossee-scilab-octave-toolbox_2/help/en_US/octave_fun.xml">
+<!ENTITY ac91b127f3650008b133aa7f9a6245451 SYSTEM "/home/detailer/Downloads/Task2/fossee-scilab-octave-toolbox/help/en_US/octave_fun.xml">
 <!--End Entities-->
 ]>
 <book version="5.0-subset Scilab" xml:lang="en_US"
@@ -16,8 +16,8 @@
     <title>scilab_octave</title>
   </info>
 
-<part xml:id='section_328782206fa125cbdc0430b054fffa2f'>
+<part xml:id='section_5e7519fee5718c0930fe5ef6701da2b8'>
 <title>scilab_octave</title>
-&a6cc3dc89e25a63d5d5def95b52cbd1c1;
+&ac91b127f3650008b133aa7f9a6245451;
 </part>
 </book>
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS
index 05ed080..47d90e9 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS
@@ -1 +1 @@
-
�@
�@
�@
�@
�@
�@
�@
�@
�@
�@
�@
�@
�@
�@
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�
�@
�@
\ No newline at end of file
+
��
��
��
��
��
��
��
��
��
��
��
��
��
��
��
�������������������������������������������������������������������������������������������������������
\ No newline at end of file
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB
index d8be745..8619a1d 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
index 49845b0..1dd7e51 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
index 4d70a0b..df7a604 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA
index c1b7d51..0f59404 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/SCHEMA
@@ -1,2 +1,2 @@
 JavaSearch 1.0
-TMAP bs=2048 rt=0 fl=-1 id1=122 id2=1
+TMAP bs=2048 rt=0 fl=-1 id1=123 id2=1
diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP
index c3eb111..02edaea 100644
--- a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP
+++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP
diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html
index 12a0617..335931d 100644
--- a/help/en_US/scilab_en_US_help/index.html
+++ b/help/en_US/scilab_en_US_help/index.html
@@ -31,7 +31,7 @@
     <h3 class="book-title">scilab_octave</h3>
 <ul class="list-part"><a name="scilab_octave_manual"></a><div class="info"></div>
 
-<li><a href="section_328782206fa125cbdc0430b054fffa2f.html" class="part">scilab_octave</a>
+<li><a href="section_5e7519fee5718c0930fe5ef6701da2b8.html" class="part">scilab_octave</a>
 <ul class="list-chapter"><li><a href="octave_fun.html" class="refentry">octave_fun</a> &#8212; <span class="refentry-description">Calls an octave function with given inputs and returns the expected output</span></li></ul></li></ul>
     <br />
 
diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm
index 0130989..65a6697 100644
--- a/help/en_US/scilab_en_US_help/jhelpmap.jhm
+++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm
@@ -2,6 +2,6 @@
 <!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_1_0.dtd">
 <map version="1.0">
 <mapID target="index" url="index.html"/>
-<mapID target="section_328782206fa125cbdc0430b054fffa2f" url="section_328782206fa125cbdc0430b054fffa2f.html"/>
+<mapID target="section_5e7519fee5718c0930fe5ef6701da2b8" url="section_5e7519fee5718c0930fe5ef6701da2b8.html"/>
 <mapID target="octave_fun" url="octave_fun.html"/>
 </map>
\ No newline at end of file
diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml
index f6b705d..6ccea26 100644
--- a/help/en_US/scilab_en_US_help/jhelptoc.xml
+++ b/help/en_US/scilab_en_US_help/jhelptoc.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd">
 <toc version="1.0">
 <tocitem target="index" text="scilab_octave">
-<tocitem target="section_328782206fa125cbdc0430b054fffa2f" text="scilab_octave">
+<tocitem target="section_5e7519fee5718c0930fe5ef6701da2b8" text="scilab_octave">
 <tocitem target="octave_fun" text="octave_fun"/>
 </tocitem>
 </tocitem>
diff --git a/help/en_US/scilab_en_US_help/octave_fun.html b/help/en_US/scilab_en_US_help/octave_fun.html
index 827d29a..9576ea8 100644
--- a/help/en_US/scilab_en_US_help/octave_fun.html
+++ b/help/en_US/scilab_en_US_help/octave_fun.html
@@ -12,11 +12,11 @@
     <div class="manualnavbar">
     <table width="100%"><tr>
       <td width="30%">
-    	<span class="previous"><a href="section_328782206fa125cbdc0430b054fffa2f.html">&lt;&lt; scilab_octave</a></span>
+    	<span class="previous"><a href="section_5e7519fee5718c0930fe5ef6701da2b8.html">&lt;&lt; scilab_octave</a></span>
 
       </td>
       <td width="40%" class="center">
-      	<span class="top"><a href="section_328782206fa125cbdc0430b054fffa2f.html">scilab_octave</a></span>
+      	<span class="top"><a href="section_5e7519fee5718c0930fe5ef6701da2b8.html">scilab_octave</a></span>
 
       </td>
       <td width="30%" class="next">
@@ -28,7 +28,7 @@
 
 
 
-    <span class="path"><a href="index.html">scilab_octave</a> &gt;&gt; <a href="section_328782206fa125cbdc0430b054fffa2f.html">scilab_octave</a> &gt; octave_fun</span>
+    <span class="path"><a href="index.html">scilab_octave</a> &gt;&gt; <a href="section_5e7519fee5718c0930fe5ef6701da2b8.html">scilab_octave</a> &gt; octave_fun</span>
 
     <br /><br />
     <div class="refnamediv"><h1 class="refname">octave_fun</h1>
@@ -94,11 +94,11 @@
     <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
 <tr>
       <td width="30%">
-    	<span class="previous"><a href="section_328782206fa125cbdc0430b054fffa2f.html">&lt;&lt; scilab_octave</a></span>
+    	<span class="previous"><a href="section_5e7519fee5718c0930fe5ef6701da2b8.html">&lt;&lt; scilab_octave</a></span>
 
       </td>
       <td width="40%" class="center">
-      	<span class="top"><a href="section_328782206fa125cbdc0430b054fffa2f.html">scilab_octave</a></span>
+      	<span class="top"><a href="section_5e7519fee5718c0930fe5ef6701da2b8.html">scilab_octave</a></span>
 
       </td>
       <td width="30%" class="next">
diff --git a/help/en_US/scilab_en_US_help/section_5e7519fee5718c0930fe5ef6701da2b8.html b/help/en_US/scilab_en_US_help/section_5e7519fee5718c0930fe5ef6701da2b8.html
new file mode 100644
index 0000000..a828712
--- /dev/null
+++ b/help/en_US/scilab_en_US_help/section_5e7519fee5718c0930fe5ef6701da2b8.html
@@ -0,0 +1,55 @@
+<html><head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title></title>
+    <style type="text/css" media="all">
+      @import url("scilab_code.css");
+      @import url("xml_code.css");
+      @import url("c_code.css");
+      @import url("style.css");
+    </style>
+  </head>
+  <body>
+    <div class="manualnavbar">
+    <table width="100%"><tr>
+      <td width="30%">
+    	
+      </td>
+      <td width="40%" class="center">
+      	<span class="top"><a href="index.html">scilab_octave</a></span>
+
+      </td>
+      <td width="30%" class="next">
+      	
+      </td>
+    </tr></table>
+      <hr />
+    </div>
+
+
+
+    <span class="path"><a href="index.html">scilab_octave</a> &gt;&gt; scilab_octave</span>
+
+    <br /><br />
+    <h3 class="title-part">scilab_octave</h3>
+<ul class="list-chapter"><li><a href="octave_fun.html" class="refentry">octave_fun</a> &#8212; <span class="refentry-description">Calls an octave function with given inputs and returns the expected output</span></li></ul>
+    <br />
+
+    <div class="manualnavbar">
+    <table width="100%">
+    <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr>
+<tr>
+      <td width="30%">
+    	
+      </td>
+      <td width="40%" class="center">
+      	<span class="top"><a href="index.html">scilab_octave</a></span>
+
+      </td>
+      <td width="30%" class="next">
+      	
+      </td>
+    </tr></table>
+      <hr />
+    </div>
+  </body>
+</html>
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index 81861cc..973d083 100644
--- a/jar/scilab_en_US_help.jar
+++ b/jar/scilab_en_US_help.jar
diff --git a/sci_gateway/cpp/libscilab_octave.so b/sci_gateway/cpp/libscilab_octave.so
index 221c3c8..5069d2b 100755
--- a/sci_gateway/cpp/libscilab_octave.so
+++ b/sci_gateway/cpp/libscilab_octave.so
diff --git a/sci_gateway/cpp/sci_octave.cpp b/sci_gateway/cpp/sci_octave.cpp
index 817c184..177a6b9 100644
--- a/sci_gateway/cpp/sci_octave.cpp
+++ b/sci_gateway/cpp/sci_octave.cpp
@@ -368,6 +368,10 @@ extern "C"
 						else if (outStruct[j].type == TYPE_STRING){
 							scilab_setStructMatrix2dData(env, out[i], (const wchar_t*) outStruct[j].key, 0, 0, scilab_createString(env, (const wchar_t*) outStruct[j].str));
 						}
+						else{
+							Scierror(999, _("%s: Unsupported type of output argument in struct %d for key \"%ls\".\n"), fname, i, (const wchar_t*) outStruct[i].key);
+							return STATUS_ERROR;
+						}
 					}
 				}
 				else if (ins[i].is_out_string == 1){
diff --git a/src/fun.cpp b/src/fun.cpp
index 1362e67..8929d83 100644
--- a/src/fun.cpp
+++ b/src/fun.cpp
@@ -275,7 +275,7 @@ extern "C"
 							outStruct[j].str = malloc(sizeof(wchar_t) * (currValueStr.length() + 1));

 							mbstowcs((wchar_t*) outStruct[j].str, currValueStr.c_str(), currValueStr.length() + 1);

 						}

-						else {

+						else if (currValue.is_double_type()){

 							outStruct[j].type = TYPE_DOUBLE;

 							

 							Matrix currValueMatrix(currValue.matrix_value());

diff --git a/src/fun.o b/src/fun.o
index ca3d57a..db956ed 100644
--- a/src/fun.o
+++ b/src/fun.o
diff --git a/src/libfun.so b/src/libfun.so
index 581c20b..eb0a7e0 100755
--- a/src/libfun.so
+++ b/src/libfun.so
diff --git a/thirdparty/linux/lib/x64/libfun.so b/thirdparty/linux/lib/x64/libfun.so
index 581c20b..eb0a7e0 100755
--- a/thirdparty/linux/lib/x64/libfun.so
+++ b/thirdparty/linux/lib/x64/libfun.so