Merged Ukasha's work, code generation for control loop changed

40 files changed, 803 insertions, 109 deletions

diff --git a/macros/ASTManagement/%equal_string.sci b/macros/ASTManagement/%equal_string.sci
index 9678f0e..041fb84 100644
--- a/macros/ASTManagement/%equal_string.sci
+++ b/macros/ASTManagement/%equal_string.sci
@@ -13,4 +13,4 @@ function txt=%equal_string(e)
        '     '+objectlist2string(e.lhs)
        'EndEqual'
       ]
-endfunction
\ No newline at end of file
+endfunction
diff --git a/macros/ASTManagement/%operatio_string.sci b/macros/ASTManagement/%operatio_string.sci
index 8421a3f..c0ecb47 100644
--- a/macros/ASTManagement/%operatio_string.sci
+++ b/macros/ASTManagement/%operatio_string.sci
@@ -4,10 +4,17 @@ function txt=%operatio_string(O)
 //fields:
 //     operands: a list
 //     operator: a string
+if O.operator <> 'rc' 
   txt=['Operation'
        '   Operands:'
        '      '+objectlist2string(O.operands)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-endfunction
\ No newline at end of file
+else
+  txt=['   Operands:'
+       '      '+objectlist2string(O.operands)
+       'Endrc'
+      ]
+end
+endfunction
diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci
index e3177be..af07c5f 100644
--- a/macros/ASTManagement/AST2Ccode.sci
+++ b/macros/ASTManagement/AST2Ccode.sci
@@ -46,6 +46,9 @@ ReportFileName  = FileInfo.Funct(nxtscifunnumber).ReportFileName;
 // ---------------------------------
 // --- Parameter Initialization. ---
 // ---------------------------------
+global rc_count
+rc_count = 0;
+
 global SCI2CSTACK
 SCI2CSTACK = ['EMPTYSTACK'];
 
@@ -144,25 +147,45 @@ 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.
-         [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Equal');
-         SharedInfo = INIT_SharedInfoEqual(SharedInfo);
+ 	 if rc_count > 0
+		[FileInfo,SharedInfo] = AST_HandleFunRC(FileInfo,SharedInfo);
+	 else
+         	[FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,'Equal');
+         	SharedInfo = INIT_SharedInfoEqual(SharedInfo);
+	 end
       case 'Equal' then
          SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block.
          AST_PushASTStack(treeline);
       case 'Lhs       :' then
-         SharedInfo.Equal.Lhs = 1; // 1 means that we are inside the Lhs block of the Equal
-         [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_ReadEqualRhsNames(FileInfo,SharedInfo);
-         
-         // lengthNumber = length('Number_');
-         // if (part(EqualInArgScope,1:lengthNumber) == 'Number_')
-         //    SharedInfo.SkipNextEqual = 1
-         // end
-         SharedInfo.Equal.NInArg = EqualNInArg;
-         for tmpcnt = 1:SharedInfo.Equal.NInArg
-            SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt);
-            SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt);
-         end
-         AST_PushASTStack(treeline);
+		disp(rc_count);
+		if rc_count > 0
+		SharedInfo.Equal.Lhs = 1;
+		[EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo);
+		SharedInfo.Equal.NInArg = EqualNInArg;
+		AST_PushASTStack(treeline);
+		for tmpcnt = 1:SharedInfo.Equal.NInArg
+	           SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt);
+	           SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt);
+         	end		
+		else
+	        SharedInfo.Equal.Lhs = 1; // 1 means that we are inside the Lhs block of the Equal
+	 	//if SharedInfo.Equal.NOutArg > 0
+	        [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_ReadEqualRhsNames(FileInfo,SharedInfo);
+		SharedInfo.Equal.NInArg = EqualNInArg;
+		//end
+     
+	        // lengthNumber = length('Number_');
+	        // if (part(EqualInArgScope,1:lengthNumber) == 'Number_')
+	        //    SharedInfo.SkipNextEqual = 1
+	        // end
+	         
+	        for tmpcnt = 1:SharedInfo.Equal.NInArg
+	           SharedInfo.Equal.InArg(tmpcnt).Name = EqualInArgName(tmpcnt);
+	           SharedInfo.Equal.InArg(tmpcnt).Scope = EqualInArgScope(tmpcnt);
+         	end
+	 	//end
+         	AST_PushASTStack(treeline);
+		end
 
       // ----------------
       // --- If/Else. ---
@@ -229,6 +252,11 @@ while ~meof(fidAST)
          SharedInfo = AST_HandleEndWhile(FileInfo,SharedInfo);
          SharedInfo.While.Level = SharedInfo.While.Level - 1;
 
+
+      case 'Endrc' then
+	 rc_count = rc_count + 1;	
+         //[FileInfo,SharedInfo] = AST_HandleRC(FileInfo,SharedInfo);
+
       // ----------------
       // --- Default. ---
       // ----------------
diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci
index 6544667..57c0c5e 100644
--- a/macros/ASTManagement/AST_HandleEndGenFun.sci
+++ b/macros/ASTManagement/AST_HandleEndGenFun.sci
@@ -73,6 +73,14 @@ global STACKDEDUG
 // #RNU_RES_E
 [ASTFunName,InArg,NInArg,OutArg,NOutArg] = AST_GetFuncallPrm(FileInfo,SharedInfo,ASTFunType);
 NOutArg_mod = NOutArg
+	if ASTFunName == 'OpLogAnd'
+		AST_PushASTStack('&&');
+		return ;
+	end
+	if ASTFunName == 'OpLogOr'
+		AST_PushASTStack('||');
+		return;
+	end
 	if(mtlb_strcmp(part(ASTFunName,1:2),'CV') == %T)
 		SharedInfo.OpenCVUsed = %T;
 	end
@@ -119,6 +127,9 @@ NOutArg_mod = NOutArg
 	// --- Read the function annotations. ---
 	// --------------------------------------
 	// #RNU_RES_E
+	if ASTFunName == '%k'
+		ASTFunName='modk';
+	end
 	
 	if (ASTFunName == 'OpEqual')
 	   FunTypeAnnot = '';
@@ -132,6 +143,7 @@ NOutArg_mod = NOutArg
 	// --- Search for Equal Lhs and precision specifier to be applied to the current function. ---
 	// -------------------------------------------------------------------------------------------
 	// #RNU_RES_E
+	PrintStringInfo(' no of out arguments' + string(NOutArg),ReportFileName,'file','y');
 	[LhsArg,NLhsArg,FunPrecSpecifier,SharedInfo] = AST_GetPrecAndLhsArg(OutArg,NOutArg,ASTFunName,FunTypeAnnot,FunSizeAnnot,ASTFunType,FileInfo,SharedInfo);
 	//NUT: questa funzione contiene troppi parametri e mi sembra disordinata.
 
@@ -329,8 +341,13 @@ NOutArg_mod = NOutArg
 	   OutArg(1).Name  = string(OutArg(1).Value);
 	elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
 	   OutArg(1).Name  = string(OutArg(1).Value);
+	//elseif ASTFunName == 'disp'
 	else
 	   [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo);
+	   if ( ASTFunName == 'OpLogGt' | ASTFunName == 'OpLogLt' | ASTFunName == 'OpLogLe' | ASTFunName == 'OpLogGe' | ASTFunName == 'OpLogNe' | ASTFunName == 'OpLogEq')
+		PrintStringInfo('   returning back due logical function',ReportFileName,'file','y');
+		return;
+	   end
 	end
 	
 	if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
@@ -374,6 +391,8 @@ NOutArg_mod = NOutArg
 	   // Scope already set above.
 	elseif (ASTFunName == 'double' & NInArg == 1 & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
 	   // Scope already set above.
+	//elseif ASTFunName == 'disp'
+	   //do nothing
 	else
 	   OutArg = ST_AnalyzeScope(OutArg,NOutArg,FileInfo,SharedInfo);
 	end
@@ -392,6 +411,8 @@ NOutArg_mod = NOutArg
 	   //#RNUREM_ME A number is not inserted in the symbol table.
 	elseif ((ASTFunName == 'double') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
 	   //#RNUREM_ME A number is not inserted in the symbol table.
+	//elseif ASTFunName == 'disp'
+	   //do nothing
 	else
 	   ST_InsOutArg(OutArg,NOutArg,FileInfo,SharedInfo,'all');
 	end
@@ -424,8 +445,9 @@ NOutArg_mod = NOutArg
 	// --------------------------------------------
 	//#RNU_RES_E
 	//disp(OutArg,InArg,ASTFunName)
+
 	CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod);
-    
+    	
   	//#RNU_RES_B
 	PrintStringInfo('   C Function Name: '+CFunName,ReportFileName,'file','y');
 	if(IsArduinoFunction(ASTFunName))
@@ -497,6 +519,8 @@ NOutArg_mod = NOutArg
 		SharedInfo.SkipNextFun > 0 | ...
 		((sum(mtlb_strcmp(ASTFunName,SharedInfo.Annotations.DataPrec)) > 0) & (SharedInfo.SkipNextPrec == 1)))
 	   // Do nothing
+	//elseif ASTFunName == 'disp'
+	   // Do nothing
 	else
 	   AST_CheckCommonInOutArgs(InArg,NInArg,OutArg,NOutArg,ReportFileName);
 	end
diff --git a/macros/ASTManagement/AST_HandleFunRC.sci b/macros/ASTManagement/AST_HandleFunRC.sci
new file mode 100644
index 0000000..a70155a
--- /dev/null
+++ b/macros/ASTManagement/AST_HandleFunRC.sci
@@ -0,0 +1,165 @@
+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
+// -----------------------------------------------------------------
+
+// ------------------------------
+// --- 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();
+NInArg = 0;
+InArg = [];
+while (RhsField ~= 'Expression:')
+   NInArg = NInArg + 1;
+   InArg(NInArg) = RhsField;
+   RhsField = AST_PopASTStack();
+end
+InputArgumentNames = SCI2Cflipud(InputArgumentNames);
+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);
+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');
+
+size_count = 0;
+for i = 1:NInArg
+	size_count = size_count + 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;
+
+//--- 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');
+
+
+endfunction
diff --git a/macros/ASTManagement/AST_HandleIfElse.sci b/macros/ASTManagement/AST_HandleIfElse.sci
index 5373adf..2b549ed 100644
--- a/macros/ASTManagement/AST_HandleIfElse.sci
+++ b/macros/ASTManagement/AST_HandleIfElse.sci
@@ -74,11 +74,13 @@ global STACKDEDUG
 // ---------------------------------------------------
 //#RNU_RES_E
 if (ASTIfExpType~='else')
