diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch) | |
| tree | 8fa462e65aca52e5e933dee026a78c31baf0181c /macros/CCodeGeneration/C_WhileExpression.sci | |
| parent | f577f255fd5c1d30bc770e9b053823ada8684528 (diff) | |
| parent | 69c573fe2e59236f063aaa94dcd44b556f945cbc (diff) | |
| download | scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2 scilab2c-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/CCodeGeneration/C_WhileExpression.sci')
| -rw-r--r-- | macros/CCodeGeneration/C_WhileExpression.sci | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/macros/CCodeGeneration/C_WhileExpression.sci b/macros/CCodeGeneration/C_WhileExpression.sci index 368ccffa..c63b9e80 100644 --- a/macros/CCodeGeneration/C_WhileExpression.sci +++ b/macros/CCodeGeneration/C_WhileExpression.sci @@ -1,4 +1,8 @@ +<<<<<<< HEAD function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo) +======= +function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) // ----------------------------------------------------------------- // //NUT: add description here @@ -19,7 +23,11 @@ function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,Sha // ------------------------------ // --- Check input arguments. --- // ------------------------------ +<<<<<<< HEAD SCI2CNInArgCheck(argn(2),6,6); +======= +SCI2CNInArgCheck(argn(2),2,2); +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ----------------------- // --- Initialization. --- @@ -63,7 +71,11 @@ 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. +<<<<<<< HEAD // Function not defined for given argument type(s), +======= + // Function not defined for given argument type(s),
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // check arguments or define function %0_mputstr for overloading. end PrintStringInfo(C_Strings(cntstr),CPass1WhileEpilFileName ,'file','y','n'); @@ -76,6 +88,7 @@ PrintStringInfo('}',CPass1WhileEpilFileName ,'file','y'); // ------------------------------ // --- Insert for expression. --- // ------------------------------ +<<<<<<< HEAD //CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; //PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); @@ -97,6 +110,9 @@ CCall = CCall+'while'; CCall = CCall+')'; PrintStringInfo(' '+CCall,ReportFileName,'file','y'); +======= +CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); // ------------------- |