41 files changed, 353 insertions, 129 deletions
diff --git a/macros/ASTManagement/%funcall_string.sci b/macros/ASTManagement/%funcall_string.sci
index 0ee9701..fc4b929 100644
--- a/macros/ASTManagement/%funcall_string.sci
+++ b/macros/ASTManagement/%funcall_string.sci
@@ -5,6 +5,8 @@ function txt=%funcall_string(F)
 //    rhs  : a list
 //    name : string, the name of the function
 //    lhsnb: number, the number of function lhs
+// Modified By: Ukasha Noor
+
 
 if F.name <> 'disp'
 txt=['Funcall  : '+F.name
diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci
index 563f313..516291a 100644
--- a/macros/ASTManagement/AST2Ccode.sci
+++ b/macros/ASTManagement/AST2Ccode.sci
@@ -11,6 +11,7 @@ function AST2Ccode(FileInfoDatFile)
 //
 // Status:
 // 11-May-2007 -- Raffaele Nutricato: Author.
+// 15-June-2017 -- Ukasha Noor: Revised By
 //
 // Copyright 2007 Raffaele Nutricato.
 // Contact: raffaele.nutricato@tiscali.it
@@ -64,6 +65,8 @@ STACKDEDUG = 0; // 1 -> Every Pop and Push operation on the stack, the stack con
 
 global disp_isthere
 disp_isthere = 0;
+
+FName = null
 // -------------------------------------
 // --- End parameter Initialization. ---
 // -------------------------------------
@@ -144,9 +147,13 @@ while ~meof(fidAST)
       case 'EndOperation' then
          [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Operation');
       case 'EndFuncall' then
+	 if rc_count > 0 & cc_count == 0
+		[EqualInArgName,EqualInArgScope,EqualNInArg,FName] = AST_HandleFuncArray(FileInfo,SharedInfo);
+	elseif cc_count > 0
+		[EqualInArgName,EqualInArgScope,EqualNInArg,FName] = AST_HandleFuncArray2D(FileInfo,SharedInfo);
+	else
          [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Funcall');
-	 disp(disp_isthere);
-
+	end
       // --------------
       // --- Equal. ---
       // --------------
@@ -156,10 +163,10 @@ while ~meof(fidAST)
       //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 & cc_count == 0
-		[FileInfo,SharedInfo] = AST_HandleFunRC(FileInfo,SharedInfo);
+		[FileInfo,SharedInfo] = AST_HandleFunRC(FName,FileInfo,SharedInfo);
 		rc_count = 0;
 	 elseif cc_count > 0
-		[FileInfo,SharedInfo] = AST_HandleFunCC(cc_count,FileInfo,SharedInfo);
+		[FileInfo,SharedInfo] = AST_HandleFunCC(FName,cc_count,FileInfo,SharedInfo);
 		rc_count = 0;
                 cc_count = 0;
 	 else
@@ -169,12 +176,12 @@ while ~meof(fidAST)
 		end
 	 end
 	 disp_isthere = 0;
+ 	 FName = null
 
       case 'Equal' then
          SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block.
          AST_PushASTStack(treeline);
       case 'Lhs       :' then
-		disp(disp_isthere);
 		if rc_count > 0 & cc_count == 0
 		SharedInfo.Equal.Lhs = 1;
 		[EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo);
diff --git a/macros/ASTManagement/AST_HandleCC.sci b/macros/ASTManagement/AST_HandleCC.sci
index cc41154..897a06f 100644
--- a/macros/ASTManagement/AST_HandleCC.sci
+++ b/macros/ASTManagement/AST_HandleCC.sci
@@ -8,7 +8,9 @@
 // Author: Ukasha Noor
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
-
+// This function is used for 2D array declaration
+// This function extracts the input arguments in the array and check there Name and Scope.
+// Then repush everything back to stack
 function [RhsNames,RhsScope,NRhs] = AST_HandleCC(FileInfo,SharedInfo)
 
 SCI2CNInArgCheck(argn(2),2,2)
@@ -56,14 +58,6 @@ for cntpush = cntpop:-1:1
 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/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci
index 96830aa..e191f10 100644
--- a/macros/ASTManagement/AST_HandleEndGenFun.sci
+++ b/macros/ASTManagement/AST_HandleEndGenFun.sci
@@ -1,4 +1,3 @@
-
 function [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,ASTFunType)
 // function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
 // -----------------------------------------------------------------
@@ -28,11 +27,13 @@ function [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,F
 //
 // Status:
 // 11-Apr-2007 -- Raffaele Nutricato: Author.
+// 15-June-2017 -- Ukasha Noor : Revised By 
 //
 // Copyright 2007 Raffaele Nutricato.
 // Contact: raffaele.nutricato@tiscali.it
 // -----------------------------------------------------------------
 
+
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
@@ -127,8 +128,10 @@ NOutArg_mod = NOutArg
 		  PrintStringInfo(' ',ReportFileName,'both','y');
 		  error(9999, 'SCI2CERROR: Unexpected number of output arguments for global function.');
 	   end
-	 elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close')
-	   SharedInfo.SkipNextFun = 1;
+	//To skip the functions for Raspberry Pi connections 
+    elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close' | ASTFunName == 'i2cdetect')
+       disp_isthere=1;  // Skips the corresponding Lhs argument declaration
+       return           // Skips the function call
 	end
 
 	// #RNU_RES_B
@@ -142,8 +145,8 @@ NOutArg_mod = NOutArg
 	
 	if ASTFunName == '%sn'
 		ASTFunName='modsn';
-	end
-	
+	end	
+
 	if (ASTFunName == 'OpEqual')
 	   FunTypeAnnot = '';
 	   FunSizeAnnot = '';
diff --git a/macros/ASTManagement/AST_HandleFunCC.sci b/macros/ASTManagement/AST_HandleFunCC.sci
index 1942c74..8669ad1 100644
--- a/macros/ASTManagement/AST_HandleFunCC.sci
+++ b/macros/ASTManagement/AST_HandleFunCC.sci
@@ -8,11 +8,14 @@
 // Author: Ukasha Noor
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
+// This function put the input elements of array in InArg and
+// output in OutArg from the stack.
+// Then finds the number of columns and rows in matrix and the type of matrix.
+// The call the function to generate the C code for declaration.
 
+function [FileInfo,SharedInfo] = AST_HandleFunCC(FName,NCol,FileInfo,SharedInfo)
 
-function [FileInfo,SharedInfo] = AST_HandleFunCC(NCol,FileInfo,SharedInfo)
-
-SCI2CNInArgCheck(argn(2),3,3)
+SCI2CNInArgCheck(argn(2),4,4)
 
 // ------------------------------
 // --- Check input arguments. ---
@@ -140,30 +143,56 @@ for i = 1:NInArg
 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;
+if FName <> null
+		PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+		if FName == 'float'
+			OutArg(1).Type      = 's';
+		elseif FName == 'uint8'
+			OutArg(1).Type      = 'u8';
+		elseif FName == 'int16'
+			OutArg(1).Type      = 'i16';
+		elseif FName == 'uint16'
+			OutArg(1).Type      = 'u16';
+		elseif FName == 'int8'
+			OutArg(1).Type      = 'i8';
+		elseif FName == 'uint32'
+			OutArg(1).Type      = 'u32';
+		elseif FName == 'int32'
+			OutArg(1).Type      = 'i32';
+		else
+			OutArg(1).Type      = 'd';
+		end
+		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;
+	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
 end
 
 //--- Check for output Argument in symbol table ---//
diff --git a/macros/ASTManagement/AST_HandleFunRC.sci b/macros/ASTManagement/AST_HandleFunRC.sci
index d316924..a5885d5 100644
--- a/macros/ASTManagement/AST_HandleFunRC.sci
+++ b/macros/ASTManagement/AST_HandleFunRC.sci
@@ -8,10 +8,13 @@
 // Author: Ukasha Noor
 // Organization: FOSSEE, IIT Bombay
 // Email: toolbox@scilab.in
+// This function is used for 1D array declaration.
+// Checks the input and output argumnets and put them in respective variables.
+// Then calls the function to generate the C code for 1D array declaration.
 
-function [FileInfo,SharedInfo] = AST_HandleFunRC(FileInfo,SharedInfo)
+function [FileInfo,SharedInfo] = AST_HandleFunRC(FName,FileInfo,SharedInfo)
 
-SCI2CNInArgCheck(argn(2),2,2)
+SCI2CNInArgCheck(argn(2),3,3)
 
 // ------------------------------
 // --- Check input arguments. ---
@@ -142,30 +145,56 @@ for i = 1:NInArg
 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;
+if FName <> null
+		PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
+		if FName == 'float'
+			OutArg(1).Type      = 's';
+		elseif FName == 'uint8'
+			OutArg(1).Type      = 'u8';
+		elseif FName == 'int16'
+			OutArg(1).Type      = 'i16';
+		elseif FName == 'uint16'
+			OutArg(1).Type      = 'u16';
+		elseif FName == 'int8'
+			OutArg(1).Type      = 'i8';
+		elseif FName == 'uint32'
+			OutArg(1).Type      = 'u32';
+		elseif FName == 'int32'
+			OutArg(1).Type      = 'i32';
+		else
+			OutArg(1).Type      = 'd';
+		end
+		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;
+	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
 end
 
 //--- Check for output Argument in symbol table ---//
diff --git a/macros/ASTManagement/AST_HandleFuncArray.sci b/macros/ASTManagement/AST_HandleFuncArray.sci
new file mode 100644
index 0000000..364e305
--- /dev/null
+++ b/macros/ASTManagement/AST_HandleFuncArray.sci
@@ -0,0 +1,63 @@
+function [RhsNames,RhsScope,NRhs,FName] = AST_HandleFuncArray(FileInfo,SharedInfo)
+// 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
+// This function is used for 1D array declaration.
+
+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) ~= 'Rhs    :')
+   NRhs = NRhs + 1;
+   if RhsField(cntpop) <> 'Operands:'
+   [RhsNames(NRhs),RhsScope(NRhs)] = AST_ExtractNameAndScope(RhsField(cntpop));
+   end
+   cntpop = cntpop + 1;
+   RhsField(cntpop) = AST_PopASTStack();
+end
+first = AST_PopASTStack();
+second = AST_PopASTStack();
+
+FName = stripblanks(part(second,12:length(second)));
+
+RhsNames = SCI2Cflipud(RhsNames);
+RhsScope = SCI2Cflipud(RhsScope);
+
+// --- Repush everything into the stack. ---
+for cntpush = cntpop:-1:1
+   if RhsField(cntpush) <> 'Operands:' & RhsField(cntpush) <> 'Rhs    :'
+   AST_PushASTStack(RhsField(cntpush));
+   end
+end
+
+
+
+endfunction
diff --git a/macros/ASTManagement/AST_HandleFuncArray2D.sci b/macros/ASTManagement/AST_HandleFuncArray2D.sci
new file mode 100644
index 0000000..859c994
--- /dev/null
+++ b/macros/ASTManagement/AST_HandleFuncArray2D.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
+// This function is used for 2D array declaration
+// This function extracts the input arguments in the array and check there Name and Scope.
+// Then repush everything back to stack
+function [RhsNames,RhsScope,NRhs,FName] = AST_HandleFuncArray2D(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) ~= 'Rhs    :')
+   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
+
+first = AST_PopASTStack();
+second = AST_PopASTStack();
+
+FName = stripblanks(part(second,12:length(second)));
+
+RhsNames = SCI2Cflipud(RhsNames);
+RhsScope = SCI2Cflipud(RhsScope);
+
+// --- Repush everything into the stack. ---
+for cntpush = cntpop:-1:1
+   if RhsField(cntpush) <> 'Operands:' & RhsField(cntpush) <> 'Begin:' & RhsField(cntpush) <> 'Rhs    :'
+   PrintStringInfo(' ' + RhsField(cntpush),ReportFileName,'file','y');
+   AST_PushASTStack(RhsField(cntpush));
+   end
+end
+
+
+
+
+endfunction
diff --git a/macros/ASTManagement/AST_HandleRC.sci b/macros/ASTManagement/AST_HandleRC.sci
index 2a6cbc3..7056861 100644
--- a/macros/ASTManagement/AST_HandleRC.sci
+++ b/macros/ASTManagement/AST_HandleRC.sci
@@ -1,36 +1,15 @@
 function [RhsNames,RhsScope,NRhs] = AST_HandleRC(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
+// This function is used for 1D array declaration.
 
 SCI2CNInArgCheck(argn(2),2,2)
 
@@ -75,14 +54,5 @@ for cntpush = cntpop:-1:1
 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/macros/ASTManagement/AST_ParseIfExprStruct.sci b/macros/ASTManagement/AST_ParseIfExprStruct.sci
index 2bfb08d..88ba2e9 100644
--- a/macros/ASTManagement/AST_ParseIfExprStruct.sci
+++ b/macros/ASTManagement/AST_ParseIfExprStruct.sci
@@ -31,6 +31,8 @@ function [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedIn
 //
 // Status:
 // 11-Apr-2007 -- Raffaele Nutricato: Author.
+// 25-June-2017 -- Ukasha Noor: Revised By 
+// This function is counting the number of logical operators and there operands.
 //
 // Copyright 2007 Raffaele Nutricato.
 // Contact: raffaele.nutricato@tiscali.it
diff --git a/macros/ASTManagement/AST_ParseOperStruct.sci b/macros/ASTManagement/AST_ParseOperStruct.sci
index 903f095..ce0bcc7 100644
--- a/macros/ASTManagement/AST_ParseOperStruct.sci
+++ b/macros/ASTManagement/AST_ParseOperStruct.sci
@@ -26,6 +26,7 @@ function [FunctionName,InArg,NInArg,NOutArg] = AST_ParseOperStruct(FileInfo,Shar
 //
 // Status:
 // 11-Apr-2007 -- Raffaele Nutricato: Author.
+// 25-June-2017 -- Ukasha Noor: Revised By
 //
 // Copyright 2007 Raffaele Nutricato.
 // Contact: raffaele.nutricato@tiscali.it
diff --git a/macros/ASTManagement/_funcall_string.sci b/macros/ASTManagement/_funcall_string.sci
index 0ee9701..7c0b0ab 100644
--- a/macros/ASTManagement/_funcall_string.sci
+++ b/macros/ASTManagement/_funcall_string.sci
@@ -5,6 +5,7 @@ function txt=%funcall_string(F)
 //    rhs  : a list
 //    name : string, the name of the function
 //    lhsnb: number, the number of function lhs
+// Modified By: Ukasha Noor
 
 if F.name <> 'disp'
 txt=['Funcall  : '+F.name
diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib
deleted file mode 100644
index e457047..0000000
--- a/macros/ASTManagement/lib
+++ /dev/null
diff --git a/macros/ASTManagement/names b/macros/ASTManagement/names
index 6deb883..9ba83f7 100644
--- a/macros/ASTManagement/names
+++ b/macros/ASTManagement/names
@@ -31,6 +31,8 @@ AST_HandleFor
 AST_HandleForStatem
 AST_HandleFunCC
 AST_HandleFunRC
+AST_HandleFuncArray
+AST_HandleFuncArray2D
 AST_HandleHeader
 AST_HandleIfElse
 AST_HandleRC
diff --git a/macros/CCodeGeneration/C_GenDeclarations_Dup.sci b/macros/CCodeGeneration/C_GenDeclarations_Dup.sci
index 475e2e0..bdaf9c0 100644
--- a/macros/CCodeGeneration/C_GenDeclarations_Dup.sci
+++ b/macros/CCodeGeneration/C_GenDeclarations_Dup.sci
@@ -11,6 +11,10 @@ function Cdeclaration = C_GenDeclarations_Dup(InArg,NInArg,com_type,ArgStruct,CD
 //
 // Status:
 // 27-Oct-2007 -- Raffaele Nutricato: Author.
+//
+// 25-June-2017 -- Ukasha Noor: Modified it.
+// This function is called for array declaration in C.
+//
 // 10-Jun-2008 -- Raffaele Nutricato: adapted to work with realloc function.
 //
 // Copyright 2007 Raffaele Nutricato.
@@ -84,6 +88,9 @@ if (ArgStruct.Dimension > 0)
       computedSize = computedSize + ' * ' + ArgStruct.Size(sizeIterator);
       computedSizeField = computedSizeField + ', ' + ArgStruct.Size(sizeIterator);
     end
+// Modified Changes: row tells number of rows and col is number of columns in array.
+// col_type tells whether it is floatComplex or doubleComplex or real.
+// and accordingly it declares the array.
     Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+' '+ArgStruct.Name+'['+computedSize+']={';
     row = eval(ArgStruct.Size(1))
     col = eval(ArgStruct.Size(2))
diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci
index 3b977bd..dbdae9d 100644
--- a/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -70,7 +70,7 @@ else
     PrintStringInfo('CXX     = arm-linux-gnueabihf-g++ ',FileInfo.MakefileFilename,'file','y','y');
 	  PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
-    PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread',FileInfo.MakefileFilename,'file','y','y');
+    PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread -lRPIwfi',FileInfo.MakefileFilename,'file','y','y');
   else
 		PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
     PrintStringInfo('CXX     = g++',FileInfo.MakefileFilename,'file','y','y');
diff --git a/macros/CCodeGeneration/C_IfExpression.sci b/macros/CCodeGeneration/C_IfExpression.sci
index 359b788..630134e 100644
--- a/macros/CCodeGeneration/C_IfExpression.sci
+++ b/macros/CCodeGeneration/C_IfExpression.sci
@@ -11,6 +11,7 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,Fi
 //
 // Status:
 // 27-Oct-2007 -- Raffaele Nutricato: Author.
+// 28-June-2017 -- Ukasha Noor: Modified By
 //
 // Copyright 2007 Raffaele Nutricato.
 // Contact: raffaele.nutricato@tiscali.it
diff --git a/macros/CCodeGeneration/C_WhileExpression.sci b/macros/CCodeGeneration/C_WhileExpression.sci
index 368ccff..36fcc4f 100644
--- a/macros/CCodeGeneration/C_WhileExpression.sci
+++ b/macros/CCodeGeneration/C_WhileExpression.sci
@@ -11,6 +11,7 @@ function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,Sha
 //
 // Status:
 // 15-Nov-2007 -- Raffaele Nutricato: Author.
+// 27-June-2017 -- Ukasha Noor: Modified by
 //
 // Copyright 2007 Raffaele Nutricato.
 // Contact: raffaele.nutricato@tiscali.it
diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci
index d92a431..4220410 100644
--- a/macros/CCodeGeneration/GetClsFileName.sci
+++ b/macros/CCodeGeneration/GetClsFileName.sci
@@ -78,7 +78,6 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename))
    SCI2CClassName     = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
    SCI2CClassFileName = fullfile(FileInfo.SCI2CLibSCIAnnCls,SCI2CClassName+'.acls');
 end
-
 if (FlagFoundAnnFile == 0)
    [FlagFoundAnnFile,fullpathscifilename] = SCI2CFindFile(FileInfo.UserSciFilesPaths,FunName+'.sci');
    if (FlagFoundAnnFile == 0)
diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib
deleted file mode 100644
index 849f828..0000000
--- a/macros/CCodeGeneration/lib
+++ /dev/null
diff --git a/macros/ErrorMessages/lib b/macros/ErrorMessages/lib
deleted file mode 100644
index 075fda8..0000000
--- a/macros/ErrorMessages/lib
+++ /dev/null
diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
index 99eaaa5..4d1113e 100644
--- a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
+++ b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci
@@ -29,6 +29,7 @@ SCI2CNInArgCheck(argn(2),10,10);
 // --- Initialization. ---
 // -----------------------
 
+
 UpdatedOutArg   = OutArg;
 for cntin = 1:NInArg
    IN(cntin).TP    = InArg(cntin).Type;
@@ -101,7 +102,19 @@ for counterout = 1:NOutArg
    // This is a dynamic memory extension of a local variable and for the moment
    // we issue an error according to SCI2C specifications
    // #RNU_RES_E
-   //disp(FunSizeAnnot)
+   //disp(FunSizeAnnot(2),FunSizeAnnot(1))
+	//Ukasha
+//	if ASTFunName == svd
+//		x=1;
+//		for i=1:InArg(1).Size(1)
+//			for j=1:InArg(1).Size(2)
+//				A(i)(j)=InArg(1).Value(x);
+//			end
+//		end
+//		[U,S,V]=svd(A,"e");
+			
+
+ 
    for iterOutputPosition=1:size(FunSizeAnnot, 'c')
      tmpeval = eval(FunSizeAnnot(counterout, iterOutputPosition));
      if (IsNanSize(tmpeval))
diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib
deleted file mode 100644
index 1305602..0000000
--- a/macros/FunctionAnnotation/lib
+++ /dev/null
diff --git a/macros/FunctionList/lib b/macros/FunctionList/lib
deleted file mode 100644
index 9866fad..0000000
--- a/macros/FunctionList/lib
+++ /dev/null
diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib
deleted file mode 100644
index e0628d0..0000000
--- a/macros/GeneralFunctions/lib
+++ /dev/null
diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib
deleted file mode 100644
index 341ac21..0000000
--- a/macros/Hardware/AVR/lib
+++ /dev/null
diff --git a/macros/Hardware/RasberryPi/lib b/macros/Hardware/RasberryPi/lib
deleted file mode 100644
index 1ca3515..0000000
--- a/macros/Hardware/RasberryPi/lib
+++ /dev/null
diff --git a/macros/ImageProcessing/core/lib b/macros/ImageProcessing/core/lib
deleted file mode 100644
index 87e2cd9..0000000
--- a/macros/ImageProcessing/core/lib
+++ /dev/null
diff --git a/macros/ImageProcessing/highgui/lib b/macros/ImageProcessing/highgui/lib
deleted file mode 100644
index b2d9dbc..0000000
--- a/macros/ImageProcessing/highgui/lib
+++ /dev/null
diff --git a/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib
deleted file mode 100644
index f56b4e6..0000000
--- a/macros/ImageProcessing/imgproc/lib
+++ /dev/null
diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib
deleted file mode 100644
index b84761e..0000000
--- a/macros/Scilab-Arduino/lib
+++ /dev/null
diff --git a/macros/SymbolTable/ST_GetInArgInfo.sci b/macros/SymbolTable/ST_GetInArgInfo.sci
index 4c85408..69885dd 100644
--- a/macros/SymbolTable/ST_GetInArgInfo.sci
+++ b/macros/SymbolTable/ST_GetInArgInfo.sci
@@ -210,7 +210,7 @@ for cntinarg = 1:NInArg
    PrintStringInfo('   Type:      '+UpdatedInArg(cntinarg).Type,FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
    PrintStringInfo('   Size(1):   '+string(UpdatedInArg(cntinarg).Size(1)),FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
    PrintStringInfo('   Size(2):   '+string(UpdatedInArg(cntinarg).Size(2)),FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
-   PrintStringInfo('   Value:     '+string(UpdatedInArg(cntinarg).Value),FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
+   //PrintStringInfo('   Value:     '+string(UpdatedInArg(cntinarg).Value),FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
    PrintStringInfo('   FindLike:  '+string(UpdatedInArg(cntinarg).FindLike),FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
    PrintStringInfo('   Dimension: '+string(UpdatedInArg(cntinarg).Dimension),FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
    PrintStringInfo('   Scope:     '+UpdatedInArg(cntinarg).Scope,FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
diff --git a/macros/SymbolTable/ST_InsOutArg_Dup.sci b/macros/SymbolTable/ST_InsOutArg_Dup.sci
index bca6623..67554bd 100644
--- a/macros/SymbolTable/ST_InsOutArg_Dup.sci
+++ b/macros/SymbolTable/ST_InsOutArg_Dup.sci
@@ -175,7 +175,7 @@ for counteroutput = 1:NOutArg
       ST_Set(OutArg(counteroutput).Name,...
          OutArg(counteroutput).Type,...
          TmpOutArgSize,...
-         OutArg(counteroutput).Value,...
+         InArg,...
          OutArg(counteroutput).FindLike,...
          OutArg(counteroutput).Dimension,...
          SymbTableFileName);
diff --git a/macros/SymbolTable/lib b/macros/SymbolTable/lib
deleted file mode 100644
index 07204b5..0000000
--- a/macros/SymbolTable/lib
+++ /dev/null
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 5f6e914..7269e98 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -302,6 +302,7 @@ PrintStringInfo('i80'+ArgSeparator+'s0',ClassFileName,'file','y');
 PrintStringInfo('u160'+ArgSeparator+'s0',ClassFileName,'file','y');
 PrintStringInfo('i160'+ArgSeparator+'s0',ClassFileName,'file','y');
 PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('z0'+ArgSeparator+'c0',ClassFileName,'file','y');
 
 PrintStringInfo('d2'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('u82'+ArgSeparator+'s2',ClassFileName,'file','y');
@@ -317,7 +318,6 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
 
-
 // ---------------------
 // --- Class Int8. ---
 // ---------------------
@@ -5868,6 +5868,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_digitalWriteByte'; 
@@ -5920,6 +5921,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_pwmClock'; 
@@ -5944,6 +5946,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u320'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_pwmRange'; 
@@ -6000,6 +6003,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_I2CSetup'; 
@@ -6032,6 +6036,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_I2CRead'; 
@@ -6088,6 +6093,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_getAlt'; 
@@ -6124,6 +6130,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_gertboardAnalogRead'; 
@@ -6148,6 +6155,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_serialGetchar'; 
@@ -6169,6 +6177,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_pinModeAlt'; 
@@ -6233,6 +6242,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_pwmWrite'; 
@@ -6265,6 +6275,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160u160'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_gertboardAnalogWrite'; 
@@ -6289,6 +6300,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80g2'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0g2'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_pinMode'; 
@@ -6333,6 +6345,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u320'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_softToneWrite'; 
@@ -6357,6 +6370,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80i160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_waitForInterrupt'; 
@@ -6381,6 +6395,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_I2CWrite'; 
@@ -6413,6 +6428,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('g2u320'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('g2d0'+ArgSeparator+'i80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_serialOpen'; 
@@ -6437,6 +6453,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_pcf8574Setup'; 
@@ -6474,6 +6491,7 @@ PrintStringInfo('NOUT=        1',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_lcdPosition'; 
@@ -6499,6 +6517,7 @@ PrintStringInfo('NOUT=        1',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_I2CWriteReg8'; 
@@ -6524,6 +6543,7 @@ PrintStringInfo('NOUT=        1',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_shiftIn'; 
@@ -6548,6 +6568,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_softPwmCreate'; 
@@ -6572,6 +6593,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_mcp23s08Setup'; 
@@ -6600,6 +6622,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_shiftOut'; 
@@ -6624,6 +6647,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u160u80u80u80u80'+ArgSeparator+'i80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_sr595Setup'; 
@@ -6648,6 +6672,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_lcdCharDef'; 
@@ -6672,6 +6697,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---
 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
 PrintStringInfo('u80u80u80u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
 
 // --- Annotation Function And Function List Function. ---
 FunctionName = 'RPI_lcdInit'; 
@@ -10107,7 +10133,7 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
 
 PrintStringInfo('NIN=         3',ClassFileName,'file','y');
 PrintStringInfo('NOUT=         1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP=    IN(3).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP=    ''d''',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
 PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
 
diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib
deleted file mode 100644
index f25c4d9..0000000
--- a/macros/ToolInitialization/lib
+++ /dev/null
diff --git a/macros/cb_sci2c_gui.sci b/macros/cb_sci2c_gui.sci
index 2267c6c..bf77c25 100644
--- a/macros/cb_sci2c_gui.sci
+++ b/macros/cb_sci2c_gui.sci
@@ -200,12 +200,17 @@ elseif get(gcbo, "tag")=="convertbtn" then
 
   // -*- DEBUG ONLY -*-
 
-  //mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
-  //mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
-  //mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
-  //mprintf("RunMode = {%s}\n", RunMode);
-  //mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
-  //mprintf("NativeBuild = {%s}\n", NativeBuild);
+  mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
+  mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
+  mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
+  mprintf("RunMode = {%s}\n", RunMode);
+  mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
+  mprintf("NativeBuild = {%s}\n", NativeBuild);
+  mprintf("Target = {%s}\n", Target);
+  mprintf("Board Name = {%s}\n", Board_name);
+//  disp("Variable Names:")
+//  disp(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name)
+//  disp("Done")
   scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name);
 //
 // --- sci2c help ---
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index ff60652..209cec0 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -625,9 +625,9 @@ function allSources = getAllSources(SharedInfo)
       "src/c/elementaryFunctions/lnp1m1/slnp1m1s.c"
       "src/c/elementaryFunctions/lnp1m1/dlnp1m1s.c"
 
-	"src/c/elementaryFunctions/float/dfloats.c"
+      "src/c/elementaryFunctions/float/dfloats.c"
       "src/c/elementaryFunctions/float/dfloata.c"
-	"src/c/elementaryFunctions/float/sfloats.c"
+      "src/c/elementaryFunctions/float/sfloats.c"
       "src/c/elementaryFunctions/float/sfloata.c"
       "src/c/elementaryFunctions/float/u8floats.c"
       "src/c/elementaryFunctions/float/u8floata.c"
diff --git a/macros/findDeps/lib b/macros/findDeps/lib
deleted file mode 100644
index c925b2f..0000000
--- a/macros/findDeps/lib
+++ /dev/null
diff --git a/macros/lib b/macros/lib
deleted file mode 100644
index fe083dc..0000000
--- a/macros/lib
+++ /dev/null
diff --git a/macros/sci2c_gui.sci b/macros/sci2c_gui.sci
index bee6fe4..cad8b24 100644
--- a/macros/sci2c_gui.sci
+++ b/macros/sci2c_gui.sci
@@ -216,7 +216,7 @@ outformatlabel = uicontrol("parent", sci2cfig,...
 outformatradiostalone = uicontrol("parent", sci2cfig,...
     "style", "radiobutton",...
     "string", gettext("Stand-alone"),...
-    "position",[2*margin+widgetLabelWidth outformaty 2*radiow widgeth],...
+    "position",[2*margin+widgetLabelWidth outformaty 2*radiow-10 widgeth],...
     "horizontalalignment", "left",...
     "fontname", defaultfont,...
     "fontunits", "points",...
@@ -309,7 +309,7 @@ runradiotranslate = uicontrol("parent", sci2cfig,...
 runradiogenlib = uicontrol("parent", sci2cfig,...
     "style", "radiobutton",...
     "string", gettext("Generate library"),...
-    "position",[2*margin+widgetLabelWidth+2*radiow runy 120 widgeth],...
+    "position",[2*margin+widgetLabelWidth+2*radiow+20 runy 150 widgeth],...
     "horizontalalignment", "left",...
     "fontname", defaultfont,...
     "fontunits", "points",...