-   [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType);
+   [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType);
 else
    // "else" type doesn't contain any condition to test.
    IfCondArg = '';
    NIfCondArg = 0;
+   Op = '';
+   NOp = 0;
 end
 
 //#RNU_RES_B
@@ -87,6 +89,6 @@ end
 // -----------------------------
 // --- Generate the C code for if/elseif Expression. ---
 //#RNU_RES_E
-SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo);
+SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo);
 
 endfunction
diff --git a/macros/ASTManagement/AST_HandleRC.sci b/macros/ASTManagement/AST_HandleRC.sci
new file mode 100644
index 0000000..b1a1003
--- /dev/null
+++ b/macros/ASTManagement/AST_HandleRC.sci
@@ -0,0 +1,81 @@
+function [RhsNames,RhsScope,NRhs] = AST_ReadEqualRhsNames(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
+// -----------------------------------------------------------------
+
+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) ~= 'Operands:')
+   NRhs = NRhs + 1;
+   [RhsNames(NRhs),RhsScope(NRhs)] = AST_ExtractNameAndScope(RhsField(cntpop));
+   cntpop = cntpop + 1;
+   RhsField(cntpop) = AST_PopASTStack();
+end
+RhsNames = SCI2Cflipud(RhsNames);
+RhsScope = SCI2Cflipud(RhsScope);
+
+// --- Repush everything into the stack. ---
+for cntpush = cntpop:-1:1
+   AST_PushASTStack(RhsField(cntpush));
+end
+
+
+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');
+   //#RNU_RES_E
+end
+
+endfunction
diff --git a/macros/ASTManagement/AST_HandleWhileStatem.sci b/macros/ASTManagement/AST_HandleWhileStatem.sci
index 79fb516..d8c2f73 100644
--- a/macros/ASTManagement/AST_HandleWhileStatem.sci
+++ b/macros/ASTManagement/AST_HandleWhileStatem.sci
@@ -36,6 +36,8 @@ global SCI2CSTACK
 global StackPosition;
 global STACKDEDUG
 
