Fix macros compilation after parser change 65/18565/1
Paul Bignier [Thu, 29 Sep 2016 08:06:45 +0000 (10:06 +0200)]
 * Mixing quotes with line-skippers isn't allowed anymore

Change-Id: Icddaa0efb43d864415c0f2bc6c1cea5d33d4665f

scilab/modules/scicos/macros/scicos_scicos/do_eval.sci
scilab/modules/scicos/macros/scicos_scicos/set_io.sci
scilab/modules/scicos_blocks/macros/Misc/AUTOMAT.sci
scilab/modules/scicos_blocks/macros/Misc/MBLOCK.sci
scilab/modules/scicos_blocks/macros/Misc/MPBLOCK.sci

index 8135608..78fc89e 100644 (file)
@@ -78,17 +78,17 @@ function [scs_m,cpr,needcompile,ok]=do_eval(scs_m,cpr,%scicos_context)
     deff("result         = dialog(labels,valueini)","result=valueini")
     deff("[result,Quit]  = scstxtedit(valueini,v2)","result=valueini,Quit=0")
     deff("[ok,tt]        = MODCOM(funam,tt,vinp,vout,vparam,vparamv,vpprop)",..
-    "[dirF, nameF, extF] = fileparts(funam);..
-    [modelica_path, modelica_directory] = getModelicaPath();..
-    funam1 = []; ..
-    if (extF == """")  then, ..
-        funam1 = modelica_directory + nameF + "".mo""; ..
-    elseif fileinfo(funam) == [] then, ..
-        funam1 = funam; ..
-    end; ..
-    if funam1 <> [] then, ..
-        mputl(tt, funam1); ..
-    end");
+    "[dirF, nameF, extF] = fileparts(funam);"+..
+    "[modelica_path, modelica_directory] = getModelicaPath();"+..
+    "funam1 = []; "+..
+    "if (extF == """")  then, "+..
+    "    funam1 = modelica_directory + nameF + "".mo""; "+..
+    "elseif fileinfo(funam) == [] then, "+..
+    "    funam1 = funam; "+..
+    "end; "+..
+    "if funam1 <> [] then, "+..
+    "    mputl(tt, funam1); "+..
+    "end");
     %nx=lstsize(scs_m.objs)
     funcprot(%mprt)
     for %kk=1:%nx
index 429854b..b5dd829 100644 (file)
@@ -38,50 +38,50 @@ function [model,...
     ["str__err=''ERROR''"
     "select err__"
     "case 1 then"
-    "str__err=str__#+...
-    ''put port "+...
+    "str__err=str__#"+...
+    "''put port "+...
     "must be "+...
     " list''"
     "case 2 then"
-    "str__err=str__#+...
-    ''put list "+...
+    "str__err=str__#"+...
+    "''put list "+...
     "must have "+...
     "a size "+...
     "of 2''"
     "case 3 then"
-    "str__err=''First entry of ''+...
-    str__#+...
-    ''put list "+...
+    "str__err=''First entry of ''"+...
+    "str__#"+...
+    "''put list "+...
     " must  be "+...
     "double "+...
     "or integer''"
     "case 4 then"
-    "str__err=''Second entry of ''+...
-    str__#+...
-    ''put list "+...
+    "str__err=''Second entry of ''"+...
+    "str__#"+...
+    "''put list "+...
     "must  be "+...
     "double "+...
     "or integer''"
     "case 10 then"
-    "str__err=str__#+...
-    ''put port "+...
+    "str__err=str__#"+...
+    "''put port "+...
     "sizes "+...
     "must have "+...
     "a dimension "+...
     "of nx2''"
     "case 11 then"
-    "str__err=str__#+...
-    ''put port "+...
-    "sizes and ''+...
-    str__#+...
-    ''put port "+...
+    "str__err=str__#"+...
+    "''put port "+...
+    "sizes and ''"+...
+    "str__#"+...
+    "''put port "+...
     "type "+...
     "must have "+...
     "the same number "+...
     "of rows''"
     "case 100 then"
-    "str__err=str__#+...
-    ''put port "+...
+    "str__err=str__#"+...
+    "''put port "+...
     "type must "+...
     "be <=8''"
     "end"])
index cda68b9..660c160 100644 (file)
@@ -45,9 +45,9 @@ function [x,y,typ]=AUTOMAT(job,arg1,arg2)
                 VEC=VEC+","+"''mat'',[-1,1]";
             end
             //===========================================
-            GTV="[ok,NMode,Minitial,NX,X0,XP,"+CX+",exprs]=scicos_getvalue(''Set Finite state machine model'',..
-            [''Number (finite-state) Modes'';''Initial Mode'';''Number of continuous-time states'';''Continuous-time states initial values'';''Xproperties of continuous-time states in each Mode'';"+MSG+"],..
-            list(''vec'',1,''vec'',1,''vec'',1,''mat'',[-1,-1],''mat'',[-1,-1],"+VEC+"),exprs)"
+            GTV="[ok,NMode,Minitial,NX,X0,XP,"+CX+",exprs]=scicos_getvalue(''Set Finite state machine model'',"+..
+            "[''Number (finite-state) Modes'';''Initial Mode'';''Number of continuous-time states'';''Continuous-time states initial values'';''Xproperties of continuous-time states in each Mode'';"+MSG+"],"+..
+            "list(''vec'',1,''vec'',1,''vec'',1,''mat'',[-1,-1],''mat'',[-1,-1],"+VEC+"),exprs)"
             execstr(GTV);
             if ~ok then
                 break,
index 71ae263..c3aa445 100644 (file)
@@ -109,12 +109,12 @@ function [x,y,typ]=MBLOCK(job,arg1,arg2)
             //
             //first stage of checking variable name
             //put string symbolic parameters in variable
-            ierr=execstr("in=stripblanks(evstr(Tin));..
-            intype=stripblanks(evstr(Tintype));..
-            out=stripblanks(evstr(Tout));..
-            outtype=stripblanks(evstr(Touttype));..
-            param=stripblanks(evstr(Tparam));..
-            funam=stripblanks(Tfunam)","errcatch")
+            ierr=execstr("in=stripblanks(evstr(Tin));"+..
+            "intype=stripblanks(evstr(Tintype));"+..
+            "out=stripblanks(evstr(Tout));"+..
+            "outtype=stripblanks(evstr(Touttype));"+..
+            "param=stripblanks(evstr(Tparam));"+..
+            "funam=stripblanks(Tfunam)","errcatch")
 
             if ierr<>0 then
                 //You lose! Try again! Insert coin!
index 9ccfc1b..d54f198 100644 (file)
@@ -110,12 +110,12 @@ function [x,y,typ]=MPBLOCK(job,arg1,arg2)
             //
             //first stage of checking variable name
             //put string symbolic parameters in variable
-            ierr=execstr("in=stripblanks(evstr(Tin));..
-            intype=stripblanks(evstr(Tintype));..
-            out=stripblanks(evstr(Tout));..
-            outtype=stripblanks(evstr(Touttype));..
-            param=stripblanks(evstr(Tparam));..
-            funam=stripblanks(Tfunam)","errcatch")
+            ierr=execstr("in=stripblanks(evstr(Tin));"+..
+            "intype=stripblanks(evstr(Tintype));"+..
+            "out=stripblanks(evstr(Tout));"+..
+            "outtype=stripblanks(evstr(Touttype));"+..
+            "param=stripblanks(evstr(Tparam));"+..
+            "funam=stripblanks(Tfunam)","errcatch")
 
             if ierr<>0 then
                 //You lose! Try again! Insert coin!