* Bug #14025 fixed - head_comments did not take into account compiled functions.

Change-Id: Ic21b0ff60bcb120aa845d4275a2df577371284f1

diff --git a/scilab/CHANGES_6.0.X b/scilab/CHANGES_6.0.X
index 0f304a2..5ad6cec 100644 (file)
--- a/scilab/CHANGES_6.0.X
+++ b/scilab/CHANGES_6.0.X
@@ -7,6 +7,7 @@ Scilab Bug Fixes
 
 * Bug #13709 fixed - unique function sometimes returned wrong index values.
 
+* Bug #14025 fixed - head_comments did not take into account compiled functions.
 
 
 

diff --git a/scilab/modules/functions/macros/head_comments.sci b/scilab/modules/functions/macros/head_comments.sci
index 5d94f99..c812f00 100644 (file)
--- a/scilab/modules/functions/macros/head_comments.sci
+++ b/scilab/modules/functions/macros/head_comments.sci
@@ -22,7 +22,7 @@ function head_comments(name, %paths)
         error(msprintf(gettext("%s: Undefined variable %s.\n"),"head_comments",name )),
     end
 
-    if type(var) <> 11 then
+    if and(type(var) <> [11 13]) then
         error(msprintf(gettext("%s: Wrong value for input argument #%d: Name of a Scilab function expected.\n"),"head_comments",1))
     end
     t = macr2tree(var);

diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_14025.dia.ref b/scilab/modules/functions/tests/nonreg_tests/bug_14025.dia.ref
new file mode 100644 (file)
index 0000000..a51a226
--- /dev/null
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_14025.dia.ref
@@ -0,0 +1,23 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Charlotte Hecquet
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 14025 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=14025
+//
+// <-- Short Description -->
+// head_comments did not take into account compiled functions
+function test()
+    // heading comment L#1
+    // heading comment L#2
+    disp("test function");
+endfunction
+assert_checktrue(execstr("head_comments(""test"");", "errcatch") == 0);
+function [] = test()
+ heading comment L#1
+ heading comment L#2

diff --git a/scilab/modules/functions/tests/nonreg_tests/bug_14025.tst b/scilab/modules/functions/tests/nonreg_tests/bug_14025.tst
new file mode 100644 (file)
index 0000000..db8ee02
--- /dev/null
+++ b/scilab/modules/functions/tests/nonreg_tests/bug_14025.tst
@@ -0,0 +1,22 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2015 - Scilab Enterprises - Charlotte Hecquet
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- Non-regression test for bug 14025 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=14025
+//
+// <-- Short Description -->
+// head_comments did not take into account compiled functions
+
+function test()
+    // heading comment L#1
+    // heading comment L#2
+    disp("test function");
+endfunction
+
+assert_checktrue(execstr("head_comments(""test"");", "errcatch") == 0);