+IfCondArg  = [];
+NIfCondArg = 0;
 
 // ------------------------------
 // --- Check input arguments. ---
@@ -70,36 +72,40 @@ PrintStringInfo('   Redirecting C code to: '+FileInfo.Funct(nxtscifunnumber).CPa
 // --- Generate C code. ---
 // ------------------------
 //#RNU_RES_E
-if(SharedInfo.WhileExpr.CondVar == '')
-   //#RNU_RES_B
-   // It means that we are handling something like while(a) or while(1)
-   // The while condition variable is generated by the HandleEndGenFun.
-   //#RNU_RES_E
-
-   // --- Pop the name of the condition variable or number. ---
-   Pop1 = AST_PopASTStack();
-
-   [ArgName,ArgScope] = AST_ExtractNameAndScope(Pop1);
-   if (length(ArgName) == 0)
-      PrintStringInfo(' ',ReportFileName,'both','y');
-      PrintStringInfo('SCI2CERROR: Expected while(variable) or while(number).','','stdout','y');
-      PrintStringInfo('SCI2CERROR: Expected a variable or number in the AST while expression.','','stdout','y');
-      PrintStringInfo('SCI2CERROR: Report this error to http://forge.scilab.org/index.php/p/scilab2c/issues/.','','stdout','y');
-      PrintStringInfo(' ',ReportFileName,'both','y');
-      error(9999, 'Expected a conditional variable in the while expression');
+flagendpop = 0;
+IfExprField = AST_PopASTStack();
+
+NOp=0;
+Op=[];
+while (flagendpop == 0)
+   if (IfExprField~='<EOL>')
+	if (IfExprField=='WhileExpression:')
+            flagendpop = 1;
+            // Pop Again the If tag from the AST.
+            IfExprField = AST_PopASTStack();
+	 elseif (IfExprField=='Operands:')
+		flagendpop = 0;
+		g = AST_PopASTStack();
+         else
+	    if (IfExprField=='&&' | IfExprField=='||')
+		NOp = NOp + 1;
+		Op(NOp) = IfExprField;
+		//PrintStringInfo('operators are  '+Op(NOp),ReportFileName,'file','y');
+	    else
+            NIfCondArg = NIfCondArg + 1;
+	    IfCondArg(NIfCondArg) = IfExprField;
+	    end
+            //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
+            //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
+      	end
    end
+   IfExprField = AST_PopASTStack();
+   PrintStringInfo('operators are  '+IfExprField,ReportFileName,'file','y');
+end
 
-   SharedInfo.WhileExpr.CondVar = ArgName;
-   //#RNU_RES_B
-   // --- Repush strings into the AST stack. ---
-   //#RNU_RES_E
-
-   AST_PushASTStack(Pop1);
+IfCondArg = SCI2Cflipud(IfCondArg);
 
-elseif (SharedInfo.WhileExpr.DimCondVar > 0)
-   error(9999, 'Cannot manage while with matrix conditions');
-end
-SharedInfo = C_WhileExpression(FileInfo,SharedInfo);
+SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo);
 
 // --------------------------
 // --- Update SharedInfo. ---
diff --git a/macros/ASTManagement/AST_ParseEqualStruct.sci b/macros/ASTManagement/AST_ParseEqualStruct.sci
index fa76a01..68bc3da 100644
--- a/macros/ASTManagement/AST_ParseEqualStruct.sci
+++ b/macros/ASTManagement/AST_ParseEqualStruct.sci
@@ -123,7 +123,7 @@ end
 // ------------------------
 //#RNU_RES_B
 PrintStringInfo('Function Name: '+FunctionName,ReportFileName,'file','y','n');
-PrintStringInfo('N Intput Arguments: '+string(NInArg),ReportFileName,'file','y','n');
+PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n');
 //#RNU_RES_E
 if (SharedInfo.Equal.Nins > 0)
    //#RNU_RES_B
diff --git a/macros/ASTManagement/AST_ParseFuncallStruct.sci b/macros/ASTManagement/AST_ParseFuncallStruct.sci
index 647a70d..3c322dd 100644
--- a/macros/ASTManagement/AST_ParseFuncallStruct.sci
+++ b/macros/ASTManagement/AST_ParseFuncallStruct.sci
@@ -87,6 +87,10 @@ NOutArg = eval(stripblanks(part(buffstring,10:length(buffstring))));
 buffstring = AST_PopASTStack();
 FunctionName = stripblanks(part(buffstring,12:length(buffstring)));
 
+//if (FunctionName == 'disp')
+  // NOutArg = 0;
+//end	
+
 // -------------------------------------
 // --- Generate the InArg structure. ---
 // -------------------------------------
diff --git a/macros/ASTManagement/AST_ParseIfExprStruct.sci b/macros/ASTManagement/AST_ParseIfExprStruct.sci
index a7da012..3ed1b5b 100644
--- a/macros/ASTManagement/AST_ParseIfExprStruct.sci
+++ b/macros/ASTManagement/AST_ParseIfExprStruct.sci
@@ -1,4 +1,4 @@
-function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType)
+function [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType)
 // function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType)
 // -----------------------------------------------------------------
 //#RNU_RES_B
