Revert "SCi2cDeps updated, Windows compatibility resolved"

17 files changed, 0 insertions, 226 deletions

diff --git a/macros/ASTManagement/%equal_string.sci b/macros/ASTManagement/%equal_string.sci
index 29e8cb6b..041fb84a 100644
--- a/macros/ASTManagement/%equal_string.sci
+++ b/macros/ASTManagement/%equal_string.sci
@@ -13,8 +13,4 @@ function txt=%equal_string(e)
        '     '+objectlist2string(e.lhs)
        'EndEqual'
       ]
-<<<<<<< HEAD
 endfunction
-=======
-endfunction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
diff --git a/macros/ASTManagement/%funcall_string.sci b/macros/ASTManagement/%funcall_string.sci
index 449cc744..fc4b929b 100644
--- a/macros/ASTManagement/%funcall_string.sci
+++ b/macros/ASTManagement/%funcall_string.sci
@@ -8,17 +8,13 @@ function txt=%funcall_string(F)
 // Modified By: Ukasha Noor
 
 
-<<<<<<< HEAD
 if F.name <> 'disp'
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 txt=['Funcall  : '+F.name
      '  #lhs   : '+string(F.lhsnb)
      '  Rhs    : '
      '      '+objectlist2string(F.rhs)
      'EndFuncall'
     ]
