* macr2lst removed. 94/16794/1
Vincent COUVERT [Mon, 6 Jul 2015 12:11:04 +0000 (14:11 +0200)]
Change-Id: I06cf5b60c1de81b7b2005bdfe9133a912a5a9839

12 files changed:
scilab/CHANGES_6.0.X
scilab/modules/core/includes/gw_core.h
scilab/modules/core/sci_gateway/c/sci_macr2lst.c [deleted file]
scilab/modules/core/tests/nonreg_tests/bug_71.dia.ref [deleted file]
scilab/modules/core/tests/nonreg_tests/bug_71.tst [deleted file]
scilab/modules/core/tests/unit_tests/comment.dia.ref
scilab/modules/core/tests/unit_tests/comment.tst
scilab/modules/functions/help/en_US/macr2lst.xml [deleted file]
scilab/modules/functions/help/ja_JP/macr2lst.xml [deleted file]
scilab/modules/functions/help/pt_BR/macr2lst.xml [deleted file]
scilab/modules/functions/help/ru_RU/macr2lst.xml [deleted file]
scilab/modules/helptools/data/configuration/scilab_primitives.txt

index 8b6b9b1..9402d28 100644 (file)
@@ -45,6 +45,8 @@ Removed functions (based on old Scilab stack)
 
 * gstacksize removed.
 
+* macr2lst removed.
+
 * stacksize removed.
 
 * code2str removed.
index b9f898d..0bc4846 100644 (file)
@@ -29,7 +29,7 @@ int C2F(sci_isdef)(char *fname, unsigned long fname_len);
 C_GATEWAY_PROTOTYPE(C2F(sci_predef));
 int C2F(sci_clearfun)(char *fname, unsigned long fname_len);
 int C2F(sci_funptr)(char *fname, unsigned long fname_len);
-int C2F(sci_macr2lst)(char *fname, unsigned long fname_len);
+//int C2F(sci_macr2lst)(char *fname, unsigned long fname_len);
 int C2F(sci_setbpt)(char *fname, unsigned long fname_len);
 int C2F(sci_delbpt)(char *fname, unsigned long fname_len);
 int C2F(sci_dispbpt)(char *fname, unsigned long fname_len);
diff --git a/scilab/modules/core/sci_gateway/c/sci_macr2lst.c b/scilab/modules/core/sci_gateway/c/sci_macr2lst.c
deleted file mode 100644 (file)
index f2d5005..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2006 - INRIA - Allan CORNET
- *
- * This file must be used under the terms of the CeCILL.
- * This source file is licensed as described in the file COPYING, which
- * you should have received as part of this distribution.  The terms
- * are also available at
- * http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt
- *
- */
-#include "gw_core.h"
-/*--------------------------------------------------------------------------*/
-extern int C2F(intmacrovar)(void);
-/*--------------------------------------------------------------------------*/
-int C2F(sci_macr2lst)(char *fname, unsigned long fname_len)
-{
-    C2F(intmacrovar)();
-    return 0;
-}
-/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_71.dia.ref b/scilab/modules/core/tests/nonreg_tests/bug_71.dia.ref
deleted file mode 100644 (file)
index 5dd1a45..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-// <-- Non-regression test for bug 71 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=71
-//
-// <-- Short Description -->
-//    The macr2lst() function crashes when a macro including
-//    an "exit" call is given as parameter
-function result = bug()
-       // This part replay bug
-       deff("foo","exit")
-       result=execstr("macr2lst(foo)","errcatch","n")
-       clear foo;
-endfunction
-if bug() <> 0 then bugmes();quit;end
diff --git a/scilab/modules/core/tests/nonreg_tests/bug_71.tst b/scilab/modules/core/tests/nonreg_tests/bug_71.tst
deleted file mode 100644 (file)
index 9af5efe..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-// =============================================================================
-// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
-// Copyright (C) ????-2008 - INRIA
-//
-//  This file is distributed under the same license as the Scilab package.
-// =============================================================================
-
-// <-- Non-regression test for bug 71 -->
-//
-// <-- Bugzilla URL -->
-// http://bugzilla.scilab.org/show_bug.cgi?id=71
-//
-// <-- Short Description -->
-//    The macr2lst() function crashes when a macro including 
-//    an "exit" call is given as parameter
-
-
-function result = bug()
-       // This part replay bug
-       deff("foo","exit")
-       result=execstr("macr2lst(foo)","errcatch","n")
-       clear foo;
-endfunction
-
-if bug() <> 0 then pause,end
index 1ec633e..0249d32 100644 (file)
@@ -4,23 +4,16 @@
 //
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
-//for version after 3.0 the comments are no more handled by a preprocessor, 
+//for version after 3.0 the comments are no more handled by a preprocessor,
 //but by the parser itself
 a=1//test
- a  =
-    1.  
+a  = 
+    1.
 if a<>1 then bugmes();quit;end
 a=2;//test
 if a<>2 then bugmes();quit;end
-a=1..//test
-2
- a  =
-    12.  
-if a<>12 then bugmes();quit;end
-a='1//test';
-if a<>'1/'+'/test' then bugmes();quit;end
+a="1//test";
+if a<>"1/"+"/test" then bugmes();quit;end
 a=33;//'sqdf'qsdf'
 if a<>33 then bugmes();quit;end
 //in matrix concatenation