@@ -63,13 +63,26 @@ global STACKDEDUG
 // ------------------------------------
 // --- Read if condition variables. ---
 // ------------------------------------
+//OutArgOld=[];
+//OutArgNew=[];
+
+//for i = 1:3	
+  //  OutArgOld(i)=AST_PopASTStack();
+    //PrintStringInfo(' '+OutArgOld(i),ReportFileName,'file','y');
+//end
+//x = AST_PopASTStack();
+
+//OutArgNew = SCI2Cflipud(OutArgOld);
+	
 flagendpop = 0;
 IfExprField = AST_PopASTStack();
+PrintStringInfo(' '+IfExprField+' '+ASTIfExpType,ReportFileName,'file','y');
 if (ASTIfExpType=='if')
    if (IfExprField=='Expression:')
       flagendpop = 1;
       // Pop Again the If tag from the AST.
       IfExprField = AST_PopASTStack();
+      PrintStringInfo(' '+IfExprField,ReportFileName,'file','y');
    end
 elseif (ASTIfExpType=='elseif')
    if (IfExprField=='Else If Expression')
@@ -78,7 +91,8 @@ elseif (ASTIfExpType=='elseif')
 else
    error(9999, 'Unknown ASTIfExpType ""'+ASTIfExpType+'"".');
 end
-
+NOp=0;
+Op=[];
 while (flagendpop == 0)
    if (IfExprField~='<EOL>')   
       if (ASTIfExpType=='if')
@@ -86,23 +100,41 @@ while (flagendpop == 0)
             flagendpop = 1;
             // Pop Again the If tag from the AST.
             IfExprField = AST_PopASTStack();
+	 elseif (IfExprField=='Operands:')
+		flagendpop = 0;
+		g = AST_PopASTStack();
          else
+	    if (IfExprField=='&&' | IfExprField=='||')
+		NOp = NOp + 1;
+		Op(NOp) = IfExprField;
+		//PrintStringInfo('operators are  '+Op(NOp),ReportFileName,'file','y');
+	    else
             NIfCondArg = NIfCondArg + 1;
-            [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
+	    IfCondArg(NIfCondArg) = IfExprField;
+	    end
+            //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
          end
       elseif (ASTIfExpType=='elseif')
          if (IfExprField=='Else If Expression')
             flagendpop = 1;
          else
-            NIfCondArg = NIfCondArg + 1;
-            IfCondArg(NIfCondArg) = IfExprField;
-            [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
+	    if (IfExprField=='&&')
+		NOp = NOp + 1;
+		Op(NOp) = IfExprField;
+	    else
+            	NIfCondArg = NIfCondArg + 1;
+            	IfCondArg(NIfCondArg) = IfExprField;
+	    end
+            //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
          end
       end
    end
    IfExprField = AST_PopASTStack();
+   PrintStringInfo('operators are  '+IfExprField,ReportFileName,'file','y');
 end
 
+IfCondArg = SCI2Cflipud(IfCondArg);
+
 //#RNU_RES_B
 // -------------------------------------------
 // --- Print some info in the report file. ---
diff --git a/macros/ASTManagement/AST_ParseOperStruct.sci b/macros/ASTManagement/AST_ParseOperStruct.sci
index a77317b..903f095 100644
--- a/macros/ASTManagement/AST_ParseOperStruct.sci
+++ b/macros/ASTManagement/AST_ParseOperStruct.sci
@@ -61,6 +61,17 @@ LabelFunctName = 'Operator: ';
 FunctionName = stripblanks(part(buffstring,length(LabelFunctName)+1:length(buffstring)));
 // Generate the proper function name.
 FunctionName  = Operator2FunName(FunctionName);
+PrintStringInfo(' '+FunctionName,ReportFileName,'file','y');
+
+if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr')
+    NInArg = 0;
+    NOutArg = 0;
+    InArg=[];
+    //RhsField = AST_PopASTStack();
+    //PrintStringInfo('hello'+RhsField,ReportFileName,'file','y');
+    //RhsField = AST_PopASTStack();
+    return ;
+end
 
 // ------------------------------
 // --- Read input parameters. ---
diff --git a/macros/ASTManagement/GenOutArgNames.sci b/macros/ASTManagement/GenOutArgNames.sci
index 0e68383..7b62c79 100644
--- a/macros/ASTManagement/GenOutArgNames.sci
+++ b/macros/ASTManagement/GenOutArgNames.sci
@@ -32,6 +32,12 @@ SCI2CNInArgCheck(argn(2),9,9);
 nxtscifunname   = SharedInfo.NextSCIFunName;
 nxtscifunnumber = SharedInfo.NextSCIFunNumber;
 ReportFileName  = FileInfo.Funct(nxtscifunnumber).ReportFileName;
+
+
+global SCI2CSTACK
+global StackPosition;
+global STACKDEDUG
+
 // #RNU_RES_B
 PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
 // #RNU_RES_E
@@ -43,47 +49,69 @@ OutArg = OldOutArg;
 // ---------------------------------------------------------------------------------------
 // At this step only the name of the output arguments can be generated. ---
 //#RNU_RES_E
-if (NLhsArg > 0)
-   //#RNU_RES_B
-   // Use the equal Lhs names.
-   PrintStringInfo('Using Equal Lhs names.',ReportFileName,'file','y');
-   //#RNU_RES_E
-   if (NLhsArg ~= NOutArg)
-      error(9999, 'NLhsArg='+string(NLhsArg)+' must be equal to NOutArg='+string(NOutArg)+'.');
-   end
-   for counteroutputargs = 1:NOutArg
-      OutArg(counteroutputargs).Name=LhsArg(counteroutputargs).Name;
-      OutArg(counteroutputargs).Scope=LhsArg(counteroutputargs).Scope;
-   end
+if (FunctionName ~= 'OpLogGt' & FunctionName ~= 'OpLogLt' & FunctionName ~= 'OpLogGe' & FunctionName ~= 'OpLogLe' & FunctionName ~= 'OpLogNe' & FunctionName ~= 'OpLogEq')
+	if (NLhsArg > 0)
+	   //#RNU_RES_B
+	   // Use the equal Lhs names.
+	   PrintStringInfo('Using Equal Lhs names.',ReportFileName,'file','y');
+	   //#RNU_RES_E
+	   if (NLhsArg ~= NOutArg)
+	      error(9999, 'NLhsArg='+string(NLhsArg)+' must be equal to NOutArg='+string(NOutArg)+'.');
+	   end
+	   for counteroutputargs = 1:NOutArg
+	      OutArg(counteroutputargs).Name=LhsArg(counteroutputargs).Name;
+	      OutArg(counteroutputargs).Scope=LhsArg(counteroutputargs).Scope;
+	   end
+	else
+	   //#RNU_RES_B
+	   // Generate temporary variables.
+	   PrintStringInfo('Generating temporary variables.',ReportFileName,'file','y');
+	   //#RNU_RES_E
+	   if ((sum(mtlb_strcmp(FunctionName,SharedInfo.Annotations.DataPrec)) > 0) & ...
+	       (SharedInfo.SkipNextPrec == 1))
+	      //#RNU_RES_B
+	      PrintStringInfo('   Skipping code generating because already generated in the previous function.',ReportFileName,'file','y');
+	      //#RNU_RES_E
+	      for counteroutputargs = 1:NOutArg
+		 OutArg(counteroutputargs).Name = InArg(counteroutputargs).Name;
+	      end
+	   elseif (mtlb_strcmp(FunctionName,'OpEqual'))
+	      // do nothing.
+	      //NUT: verifica questa parte di codice. e' sicuro che se ho equal gli oldoutarg contengono gia' il nome?
+	   else
+	      for counteroutputargs = 1:NOutArg
+		 if ((SharedInfo.ASTReader.EnableTempVarsReuse == 1) & ...
+		     (length(SharedInfo.ASTReader.ReusableTempVars) > 0))
+		    TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.ReusableTempVars(1))]);
+		    SharedInfo.ASTReader.ReusableTempVars = SharedInfo.ASTReader.ReusableTempVars(2:$);
+		 else
+		    SharedInfo.ASTReader.UsedTempVars = SharedInfo.ASTReader.UsedTempVars + 1;
+		    TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.UsedTempVars)]);
+		 end
+		 OutArg(counteroutputargs).Name=TmpOutArgName;
+	      end
+	   end
+	end
 else
