43 files changed, 814 insertions, 88 deletions
diff --git a/2.3-1/macros/ASTManagement/%funcall_string.sci b/2.3-1/macros/ASTManagement/%funcall_string.sci
index faeb81d9..0ee97016 100644
--- a/2.3-1/macros/ASTManagement/%funcall_string.sci
+++ b/2.3-1/macros/ASTManagement/%funcall_string.sci
@@ -6,10 +6,19 @@ function txt=%funcall_string(F)
 //    name : string, the name of the function
 //    lhsnb: number, the number of function lhs
 
+if F.name <> 'disp'
 txt=['Funcall  : '+F.name
      '  #lhs   : '+string(F.lhsnb)
      '  Rhs    : '
      '      '+objectlist2string(F.rhs)
      'EndFuncall'
     ]
+else
+txt=['Funcall  : '+F.name
+     '  #lhs   : '+'0'
+     '  Rhs    : '
+     '      '+objectlist2string(F.rhs)
+     'EndFuncall'
+    ]
+end
 endfunction
diff --git a/2.3-1/macros/ASTManagement/%operatio_string.sci b/2.3-1/macros/ASTManagement/%operatio_string.sci
index c0ecb478..cc18e919 100644
--- a/2.3-1/macros/ASTManagement/%operatio_string.sci
+++ b/2.3-1/macros/ASTManagement/%operatio_string.sci
@@ -4,17 +4,22 @@ function txt=%operatio_string(O)
 //fields:
 //     operands: a list
 //     operator: a string