@@ -39,391 +32,331 @@ a=[//test
 if a<>[]  then bugmes();quit;end
 //in multi-line control instruction
 if %t //test
-  a=3; //test1
+    a=3; //test1
 else //test2 end
-  a=4//test3 end
+    a=4//test3 end
 end//endtest
 if a<>3 then bugmes();quit;end
 if %f //test
- a=3; //test1
+    a=3; //test1
 else //test2 end
- a=4//test3 end
- a  =
-    4.  
+    a=4//test3 end
 end//endtest
+a  = 
+    4.
 if a<>4 then bugmes();quit;end
 a=0;
 for k=1:10 //loop begin
-  if a> 10 then //
-    break // go out the loop
-  else //111111
-    a=a-1; //sdfdfd
-  end //xxxxx
-  a=a+k; //hhhhh
+    if a> 10 then //
+        break // go out the loop
+    else //111111
+        a=a-1; //sdfdfd
+    end //xxxxx
+    a=a+k; //hhhhh
 end //loop end
 if a<>15 then bugmes();quit;end
 for i=1
-  a=1;
+    a=1;
 end //
 a=0;k=0
- k  =
-    0.  
+k  = 
+    0.
 while %t //loop begin
-  k=k+1; //ttttt
-  if a> 10 then //
-    break // go out the loop
-  else //111111
-    a=a-1; //sdfdfd
-  end //xxxxx
-  a=a+k; //hhhhh
+    k=k+1; //ttttt
+    if a> 10 then //
+        break // go out the loop
+    else //111111
+        a=a-1; //sdfdfd
+    end //xxxxx
+    a=a+k; //hhhhh
 end //loop end
 if a<>15 then bugmes();quit;end
 c=1;
 select c //test
 case 1 then//test then
-  a=8; //test8
+    a=8; //test8
 case 2 then //test end
-  a=-1 //test minus 1
+    a=-1 //test minus 1
 else //else
-  a=0  //test zeor
+    a=0  //test zeor
 end //end
 if a<>8 then bugmes();quit;end
 c=2;
 select c //test
 case 1 then//test then
-  a=8; //test8
+    a=8; //test8
 case 2 then //test end
-  a=-1 //test minus 1
- a  =
-  - 1.  
+    a=-1 //test minus 1
 else //else
-  a=0  //test zeor
+    a=0  //test zeor
 end //end
+a  = 
+  - 1.
 if a<>-1 then bugmes();quit;end
 // In execstr
-execstr('a=1//test')
+execstr("a=1//test")
 if a<>1 then bugmes();quit;end
-execstr('a=2;//test')
+execstr("a=2;//test")
 if a<>2 then bugmes();quit;end
-execstr('a=''1//test'';')
-if a<>'1/'+'/test' then bugmes();quit;end
-execstr('a=33;//''sqdf''qsdf''')
+execstr("a=''1//test'';")
+if a<>"1/"+"/test" then bugmes();quit;end
+execstr("a=33;//''sqdf''qsdf''")
 if a<>33 then bugmes();quit;end
 // In execstr with matrix concatenation
-t=['a=[//test'
-   '1 //test1'
-   '2 //test2'
-   '];//endtest'];
+t=["a=[//test"
+"1 //test1"
+"2 //test2"
+"];//endtest"];
 execstr(t)
 if or(a<>[1;2])  then bugmes();quit;end
-t=['a=[//test'
-   '];'];
+t=["a=[//test"
+"];"];
 execstr(t)
 if a<>[]  then bugmes();quit;end
-t=['a=[//test'
-   '//test1'
-   '//test2'
-   '];'];
+t=["a=[//test"
+"//test1"
+"//test2"
+"];"];
 execstr(t)
 if a<>[]  then bugmes();quit;end
 // In execstr with control instructions
-t=['if %t //test'
-   '  a=3; //test1'
-   'else //test2 end'
-   '  a=4//test3 end'
-   'end//endtest'];execstr(t)
+t=["if %t //test"
+"  a=3; //test1"
+"else //test2 end"
+"  a=4//test3 end"
+"end//endtest"];execstr(t)
 if a<>3 then bugmes();quit;end
-t=['if %f //test'
-' a=3; //test1'
-'else //test2 end'
-' a=4//test3 end'
-'end//endtest'];execstr(t)
+t=["if %f //test"
+" a=3; //test1"
+"else //test2 end"
+" a=4//test3 end"
+"end//endtest"];execstr(t)
 if a<>4 then bugmes();quit;end
 // in deff (without compilation)
 funcprot(0);
-deff('a=foo','a=1//test','n');a=foo();
+deff("a=foo","a=1//test","n");a=foo();
 if a<>1 then bugmes();quit;end
-deff('a=foo','a=''1//test'';','n');a=foo();
-if a<>'1/'+'/test' then bugmes();quit;end
-deff('a=foo','a=33;//''sqdf''qsdf''','n');a=foo();
+deff("a=foo","a=''1//test'';","n");a=foo();
+if a<>"1/"+"/test" then bugmes();quit;end
+deff("a=foo","a=33;//''sqdf''qsdf''","n");a=foo();
 if a<>33 then bugmes();quit;end
-t=['if %t //test'
-   '  a=3; //test1'
-   'else //test2 end'
-   '  a=4//test3 end'
-   'end//endtest'];deff('a=foo',t,'n');a=foo();
+t=["if %t //test"
+"  a=3; //test1"
+"else //test2 end"
+"  a=4//test3 end"
+"end//endtest"];deff("a=foo",t,"n");a=foo();
 if a<>3 then bugmes();quit;end
 // in deff (with compilation)
-deff('a=foo','a=1//test');a=foo();
+deff("a=foo","a=1//test");a=foo();
 if a<>1 then bugmes();quit;end
-deff('a=foo','a=''1//test'';');a=foo();
-if a<>'1/'+'/test' then bugmes();quit;end
-deff('a=foo','a=33;//''sqdf''qsdf''');a=foo();
+deff("a=foo","a=''1//test'';");a=foo();
+if a<>"1/"+"/test" then bugmes();quit;end
+deff("a=foo","a=33;//''sqdf''qsdf''");a=foo();
 if a<>33 then bugmes();quit;end
-t=['if %t //test'
-   '  a=3; //test1'
-   'else //test2 end'
-   '  a=4//test3 end'
-   'end//endtest'];deff('a=foo',t);a=foo();
+t=["if %t //test"
+"  a=3; //test1"
+"else //test2 end"
+"  a=4//test3 end"
+"end//endtest"];deff("a=foo",t);a=foo();
 if a<>3 then bugmes();quit;end
 // in function
 function a=foo
-  a=1//test
+    a=1//test
 endfunction
 a=foo();
 if a<>1 then bugmes();quit;end
 function a=foo(..
-              )
-  a=1//test
+    )
+    a=1//test
 endfunction
 a=foo();
 if a<>1 then bugmes();quit;end
 function a=foo// CALLING SYNTAX
-  a=1//test
+    a=1//test
 endfunction
 a=foo();
 if a<>1 then bugmes();quit;end
 function a=foo// CALLING SYNTAX