-   //#RNU_RES_B
-   // Generate temporary variables.
-   PrintStringInfo('Generating temporary variables.',ReportFileName,'file','y');
-   //#RNU_RES_E
-   if ((sum(mtlb_strcmp(FunctionName,SharedInfo.Annotations.DataPrec)) > 0) & ...
-       (SharedInfo.SkipNextPrec == 1))
-      //#RNU_RES_B
-      PrintStringInfo('   Skipping code generating because already generated in the previous function.',ReportFileName,'file','y');
-      //#RNU_RES_E
-      for counteroutputargs = 1:NOutArg
-         OutArg(counteroutputargs).Name = InArg(counteroutputargs).Name;
-      end
-   elseif (mtlb_strcmp(FunctionName,'OpEqual'))
-      // do nothing.
-      //NUT: verifica questa parte di codice. e' sicuro che se ho equal gli oldoutarg contengono gia' il nome?
-   else
-      for counteroutputargs = 1:NOutArg
-         if ((SharedInfo.ASTReader.EnableTempVarsReuse == 1) & ...
-             (length(SharedInfo.ASTReader.ReusableTempVars) > 0))
-            TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.ReusableTempVars(1))]);
-            SharedInfo.ASTReader.ReusableTempVars = SharedInfo.ASTReader.ReusableTempVars(2:$);
-         else
-            SharedInfo.ASTReader.UsedTempVars = SharedInfo.ASTReader.UsedTempVars + 1;
-            TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.UsedTempVars)]);
-         end
-         OutArg(counteroutputargs).Name=TmpOutArgName;
-      end
-   end
+	for counterinputargs = 1:NInArg
+		tmppushstack=InArg(counterinputargs).Name;
+		PrintStringInfo('   Pushing in the AST stack: ""'+tmppushstack+'"".',ReportFileName,'file','y');
+		AST_PushASTStack(tmppushstack);
+		if FunctionName=='OpLogGt'
+ 	            AST_PushASTStack('>');
+		elseif FunctionName=='OpLogGe'
+		    AST_PushASTStack('>=');
+		elseif FunctionName=='OpLogLt'
+                    AST_PushASTStack('<');
+		elseif FunctionName=='OpLogLe'
+		    AST_PushASTStack('<=');
+		elseif FunctionName=='OpLogEq'
+		    AST_PushASTStack('==');
+		elseif FunctionName=='OpLogNe'
+		    AST_PushASTStack('!=');
+		end
+	end
+	s = AST_PopASTStack();
+	PrintStringInfo('   Pushing in the AST stack: ""'+s+'"".',ReportFileName,'file','y');
 end
-
 endfunction
diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib
index 67ea09b..c73eb6b 100644
--- a/macros/ASTManagement/lib
+++ b/macros/ASTManagement/lib
diff --git a/macros/ASTManagement/names b/macros/ASTManagement/names
index a1aafbc..26edaf7 100644
--- a/macros/ASTManagement/names
+++ b/macros/ASTManagement/names
@@ -28,8 +28,10 @@ AST_HandleEndProgram
 AST_HandleEndWhile
 AST_HandleFor
 AST_HandleForStatem
