From: Samuel GOUGEON Date: Mon, 25 Feb 2019 16:34:52 +0000 (+0100) Subject: [scicos] last ++"|' routing to %c_a() X-Git-Tag: 6.1.0~186 X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=83c2791fb16f532ab57e3319fef3995be68ea8bf [scicos] last ++"|' routing to %c_a() http://mailinglists.scilab.org/Scilab-users-Small-problem-with-Scilab-6-0-1-code-generation-tp4039068p4039115.html This is the only remaining [+([{&~,;=|]\s*\+\s*["'] occurrence found in SCI Change-Id: Ic921a488680f570c355a568956a6697173e1e563 --- diff --git a/scilab/modules/m2sci/macros/percent/%a2sci.sci b/scilab/modules/m2sci/macros/percent/%a2sci.sci index b0070e7..9595912 100644 --- a/scilab/modules/m2sci/macros/percent/%a2sci.sci +++ b/scilab/modules/m2sci/macros/percent/%a2sci.sci @@ -20,9 +20,6 @@ function [tree]=%a2sci(tree) // In Matlab only two matrices with the same size can be added unless one is a scalar // So empty matrix can only be added to a scalar or an onther empty matrix // For example : [1,2,3]+[] is not possible - // An other important difference with Scilab is that : - // - Matlab gives : [1]+[]=[] - // - Scilab gives : [1]+[]=[1] // WARNING : translation does not work for codes like var=+'a' // In this case, user have to modify M-file and replace +'a' by 0+'a' for example diff --git a/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci b/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci index 91d45b3..6dc1465 100644 --- a/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci +++ b/scilab/modules/scicos/macros/scicos_scicos/do_compile_superblock42.sci @@ -4744,7 +4744,7 @@ function [txt]=get_comment(typ,param) case "set_blk" then txt = ["/* set blk struc. of ''"+param(1) + ... "'' (type "+string(param(2))+" - blk nb "+... - string(param(3))++" - uid "+param(4)+") */"]; + string(param(3))+ " - uid "+param(4)+") */"]; //** Update xd vector ptr case "update_xd" then txt = ["/* Update xd vector ptr */"];