-  a=0;k=0
-  while %t //loop begin
-    k=k+1; //ttttt
-    if a> 10 then //
-      break // go out the loop
-    else //111111
-      a=a-1; //sdfdfd
-    end //xxxxx
-    a=a+k; //hhhhh
-  end //loop end
+    a=0;k=0
+    while %t //loop begin
+        k=k+1; //ttttt
+        if a> 10 then //
+            break // go out the loop
+        else //111111
+            a=a-1; //sdfdfd
+        end //xxxxx
+        a=a+k; //hhhhh
+    end //loop end
 endfunction
 a=foo();
 if a<>15 then bugmes();quit;end
 function a=foo
-  a=0;k=0;//initialization
-  function a=fii  //internal function
-    while %t //loop begin
-      k=k+1; //ttttt
-      if a> 10 then //
-       break // go out the loop
-      else //111111
-       a=a-1; //sdfdfd
-      end //xxxxx
-      a=a+k; //hhhhh
-    end //loop end
-  endfunction
-  a=fii()
-  //SDSDFD
+    a=0;k=0;//initialization
+    function a=fii  //internal function
+        while %t //loop begin
+            k=k+1; //ttttt
+            if a> 10 then //
+                break // go out the loop
+            else //111111
+                a=a-1; //sdfdfd
+            end //xxxxx
+            a=a+k; //hhhhh
+        end //loop end
+    endfunction
+    a=fii()
+    //SDSDFD
 endfunction
 a=foo();
 if a<>15 then bugmes();quit;end
-warning('off');
+warning("off");
 //with  getf
-t=['function a=foo'
-  'a=0;k=0;//initialization'
-  '  while %t //loop begin'
-  '    k=k+1; //ttttt'
-  '    if a> 10 then //'
-  '    break // go out the loop'
-  '    else //111111'
-  '    a=a-1; //sdfdfd'
-  '    end //xxxxx'
-  '    a=a+k; //hhhhh'
-  '  end //loop end'
-  'endfunction'];
-mputl(t,TMPDIR+'/foo.sci');
-exec(TMPDIR+'/foo.sci')
+t=["function a=foo"
+"a=0;k=0;//initialization"
+"  while %t //loop begin"
+"    k=k+1; //ttttt"
+"    if a> 10 then //"
+"      break // go out the loop"
+"    else //111111"
+"      a=a-1; //sdfdfd"
+"    end //xxxxx"
+"    a=a+k; //hhhhh"
+"  end //loop end"
+"endfunction"];
+mputl(t,TMPDIR+"/foo.sci");
+exec(TMPDIR+"/foo.sci")
 function a=foo
 a=0;k=0;//initialization
   while %t //loop begin
     k=k+1; //ttttt
     if a> 10 then //
- break // go out the loop
+       break // go out the loop
     else //111111
- a=a-1; //sdfdfd
+       a=a-1; //sdfdfd
     end //xxxxx
     a=a+k; //hhhhh
   end //loop end
 endfunction
 a=foo();
 if a<>15 then bugmes();quit;end
-exec(TMPDIR+'/foo.sci')
+exec(TMPDIR+"/foo.sci")
 function a=foo
 a=0;k=0;//initialization
   while %t //loop begin
     k=k+1; //ttttt
     if a> 10 then //
- break // go out the loop
+       break // go out the loop
     else //111111
- a=a-1; //sdfdfd
+       a=a-1; //sdfdfd
     end //xxxxx
     a=a+k; //hhhhh
   end //loop end
 endfunction
 a=foo();
 if a<>15 then bugmes();quit;end
-t=['//sdffgfgfgggg'
-   '//sdsdsddfgfgfghgfhjhui'
-   'function a=foo//uuuuuuu'
-   'a=0;k=0;//initialization'
-   '  while %t //loop begin'
-   '    k=k+1; //ttttt'
-   '    if a> 10 then //'
-   '   break // go out the loop'
-   '    else //111111'
-   '   a=a-1; //sdfdfd'
-   '    end //xxxxx'
-   '    a=a+k; //hhhhh'
-   '  end //loop end'
-   'endfunction'];
-mputl(t,TMPDIR+'/foo.sci');
-exec(TMPDIR+'/foo.sci')
+t=["//sdffgfgfgggg"
+"//sdsdsddfgfgfghgfhjhui"
+"function a=foo//uuuuuuu"
+"a=0;k=0;//initialization"
+"  while %t //loop begin"
+"    k=k+1; //ttttt"
+"    if a> 10 then //"
+"      break // go out the loop"
+"    else //111111"
+"      a=a-1; //sdfdfd"
+"    end //xxxxx"
+"    a=a+k; //hhhhh"
+"  end //loop end"
+"endfunction"];
+mputl(t,TMPDIR+"/foo.sci");
+exec(TMPDIR+"/foo.sci")
 //sdffgfgfgggg
 //sdsdsddfgfgfghgfhjhui
 function a=foo//uuuuuuu
 a=0;k=0;//initialization
   while %t //loop begin
     k=k+1; //ttttt
     if a> 10 then //
- break // go out the loop
+       break // go out the loop
     else //111111
- a=a-1; //sdfdfd
+       a=a-1; //sdfdfd
     end //xxxxx
     a=a+k; //hhhhh
   end //loop end
 endfunction
 a=foo();
 if a<>15 then bugmes();quit;end
-exec(TMPDIR+'/foo.sci')
+exec(TMPDIR+"/foo.sci")
 //sdffgfgfgggg
 //sdsdsddfgfgfghgfhjhui
 function a=foo//uuuuuuu
 a=0;k=0;//initialization
   while %t //loop begin
     k=k+1; //ttttt
     if a> 10 then //
- break // go out the loop
+       break // go out the loop
     else //111111
- a=a-1; //sdfdfd
+       a=a-1; //sdfdfd
     end //xxxxx
     a=a+k; //hhhhh
   end //loop end
 endfunction
 a=foo();
 if a<>15 then bugmes();quit;end
-warning('on');
-//with macr2lst
+warning("on");
+//with macr2tree
 //first define an utilitary function