-<<<<<<< HEAD
 else
 txt=['Funcall  : '+F.name
      '  #lhs   : '+'0'
@@ -27,6 +23,4 @@ txt=['Funcall  : '+F.name
      'EndFuncall'
     ]
 end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 endfunction
diff --git a/macros/ASTManagement/%operatio_string.sci b/macros/ASTManagement/%operatio_string.sci
index 2a3554dc..cc18e919 100644
--- a/macros/ASTManagement/%operatio_string.sci
+++ b/macros/ASTManagement/%operatio_string.sci
@@ -4,17 +4,13 @@ function txt=%operatio_string(O)
 //fields:
 //     operands: a list
 //     operator: a string
-<<<<<<< HEAD
 if O.operator <> 'rc' & O.operator <> 'cc'
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
   txt=['Operation'
        '   Operands:'
        '      '+objectlist2string(O.operands)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-<<<<<<< HEAD
 elseif O.operator == 'rc'
   txt=['   Operands:'
        '      '+objectlist2string(O.operands)
@@ -27,6 +23,3 @@ elseif O.operator == 'cc'
       ]
 end
 endfunction
-=======
-endfunction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
diff --git a/macros/ASTManagement/%operation_string.sci b/macros/ASTManagement/%operation_string.sci
index 2de021d9..c9282f67 100644
--- a/macros/ASTManagement/%operation_string.sci
+++ b/macros/ASTManagement/%operation_string.sci
@@ -10,8 +10,4 @@ function txt=%operation_string(O)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-<<<<<<< HEAD
 endfunction
-=======
-endfunction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci
index 136c5a18..516291a8 100644
--- a/macros/ASTManagement/AST2Ccode.sci
+++ b/macros/ASTManagement/AST2Ccode.sci
@@ -44,9 +44,6 @@ nxtscifunname   = SharedInfo.NextSCIFunName;
 nxtscifunnumber = SharedInfo.NextSCIFunNumber;
 ReportFileName  = FileInfo.Funct(nxtscifunnumber).ReportFileName;
 
-SharedInfo.Function_list = [];
-SharedInfo.Function_list_index = 1;
-
 // ---------------------------------
 // --- Parameter Initialization. ---
 // ---------------------------------
@@ -165,7 +162,6 @@ while ~meof(fidAST)
       //NUT: per fare in modo di coprire le ins, anche se ci puo' essere qualche rischio quando
       //NUT: ho miste ins e variabili, per esempio [c(1,1), a] = twooutfun();
       //NUT: in questo caso solo una delle due equal va scartata.
-
  	 if rc_count > 0 & cc_count == 0
 		[FileInfo,SharedInfo] = AST_HandleFunRC(FName,FileInfo,SharedInfo);
 		rc_count = 0;
@@ -186,7 +182,6 @@ while ~meof(fidAST)
          SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block.
          AST_PushASTStack(treeline);
       case 'Lhs       :' then
-
 		if rc_count > 0 & cc_count == 0
 		SharedInfo.Equal.Lhs = 1;
 		[EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo);
@@ -254,7 +249,6 @@ while ~meof(fidAST)
       // -----------------
       case 'EndProgram'
          SharedInfo = AST_HandleEndProgram(FileInfo,SharedInfo);
-
 	 disp_isthere = 0;
          //NUT: per essere precisi si puo' pensare di mettere un check
          //NUT: alla fine dell'albero per accertarsi che c'e' end program li' dove ce lo aspettiamo
@@ -305,19 +299,6 @@ while ~meof(fidAST)
          AST_PushASTStack(treeline);
    end
 end
-// ------------------------------------
-// -----List of functions Used--------
-// -------------------------------------
-
-SharedInfo.Function_list_index = SharedInfo.Function_list_index - 2;
-SharedInfo.Function_list = SharedInfo.Function_list(1:SharedInfo.Function_list_index);
-//To remove function repeatedly used----------
-x = size(unique(SharedInfo.Function_list));                          
-SharedInfo.Function_list_index = x(1);
-SharedInfo.Function_list = unique(SharedInfo.Function_list);
-
-SharedInfo.Function_list = SharedInfo.Function_list(1:SharedInfo.Function_list_index);
-
 // --------------------------------------
 // --- End main loop to read the AST. ---
 // --------------------------------------
diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci
index fad638a3..e191f106 100644
--- a/macros/ASTManagement/AST_HandleEndGenFun.sci
+++ b/macros/ASTManagement/AST_HandleEndGenFun.sci
@@ -1,7 +1,4 @@
-
 function [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,ASTFunType)
-function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
-
 // function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType)
 // -----------------------------------------------------------------
 // #RNU_RES_B
@@ -40,7 +37,6 @@ function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunT
 // ------------------------------
 // --- Check input arguments. ---
 // ------------------------------
-
 SCI2CNInArgCheck(argn(2),4,4);
 
 // -----------------------
@@ -93,11 +89,6 @@ NOutArg_mod = NOutArg
 		disp_isthere = 1;
 	end
 
-if (ASTFunType=='Funcall')
-SharedInfo.Function_list(SharedInfo.Function_list_index) =  ASTFunName;
-SharedInfo.Function_list_index = SharedInfo.Function_list_index + 1; 
-end
-NOutArg_mod = NOutArg
 	if(mtlb_strcmp(part(ASTFunName,1:2),'CV') == %T)
 		SharedInfo.OpenCVUsed = %T;
 	end
@@ -373,10 +364,6 @@ NOutArg_mod = NOutArg
 		PrintStringInfo('   returning back due logical function',ReportFileName,'file','y');
 		return;
 	   end
-
-	else
-	   [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo);
-
 	end
 	
 	if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number'))
@@ -481,14 +468,6 @@ NOutArg_mod = NOutArg
   	//#RNU_RES_B
 	PrintStringInfo('   C Function Name: '+CFunName,ReportFileName,'file','y');
 	if(IsArduinoFunction(ASTFunName))
-
-	CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod);
-    
-  	//#RNU_RES_B
-	PrintStringInfo('   C Function Name: '+CFunName,ReportFileName,'file','y');
-	if(IsArduinoFunction(ASTFunName))
-		//disp(ASTFunName)
-
 		if(IsArduinoSetupFunction(ASTFunName))
 			//If current function is an arduino setup function (like 'dc_motor_setup'), it 	
 			//should not be converted and inserted here. It is inserted in a list now and
diff --git a/macros/ASTManagement/AST_HandleIfElse.sci b/macros/ASTManagement/AST_HandleIfElse.sci
index 449586f7..2b549ed6 100644
--- a/macros/ASTManagement/AST_HandleIfElse.sci
+++ b/macros/ASTManagement/AST_HandleIfElse.sci
@@ -74,20 +74,13 @@ global STACKDEDUG
 // ---------------------------------------------------
 //#RNU_RES_E
 if (ASTIfExpType~='else')
-<<<<<<< HEAD
    [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType);
-=======
-   [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 else
    // "else" type doesn't contain any condition to test.
    IfCondArg = '';
    NIfCondArg = 0;
-<<<<<<< HEAD
    Op = '';
    NOp = 0;
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 end
 
 //#RNU_RES_B
@@ -96,10 +89,6 @@ end
 // -----------------------------
 // --- Generate the C code for if/elseif Expression. ---
 //#RNU_RES_E
-<<<<<<< HEAD
 SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo);
-=======
-SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 endfunction
diff --git a/macros/ASTManagement/AST_HandleWhileStatem.sci b/macros/ASTManagement/AST_HandleWhileStatem.sci
index 9b5dce15..d8c2f73c 100644
--- a/macros/ASTManagement/AST_HandleWhileStatem.sci
+++ b/macros/ASTManagement/AST_HandleWhileStatem.sci
@@ -36,11 +36,8 @@ global SCI2CSTACK
 global StackPosition;
 global STACKDEDUG
 
-<<<<<<< HEAD
 IfCondArg  = [];
 NIfCondArg = 0;
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 // ------------------------------
 // --- Check input arguments. ---
@@ -75,7 +72,6 @@ PrintStringInfo('   Redirecting C code to: '+FileInfo.Funct(nxtscifunnumber).CPa
 // --- Generate C code. ---
 // ------------------------
 //#RNU_RES_E
-<<<<<<< HEAD
 flagendpop = 0;
 IfExprField = AST_PopASTStack();
 
@@ -110,38 +106,6 @@ end
 IfCondArg = SCI2Cflipud(IfCondArg);
 
 SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo);
-=======
-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');
-   end
-
-   SharedInfo.WhileExpr.CondVar = ArgName;
-   //#RNU_RES_B
-   // --- Repush strings into the AST stack. ---
-   //#RNU_RES_E
-
-   AST_PushASTStack(Pop1);
-
-elseif (SharedInfo.WhileExpr.DimCondVar > 0)
-   error(9999, 'Cannot manage while with matrix conditions');
-end
-SharedInfo = C_WhileExpression(FileInfo,SharedInfo);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 // --------------------------
 // --- Update SharedInfo. ---
diff --git a/macros/ASTManagement/AST_ParseEqualStruct.sci b/macros/ASTManagement/AST_ParseEqualStruct.sci
index 528ddaee..68bc3da7 100644
--- a/macros/ASTManagement/AST_ParseEqualStruct.sci
+++ b/macros/ASTManagement/AST_ParseEqualStruct.sci
@@ -123,11 +123,7 @@ end
 // ------------------------
 //#RNU_RES_B
 PrintStringInfo('Function Name: '+FunctionName,ReportFileName,'file','y','n');
-<<<<<<< HEAD
 PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n');
-=======
-PrintStringInfo('N Intput Arguments: '+string(NInArg),ReportFileName,'file','y','n');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //#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 ac9c4004..3c322dd5 100644
--- a/macros/ASTManagement/AST_ParseFuncallStruct.sci
+++ b/macros/ASTManagement/AST_ParseFuncallStruct.sci
@@ -87,13 +87,10 @@ NOutArg = eval(stripblanks(part(buffstring,10:length(buffstring))));
 buffstring = AST_PopASTStack();
 FunctionName = stripblanks(part(buffstring,12:length(buffstring)));
 
-<<<<<<< HEAD
 //if (FunctionName == 'disp')
   // NOutArg = 0;
 //end	
 
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // -------------------------------------
 // --- Generate the InArg structure. ---
 // -------------------------------------
diff --git a/macros/ASTManagement/AST_ParseIfExprStruct.sci b/macros/ASTManagement/AST_ParseIfExprStruct.sci
index d9658e81..88ba2e9c 100644
--- a/macros/ASTManagement/AST_ParseIfExprStruct.sci
+++ b/macros/ASTManagement/AST_ParseIfExprStruct.sci
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 function [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType)
-=======
-function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType)
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType)
 // -----------------------------------------------------------------
 //#RNU_RES_B