+AST_HandleFunRC
 AST_HandleHeader
 AST_HandleIfElse
+AST_HandleRC
 AST_HandleWhileExpr
 AST_HandleWhileStatem
 AST_ParseEqualStruct
@@ -57,3 +59,5 @@ _program_string
 _variable_string
 _while_string
 objectlist2string
+AST_HandleRC
+AST_HandleFunRC
diff --git a/macros/CCodeGeneration/C_IfExpression.sci b/macros/CCodeGeneration/C_IfExpression.sci
index 48a0538..c723d95 100644
--- a/macros/CCodeGeneration/C_IfExpression.sci
+++ b/macros/CCodeGeneration/C_IfExpression.sci
@@ -1,4 +1,4 @@
-function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo)
+function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo)
 // function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo)
 // -----------------------------------------------------------------
 // //NUT: add description here
@@ -19,12 +19,16 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
-SCI2CNInArgCheck(argn(2),5,5);
+//SCI2CNInArgCheck(argn(4),7,7);
+
+//global SCI2CSTACK 
+//global StackPosition;
+//global STACKDEDUG
 
 // --- Check NIfCondArg value. ---
-if ((NIfCondArg ~= 1) & (ASTIfExpType~='else'))
-   error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.');
-end
+//if ((NIfCondArg ~= 1) & (ASTIfExpType~='else'))
+  // error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.');
+//end
 
 // -----------------------
 // --- Initialization. ---
@@ -37,7 +41,7 @@ CPass1FileName = FileInfo.Funct(nxtscifunnumber).CPass1FileName;
 
 // #RNU_RES_B
 PrintStringInfo(' ',ReportFileName,'file','y');
-PrintStringInfo('***Generating C code***',ReportFileName,'file','y');
+PrintStringInfo('***Generating C code***'+ string(NIfCondArg),ReportFileName,'file','y');
 // #RNU_RES_E
 // ---------------------------
 // --- End Initialization. ---
@@ -66,10 +70,23 @@ if SCI2Cstrncmps1size(ASTIfExpType,'else')
    SharedInfo = C_IfElseBlocks(FileInfo,SharedInfo,'out');
 end
 
+i=1;
+k=1;
 CCall ='';
 CCall = CCall+CFunName;
 if (ASTIfExpType~='else')
-   CCall = CCall+'('+IfCondArg(1)+')';
+   CCall = CCall+'(';
+   while i <= NIfCondArg
+	CCall = CCall + IfCondArg(i) + ' ';
+	//d = modulo(i,3);
+	//PrintStringInfo(' '+string(i)+string(d),'file','y');
+	if (modulo(i,3)==0 & i<>NIfCondArg)
+	    CCall = CCall + Op(k) + ' ';
+	    k = k + 1;
+	end
+        i = i + 1;
+   end 
+   CCall = CCall+')';
 end
 PrintStringInfo('   '+CCall,ReportFileName,'file','y');
 PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
diff --git a/macros/CCodeGeneration/C_WhileExpression.sci b/macros/CCodeGeneration/C_WhileExpression.sci
index edd2830..d7cf70e 100644
--- a/macros/CCodeGeneration/C_WhileExpression.sci
+++ b/macros/CCodeGeneration/C_WhileExpression.sci
@@ -1,4 +1,4 @@
-function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
+function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo)
 // function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
 // -----------------------------------------------------------------
 // //NUT: add description here
@@ -19,7 +19,7 @@ function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
-SCI2CNInArgCheck(argn(2),2,2);
+//SCI2CNInArgCheck(argn(2),2,2);
 
 // -----------------------
 // --- Initialization. ---
@@ -63,7 +63,7 @@ for cntstr = 1:NumCStrings
    // Epilogue
    if (length(C_Strings(cntstr)) == 0)
       C_Strings(cntstr) = ' '; // RNU for Bruno: If I don't do that I get a PrintStringInfo error related to mputstr.
-      // Function not defined for given argument type(s),

+      // Function not defined for given argument type(s),
       // check arguments or define function %0_mputstr for overloading.
    end
    PrintStringInfo(C_Strings(cntstr),CPass1WhileEpilFileName ,'file','y','n');
@@ -76,7 +76,27 @@ PrintStringInfo('}',CPass1WhileEpilFileName ,'file','y');
 // ------------------------------
 // --- Insert for expression. ---
 // ------------------------------
-CCall = 'while('+SharedInfo.WhileExpr.CondVar+')';
+//CCall = 'while('+SharedInfo.WhileExpr.CondVar+')';
+//PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
+
+i=1;
+k=1;
+CCall ='';
+CCall = CCall+'while';
+   CCall = CCall+'(';
+   while i <= NIfCondArg
+	CCall = CCall + IfCondArg(i) + ' ';
+	//d = modulo(i,3);
+	//PrintStringInfo(' '+string(i)+string(d),'file','y');
+	if (modulo(i,3)==0 & i<>NIfCondArg)
+	    CCall = CCall + Op(k) + ' ';
+	    k = k + 1;
+	end
+        i = i + 1;
+   end 
+   CCall = CCall+')';
+
+PrintStringInfo('   '+CCall,ReportFileName,'file','y');
 PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
    
 // -------------------
diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci
index 46f0820..d92a431 100644
--- a/macros/CCodeGeneration/GetClsFileName.sci
+++ b/macros/CCodeGeneration/GetClsFileName.sci
@@ -45,6 +45,7 @@ if SCI2Cfileexist(FileInfo.USER2CLibCAnnFun,tmpannfilename)
    // #RNU_RES_B
    // It is a C function of the USER2C library.
    // #RNU_RES_E
