X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Foverloading%2Fmacros%2F%25s_g_s.sci;h=bde69955d0227cfdb0048b0089b14fb15e0c0ed2;hp=3b986b3027e2b54b19e70d49b3308b4ff8d7af93;hb=0dd6b782ada56441259ef3f756ef5ecd0f6b783f;hpb=1c7afa75c642b22f896f7c3373485b79a181e591 diff --git a/scilab/modules/overloading/macros/%s_g_s.sci b/scilab/modules/overloading/macros/%s_g_s.sci index 3b986b3..bde6995 100644 --- a/scilab/modules/overloading/macros/%s_g_s.sci +++ b/scilab/modules/overloading/macros/%s_g_s.sci @@ -1,8 +1,8 @@ // Scilab ( http://www.scilab.org/ ) - This file is part of Scilab // Copyright (C) INRIA -// // Copyright (C) 2012 - 2016 - Scilab Enterprises // Copyright (C) 2016 - Scilab Enterprises - Pierre-Aimé AGNEL +// Copyright (C) 2020 - Samuel GOUGEON // // This file is hereby licensed under the terms of the GNU GPL v2.0, // pursuant to article 5.3.4 of the CeCILL v.2.1. @@ -11,7 +11,11 @@ // For more information, see the COPYING file which you should have received // along with this program. -function res=%s_g_s(s1,s2) +function res = %s_g_s(s1,s2) // Logical operand on complex numbers - res = (s1<>0) | (s2<>0); + if s1==[] | s2==[] then + res = [] + else + res = (s1<>0) | (s2<>0); + end endfunction