-function [C,L,lc]=getcomments(lst,lc)
- C=[],L=[];
- if argn(2)<2 then lc=0,end
-  for l=lst
-    if type(l)==15 then
-      [CC,LL,lc]=getcomments(l,lc)
-      C=[C;CC]
-      L=[L;LL]
-    elseif l==[] then
-    elseif l(1)=='31' then
-      C=[C;l(2)]
-      L=[L;lc]
-    elseif l(1)=='15' then
-      lc=lc+1
-    end
-  end
-endfunction
 function [C,L,lc]=getcommentsintree(T,lc)
- C=[],L=[];
- if argn(2)<2 then lc=0,end
-  for k=1:size(T)
-    l=T(k)
-    if  l(1)(1)=='ifthenelse' then
-      [CC,LL,lc]=getcommentsintree(l.then,lc)
-      C=[C;CC]
-      L=[L;LL]
-      [CC,LL,lc]=getcommentsintree(l.elseifs,lc)
-      C=[C;CC]
-      L=[L;LL]
-      [CC,LL,lc]=getcommentsintree(l.else,lc)
-      C=[C;CC]
-      L=[L;LL]
-    elseif  l(1)(1)=='while' then
-      [CC,LL,lc]=getcommentsintree(l.statements,lc)
-      C=[C;CC]
-      L=[L;LL]
-    elseif l(1)(1)=='comment' then
-      C=[C;l.text]
-      L=[L;lc]
-    elseif l(1)=='EOL' then
-      lc=lc+1
+    C=[],L=[];
+    if argn(2)<2 then lc=0,end
+    for k=1:size(T)
+        l=T(k)
+        if  l(1)(1)=="ifthenelse" then
+            [CC,LL,lc]=getcommentsintree(l.then,lc)
+            C=[C;CC]
+            L=[L;LL]
+            [CC,LL,lc]=getcommentsintree(l.elseifs,lc)
+            C=[C;CC]
+            L=[L;LL]
+        [CC,LL,lc]=getcommentsintree(l.else,lc)
+            C=[C;CC]
+            L=[L;LL]
+        elseif  l(1)(1)=="while" then
+            [CC,LL,lc]=getcommentsintree(l.statements,lc)
+            C=[C;CC]
+            L=[L;LL]
+        elseif l(1)(1)=="comment" then
+            C=[C;l.text]
+            L=[L;lc]
+        elseif l(1)=="EOL" then
+            lc=lc+1
+        end
     end
-  end
 endfunction
 function a=foo
-  a=0;k=0;//initialization
-  while %t //loop begin
-    k=k+1; //ttt tt
-    if a> 10 then //
-      break // go out the loop
-    else //111 111
-      a=a-1; //sdf dfd
-    end //x xxxx
-    a=a+k; //hhhh h
-  end //loop end
-endfunction
-[C,L]=getcomments(macr2lst(foo));
-Cref=["initialization";
-"loop begin";
-"ttt tt";
-"";
-" go out the loop";
-"111 111";
-"sdf dfd";
-"x xxxx";
-"hhhh h";
-"loop end"];
-if or(C<>Cref) then bugmes();quit;end
-if or(L<>(1:10)') then bugmes();quit;end
-//with macr2tree
-function a=foo
-  a=0;k=0;//initialization
-  while %t
-    k=k+1; //ttttt ttttt
-    if a> 10 then //f f
-      break // go out the loop
-    else //111 111
-      a=a-1; //sdf dfd
-    end //xx xxx
-    a=a+k; //hhh hh
-  end //loop end
+    a=0;k=0;//initialization
+    while %t
+        k=k+1; //ttttt ttttt
+        if a> 10 then //f f
+            break // go out the loop
+        else //111 111
+            a=a-1; //sdf dfd
+        end //xx xxx
+        a=a+k; //hhh hh
+    end //loop end
 endfunction
 T=macr2tree(foo);
 [C,L]=getcommentsintree(T.statements)
- L  =
-    1.   
-    3.   
-    4.   
-    5.   
-    6.   
-    7.   
-    8.   
-    9.   
-    10.  
- C  =
+L  = 
+    1.
+    3.
+    5.
+    6.
+    8.
+    9.
+    10.
+    11.
+    12.
+C  = 
 !initialization    !
 !                  !
 !ttttt ttttt       !
@@ -442,34 +375,31 @@ T=macr2tree(foo);
 !                  !
 !loop end          !
 Cref=["initialization";
-      "ttttt ttttt";
-      "f f";
-      " go out the loop";
-      "111 111";
-      "sdf dfd";
-      "xx xxx";
-      "hhh hh";
-      "loop end"];
-Lref=[1 3:10]';
+"ttttt ttttt";
+"f f";
+" go out the loop";
+"111 111";
+"sdf dfd";
+"xx xxx";
+"hhh hh";
+"loop end"];
+Lref=[1 3 5:6 8:12]';
 if or(C<>Cref) then bugmes();quit;end
 if or(L<>Lref) then bugmes();quit;end
 function a=foo
-  a=0;k=0;//initialization
-  while %t //loop begin
-    k=k+1; //ttttt tttt 
-    if a> 10 then //ff
-      break // go out the loop
-    else //111111
-      a=a-1; //sdfdfd
-    end //xxxxx
-    a=a+k; //hhhhh
-  end //loop end
+    a=0;k=0;//initialization
+    while %t //loop begin
+        k=k+1; //ttttt tttt
+        if a> 10 then //ff
+            break // go out the loop
+        else //111111
+            a=a-1; //sdfdfd
+        end //xxxxx
+        a=a+k; //hhhhh
+    end //loop end
 endfunction
 //T=macr2tree(foo);  bug a cause du commentaire //loop begin
-deff('[y]=u(t)','if t==0 then y=0;else y=1,end') //step qsdqsqsd
+deff("[y]=u(t)","if t==0 then y=0;else y=1,end") //step qsdqsqsd
 function y=foo(a),y=a,endfunction//test qsdqsd
-foo(2)  //zeros=0
- ans  =
-    2.  
+foo(2);  //zeros=0
 foo("f//");
index b87553a..8fa3d61 100644 (file)
@@ -5,8 +5,6 @@
 //  This file is distributed under the same license as the Scilab package.
 // =============================================================================
 
-// <-- NOT FIXED -->
-
 //for version after 3.0 the comments are no more handled by a preprocessor,
 //but by the parser itself
 