+   PrintStringInfo('cUser2c',ReportFileName,'file','y');
    FlagFoundAnnFile   = 1;
    AnnFileName        = fullfile(FileInfo.USER2CLibCAnnFun,tmpannfilename);
    SCI2CClassName     = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -53,6 +54,7 @@ elseif SCI2Cfileexist(FileInfo.USER2CLibSCIAnnFun,tmpannfilename)
    // #RNU_RES_B
    // It is a scilab function of the USER2C library.
    // #RNU_RES_E
+   PrintStringInfo('fUser2c',ReportFileName,'file','y');
    FlagFoundAnnFile   = 1;
    AnnFileName        = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename);
    SCI2CClassName     = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -61,6 +63,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibCAnnFun,tmpannfilename))
    // #RNU_RES_B
    // It is a C function of the SCI2C library.
    // #RNU_RES_E
+   PrintStringInfo('csci2c',ReportFileName,'file','y');
    FlagFoundAnnFile   = 1;
    AnnFileName        = fullfile(FileInfo.SCI2CLibCAnnFun,tmpannfilename);
    SCI2CClassName     = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -69,6 +72,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename))
    // #RNU_RES_B
    // It is a scilab function of the SCI2C library.
    // #RNU_RES_E
+   PrintStringInfo('fsci2c',ReportFileName,'file','y');
    FlagFoundAnnFile   = 1;
    AnnFileName        = fullfile(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename);
    SCI2CClassName     = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib
index 2db4b8c..4e87a55 100644
--- a/macros/CCodeGeneration/lib
+++ b/macros/CCodeGeneration/lib
diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names
index 5311c7f..4d76299 100644
--- a/macros/CCodeGeneration/names
+++ b/macros/CCodeGeneration/names
@@ -13,6 +13,7 @@ C_IfExpression
 C_IndentBlanks
 C_InitHeader
 C_MemAllocOutTempVars
+C_RCOperator
 C_SCI2CHeader
 C_Type
 C_WhileExpression
diff --git a/macros/ErrorMessages/lib b/macros/ErrorMessages/lib
index 5370e12..0a9f891 100644
--- a/macros/ErrorMessages/lib
+++ b/macros/ErrorMessages/lib
diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.sci b/macros/FunctionAnnotation/FA_GetFunAnn.sci
index d11e3ce..3fadd1f 100644
--- a/macros/FunctionAnnotation/FA_GetFunAnn.sci
+++ b/macros/FunctionAnnotation/FA_GetFunAnn.sci
@@ -52,7 +52,7 @@ FunSizeAnnot = '';
 // ---------------------------------------------

 // --- Open the .sci file (read only). ---

 inclsfid = SCI2COpenFileRead(SCI2CClassFileName);

-

+PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');

 // #RNU_RES_B

 // --- Loop over the lines of the input file. ---

 // Position file pointer to the desired NInArg/NOutArg section,

@@ -212,5 +212,6 @@ mclose(inclsfid);
 // -------------------------------------------------

 // --- End Read the annotations of the function. ---

 // -------------------------------------------------

+PrintStringInfo('  end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');

 

 endfunction

diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib
index 3608981..f02997b 100644
--- a/macros/FunctionAnnotation/lib
+++ b/macros/FunctionAnnotation/lib
diff --git a/macros/FunctionList/lib b/macros/FunctionList/lib
index f5a84d5..2bbf0cb 100644
--- a/macros/FunctionList/lib
+++ b/macros/FunctionList/lib
diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib
index 9d57416..e1d6f0f 100644
--- a/macros/GeneralFunctions/lib
+++ b/macros/GeneralFunctions/lib
diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib
index 7631c35..5c8f0da 100644
--- a/macros/Hardware/AVR/lib
+++ b/macros/Hardware/AVR/lib
diff --git a/macros/Hardware/RasberryPi/lib b/macros/Hardware/RasberryPi/lib
index c238317..9afd77d 100644
--- a/macros/Hardware/RasberryPi/lib
+++ b/macros/Hardware/RasberryPi/lib
diff --git a/macros/ImageProcessing/core/lib b/macros/ImageProcessing/core/lib
index fedf05e..5605351 100644
--- a/macros/ImageProcessing/core/lib
+++ b/macros/ImageProcessing/core/lib
diff --git a/macros/ImageProcessing/highgui/lib b/macros/ImageProcessing/highgui/lib
index 3021760..a46d5d8 100644
--- a/macros/ImageProcessing/highgui/lib
+++ b/macros/ImageProcessing/highgui/lib
diff --git a/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib
index ac605c0..4863059 100644
--- a/macros/ImageProcessing/imgproc/lib
+++ b/macros/ImageProcessing/imgproc/lib
diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib
index 1f099fb..a5bf12b 100644
--- a/macros/Scilab-Arduino/lib
+++ b/macros/Scilab-Arduino/lib
diff --git a/macros/SymbolTable/lib b/macros/SymbolTable/lib
index 59ce465..dbc603e 100644
--- a/macros/SymbolTable/lib
+++ b/macros/SymbolTable/lib
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 313d25b..3ec6d13 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -844,6 +844,207 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 // -------------------

+// --- Class Isreal. ---

+// -------------------

+ClassName = 'Isreal';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+//---Function list class. ----

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+//PrintStringInfo('z0'+ArgSeparator+'d0',ClassFileName,'file','y');

+//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'isreal';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+ClassName = 'gcd';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+//---Function list class. ----

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+//PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'gcd';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+ClassName = 'nextpow2';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+//PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');

+//PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'nextpow2';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+ClassName = 'interp1';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=          2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=          3',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=          4',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+//---Function list class. ----

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+//PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y');

+//PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+//PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('d2d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d2d2d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'interp1';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+// -------------------

+// --- Class DCT. ---

+// -------------------