@@ -69,7 +65,6 @@ global STACKDEDUG
 // ------------------------------------
 // --- Read if condition variables. ---
 // ------------------------------------
-<<<<<<< HEAD
 //OutArgOld=[];
 //OutArgNew=[];
 
@@ -84,19 +79,12 @@ global STACKDEDUG
 flagendpop = 0;
 IfExprField = AST_PopASTStack();
 PrintStringInfo(' '+IfExprField+' '+ASTIfExpType,ReportFileName,'file','y');
-=======
-flagendpop = 0;
-IfExprField = AST_PopASTStack();
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 if (ASTIfExpType=='if')
    if (IfExprField=='Expression:')
       flagendpop = 1;
       // Pop Again the If tag from the AST.
       IfExprField = AST_PopASTStack();
-<<<<<<< HEAD
       PrintStringInfo(' '+IfExprField,ReportFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
    end
 elseif (ASTIfExpType=='elseif')
    if (IfExprField=='Else If Expression')
@@ -105,18 +93,13 @@ elseif (ASTIfExpType=='elseif')
 else
    error(9999, 'Unknown ASTIfExpType ""'+ASTIfExpType+'"".');
 end
-<<<<<<< HEAD
 NOp=0;
 Op=[];
-=======
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 while (flagendpop == 0)
    if (IfExprField~='<EOL>')   
       if (ASTIfExpType=='if')
          if (IfExprField=='Expression:')
             flagendpop = 1;
-<<<<<<< HEAD
             //PrintStringInfo('hello dere  '+IfExprField,ReportFileName,'file','y');
             // Pop Again the If tag from the AST.
             IfExprField = AST_PopASTStack();
@@ -133,18 +116,10 @@ while (flagendpop == 0)
 	    IfCondArg(NIfCondArg) = IfExprField;
 	    end
             //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
-=======
-            // Pop Again the If tag from the AST.
-            IfExprField = AST_PopASTStack();
-         else
-            NIfCondArg = NIfCondArg + 1;
-            [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
          end
       elseif (ASTIfExpType=='elseif')
          if (IfExprField=='Else If Expression')
             flagendpop = 1;
-<<<<<<< HEAD
 	    //IfExprField = AST_PopASTStack();
          else
 	    if (IfExprField=='&&' | IfExprField=='||')
@@ -169,18 +144,6 @@ end
 
 IfCondArg = SCI2Cflipud(IfCondArg);
 
-=======
-         else
-            NIfCondArg = NIfCondArg + 1;
-            IfCondArg(NIfCondArg) = IfExprField;
-            [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField);
-         end
-      end
-   end
-   IfExprField = AST_PopASTStack();
-end
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //#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 cc992a9e..ce0bcc72 100644
--- a/macros/ASTManagement/AST_ParseOperStruct.sci
+++ b/macros/ASTManagement/AST_ParseOperStruct.sci
@@ -62,7 +62,6 @@ LabelFunctName = 'Operator: ';
 FunctionName = stripblanks(part(buffstring,length(LabelFunctName)+1:length(buffstring)));
 // Generate the proper function name.
 FunctionName  = Operator2FunName(FunctionName);
-<<<<<<< HEAD
 PrintStringInfo(' '+FunctionName,ReportFileName,'file','y');
 
 if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr')
@@ -74,8 +73,6 @@ if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr')
     //RhsField = AST_PopASTStack();
     return ;
 end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 // ------------------------------
 // --- Read input parameters. ---
diff --git a/macros/ASTManagement/GenOutArgNames.sci b/macros/ASTManagement/GenOutArgNames.sci
index 800b8d6d..7b62c794 100644
--- a/macros/ASTManagement/GenOutArgNames.sci
+++ b/macros/ASTManagement/GenOutArgNames.sci
@@ -32,15 +32,12 @@ SCI2CNInArgCheck(argn(2),9,9);
 nxtscifunname   = SharedInfo.NextSCIFunName;
 nxtscifunnumber = SharedInfo.NextSCIFunNumber;
 ReportFileName  = FileInfo.Funct(nxtscifunnumber).ReportFileName;
-<<<<<<< HEAD
 
 
 global SCI2CSTACK
 global StackPosition;
 global STACKDEDUG
 
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // #RNU_RES_B
 PrintStringInfo('   Generating Out Arg names.',ReportFileName,'file','y');
 // #RNU_RES_E
@@ -52,7 +49,6 @@ OutArg = OldOutArg;
 // ---------------------------------------------------------------------------------------
 // At this step only the name of the output arguments can be generated. ---
 //#RNU_RES_E
-<<<<<<< HEAD
 if (FunctionName ~= 'OpLogGt' & FunctionName ~= 'OpLogLt' & FunctionName ~= 'OpLogGe' & FunctionName ~= 'OpLogLe' & FunctionName ~= 'OpLogNe' & FunctionName ~= 'OpLogEq')
 	if (NLhsArg > 0)
 	   //#RNU_RES_B
@@ -118,49 +114,4 @@ else
 	s = AST_PopASTStack();
 	PrintStringInfo('   Pushing in the AST stack: ""'+s+'"".',ReportFileName,'file','y');
 end
-=======
-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
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 endfunction
diff --git a/macros/ASTManagement/_funcall_string.sci b/macros/ASTManagement/_funcall_string.sci
index 5218d533..7c0b0abf 100644
--- a/macros/ASTManagement/_funcall_string.sci
+++ b/macros/ASTManagement/_funcall_string.sci
@@ -7,17 +7,13 @@ function txt=%funcall_string(F)
 //    lhsnb: number, the number of function lhs
 // Modified By: Ukasha Noor
 
-<<<<<<< HEAD
 if F.name <> 'disp'
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 txt=['Funcall  : '+F.name
      '  #lhs   : '+string(F.lhsnb)
      '  Rhs    : '
      '      '+objectlist2string(F.rhs)
      'EndFuncall'
     ]
-<<<<<<< HEAD
 else
 txt=['Funcall  : '+F.name
      '  #lhs   : '+'0'
@@ -26,6 +22,4 @@ txt=['Funcall  : '+F.name
      'EndFuncall'
     ]
 end
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 endfunction
diff --git a/macros/ASTManagement/_operatio_string.sci b/macros/ASTManagement/_operatio_string.sci
index 76753868..e9332337 100644
--- a/macros/ASTManagement/_operatio_string.sci
+++ b/macros/ASTManagement/_operatio_string.sci
@@ -10,8 +10,4 @@ function txt=%operatio_string(O)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-<<<<<<< HEAD
 endfunction
-=======
-endfunction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
diff --git a/macros/ASTManagement/_operation_string.sci b/macros/ASTManagement/_operation_string.sci
index 2de021d9..c9282f67 100644
--- a/macros/ASTManagement/_operation_string.sci
+++ b/macros/ASTManagement/_operation_string.sci
@@ -10,8 +10,4 @@ function txt=%operation_string(O)
        '   Operator: '+O.operator
        'EndOperation'
       ]
-<<<<<<< HEAD
 endfunction
-=======
-endfunction
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
diff --git a/macros/ASTManagement/names b/macros/ASTManagement/names
index 3045d397..9ba83f73 100644
--- a/macros/ASTManagement/names
+++ b/macros/ASTManagement/names
@@ -21,10 +21,7 @@ AST_ExtractNameAndScope
 AST_GetASTFile
 AST_GetFuncallPrm
 AST_GetPrecAndLhsArg
-<<<<<<< HEAD
 AST_HandleCC
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 AST_HandleEOL
 AST_HandleEndFor
 AST_HandleEndGenFun
@@ -32,7 +29,6 @@ AST_HandleEndProgram
 AST_HandleEndWhile
 AST_HandleFor
 AST_HandleForStatem
-<<<<<<< HEAD
 AST_HandleFunCC
 AST_HandleFunRC
 AST_HandleFuncArray
@@ -40,10 +36,6 @@ AST_HandleFuncArray2D
 AST_HandleHeader
 AST_HandleIfElse
 AST_HandleRC
-=======
-AST_HandleHeader
-AST_HandleIfElse
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 AST_HandleWhileExpr
 AST_HandleWhileStatem
 AST_ParseEqualStruct