-if O.operator <> 'rc' 
+if O.operator <> 'rc' & O.operator <> 'cc'
   txt=['Operation'
        '   Operands:'
        '      '+objectlist2string(O.operands)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-else
+elseif O.operator == 'rc'
   txt=['   Operands:'
        '      '+objectlist2string(O.operands)
        'Endrc'
       ]
+elseif O.operator == 'cc'
+  txt=['   Begin:'
+       '      '+objectlist2string(O.operands)
+       'Endcc'
+      ]
 end
 endfunction
diff --git a/2.3-1/macros/ASTManagement/%operation_string.sci b/2.3-1/macros/ASTManagement/%operation_string.sci
index 84f5ce3c..c9282f67 100644
--- a/2.3-1/macros/ASTManagement/%operation_string.sci
+++ b/2.3-1/macros/ASTManagement/%operation_string.sci
@@ -10,4 +10,4 @@ function txt=%operation_string(O)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-endfunction
-\ No newline at end of file
+endfunction
diff --git a/2.3-1/macros/ASTManagement/AST2Ccode.sci b/2.3-1/macros/ASTManagement/AST2Ccode.sci
index 19cf00c4..563f3133 100644
--- a/2.3-1/macros/ASTManagement/AST2Ccode.sci
+++ b/2.3-1/macros/ASTManagement/AST2Ccode.sci
@@ -46,6 +46,10 @@ ReportFileName  = FileInfo.Funct(nxtscifunnumber).ReportFileName;
 // ---------------------------------
 // --- Parameter Initialization. ---
 // ---------------------------------
+
+global cc_count
+cc_count = 0;
+
 global rc_count
 rc_count = 0;
 
@@ -57,6 +61,9 @@ StackPosition = 1;
 
 global STACKDEDUG
 STACKDEDUG = 0; // 1 -> Every Pop and Push operation on the stack, the stack content will be printed on screen.
+
+global disp_isthere
+disp_isthere = 0;
 // -------------------------------------
 // --- End parameter Initialization. ---
 // -------------------------------------
@@ -135,9 +142,10 @@ while ~meof(fidAST)
       //NUT: qui puoi anche aggiunger piu' case per specificare meglio la struttura della funcall
       //NUT: i case aggiunti ovviamente faranno solo il push della treeline.
       case 'EndOperation' then
-         [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Operation');
+         [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Operation');
       case 'EndFuncall' then
-         [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Funcall');
+         [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Funcall');
+	 disp(disp_isthere);
 
       // --------------
       // --- Equal. ---
@@ -147,29 +155,43 @@ while ~meof(fidAST)
       //NUT: per fare in modo di coprire le ins, anche se ci puo' essere qualche rischio quando
       //NUT: ho miste ins e variabili, per esempio [c(1,1), a] = twooutfun();
       //NUT: in questo caso solo una delle due equal va scartata.
- 	 if rc_count > 0
+ 	 if rc_count > 0 & cc_count == 0
 		[FileInfo,SharedInfo] = AST_HandleFunRC(FileInfo,SharedInfo);
+		rc_count = 0;
+	 elseif cc_count > 0
+		[FileInfo,SharedInfo] = AST_HandleFunCC(cc_count,FileInfo,SharedInfo);
+		rc_count = 0;
+                cc_count = 0;
 	 else
-         	[FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Equal');
+		if disp_isthere == 0
+         	[disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Equal');
          	SharedInfo = INIT_SharedInfoEqual(SharedInfo);
+		end
 	 end
+	 disp_isthere = 0;
+
       case 'Equal' then
          SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block.
          AST_PushASTStack(treeline);
       case 'Lhs       :' then
-		disp(rc_count);
-		if rc_count > 0
+		disp(disp_isthere);
+		if rc_count > 0 & cc_count == 0
 		SharedInfo.Equal.Lhs = 1;
 		[EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo);
-		SharedInfo.Equal.NInArg = EqualNInArg;
+		SharedInfo.Equal.NInArg = EqualNInArg - rc_count -1;
 		AST_PushASTStack(treeline);
 		for tmpcnt = 1:SharedInfo.Equal.NInArg
 	           SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt);
 	           SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt);
-         	end		
+         	end
+		elseif cc_count > 0
+		SharedInfo.Equal.Lhs = 1;
+ 		[EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleCC(FileInfo,SharedInfo);
+                AST_PushASTStack(treeline);
 		else
 	        SharedInfo.Equal.Lhs = 1; // 1 means that we are inside the Lhs block of the Equal
 	 	//if SharedInfo.Equal.NOutArg > 0
+                if disp_isthere == 0
 	        [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_ReadEqualRhsNames(FileInfo,SharedInfo);
 		SharedInfo.Equal.NInArg = EqualNInArg;
 		//end
@@ -184,6 +206,7 @@ while ~meof(fidAST)
 	           SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt);
          	end
 	 	//end
+                end
          	AST_PushASTStack(treeline);
 		end
 
@@ -219,6 +242,7 @@ while ~meof(fidAST)
       // -----------------
       case 'EndProgram'
          SharedInfo = AST_HandleEndProgram(FileInfo,SharedInfo);
+	 disp_isthere = 0;
          //NUT: per essere precisi si puo' pensare di mettere un check
          //NUT: alla fine dell'albero per accertarsi che c'e' end program li' dove ce lo aspettiamo
 
@@ -254,7 +278,11 @@ while ~meof(fidAST)
 
 
       case 'Endrc' then
-	 rc_count = rc_count + 1;	
+	 rc_count = rc_count + 1;
+      
+      case 'Endcc' then
+	 cc_count = cc_count + 1;
+	
          //[FileInfo,SharedInfo] = AST_HandleRC(FileInfo,SharedInfo);
 
       // ----------------
diff --git a/2.3-1/macros/ASTManagement/AST_HandleCC.sci b/2.3-1/macros/ASTManagement/AST_HandleCC.sci
new file mode 100644
index 00000000..cc411549
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/AST_HandleCC.sci
@@ -0,0 +1,69 @@
+// Copyright (C) 2017 - IIT Bombay - FOSSEE
+
+// 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-en.txt
+// Author: Ukasha Noor
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+function [RhsNames,RhsScope,NRhs] = AST_HandleCC(FileInfo,SharedInfo)
+
+SCI2CNInArgCheck(argn(2),2,2)
+
+ReportFileName  = FileInfo.Funct(nxtscifunnumber).ReportFileName;
+
+// ------------------------------
+// --- Check input arguments. ---
+// ------------------------------
+
+
+global SCI2CSTACK
+global StackPosition;
+global STACKDEDUG
+// ---------------------------
+// --- End Initialization. ---
+// ---------------------------
+
+
+// ------------------------------
+// --- Read input parameters. ---
+// ------------------------------
+cntpop = 1;
+NRhs = 0;
+RhsField(cntpop) = AST_PopASTStack();
+RhsNames = [];
+while (RhsField(cntpop) ~= 'Expression:')
+   if RhsField(cntpop) <> 'Operands:' & RhsField(cntpop) <> 'Begin:'
+   NRhs = NRhs + 1;
+   
+   [RhsNames(NRhs),RhsScope(NRhs)] = AST_ExtractNameAndScope(RhsField(cntpop));
+   end
+   cntpop = cntpop + 1;
+   RhsField(cntpop) = AST_PopASTStack();
+end
+RhsNames = SCI2Cflipud(RhsNames);
+RhsScope = SCI2Cflipud(RhsScope);
+
+// --- Repush everything into the stack. ---
+for cntpush = cntpop:-1:1
+   if RhsField(cntpush) <> 'Operands:' & RhsField(cntpush) <> 'Begin:'
+   PrintStringInfo(' ' + RhsField(cntpush),ReportFileName,'file','y');
+   AST_PushASTStack(RhsField(cntpush));
+   end
+end
+
+
+//for counterinputargs = 1:NRhs
+   //#RNU_RES_B
+   //disp(counterinputargs);
+   //PrintStringInfo('Input Argument Number '+string(counterinputargs)+': '+RhsNames(counterinputargs).Name,...
+     // ReportFileName,'file','y');
+   //PrintStringInfo('   Scope: '+RhsNames(counterinputargs).Scope,...
+     // ReportFileName,'file','y');
+   //#RNU_RES_E
+//end
+
+endfunction
diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci
index 32685de3..807b8bab 100644
--- a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci
+++ b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci
@@ -1,5 +1,5 @@
 
-function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
+function [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,ASTFunType)
 // function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
 // -----------------------------------------------------------------
 // #RNU_RES_B
@@ -36,7 +36,7 @@ function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunT
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
-SCI2CNInArgCheck(argn(2),3,3);
+SCI2CNInArgCheck(argn(2),4,4);
 
 // -----------------------
 // --- Initialization. ---
@@ -61,6 +61,8 @@ PrintStepInfo('Handling Funcall/Operation/Equal',FileInfo.Funct(nxtscifunnumber)
 global SCI2CSTACK
 global StackPosition;
 global STACKDEDUG
+
+disp_isthere = 0;
 // ---------------------------
 // --- End Initialization. ---
 // ---------------------------
@@ -81,6 +83,11 @@ NOutArg_mod = NOutArg
 		AST_PushASTStack('||');
 		return;
 	end
+	
+	if ASTFunName == 'disp'
+		disp_isthere = 1;
+	end
+
 	if(mtlb_strcmp(part(ASTFunName,1:2),'CV') == %T)
 		SharedInfo.OpenCVUsed = %T;
 	end
diff --git a/2.3-1/macros/ASTManagement/AST_HandleFunCC.sci b/2.3-1/macros/ASTManagement/AST_HandleFunCC.sci
new file mode 100644
index 00000000..1942c749
--- /dev/null
+++ b/2.3-1/macros/ASTManagement/AST_HandleFunCC.sci
@@ -0,0 +1,176 @@
+// Copyright (C) 2017 - IIT Bombay - FOSSEE
+
+// 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-en.txt
+// Author: Ukasha Noor
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+
+function [FileInfo,SharedInfo] = AST_HandleFunCC(NCol,FileInfo,SharedInfo)
+
+SCI2CNInArgCheck(argn(2),3,3)
+
+// ------------------------------
+// --- Check input arguments. ---
+// ------------------------------
+
+// -----------------------
+// --- Initialization. ---
+// -----------------------
+nxtscifunname   = SharedInfo.NextSCIFunName;
+nxtscifunnumber = SharedInfo.NextSCIFunNumber;
+ReportFileName         = FileInfo.Funct(nxtscifunnumber).ReportFileName;
+
+global SCI2CSTACK
+global StackPosition;
+global STACKDEDUG
+// ---------------------------
+// --- End Initialization. ---
+// ---------------------------
+
+// ------------------------------
+// --- Read output parameters. --
+// ------------------------------
+LhsField = AST_PopASTStack();
+NOutArg = 0;
+OutputArgumentNames = [];
+OutputArgumentScope = [];
+while (LhsField ~= 'Lhs       :')
+   NOutArg = NOutArg + 1;
+   [OutputArgumentNames(NOutArg),OutputArgumentScope(NOutArg)] = AST_ExtractNameAndScope(LhsField);
+   LhsField = AST_PopASTStack();
+   if (LhsField == 'Expression:')
+     error(9999, 'Found Expression: before Lhs');
+   elseif (LhsField == 'Equal')
+     error(9999, 'Found Equal before Lhs');
+   end
+end
+
+// ------------------------------
+// --- Read input parameters. ---
+// ------------------------------
+
+
+RhsField = AST_PopASTStack();
+InputArgumentNames = [];
+InputArgumentScope = [];
+NInArg = 0;
+InArg = [];
+while (RhsField ~= 'Expression:')
+   NInArg = NInArg + 1;
+   if RhsField <> 'Operands:'
+   [InputArgumentNames(NInArg),InputArgumentScope(NInArg)] = AST_ExtractNameAndScope(RhsField);
+   end
+   //InArg(NInArg) = RhsField;
+   RhsField = AST_PopASTStack();
+end
+InputArgumentNames = SCI2Cflipud(InputArgumentNames);
+InputArgumentScope = SCI2Cflipud(InputArgumentScope);
+
+
+// -------------------------------------
+// --- Generate the InArg structure. ---
+// -------------------------------------
+//#RNU_RES_E
+for counterinputargs = 1:NInArg
+   InArg(counterinputargs).Name=InputArgumentNames(counterinputargs);
+   InArg(counterinputargs).Scope=InputArgumentScope(counterinputargs);
+end
+
+//#RNU_RES_B
+// -------------------------------------
+// --- Generate the InArg structure. ---
+// -------------------------------------
+//#RNU_RES_E
+OutArg = [];
+for counteroutputargs = 1:NOutArg
+   OutArg(counteroutputargs).Name=OutputArgumentNames(counteroutputargs);
+   OutArg(counteroutputargs).Scope=OutputArgumentScope(counteroutputargs);
+end
+
+// ------------------------
+// --- Print Some Info. ---
+// ------------------------
+
+PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n');
+PrintStringInfo('N Output Arguments: '+string(NOutArg),ReportFileName,'file','y');
+   //#RNU_RES_E
+   for counterinputargs = 1:NInArg
+      //#RNU_RES_B
+      PrintStringInfo('Input Argument Number '+string(counterinputargs)+': '+InArg(counterinputargs).Name,...
+         ReportFileName,'file','y','n');
+      PrintStringInfo('   Scope: '+InArg(counterinputargs).Scope,...
+         ReportFileName,'file','y','n');
+      //#RNU_RES_E
+   end
+   for counteroutputargs = 1:NOutArg
+      //#RNU_RES_B
+      PrintStringInfo('Output Argument Number '+string(counteroutputargs)+': '+OutArg(counteroutputargs).Name,...
+         ReportFileName,'file','y','n');
+      //PrintStringInfo('   Scope: '+ OutArg(counterinputargs).Scope,ReportFileName,'file','y','n');
+      //#RNU_RES_E
+   end
+
+NOutArg_mod = NOutArg;
+
+FunTypeAnnot = '';
+FunSizeAnnot = '';
+NLhsArg = 0;
+LhsArg = [];
+PrintStringInfo('...Equal not found.',ReportFileName,'file','y');
+
+PrintStringInfo('***Analyzing Input Arguments***',ReportFileName,'file','y');
+UpdatedInArg = InArg;
+[InArg,SharedInfo] = ST_GetInArgInfo(InArg,NInArg,FileInfo,SharedInfo,'OpEqual');
+
+NCol = NCol + 1;
+NRow = NInArg/NCol;
+
+com_type = 0;
+for i = 1:NInArg
+	if InArg(i).Type == 'z'
+		com_type = 1;
+	elseif InArg(i).Type == 'c'
+		com_type = 2;
+	end
+end
+	
+
+if com_type == 0
+	PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+	OutArg(1).Type      = InArg(1).Type;
+	OutArg(1).Size(1)   = string(NCol);
+	OutArg(1).Size(2)   = string(NRow);
+	OutArg(1).Dimension = 2;
+	OutArg(1).Value     = InArg(1).Value;
+	OutArg(1).FindLike  = InArg(1).FindLike;
+elseif com_type == 1
+	PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+	OutArg(1).Type      = 'z';
+	OutArg(1).Size(1)   = string(NCol);
+	OutArg(1).Size(2)   = string(NRow);
+	OutArg(1).Dimension = 2;
+	OutArg(1).Value     = InArg(1).Value;
+	OutArg(1).FindLike  = InArg(1).FindLike;
+else
+	PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+	OutArg(1).Type      = 'c';
+	OutArg(1).Size(1)   = string(NCol);
+	OutArg(1).Size(2)   = string(NRow);
+	OutArg(1).Dimension = 2;
+	OutArg(1).Value     = InArg(1).Value;
+	OutArg(1).FindLike  = InArg(1).FindLike;
+end
+
+//--- Check for output Argument in symbol table ---//
+OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo);
+
+//--- Put the output Argument in symbol table ---//
+ST_InsOutArg_Dup(InArg,NInArg,OutArg,NOutArg,com_type,FileInfo,SharedInfo,'all');
+
+
+endfunction
diff --git a/2.3-1/macros/ASTManagement/AST_HandleFunRC.sci b/2.3-1/macros/ASTManagement/AST_HandleFunRC.sci
index a70155a7..d3169249 100644
--- a/2.3-1/macros/ASTManagement/AST_HandleFunRC.sci
+++ b/2.3-1/macros/ASTManagement/AST_HandleFunRC.sci
@@ -1,36 +1,17 @@
-function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo)
-// function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
-// -----------------------------------------------------------------
-// #RNU_RES_B
-// Handles the EndFuncall, EndOperation and EndEqual tags of the AST.
-// ASTFunType can be 'Funcall', 'Operation', 'Equal'
-// Structure of Funcall:
-// overloading function for "funcall" type tlist string function
-// this is a node of the AST
-// fields:
-//     rhs  : a list
-//     name : string, the name of the function
-//     lhsnb: number, the number of function lhs
-//  txt=['Funcall  : '+F.name
-//       '  #lhs   : '+string(F.lhsnb)
-//       '  Rhs    : '
-//       '      '+objectlist2string(F.rhs)
-//       'EndFuncall'
-//      ]
-// #RNU_RES_E
-//
-// Input data:
-// //NUT: add description here
-//
-// Output data:
-// //NUT: add description here
-//
-// Status:
-// 11-Apr-2007 -- Raffaele Nutricato: Author.
-//
-// Copyright 2007 Raffaele Nutricato.
-// Contact: raffaele.nutricato@tiscali.it
-// -----------------------------------------------------------------
+// Copyright (C) 2017 - IIT Bombay - FOSSEE
+
+// 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-en.txt
+// Author: Ukasha Noor
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+function [FileInfo,SharedInfo] = AST_HandleFunRC(FileInfo,SharedInfo)
+
+SCI2CNInArgCheck(argn(2),2,2)
 
 // ------------------------------
 // --- Check input arguments. ---
@@ -74,11 +55,16 @@ end
 
 
 RhsField = AST_PopASTStack();
+InputArgumentNames = [];
+InputArgumentScope = [];
 NInArg = 0;
 InArg = [];
 while (RhsField ~= 'Expression:')
    NInArg = NInArg + 1;
-   InArg(NInArg) = RhsField;
+   if RhsField <> 'Operands:'
+   [InputArgumentNames(NInArg),InputArgumentScope(NInArg)] = AST_ExtractNameAndScope(RhsField);
+   end
+   //InArg(NInArg) = RhsField;
    RhsField = AST_PopASTStack();
 end
 InputArgumentNames = SCI2Cflipud(InputArgumentNames);
@@ -89,7 +75,6 @@ InputArgumentScope = SCI2Cflipud(InputArgumentScope);
 // --- Generate the InArg structure. ---
 // -------------------------------------
 //#RNU_RES_E
-InArg = [];
 for counterinputargs = 1:NInArg
    InArg(counterinputargs).Name=InputArgumentNames(counterinputargs);
    InArg(counterinputargs).Scope=InputArgumentScope(counterinputargs);
@@ -106,6 +91,7 @@ for counteroutputargs = 1:NOutArg
    OutArg(counteroutputargs).Scope=OutputArgumentScope(counteroutputargs);
 end
 
+
 // ------------------------
 // --- Print Some Info. ---
 // ------------------------
@@ -125,8 +111,7 @@ PrintStringInfo('N Output Arguments: '+string(NOutArg),ReportFileName,'file','y'
       //#RNU_RES_B
       PrintStringInfo('Output Argument Number '+string(counteroutputargs)+': '+OutArg(counteroutputargs).Name,...
          ReportFileName,'file','y','n');
-      PrintStringInfo('   Scope: '+OutArg(counterinputargs).Scope,...
-         ReportFileName,'file','y','n');
+      //PrintStringInfo('   Scope: '+ OutArg(counterinputargs).Scope,ReportFileName,'file','y','n');
       //#RNU_RES_E
    end
 
@@ -144,22 +129,50 @@ UpdatedInArg = InArg;
 
 size_count = 0;
 for i = 1:NInArg
-	size_count = size_count + InArg(i).Size(2);
+	size_count = size_count + eval(InArg(i).Size(2));
 end
 
-PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
-OutArg(1).Type      = InArg(1).Type;
-OutArg(1).Size(1)   = '1'
-OutArg(1).Size(2)   = string(size_count);
-OutArg(1).Dimension = InArg(1).Dimension;
-OutArg(1).Value     = InArg(1).Value;
-OutArg(1).FindLike  = InArg(1).FindLike;
+com_type = 0;
+for i = 1:NInArg
+	if InArg(i).Type == 'z'
+		com_type = 1;
+	elseif InArg(i).Type == 'c'
+		com_type = 2;
+	end
+end
+	
+
+if com_type == 0
+	PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+	OutArg(1).Type      = InArg(1).Type;
+	OutArg(1).Size(1)   = '1'
+	OutArg(1).Size(2)   = string(size_count);
+	OutArg(1).Dimension = 2;
+	OutArg(1).Value     = InArg(1).Value;
+	OutArg(1).FindLike  = InArg(1).FindLike;
+elseif com_type == 1
+	PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+	OutArg(1).Type      = 'z';
+	OutArg(1).Size(1)   = '1'
+	OutArg(1).Size(2)   = string(size_count);
+	OutArg(1).Dimension = 2;
+	OutArg(1).Value     = InArg(1).Value;
+	OutArg(1).FindLike  = InArg(1).FindLike;
+else
+	PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+	OutArg(1).Type      = 'c';
+	OutArg(1).Size(1)   = '1'
+	OutArg(1).Size(2)   = string(size_count);
+	OutArg(1).Dimension = 2;
+	OutArg(1).Value     = InArg(1).Value;
+	OutArg(1).FindLike  = InArg(1).FindLike;
+end
 
 //--- Check for output Argument in symbol table ---//
 OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo);
 
 //--- Put the output Argument in symbol table ---//
-ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,'all');
+ST_InsOutArg_Dup(InArg,NInArg,OutArg,NOutArg,com_type,FileInfo,SharedInfo,'all');
 
 
 endfunction
diff --git a/2.3-1/macros/ASTManagement/AST_HandleRC.sci b/2.3-1/macros/ASTManagement/AST_HandleRC.sci
index b1a1003f..2a6cbc3f 100644
--- a/2.3-1/macros/ASTManagement/AST_HandleRC.sci
+++ b/2.3-1/macros/ASTManagement/AST_HandleRC.sci
@@ -1,4 +1,4 @@
-function [RhsNames,RhsScope,NRhs] = AST_ReadEqualRhsNames(FileInfo,SharedInfo)
+function [RhsNames,RhsScope,NRhs] = AST_HandleRC(FileInfo,SharedInfo)
 // function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
 // -----------------------------------------------------------------
 // #RNU_RES_B
@@ -32,6 +32,8 @@ function [RhsNames,RhsScope,NRhs] = AST_ReadEqualRhsNames(FileInfo,SharedInfo)
 // Contact: raffaele.nutricato@tiscali.it
 // -----------------------------------------------------------------
 
+SCI2CNInArgCheck(argn(2),2,2)
+
 ReportFileName  = FileInfo.Funct(nxtscifunnumber).ReportFileName;
 
 // ------------------------------
@@ -54,9 +56,11 @@ cntpop = 1;
 NRhs = 0;
 RhsField(cntpop) = AST_PopASTStack();
 RhsNames = [];
-while (RhsField(cntpop) ~= 'Operands:')
+while (RhsField(cntpop) ~= 'Expression:')
    NRhs = NRhs + 1;
+   if RhsField(cntpop) <> 'Operands:'
    [RhsNames(NRhs),RhsScope(NRhs)] = AST_ExtractNameAndScope(RhsField(cntpop));
+   end
    cntpop = cntpop + 1;
    RhsField(cntpop) = AST_PopASTStack();
 end
@@ -65,17 +69,20 @@ RhsScope = SCI2Cflipud(RhsScope);
 
 // --- Repush everything into the stack. ---
 for cntpush = cntpop:-1:1
+   if RhsField(cntpush) <> 'Operands:'
    AST_PushASTStack(RhsField(cntpush));
+   end
 end
 
 
-for counterinputargs = 1:NRhs
+//for counterinputargs = 1:NRhs
    //#RNU_RES_B
-   PrintStringInfo('Input Argument Number '+string(counterinputargs)+': '+InArg(counterinputargs).Name,...
-      ReportFileName,'file','y');
-   PrintStringInfo('   Scope: '+InArg(counterinputargs).Scope,...
-      ReportFileName,'file','y');
+   //disp(counterinputargs);
+  // PrintStringInfo('Input Argument Number '+string(counterinputargs)+': '+RhsNames(counterinputargs).Name,...
+    //  ReportFileName,'file','y');
+   //PrintStringInfo('   Scope: '+RhsNames(counterinputargs).Scope,...
+     // ReportFileName,'file','y');
    //#RNU_RES_E
-end
+//end
 
 endfunction
diff --git a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci
index 3ed1b5b6..2bfb08dd 100644
--- a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci
+++ b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci
@@ -98,6 +98,7 @@ while (flagendpop == 0)
       if (ASTIfExpType=='if')
          if (IfExprField=='Expression:')
             flagendpop = 1;
+            //PrintStringInfo('hello dere  '+IfExprField,ReportFileName,'file','y');
             // Pop Again the If tag from the AST.
             IfExprField = AST_PopASTStack();
 	 elseif (IfExprField=='Operands:')
@@ -117,10 +118,14 @@ while (flagendpop == 0)
       elseif (ASTIfExpType=='elseif')
          if (IfExprField=='Else If Expression')
             flagendpop = 1;
+	    //IfExprField = AST_PopASTStack();
          else
-	    if (IfExprField=='&&')
+	    if (IfExprField=='&&' | IfExprField=='||')
 		NOp = NOp + 1;
 		Op(NOp) = IfExprField;
+            elseif (IfExprField=='Operands:')
+		flagendpop = 0;
+		g = AST_PopASTStack();
 	    else
             	NIfCondArg = NIfCondArg + 1;
             	IfCondArg(NIfCondArg) = IfExprField;
@@ -129,7 +134,9 @@ while (flagendpop == 0)
          end
       end
    end
+   if flagendpop == 0
    IfExprField = AST_PopASTStack();
+   end
    PrintStringInfo('operators are  '+IfExprField,ReportFileName,'file','y');
 end
 
diff --git a/2.3-1/macros/ASTManagement/_funcall_string.sci b/2.3-1/macros/ASTManagement/_funcall_string.sci
index faeb81d9..0ee97016 100644
--- a/2.3-1/macros/ASTManagement/_funcall_string.sci
+++ b/2.3-1/macros/ASTManagement/_funcall_string.sci
@@ -6,10 +6,19 @@ function txt=%funcall_string(F)
 //    name : string, the name of the function
 //    lhsnb: number, the number of function lhs
 
+if F.name <> 'disp'
 txt=['Funcall  : '+F.name
      '  #lhs   : '+string(F.lhsnb)
      '  Rhs    : '
      '      '+objectlist2string(F.rhs)
      'EndFuncall'
     ]
+else
+txt=['Funcall  : '+F.name
+     '  #lhs   : '+'0'
+     '  Rhs    : '
+     '      '+objectlist2string(F.rhs)
+     'EndFuncall'
+    ]
+end
 endfunction
diff --git a/2.3-1/macros/ASTManagement/_operatio_string.sci b/2.3-1/macros/ASTManagement/_operatio_string.sci
index 8421a3f4..e9332337 100644
--- a/2.3-1/macros/ASTManagement/_operatio_string.sci
+++ b/2.3-1/macros/ASTManagement/_operatio_string.sci
@@ -10,4 +10,4 @@ function txt=%operatio_string(O)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-endfunction
-\ No newline at end of file
+endfunction
diff --git a/2.3-1/macros/ASTManagement/_operation_string.sci b/2.3-1/macros/ASTManagement/_operation_string.sci
index 84f5ce3c..c9282f67 100644
--- a/2.3-1/macros/ASTManagement/_operation_string.sci
+++ b/2.3-1/macros/ASTManagement/_operation_string.sci
@@ -10,4 +10,4 @@ function txt=%operation_string(O)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-endfunction
-\ No newline at end of file
+endfunction
diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib
index 7b6a162e..4e309a25 100644
--- a/2.3-1/macros/ASTManagement/lib
+++ b/2.3-1/macros/ASTManagement/lib
diff --git a/2.3-1/macros/ASTManagement/names b/2.3-1/macros/ASTManagement/names
index 26edaf7c..6deb883d 100644
--- a/2.3-1/macros/ASTManagement/names
+++ b/2.3-1/macros/ASTManagement/names
@@ -21,6 +21,7 @@ AST_ExtractNameAndScope
 AST_GetASTFile
 AST_GetFuncallPrm
 AST_GetPrecAndLhsArg
+AST_HandleCC
 AST_HandleEOL
 AST_HandleEndFor
 AST_HandleEndGenFun
@@ -28,6 +29,7 @@ AST_HandleEndProgram
 AST_HandleEndWhile
 AST_HandleFor
 AST_HandleForStatem
+AST_HandleFunCC
 AST_HandleFunRC
 AST_HandleHeader
 AST_HandleIfElse
@@ -59,5 +61,3 @@ _program_string
 _variable_string
 _while_string
 objectlist2string
-AST_HandleRC
-AST_HandleFunRC
diff --git a/2.3-1/macros/CCodeGeneration/C_GenDeclarations_Dup.sci b/2.3-1/macros/CCodeGeneration/C_GenDeclarations_Dup.sci
new file mode 100644
index 00000000..475e2e0c
--- /dev/null
+++ b/2.3-1/macros/CCodeGeneration/C_GenDeclarations_Dup.sci
@@ -0,0 +1,187 @@
+function Cdeclaration = C_GenDeclarations_Dup(InArg,NInArg,com_type,ArgStruct,CDeclarationFileName,IndentLevel,ReportFileName,FlagExt,ResizeApproach)
+// function Cdeclaration = C_GenDeclarations(ArgStruct,CDeclarationFileName,IndentLevel,ReportFileName,FlagExt,ResizeApproach)
+// -----------------------------------------------------------------
+// //NUT: add description here
+//
+// Input data:
+// //NUT: add description here
+//
+// Output data:
+// //NUT: add description here
+//
+// Status:
+// 27-Oct-2007 -- Raffaele Nutricato: Author.
+// 10-Jun-2008 -- Raffaele Nutricato: adapted to work with realloc function.
+//
+// Copyright 2007 Raffaele Nutricato.
+// Contact: raffaele.nutricato@tiscali.it
+// -----------------------------------------------------------------
+
+// Generate C corresponding declaration given some information in ArgStruct
+// 
+  
+// ------------------------------
+// --- Check input arguments. ---
+// ------------------------------
+SCI2CNInArgCheck(argn(2),9,9);
+// #RNU_RES_B
+//NUT: ilnome di questa funzione va cambiato perche' le dichiarazioni le fanno anche i for e i while.
+
+PrintStringInfo(' ',ReportFileName,'file','y');
+PrintStringInfo('***Generating C declaration***',ReportFileName,'file','y');
+// #RNU_RES_E
+
+Cdeclaration = '';
+if (ArgStruct.Dimension > 0)
+  if (FlagExt == 1)
+    Cdeclaration(1) = 'extern ';
+    Cdeclaration(2) = 'extern ';
+  else
+    Cdeclaration(1) = '';
+    Cdeclaration(2) = '';
+  end
+// #RNU_RES_B
+//NUT: vedi Mem_Alloc_Out per maggiori info sulla rimozione della temp nella if
+// if ((ArgStruct.Scope=='Temp') | (ArgStruct.FindLike == -1) | (isnum(ArgStruct.Size(1))==%F) | (isnum(ArgStruct.Size(2))==%F))
+// #RNU_RES_E
+  if (ArgStruct.Type=='g')
+// if (isnan(ArgStruct.Value) )
+    if ((isnum(ArgStruct.Size(1))==%F) | (isnum(ArgStruct.Size(2))==%F) )
+      Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+...
+          ' * '+ArgStruct.Name+';';
+    else
+      if ((FlagExt == 1) | (isnan(ArgStruct.Value)))
+        Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+...
+            ' '+ArgStruct.Name+'['+ArgStruct.Size(1)+'*'+ArgStruct.Size(2)+'];';
+      else
+        Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+...
+            ' '+ArgStruct.Name+'['+ArgStruct.Size(1)+'*'+ArgStruct.Size(2)+'] = {'+ArgStruct.Value+'};';
+      end
+    end
+    Cdeclaration(2) = Cdeclaration(2)+C_Type('i')+' __'+ArgStruct.Name+'Size[2] = {'+ArgStruct.Size(1)+','+ArgStruct.Size(2)+'};';
+  elseif ((ArgStruct.FindLike == -1) | ...
+          (isnum(ArgStruct.Size(1))==%F) | (isnum(ArgStruct.Size(2))==%F) | ...
+          (ResizeApproach=='REALLOC_ALL_RESIZE_ALL' & ArgStruct.Type~='g'))
+// #RNU_RES_B
+//RNU sulle stringhe non ho ancora deciso se applicare la realloc.
+// Generate only the pointer that will be used by the malloc function.
+// #RNU_RES_E
+    if (FlagExt == 1)
+      Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+'* '+...
+          ArgStruct.Name+';';
+    else
+      Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+'* '+...
+          ArgStruct.Name+' = NULL;';
+    end
+// Declare the Size array
+    Cdeclaration(2) = Cdeclaration(2)+C_Type('i')+' __'+ArgStruct.Name+'Size[2];';
+  else
+// Declare the array with its size.
+    computedSize = ArgStruct.Size(1);
+    computedSizeLength = size(ArgStruct.Size, '*');
+    computedSizeField =  ArgStruct.Size(1);
+    for sizeIterator = 2:computedSizeLength;
+      computedSize = computedSize + ' * ' + ArgStruct.Size(sizeIterator);
+      computedSizeField = computedSizeField + ', ' + ArgStruct.Size(sizeIterator);
+    end
+    Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+' '+ArgStruct.Name+'['+computedSize+']={';
+    row = eval(ArgStruct.Size(1))
+    col = eval(ArgStruct.Size(2))
+    if row == 1
+	if com_type == 0
+		for i = 1:NInArg-1
+			Cdeclaration(1) = Cdeclaration(1)+InArg(i).Name+',';
+		end
+		Cdeclaration(1) = Cdeclaration(1)+InArg(NInArg).Name+'};';
+    	else
+    		for i=1:NInArg-1
+    			if InArg(i).Type <> 'z' & InArg(i).Type <> 'c'
+    				Cdeclaration(1) = Cdeclaration(1)+InArg(i).Name+',0,';
+    		    	else
+    		                Cdeclaration(1) = Cdeclaration(1)+InArg(i).Name+',';
+    		    	end
+    		end
+    		if InArg(NInArg).Type <> 'z' & InArg(NInArg).Type <> 'c'
+    			Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + ',0};'
+    		else
+    		    Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + '};'
+    		end
+    	end
+    else
+	if com_type == 0
+		for i = 1:col
+			for j = 0:row-1
+				if (j*col)+i ~= row*col
+				Cdeclaration(1) = Cdeclaration(1) + InArg(((j*col)+i)).Name + ',';
+				end
+			end
+		end
+		Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + '};';
+	else
+		for i = 1:col
+			for j = 0:row-1
+				if (j*col)+i ~= row*col
+					if InArg(((j*col)+i)).Type <> 'z' & InArg(((j*col)+i)).Type <> 'c'
+						Cdeclaration(1) = Cdeclaration(1) + InArg(((j*col)+i)).Name + ',0,';
+					else
+						Cdeclaration(1) = Cdeclaration(1) + InArg(((j*col)+i)).Name + ',';
+					end
+				end
+			end
+		end
+		if InArg(NInArg).Type <> 'z' & InArg(NInArg).Type <> 'c' 
+			Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + ',0};';
+		else
+			Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + '};';
+		end
+	end
+    end
+    Cdeclaration(2) = Cdeclaration(2)+C_Type('i')+' __'+ArgStruct.Name+'Size['+string(computedSizeLength)+']';
+    if (FlagExt <> 1)
+      Cdeclaration(2) = Cdeclaration(2)+' = {'+computedSizeField+'}';
+    end
+    Cdeclaration(2) = Cdeclaration(2)+';';
+  end
+else
+  if (ArgStruct.Type == 'fn')
+    //do nothing. This is a function name. Will be declared in header file.
+  else
+    if (FlagExt == 1)
+      Cdeclaration(1) = 'extern ';
+    else
+      Cdeclaration(1) = '';
+    end
+    Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+' '+ArgStruct.Name;
+    if (~isnan(ArgStruct.Value) & (FlagExt == 0))
+      if isreal(ArgStruct.Value)
+        Cdeclaration(1) = Cdeclaration(1)+' = '+SCI2Cstring(ArgStruct.Value);
+      else
+        if (ArgStruct.Type == 'z')
+          Cdeclaration(1) = Cdeclaration(1)+' = DoubleComplex('+SCI2Cstring(real(ArgStruct.Value))+','+SCI2Cstring(imag(ArgStruct.Value))+')';
+        else
+          Cdeclaration(1) = Cdeclaration(1)+' = FloatComplex('+SCI2Cstring(real(ArgStruct.Value))+','+SCI2Cstring(imag(ArgStruct.Value))+')';
+        end
+      end
+    end
+    Cdeclaration(1) = Cdeclaration(1)+';';
+  end
+end
+
+
+// --------------------------------------------
+// --- Write C declaration into the C file. ---
+// --------------------------------------------
+PrintStringInfo(' ',CDeclarationFileName,'file','y'); 
+for cntdecl = 1:size(Cdeclaration, '*')
+  PrintStringInfo('   '+Cdeclaration(cntdecl),ReportFileName,'file','y');
+  PrintStringInfo(C_IndentBlanks(IndentLevel)+Cdeclaration(cntdecl),CDeclarationFileName,'file','y');
+end
+
+PrintStringInfo('   Writing C declaration in: '+CDeclarationFileName,ReportFileName,'file','y');
+PrintStringInfo(' ',CDeclarationFileName,'file','y');
+
+endfunction
+// #RNU_RES_B
+//NUT: dove sta il controllo che verifica se dopo aver dichiarato una local A[10] essa viene utilizzata
+//NUT: per memorizzare un A = sin(B) dove B[11]??
+// #RNU_RES_E
diff --git a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci
index c723d95a..359b7882 100644
--- a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci
+++ b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci
@@ -19,7 +19,7 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,Fi
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
-//SCI2CNInArgCheck(argn(4),7,7);
+SCI2CNInArgCheck(argn(2),7,7);
 
 //global SCI2CSTACK 
 //global StackPosition;
diff --git a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci
index d7cf70ec..368ccffa 100644
--- a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci
+++ b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci
@@ -19,7 +19,7 @@ function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,Sha
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
-//SCI2CNInArgCheck(argn(2),2,2);
+SCI2CNInArgCheck(argn(2),6,6);
 
 // -----------------------
 // --- Initialization. ---
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
index 2db4b8c8..96294d09 100644
--- a/2.3-1/macros/CCodeGeneration/lib
+++ b/2.3-1/macros/CCodeGeneration/lib
diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names
index 4d76299e..56caa81d 100644
--- a/2.3-1/macros/CCodeGeneration/names
+++ b/2.3-1/macros/CCodeGeneration/names
@@ -2,6 +2,7 @@ C_FinalizeCode
 C_ForExpression
 C_Funcall
 C_GenDeclarations
+C_GenDeclarations_Dup
 C_GenerateFunName
 C_GenerateLaunchScript
 C_GenerateMakefile
@@ -13,7 +14,6 @@ C_IfExpression
 C_IndentBlanks
 C_InitHeader
 C_MemAllocOutTempVars
-C_RCOperator
 C_SCI2CHeader
 C_Type
 C_WhileExpression
diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib
index 0a9f8913..2b3ee2f3 100644
--- a/2.3-1/macros/ErrorMessages/lib
+++ b/2.3-1/macros/ErrorMessages/lib
diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
index 695bef02..3b8b25c5 100644
--- a/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
+++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.sci
@@ -26,8 +26,8 @@ function opout = FA_SZ_U_SVA(in1,in2)
 // -----------------------------------------------------------------
 
 //in1 = string(in1);
-disp(in1)
-disp(in2)
+// disp(in1)
+// disp(in2)
 //in1 = eval(in1);
 //in2 = string(in2);
 //in2 = eval(in2);
diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib
index 2e23020c..0091f726 100644
--- a/2.3-1/macros/FunctionAnnotation/lib
+++ b/2.3-1/macros/FunctionAnnotation/lib
diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names
index 83941f85..94b37efc 100644
--- a/2.3-1/macros/FunctionAnnotation/names
+++ b/2.3-1/macros/FunctionAnnotation/names
@@ -59,8 +59,8 @@ FA_SZ_ROW_DIAG
 FA_SZ_ROW_DIAG_INS_EXT
 FA_SZ_SEL1
 FA_SZ_SEL2
-FA_TP_ASCII
 FA_SZ_U_SVA
+FA_TP_ASCII
 FA_TP_C
 FA_TP_COMPLEX
 FA_TP_CVIMAGE
diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib
index 39794862..32c92be8 100644
--- a/2.3-1/macros/FunctionList/lib
+++ b/2.3-1/macros/FunctionList/lib
diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib
index e1d6f0fb..a3af87e6 100644
--- a/2.3-1/macros/GeneralFunctions/lib
+++ b/2.3-1/macros/GeneralFunctions/lib
diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib
index 5c8f0da2..170d3211 100644
--- a/2.3-1/macros/Hardware/AVR/lib
+++ b/2.3-1/macros/Hardware/AVR/lib
diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib
index 9afd77da..d25d9440 100644
--- a/2.3-1/macros/Hardware/RasberryPi/lib
+++ b/2.3-1/macros/Hardware/RasberryPi/lib
diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib
index 56053510..8d5e5c74 100644
--- a/2.3-1/macros/ImageProcessing/core/lib
+++ b/2.3-1/macros/ImageProcessing/core/lib
diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib
index a46d5d87..2db04822 100644
--- a/2.3-1/macros/ImageProcessing/highgui/lib
+++ b/2.3-1/macros/ImageProcessing/highgui/lib
diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib
index 4863059b..656e3bb4 100644
--- a/2.3-1/macros/ImageProcessing/imgproc/lib
+++ b/2.3-1/macros/ImageProcessing/imgproc/lib
diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib
index 0304cade..60340e21 100644
--- a/2.3-1/macros/Scilab-Arduino/lib
+++ b/2.3-1/macros/Scilab-Arduino/lib
diff --git a/2.3-1/macros/SymbolTable/ST_InsOutArg_Dup.sci b/2.3-1/macros/SymbolTable/ST_InsOutArg_Dup.sci
new file mode 100644
index 00000000..bca66235
--- /dev/null
+++ b/2.3-1/macros/SymbolTable/ST_InsOutArg_Dup.sci
@@ -0,0 +1,195 @@
+function ST_InsOutArg_Dup(InArg,NInArg,OutArg,NOutArg,com_type,FileInfo,SharedInfo,MatchRule)
+// function ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,MatchRule)
+// -----------------------------------------------------------------
+// //NUT: add description here
+//
+// Input data:
+// //NUT: add description here
+//
+// Output data:
+// //NUT: add description here
+//
+// Status:
+// 26-Oct-2007 -- Raffaele Nutricato: Author.
+// 26-Oct-2007 -- Alberto Morea: Test Ok.
+//
+// Copyright 2007 Raffaele Nutricato & Alberto Morea.
+// Contact: raffaele.nutricato@tiscali.it
+// -----------------------------------------------------------------
+SCI2CNInArgCheck(argn(2),8,8)
+
+
+// ------------------------------
+// --- Check input arguments. ---
+// ------------------------------
+//SCI2CNInArgCheck(argn(2),5,5);
+
+// -----------------------
+// --- Initialization. ---
+// -----------------------
+nxtscifunname        = SharedInfo.NextSCIFunName;
+nxtscifunnumber      = SharedInfo.NextSCIFunNumber;
+ReportFileName       = FileInfo.Funct(nxtscifunnumber).ReportFileName;
+CDeclarationFileName = FileInfo.Funct(nxtscifunnumber).CDeclarationFileName;
+CGblDeclarFileName   = FileInfo.Funct(nxtscifunnumber).CGblDeclarFileName;
+
+GlobalVarsFileName   = FileInfo.GlobalVarFileName;
+LocalVarsFileName    = FileInfo.Funct(nxtscifunnumber).LocalVarFileName;
+TempVarsFileName     = FileInfo.Funct(nxtscifunnumber).TempVarFileName;
+
+CPass1FileName       = FileInfo.Funct(nxtscifunnumber).CPass1FileName;
+CPass1FreeFileName   = FileInfo.Funct(nxtscifunnumber).CPass1FreeFileName;
+
+
+// #RNU_RES_B
+PrintStringInfo(' ',ReportFileName,'file','y');
+PrintStringInfo('***Putting output arguments in the symbol table***',ReportFileName,'file','y','n');
+// #RNU_RES_E
+// ---------------------------
+// --- End Initialization. ---
+// ---------------------------
+
+
+for counteroutput = 1:NOutArg
+   // #RNU_RES_B
+   PrintStringInfo('   Symbol ""'+OutArg(counteroutput).Name+'""',ReportFileName,'file','y','n');
+   PrintStringInfo('   Type:      '+OutArg(counteroutput).Type,ReportFileName,'file','y','n');
+   PrintStringInfo('   Size(1):   '+string(OutArg(counteroutput).Size(1)),ReportFileName,'file','y','n');
+   PrintStringInfo('   Size(2):   '+string(OutArg(counteroutput).Size(2)),ReportFileName,'file','y','n');
+   PrintStringInfo('   Value:     '+string(OutArg(counteroutput).Value),ReportFileName,'file','y','n');
+   PrintStringInfo('   FindLike:  '+string(OutArg(counteroutput).FindLike),ReportFileName,'file','y','n');
+   PrintStringInfo('   Dimension: '+string(OutArg(counteroutput).Dimension),ReportFileName,'file','y','n');
+   PrintStringInfo('   Scope:     '+string(OutArg(counteroutput).Scope),ReportFileName,'file','y','n');
+   PrintStringInfo(' ',ReportFileName,'file','y','n');
+   // #RNU_RES_E
+   if (OutArg(counteroutput).Scope == 'Temp')
+      SymbTableFileName = TempVarsFileName;
+   elseif (OutArg(counteroutput).Scope == 'Local')
+      SymbTableFileName = LocalVarsFileName;
+   elseif (OutArg(counteroutput).Scope == 'Global')
+      SymbTableFileName = GlobalVarsFileName;
+   else
+      error(9999, 'Unknown scope ""'+OutArg(counteroutput).Scope+'"" for symbol: '+OutArg(counteroutput).Name);
+   end
+   // #RNU_RES_B
+   PrintStringInfo('   Setting symbol ""'+OutArg(counteroutput).Name+'"" in '+SymbTableFileName+'.',ReportFileName,'file','y');
+   // #RNU_RES_E
+
+   // #RNU_RES_B
+   // Check existence and conflicts in the symbol table.
+   // Here we have four possibilities:
+   // 1. the symbol is a global variable not initialized yet -> we have to initialize it.
+   // 2. the symbol already exists with different settings -> we have to issue an error.
+   // 3. the symbol already exists with the same settings -> ok, we don't have to do nothing.
+   // 4. the symbol doesn't exist -> we have to insert it into the table.
+   // #RNU_RES_E
+   [TBFlagfound,TBFlagEqualSymbols] = ...
+      ST_MatchSymbol(OutArg(counteroutput).Name,...
+      OutArg(counteroutput).Type,...
+      OutArg(counteroutput).Size,...
+      OutArg(counteroutput).Value,...
+      OutArg(counteroutput).FindLike,...
+      OutArg(counteroutput).Dimension,...
+      SymbTableFileName,MatchRule);
+
+   if (TBFlagfound == 1)
+      if (TBFlagEqualSymbols == 0)
+         PrintStringInfo(' ',ReportFileName,'both','y');
+         PrintStringInfo('SCI2CERROR: Symbol Table Conflict. Trying to insert again symbol ""'+...
+                         OutArg(counteroutput).Name+'"" with different settings',ReportFileName,'both','y');
+         PrintStringInfo('SCI2CERROR: Please check that you are not using variable ""'+OutArg(counteroutput).Name+'""',ReportFileName,'both','y');
+         PrintStringInfo('SCI2CERROR: with different sizes and/or types.',ReportFileName,'both','y');
+         PrintStringInfo(' ',ReportFileName,'both','y');
+         error(9999, 'SCI2CERROR: Symbol Table Conflict. Trying to insert again symbol ""'+...
+               OutArg(counteroutput).Name+'"" with different settings');
+      else
+         // #RNU_RES_B
+         // It's ok symbols do match.
+         //NUT: forse occorre un altro check sulla size per capire se occore fare il malloc.
+         //NUT: qui entro anche quando ho una variabile global gia' dichiarata tale in un altro
+         //NUT: per cui devo dichiararala come external.
+         //RNU qui ci puoi mettere una warning quando stai riallocando uno stesso simbolo con size simbolica.
+         //RNU puoi anche aggiungere del codice in c o un semplice commento. per esempio una funzione c del tipo checksize che controlla il valore
+         //RNU prima dopo delle size di una data variabile. Cosa succede se cambio la size anche nel caso di array e approccio
+         //RNU di resize non attivo? L'unica cosa e' che molte size numeriche scompaiono e incomincio a creare numerose variabili
+         //RNU con size simbolica.
+
+         // If the symbol is scalar we update its value if it is an array we update its size
+         // only in case we are using the 'REALLOC_ALL_RESIZE_ALL' resize approach
+         // #RNU_RES_E
+         if ((GetSymbolDimension(OutArg(counteroutput).Size)) == 0 | (SharedInfo.ResizeApproach=='REALLOC_ALL_RESIZE_ALL'))
+            ST_Set(OutArg(counteroutput).Name,...
+               OutArg(counteroutput).Type,...
+               OutArg(counteroutput).Size,...
+               OutArg(counteroutput).Value,...
+               OutArg(counteroutput).FindLike,...
+               OutArg(counteroutput).Dimension,...
+               SymbTableFileName);
+         end
+
+         // IndentLevelDeclaration = 1; //NUT: per ora lo forzo sempre a 1
+         // IndentLevelMalloc      = SharedInfo.NIndent;
+         // FlagExt = 0;
+         // C_GenDeclarations(OutArg(counteroutput),CDeclarationFileName,IndentLevelDeclaration,ReportFileName,FlagExt,SharedInfo.ResizeApproach);
+      
+
+      end
+   elseif (TBFlagfound == 2)
+      // #RNU_RES_B
+      // We have a non-initialized global variable.
+      // Set the non-initialized global variable.
+      PrintStringInfo(' Found a non-initialized global variable.',ReportFileName,'file','y');
+      // #RNU_RES_E
+      ST_Set(OutArg(counteroutput).Name,...
+         OutArg(counteroutput).Type,...
+         OutArg(counteroutput).Size,...
+         OutArg(counteroutput).Value,...
+         OutArg(counteroutput).FindLike,...
+         OutArg(counteroutput).Dimension,...
+         SymbTableFileName);
+      IndentLevel = 0; //NUT: forced always to 1
+      FlagExt = 0;
+      C_GenDeclarations(OutArg(counteroutput),CGblDeclarFileName,IndentLevel,ReportFileName,FlagExt,SharedInfo.ResizeApproach);
+      IndentLevelMalloc      = SharedInfo.NIndent;
+      // #RNU_RES_B
+      //RNU da verificare bene qui. Cio' che si verifica e' che se la size della globale e' simbolica
+      //RNU allora si assume che essa sia da allocare come puntatore e poi realloc.
+      // #RNU_RES_E
+      C_MemAllocOutTempVars(OutArg(counteroutput),1,CPass1FileName,CPass1FreeFileName,IndentLevelMalloc,ReportFileName,SharedInfo.ResizeApproach);
+   else
+      if (OutArg(counteroutput).FindLike == 1)
+         // #RNU_RES_B
+         // In presence of find-like functions the size must be always symbolic.
+         // Don't change here the value of OutArg.Size because the first time
+         // I need them to declare the OutArg variable with the values assumed by OutArg.Size.
+         // #RNU_RES_E
+         TmpOutArgSize(1) = '__'+OutArg(counteroutput).Name+'Size[0]';
+         TmpOutArgSize(2) = '__'+OutArg(counteroutput).Name+'Size[1]';
+      else
+         TmpOutArgSize(1) = OutArg(counteroutput).Size(1);
+         TmpOutArgSize(2) = OutArg(counteroutput).Size(2);
+      end
+      // #RNU_RES_B
+      // Set a new symbol.
+      // #RNU_RES_E
+      ST_Set(OutArg(counteroutput).Name,...
+         OutArg(counteroutput).Type,...
+         TmpOutArgSize,...
+         OutArg(counteroutput).Value,...
+         OutArg(counteroutput).FindLike,...
+         OutArg(counteroutput).Dimension,...
+         SymbTableFileName);
+      IndentLevelDeclaration = 1; //NUT: per ora lo forzo sempre a 1
+      IndentLevelMalloc      = SharedInfo.NIndent;
+      FlagExt = 0;
+      C_GenDeclarations_Dup(InArg,NInArg,com_type,OutArg(counteroutput),CPass1FileName,IndentLevelDeclaration,ReportFileName,FlagExt,SharedInfo.ResizeApproach);
+      // #RNU_RES_B
+      //RNU aggiunta qui in modo che le malloc saranno fatte una sola volta:
+      //RNU verifica che tutto funzioni e chi altro usa la C_MemAlloc per capire se si puo' ottimizzare per questo stadio.
+      // #RNU_RES_E
+      C_MemAllocOutTempVars(OutArg(counteroutput),1,CPass1FileName,CPass1FreeFileName,IndentLevelMalloc,ReportFileName,SharedInfo.ResizeApproach);
+   end
+
+end
+
+endfunction
diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib
index dbc603e2..165b7070 100644
--- a/2.3-1/macros/SymbolTable/lib
+++ b/2.3-1/macros/SymbolTable/lib
diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names
index b5a7d65f..c2efc843 100644
--- a/2.3-1/macros/SymbolTable/names
+++ b/2.3-1/macros/SymbolTable/names
@@ -6,6 +6,7 @@ ST_GetInArgInfo
 ST_GetSymbolInfo
 ST_InsForCntVars
 ST_InsOutArg
+ST_InsOutArg_Dup
 ST_Load
 ST_MatchSymbol
 ST_Save
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 0cc50da9..cb2a7334 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -968,6 +968,8 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 //PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
 PrintStringInfo('d2d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('d2d2d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s2s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('s2s2s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'interp1';
@@ -1005,6 +1007,8 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 
 PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
@@ -1034,6 +1038,7 @@ PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 
 PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
 PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
 // --- Annotation Function And Function List Function. ---
@@ -1404,7 +1409,9 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 
 
 PrintStringInfo('d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s0s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('s2s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
 
 
 // --- Annotation Function And Function List Function. ---
diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib
index 4d03bdc5..6240d3dd 100644
--- a/2.3-1/macros/ToolInitialization/lib
+++ b/2.3-1/macros/ToolInitialization/lib
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 9cd2d224..2141128f 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -60,7 +60,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/matrixOperations/includes/logm.h"
       "src/c/matrixOperations/includes/ones.h"
       "src/c/matrixOperations/includes/matrixSquaredMagnitude.h"
-      "src/c/linearAlgebra/includes/spec.h"			// moved from matrixOperation to linearAlgebra
+      "src/c/linearAlgebra/includes/spec.h"
       "src/c/matrixOperations/includes/matrixTranspose.h"
       "src/c/matrixOperations/includes/determ.h"
       "src/c/matrixOperations/includes/matrixMultiplication.h"
@@ -219,8 +219,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/linearAlgebra/includes/schur.h"
       "src/c/linearAlgebra/includes/balanc.h"
       "src/c/linearAlgebra/includes/svd.h"
-	  "src/c/linearAlgebra/includes/hess.h"
-	  "src/c/linearAlgebra/includes/sva.h"	
+	"src/c/linearAlgebra/includes/hess.h"
+	"src/c/linearAlgebra/includes/sva.h"
       "src/c/linearAlgebra/includes/rcond.h"];
 
 
@@ -252,7 +252,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/hardware/avr/includes/AVRUtil.h"
       "src/c/hardware/avr/includes/AVRPeripheralTimer.h"
       "src/c/hardware/avr/includes/AVRPeripheralUART.h"
-	    ];
+      ];
 
   RPi_headers = [
       "thirdparty/includes/WiringPi/wiringPi.h"
@@ -263,7 +263,7 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h"
       "src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h"
       "src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h"
-		];
+      ];
 
   OpenCV_headers = [
       "src/c/imageProcessing/includes/cvcore.hpp"
@@ -285,7 +285,8 @@ function allHeaders = getAllHeaders(SharedInfo)
       allHeaders = cat(1,allHeaders,OpenCV_headers);
   end
 
-  if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
+  if(size(SharedInfo.Includelist) <> 0 & (mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
+      disp("Hi")
   	allHeaders = cat(1,allHeaders,"thirdparty/includes/GSL");
   end
 
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 48d5dd70..4255608d 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -698,6 +698,8 @@ function allSources = getAllSources(SharedInfo)
       "src/c/elementaryFunctions/bitset/u16bitsets.c"
       "src/c/elementaryFunctions/bitget/u8bitgets.c"
       "src/c/elementaryFunctions/bitget/u16bitgets.c"
+      "src/c/elementaryFunctions/linspace/slinspacea.c"
+      "src/c/elementaryFunctions/linspace/slinspaces.c"
       "src/c/elementaryFunctions/linspace/dlinspaces.c"
       "src/c/elementaryFunctions/linspace/dlinspacea.c"
       "src/c/elementaryFunctions/logspace/dlogspaces.c"
@@ -970,9 +972,11 @@ function allSources = getAllSources(SharedInfo)
       "src/c/string/string/i16stringa.c"
       "src/c/string/string/i16strings.c"
       "src/c/signalProcessing/modk/dmodka.c"
+      "src/c/signalProcessing/transforms/idct/sidcta.c"
       "src/c/signalProcessing/transforms/idct/cidcta.c"
       "src/c/signalProcessing/transforms/idct/zidcta.c"
       "src/c/signalProcessing/transforms/idct/didcta.c"
+      "src/c/signalProcessing/transforms/dct/sdcta.c"
       "src/c/signalProcessing/transforms/dct/cdcta.c"
       "src/c/signalProcessing/transforms/dct/zdcta.c"
       "src/c/signalProcessing/transforms/dct/ddcta.c"
@@ -1209,6 +1213,7 @@ function allSources = getAllSources(SharedInfo)
       "src/c/elementaryFunctions/Trigonometry/sech/zsechs.c"
       "src/c/elementaryFunctions/Trigonometry/sech/csecha.c"
       "src/c/elementaryFunctions/Trigonometry/sech/csechs.c"
+      "src/c/interpolation/interp1/sinterp13a.c"
       "src/c/interpolation/interp1/dinterp13a.c"
       "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c"
       "src/c/elementaryFunctions/Trigonometry/sinc/dsinca.c"
diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib
index 0c9a1117..c1deaa62 100644
--- a/2.3-1/macros/findDeps/lib
+++ b/2.3-1/macros/findDeps/lib
diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib
index d818e184..1b718c75 100644
--- a/2.3-1/macros/lib
+++ b/2.3-1/macros/lib
diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci
index ae38e57f..f05cb83d 100644
--- a/2.3-1/macros/runsci2c.sci
+++ b/2.3-1/macros/runsci2c.sci
@@ -113,7 +113,7 @@ PrintStepInfo('Copying sources', FileInfo.GeneralReport,'both');
 
 for i = 1:size(allSources, "*")
   // DEBUG only
-  disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
+  //disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
   //Copy ode related functions only if 'ode' function is used.
   if(~isempty(strstr(allSources(i),'dode')))
     if(size(SharedInfo.Includelist) <> 0)
@@ -130,7 +130,7 @@ end
 PrintStepInfo('Copying headers', FileInfo.GeneralReport,'both');
 for i = 1:size(allHeaders, "*")
   // DEBUG only
-  disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/");
+  //disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/");
   copyfile(allHeaders(i), SCI2COutputPath+"/includes/");
 end
 
diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 61ac42d3..d0acd567 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -12,7 +12,7 @@
 
 function scilab2c(varargin)
   [lhs, rhs] = argn();
-  disp("YES")
+  
   select rhs
 //
 // scilab2c()