+ClassName = 'dct';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+PrintStringInfo('NIN=          2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+PrintStringInfo('c2s0'+ArgSeparator+'c2',ClassFileName,'file','y');

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'dct';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+// -------------------

+// --- Class IDCT. ---

+// -------------------

+ClassName = 'idct';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+//Was FA_TP_USER

+//Cause some trouble if user specify some precision and if input(and also output) is complex.

+PrintStringInfo('OUT(1).TP=    IN(1).TP',ClassFileName,'file','y'); //FOR INRIA changed from IN(1).TP to FA_TP_USER

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'idct';

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+

+

+// -------------------

 // --- Class Sqrt. ---

 // -------------------

 ClassName = 'Sqrt';

@@ -7685,6 +7886,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 

 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2d2d2'+ArgSeparator+'d0',ClassFileName,'file','y');

 PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y');

 //PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

 //PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

@@ -7702,6 +7904,36 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 

+// --- Class Modk. ---

+// ------------------

+ClassName = 'Modk';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          1',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');

+//PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');

+//PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');

+

+//PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+//PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');

+//PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');

+

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'modk'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

 

 //------------------------------------

 //---- Class PRIMES --------------------

diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib
index 4d03bdc..b7e8685 100644
--- a/macros/ToolInitialization/lib
+++ b/macros/ToolInitialization/lib
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index e9214a2..7788f2c 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -72,6 +72,10 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/matrixOperations/includes/kron.h"
       "src/c/matrixOperations/includes/flipdim.h"
       "src/c/matrixOperations/includes/norm.h"
+      "src/c/interpolation/includes/interp1.h"
+      "src/c/elementaryFunctions/includes/nextpow2.h"
+      "src/c/elementaryFunctions/includes/gcd.h"
+      "src/c/elementaryFunctions/includes/isreal.h"
       "src/c/elementaryFunctions/includes/cos.h"
       "src/c/elementaryFunctions/includes/fix.h"
       "src/c/elementaryFunctions/includes/exp.h"
@@ -140,6 +144,9 @@ function allHeaders = getAllHeaders(SharedInfo)
       "src/c/string/includes/dynlib_string.h"
       "src/c/string/includes/disp.h"
       "src/c/string/includes/str.h"
+      "src/c/signalProcessing/includes/modk.h"
+      "src/c/signalProcessing/includes/idct.h"
+      "src/c/signalProcessing/includes/dct.h"
       "src/c/signalProcessing/fft/fft_internal.h"
       "src/c/signalProcessing/ifft/ifft_internal.h"
       "src/c/signalProcessing/levin/levinUtils.h"
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index e5c7e0a..9086ba1 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -61,6 +61,10 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/matrixOperations/interfaces/int_flipdim.h"
       "src/c/matrixOperations/interfaces/int_permute.h"
       "src/c/matrixOperations/interfaces/int_norm.h"
+      "src/c/interpolation/interfaces/int_interp1.h"
+      "src/c/elementaryFunctions/interfaces/int_nextpow2.h"
+      "src/c/elementaryFunctions/interfaces/int_gcd.h"
+      "src/c/elementaryFunctions/interfaces/int_isreal.h"
       "src/c/elementaryFunctions/interfaces/int_asinh.h"
       "src/c/elementaryFunctions/interfaces/int_atanh.h"
       "src/c/elementaryFunctions/interfaces/int_sinh.h"
@@ -140,6 +144,9 @@ function allInterfaces = getAllInterfaces(SharedInfo)
       "src/c/operations/interfaces/int_OpIns.h"
       "src/c/string/interfaces/int_disp.h"
       "src/c/string/interfaces/int_string.h"
+      "src/c/signalProcessing/interfaces/int_modk.h"
+      "src/c/signalProcessing/interfaces/int_idct.h"
+      "src/c/signalProcessing/interfaces/int_dct.h"
       "src/c/signalProcessing/interfaces/int_ifft.h"
       "src/c/signalProcessing/interfaces/int_lpc2cep.h"
       "src/c/signalProcessing/interfaces/int_cepstrum.h"
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index 826f670..0a72492 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -330,6 +330,9 @@ function allSources = getAllSources(SharedInfo)
       "src/c/matrixOperations/kron/skrona.c"
       "src/c/matrixOperations/norm/dnormv.c"
       "src/c/matrixOperations/norm/dnorma.c"
+      "src/c/elementaryFunctions/nextpow2/dnextpow2a.c"
+      "src/c/elementaryFunctions/isreal/sisreals.c"
+      "src/c/elementaryFunctions/isreal/disreals.c"
       "src/c/elementaryFunctions/cos/dcosa.c"
       "src/c/elementaryFunctions/cos/dcoss.c"
       "src/c/elementaryFunctions/cos/scosa.c"
@@ -960,6 +963,13 @@ function allSources = getAllSources(SharedInfo)
       "src/c/string/string/u16strings.c"
       "src/c/string/string/i16stringa.c"
       "src/c/string/string/i16strings.c"
+      "src/c/signalProcessing/modk/dmodka.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/cdcta.c"
+      "src/c/signalProcessing/transforms/dct/zdcta.c"
+      "src/c/signalProcessing/transforms/dct/ddcta.c"
       "src/c/signalProcessing/fft/dfft2.c"
       "src/c/signalProcessing/fft/cfftma.c"
       "src/c/signalProcessing/fft/r2tx.c"
@@ -1171,6 +1181,9 @@ 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/dinterp13a.c"
+      "src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c"
+      "src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c"
       "src/c/elementaryFunctions/discrete_mathematics/factorial/dfactorials.c"
       "src/c/elementaryFunctions/discrete_mathematics/factorial/dfactoriala.c"
       "src/c/elementaryFunctions/discrete_mathematics/factorial/sfactorials.c"
diff --git a/macros/findDeps/lib b/macros/findDeps/lib
index a49dc79..d94232c 100644
--- a/macros/findDeps/lib
+++ b/macros/findDeps/lib
diff --git a/macros/lib b/macros/lib
index 347bbe3..1be60a2 100644
--- a/macros/lib
+++ b/macros/lib
diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci
index f05cb83..ae38e57 100644
--- a/macros/runsci2c.sci
+++ b/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