@@ -281,26 +279,8 @@ a=foo();
 if a<>15 then pause,end
 warning("on");
 
-//with macr2lst
-
+//with macr2tree
 //first define an utilitary function
-function [C,L,lc]=getcomments(lst,lc)
-    C=[],L=[];
-    if argn(2)<2 then lc=0,end
-    for l=lst
-        if type(l)==15 then
-            [CC,LL,lc]=getcomments(l,lc)
-            C=[C;CC]
-            L=[L;LL]
-        elseif l==[] then
-        elseif l(1)=="31" then
-            C=[C;l(2)]
-            L=[L;lc]
-        elseif l(1)=="15" then
-            lc=lc+1
-        end
-    end
-endfunction
 function [C,L,lc]=getcommentsintree(T,lc)
     C=[],L=[];
     if argn(2)<2 then lc=0,end
@@ -331,35 +311,6 @@ endfunction
 
 function a=foo
     a=0;k=0;//initialization
-    while %t //loop begin
-        k=k+1; //ttt tt
-        if a> 10 then //
-            break // go out the loop
-        else //111 111
-            a=a-1; //sdf dfd
-        end //x xxxx
-        a=a+k; //hhhh h
-    end //loop end
-endfunction
-
-[C,L]=getcomments(macr2lst(foo));
-Cref=["initialization";
-"loop begin";
-"ttt tt";
-"";
-" go out the loop";
-"111 111";
-"sdf dfd";
-"x xxxx";
-"hhhh h";
-"loop end"];
-if or(C<>Cref) then pause,end
-if or(L<>(1:10)') then pause,end
-
-//with macr2tree
-
-function a=foo
-    a=0;k=0;//initialization
     while %t
         k=k+1; //ttttt ttttt
         if a> 10 then //f f
@@ -381,7 +332,7 @@ Cref=["initialization";
 "xx xxx";
 "hhh hh";
 "loop end"];
-Lref=[1 3:10]';
+Lref=[1 3 5:6 8:12]';
 if or(C<>Cref) then pause,end
 if or(L<>Lref) then pause,end
 
@@ -404,5 +355,5 @@ endfunction
 
 deff("[y]=u(t)","if t==0 then y=0;else y=1,end") //step qsdqsqsd
 function y=foo(a),y=a,endfunction//test qsdqsd
-foo(2)  //zeros=0
+foo(2);  //zeros=0
 foo("f//");
diff --git a/scilab/modules/functions/help/en_US/macr2lst.xml b/scilab/modules/functions/help/en_US/macr2lst.xml
deleted file mode 100644 (file)
index 9280b20..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="en" xml:id="macr2lst">
-    <refnamediv>
-        <refname>macr2lst</refname>
-        <refpurpose>function to list conversion</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Calling Sequence</title>
-        <synopsis>lst = macr2lst(function_name)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>function_name</term>
-                <listitem>
-                    <para>a function to be converted.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>lst</term>
-                <listitem>
-                    <para>a list.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Description</title>
-        <para>
-            This primitive converts a compiled Scilab function <varname>function_name</varname>
-            into a list which codes the internal representation of
-            the function (reverse Polish notation).
-        </para>
-        <para>The first entry of the list is the function name, the second
-            and third are respectively the vectors of left hand side variables
-            and right hand side variables names. The following entries are either basic operation records
-            either lists with contains the hierarchical control structures like
-            <literal>if</literal>, <literal>for</literal>, ...
-        </para>
-        <para>Basic operation records are described by a character string
-            vector whose first element represents the opcode.
-        </para>
-        <informaltable border="1">
-            <tr>
-                <td>op codes</td>
-                <td>meaning</td>
-                <td>parameters</td>
-            </tr>
-            <tr>
-                <td>"0"</td>
-                <td>ignored opcode</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"1"</td>
-                <td>No more used</td>
-                <td/>
-            </tr>
-            <tr>
-                <td>"2"</td>
-                <td>variable or function reference</td>
-                <td>variable name, #rhs, #lhs</td>
-            </tr>
-            <tr>
-                <td>"3"</td>
-                <td>put a string in the stack</td>
-                <td>the string</td>
-            </tr>
-            <tr>
-                <td>"4"</td>
-                <td>put am empty matrix in the stack</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"5"</td>
-                <td>apply an operation</td>
-                <td>operation code, #rhs,#lhs</td>
-            </tr>
-            <tr>
-                <td>"6"</td>
-                <td>put a number  in the stack</td>
-                <td>the number</td>
-            </tr>
-            <tr>
-                <td>"12"</td>
-                <td>pause command</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"13"</td>
-                <td>break command</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"14"</td>
-                <td>abort command</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"15"</td>
-                <td>end of line mark</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"17"</td>
-                <td>quit command</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"18"</td>
-                <td>named variable</td>
-                <td>variable name</td>
-            </tr>
-            <tr>
-                <td>"19"</td>
-                <td>create recursive index structure</td>
-                <td>path length, number of final indices</td>
-            </tr>
-            <tr>
-                <td>"20"</td>
-                <td>function call</td>
-                <td>function name, #rhs, #lhs </td>
-            </tr>
-            <tr>
-                <td>"23"</td>
-                <td>create variable from name</td>
-                <td>variable name</td>
-            </tr>
-            <tr>
-                <td>"24"</td>
-                <td>put a variable with type 0 in the stack</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"25"</td>
-                <td>profile record</td>
-                <td>number of call, time spend </td>
-            </tr>
-            <tr>
-                <td>"26"</td>
-                <td>put a vector of strings in the stack</td>
-                <td>#rows, #columns, element sequence</td>
-            </tr>
-            <tr>
-                <td>"27"</td>
-                <td>put a builtin reference in the stack</td>
-                <td>interface number, position in interface, function name</td>
-            </tr>
-            <tr>
-                <td>"28"</td>
-                <td>continue command</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td>"29"</td>
-                <td>assignment</td>
-                <td>#lhs, display mode, (variable name, #rhs)*</td>
-            </tr>
-            <tr>
-                <td>"30"</td>
-                <td>logical expression short circuit</td>
-                <td>type, jump size</td>
-            </tr>
-            <tr>
-                <td>"31"</td>
-                <td>comment</td>
-                <td>the comment</td>
-            </tr>
-            <tr>
-                <td>"99"</td>
-                <td>return command</td>
-                <td>none</td>
-            </tr>
-            <tr>
-                <td> &gt; "100"</td>
-                <td>builtin call (obsolete)</td>
-                <td>100*fun, #rhs, #lhs, fin</td>
-            </tr>
-        </informaltable>
-        <para>
-            The <link linkend="fun2string">fun2string</link> function can be used to generate the initial code.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Examples</title>
-        <programlisting role="example"><![CDATA[
-//DISPLAY
-function y=foo(x,flag)
-  if flag then
-    y=sin(x)
-  else
-    y=cos(x)
-  end
-endfunction
-L=macr2lst(foo)
-fun2string(L)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>See Also</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="macrovar">macrovar</link>
-            </member>
-            <member>
-                <link linkend="fun2string">fun2string</link>
-            </member>
-            <member>
-                <link linkend="macr2tree">macr2tree</link>
-            </member>
-            <member>
-                <link linkend="tree2code">tree2code</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/functions/help/ja_JP/macr2lst.xml b/scilab/modules/functions/help/ja_JP/macr2lst.xml
deleted file mode 100644 (file)
index c08b83a..0000000
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ja" xml:id="macr2lst">
-    
-    <refnamediv>
-        
-        <refname>macr2lst</refname>
-        
-        <refpurpose>リスト変換用の関数</refpurpose>
-        
-    </refnamediv>
-    
-    <refsynopsisdiv>
-        
-        <title>呼び出し手順</title>
-        
-        <synopsis>lst = macr2lst(function_name)</synopsis>
-        
-    </refsynopsisdiv>
-    
-    <refsection>
-        
-        <title>引数</title>
-        
-        <variablelist>
-            
-            <varlistentry>
-                
-                <term>function_name</term>
-                
-                <listitem>
-                    
-                    <para>変換する関数.</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-            <varlistentry>
-                
-                <term>lst</term>
-                
-                <listitem>
-                    
-                    <para>リスト.</para>
-                    
-                </listitem>
-                
-            </varlistentry>
-            
-        </variablelist>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>説明</title>
-        
-        <para>
-            
-            このプリミティブは,コンパイル済みのScilab関数 <varname>function_name</varname>
-            
-            を,関数の内部表現をコード化(逆ポーランド表記)したリストに変換します.
-            
-        </para>
-        
-        <para>
-            
-            リストの最初のエントリは関数名,2番目および3番目のエントリは
-            
-            それぞれ左辺引数および右辺引数の変数名となります.
-            
-            それ以降のエントリは,基本的な演算子レコードもしくは
-            
-            <literal>if</literal>, <literal>for</literal>, ... のような制御構造の階層を含むリストのどちらかです.
-            
-        </para>
-        
-        <para>
-            
-            基本的な演算子レコードは, 文字列ベクトルにより記述されます.
-            
-            その最初の要素はオペコードを表します.
-            
-        </para>
-        
-        <informaltable border="1">
-            
-            <tr>
-                
-                <td>オペコード</td>
-                
-                <td>意味</td>
-                
-                <td>パラメータ</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"0"</td>
-                
-                <td>無視されるオペコード</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"1"</td>
-                
-                <td>使用停止</td>
-                
-                <td/>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"2"</td>
-                
-                <td>変数または関数リファレンス</td>
-                
-                <td>変数名, #rhs, #lhs</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"3"</td>
-                
-                <td>スタック内に文字列を配置</td>
-                
-                <td>文字列</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"4"</td>
-                
-                <td>スタック内に空の行列を配置</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"5"</td>
-                
-                <td>処理を適用</td>
-                
-                <td>処理コード, #rhs,#lhs</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"6"</td>
-                
-                <td>数値をスタックに配置</td>
-                
-                <td>数値</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"12"</td>
-                
-                <td>停止コマンド</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"13"</td>
-                
-                <td>ブレークコマンド</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"14"</td>
-                
-                <td>中断コマンド</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"15"</td>
-                
-                <td>行終端記号</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"17"</td>
-                
-                <td>quit コマンド</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"18"</td>
-                
-                <td>名前のある変数</td>
-                
-                <td>変数名</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"19"</td>
-                
-                <td>再帰的な添え字構造を作成</td>
-                
-                <td>パスの長さ, 最終添え字の番号</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"20"</td>
-                
-                <td>関数コール</td>
-                
-                <td>関数名, #rhs, #lhs </td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"23"</td>
-                
-                <td>名前を指定して変数を作成</td>
-                
-                <td>変数名</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"24"</td>
-                
-                <td>0型の変数をスタックに代入</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"25"</td>
-                
-                <td>プロファイル用レコード</td>
-                
-                <td>コール数, 消費時間 </td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"26"</td>
-                
-                <td>文字列ベクトルをスタック内に配置</td>
-                
-                <td>#rows, #columns, 要素のシーケンス</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"27"</td>
-                
-                <td>組み込みリファレンスをスタックに配置</td>
-                
-                <td>インターフェイス番号, インターフェイス内の位置, 関数名</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"28"</td>
-                
-                <td>continue コマンド</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"29"</td>
-                
-                <td>代入</td>
-                
-                <td>#lhs, 表示モード, (変数名, #rhs)*</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"30"</td>
-                
-                <td>論理値式 省略形</td>
-                
-                <td>型, ジャンプの長さ</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"31"</td>
-                
-                <td>コメント</td>
-                
-                <td>コメント</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td>"99"</td>
-                
-                <td>return コマンド</td>
-                
-                <td>なし</td>
-                
-            </tr>
-            
-            <tr>
-                
-                <td> &gt; "100"</td>
-                
-                <td>組み込みコール (古い)</td>
-                
-                <td>100*fun, #rhs, #lhs, fin</td>
-                
-            </tr>
-            
-        </informaltable>
-        
-        <para>
-            
-            <link linkend="fun2string">fun2string</link> 関数は,
-            
-            初期コードを生成する際に使用できます.
-            
-        </para>
-        
-    </refsection>
-    
-    <refsection>
-        
-        <title>例</title>
-        
-        <programlisting role="example"><![CDATA[
-//DISPLAY
-function y=foo(x,flag)
-  if flag then
-    y=sin(x)
-  else
-    y=cos(x)
-  end
-endfunction
-L=macr2lst(foo)
-fun2string(L)
- ]]></programlisting>
-        
-    </refsection>
-    
-    <refsection role="see also">
-        
-        <title>参照</title>
-        
-        <simplelist type="inline">
-            
-            <member>
-                
-                <link linkend="macrovar">macrovar</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="fun2string">fun2string</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="macr2tree">macr2tree</link>
-                
-            </member>
-            
-            <member>
-                
-                <link linkend="tree2code">tree2code</link>
-                
-            </member>
-            
-        </simplelist>
-        
-    </refsection>
-    
-</refentry>
-
diff --git a/scilab/modules/functions/help/pt_BR/macr2lst.xml b/scilab/modules/functions/help/pt_BR/macr2lst.xml
deleted file mode 100644 (file)
index 06d6819..0000000
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:id="macr2lst" xml:lang="en">
-    <refnamediv>
-        <refname>macr2lst</refname>
-        <refpurpose>conversão de função para lista</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Seqüência de Chamamento</title>
-        <synopsis>lst = macr2lst(function_name)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Arguments</title>
-        <variablelist>
-            <varlistentry>
-                <term>function_name</term>
-                <listitem>
-                    <para>a function to be converted.</para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>lst</term>
-                <listitem>
-                    <para>a list.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Descrição</title>
-        <para>Esta primitiva converte uma versão compilada do Scilab
-            <varname>function_name</varname> em uma lista que codifica a representação
-            interna da função (notação polonesa inversa).
-        </para>
-        <para>A primeira entrada da lista é o nome da função, as segunda e
-            terceira são, respectivamente, os vetores das variáveis de lado esquerdo e
-            direito (lhs e rhs). As entradas seguintes são registros de operação
-            básica ou listas que contém as estruturas de controle hierárquicas como <literal>if</literal>, <literal>for</literal>, ...
-        </para>
-        <para>Registros de operação básica são descritos por um vetor de strings
-            cujo primeiro elemento representa código do operador (op code).
-        </para>
-        <informaltable border="1">
-            <tr>
-                <td>op codes</td>
-                <td>significado</td>
-                <td>parâmetros</td>
-            </tr>
-            <tr>
-                <td>"0"</td>
-                <td>opcode ignorado</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"1"</td>
-                <td>não mais usado</td>
-                <td/>
-            </tr>
-            <tr>
-                <td>"2"</td>
-                <td>referência à função ou variável</td>
-                <td>nome da variável, #rhs, #lhs</td>
-            </tr>
-            <tr>
-                <td>"3"</td>
-                <td>coloca um string na pilha</td>
-                <td>um string</td>
-            </tr>
-            <tr>
-                <td>"4"</td>
-                <td>coloca uma matriz vazia na pilha</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"5"</td>
-                <td>aplica uma operação</td>
-                <td>código de operação, #rhs,#lhs</td>
-            </tr>
-            <tr>
-                <td>"6"</td>
-                <td>coloca um número na pilha</td>
-                <td>o número</td>
-            </tr>
-            <tr>
-                <td>"12"</td>
-                <td>comando pause</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"13"</td>
-                <td>comando break</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"14"</td>
-                <td>comando abort</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"15"</td>
-                <td>marca de fim da linha</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"17"</td>
-                <td>comando quit</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"18"</td>
-                <td>variável nomeada</td>
-                <td>nome da variável</td>
-            </tr>
-            <tr>
-                <td>"19"</td>
-                <td>cria estrutura de índice recursiva</td>
-                <td>comprimento do endereço, número de índices finais</td>
-            </tr>
-            <tr>
-                <td>"20"</td>
-                <td>chamada a função</td>
-                <td>nome da função, #rhs, #lhs</td>
-            </tr>
-            <tr>
-                <td>"23"</td>
-                <td>cria variável a partir do nome</td>
-                <td>nome da variável</td>
-            </tr>
-            <tr>
-                <td>"24"</td>
-                <td>coloca uma variável de tipo 0 na pilha</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"25"</td>
-                <td>registro de perfil</td>
-                <td>número da chamada, gasto de tempo</td>
-            </tr>
-            <tr>
-                <td>"26"</td>
-                <td>coloca um vetor de strings na pilha</td>
-                <td>#linhas, #colunas, seqüência de elementos</td>
-            </tr>
-            <tr>
-                <td>"27"</td>
-                <td>coloca uma referência a um builtin na pilha</td>
-                <td>número da interface, posição da interface, nome da função</td>
-            </tr>
-            <tr>
-                <td>"28"</td>
-                <td>comando continue</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>"29"</td>
-                <td>atribuição</td>
-                <td>#lhs, modo de exibição, (nome da variável, #rhs)*</td>
-            </tr>
-            <tr>
-                <td>"30"</td>
-                <td>curto circuito de expressão lógica</td>
-                <td>tipo, tamanho do salto (jump)</td>
-            </tr>
-            <tr>
-                <td>"31"</td>
-                <td>comentário</td>
-                <td>o comentário</td>
-            </tr>
-            <tr>
-                <td>"99"</td>
-                <td>comando return</td>
-                <td>nenhum</td>
-            </tr>
-            <tr>
-                <td>&gt; "100"</td>
-                <td>chamada a um builtin (obsoleto)</td>
-                <td>100*fun, #rhs, #lhs, fin</td>
-            </tr>
-        </informaltable>
-        <para>
-            A função <link linkend="fun2string">fun2string</link> pode ser usada
-            para se gerar o código inicial
-        </para>
-    </refsection>
-    <refsection>
-        <title>Exemplos</title>
-        <programlisting role="example"><![CDATA[
-//EXIBIÇÃO
-function y=foo(x,flag)
-  if flag then
-    y=sin(x)
-  else
-    y=cos(x)
-  end
-endfunction
-L=macr2lst(foo)
-fun2string(L)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Ver Também</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="macrovar">macrovar</link>
-            </member>
-            <member>
-                <link linkend="fun2string">fun2string</link>
-            </member>
-            <member>
-                <link linkend="macr2tree">macr2tree</link>
-            </member>
-            <member>
-                <link linkend="tree2code">tree2code</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>
diff --git a/scilab/modules/functions/help/ru_RU/macr2lst.xml b/scilab/modules/functions/help/ru_RU/macr2lst.xml
deleted file mode 100644 (file)
index d5893f2..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svg="http://www.w3.org/2000/svg" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:db="http://docbook.org/ns/docbook" xmlns:scilab="http://www.scilab.org" xml:lang="ru" xml:id="macr2lst">
-    <refnamediv>
-        <refname>macr2lst</refname>
-        <refpurpose>преобразование функции в список</refpurpose>
-    </refnamediv>
-    <refsynopsisdiv>
-        <title>Последовательность вызова</title>
-        <synopsis>lst = macr2lst(function_name)</synopsis>
-    </refsynopsisdiv>
-    <refsection>
-        <title>Аргументы</title>
-        <variablelist>
-            <varlistentry>
-                <term>function_name</term>
-                <listitem>
-                    <para>
-                        функция, которую требуется преобразовать.
-                    </para>
-                </listitem>
-            </varlistentry>
-            <varlistentry>
-                <term>lst</term>
-                <listitem>
-                    <para>список.</para>
-                </listitem>
-            </varlistentry>
-        </variablelist>
-    </refsection>
-    <refsection>
-        <title>Описание</title>
-        <para>
-            Этот примитив преобразует компилированную функцию Scilab
-            <varname>function_name</varname> в список, который кодирует внутреннее
-            представление функции (обратная бесскобочная запись).
-        </para>
-        <para>
-            Первый элемент списка является именем функции, второй и третий являются, соответственно, именами выходных переменных и входных переменных. Следующие элементы являются или записями основных операций или списками, содержащими иерархические управляющие структуры, такие, как
-            <literal>if</literal>, <literal>for</literal>, ...
-        </para>
-        <para>
-            Записи основных операций описываются вектором символьных строк, чей первый элемент представляет собой код операции.
-        </para>
-        <informaltable border="1">
-            <tr>
-                <td>коды операций</td>
-                <td>значение</td>
-                <td>параметры</td>
-            </tr>
-            <tr>
-                <td>"0"</td>
-                <td>игнорируемый код операции</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"1"</td>
-                <td>более не используется</td>
-                <td/>
-            </tr>
-            <tr>
-                <td>"2"</td>
-                <td>ссылка на переменную или функцию</td>
-                <td>имя переменной, #rhs, #lhs</td>
-            </tr>
-            <tr>
-                <td>"3"</td>
-                <td>положить строку в стек</td>
-                <td>строка</td>
-            </tr>
-            <tr>
-                <td>"4"</td>
-                <td>положить пустую матрицу в стек</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"5"</td>
-                <td>применить операцию</td>
-                <td>код операции, #rhs,#lhs</td>
-            </tr>
-            <tr>
-                <td>"6"</td>
-                <td>положить число в стек</td>
-                <td>число</td>
-            </tr>
-            <tr>
-                <td>"12"</td>
-                <td>команда pause</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"13"</td>
-                <td>команда break</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"14"</td>
-                <td>команда abort</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"15"</td>
-                <td>конец метки строки</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"17"</td>
-                <td>команда quit</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"18"</td>
-                <td>именованная переменная</td>
-                <td>имя переменной</td>
-            </tr>
-            <tr>
-                <td>"19"</td>
-                <td>создать рекурсивную структуру индексов</td>
-                <td>длина пути, количество конечных индексов</td>
-            </tr>
-            <tr>
-                <td>"20"</td>
-                <td>вызов функции</td>
-                <td>имя функции, #rhs, #lhs </td>
-            </tr>
-            <tr>
-                <td>"23"</td>
-                <td>создать переменную из имени</td>
-                <td>имя переменной</td>
-            </tr>
-            <tr>
-                <td>"24"</td>
-                <td>положить переменную с типом 0 в стек</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"25"</td>
-                <td>запись профиля</td>
-                <td>количество вызовов, затраченное время</td>
-            </tr>
-            <tr>
-                <td>"26"</td>
-                <td>положить вектор строк в стек</td>
-                <td>кол-во строк, кол-во столбцов, последовательность элементов</td>
-            </tr>
-            <tr>
-                <td>"27"</td>
-                <td>положить встроенную ссылку в стек</td>
-                <td>номер интерфейса, положение в интерфейсе, имя функции</td>
-            </tr>
-            <tr>
-                <td>"28"</td>
-                <td>команда continue</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td>"29"</td>
-                <td>присвоение</td>
-                <td>#lhs, режим отображения, (имя переменной, #rhs)*</td>
-            </tr>
-            <tr>
-                <td>"30"</td>
-                <td>сокращённое вычисление логического выражения</td>
-                <td>тип, размер скачка</td>
-            </tr>
-            <tr>
-                <td>"31"</td>
-                <td>комментарий</td>
-                <td>комментарий</td>
-            </tr>
-            <tr>
-                <td>"99"</td>
-                <td>команда return</td>
-                <td>ничего</td>
-            </tr>
-            <tr>
-                <td> &gt; "100"</td>
-                <td>встроенный вызов (устарело)</td>
-                <td>100*fun, #rhs, #lhs, fin</td>
-            </tr>
-        </informaltable>
-        <para>
-            Функция <link linkend="fun2string">fun2string</link> может быть использована для генерации исходного кода.
-        </para>
-    </refsection>
-    <refsection>
-        <title>Примеры</title>
-        <programlisting role="example"><![CDATA[
-// ОТОБРАЖЕНИЕ
-function y=foo(x,flag)
-  if flag then
-    y=sin(x)
-  else
-    y=cos(x)
-  end
-endfunction
-L=macr2lst(foo)
-fun2string(L)
- ]]></programlisting>
-    </refsection>
-    <refsection role="see also">
-        <title>Смотрите также</title>
-        <simplelist type="inline">
-            <member>
-                <link linkend="macrovar">macrovar</link>
-            </member>
-            <member>
-                <link linkend="fun2string">fun2string</link>
-            </member>
-            <member>
-                <link linkend="macr2tree">macr2tree</link>
-            </member>
-            <member>
-                <link linkend="tree2code">tree2code</link>
-            </member>
-        </simplelist>
-    </refsection>
-</refentry>