diff options
Diffstat (limited to '2.3-1/macros/ASTManagement/AST_HandleIfElse.sci')
| -rw-r--r-- | 2.3-1/macros/ASTManagement/AST_HandleIfElse.sci | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci b/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci index 449586f7..2b549ed6 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci +++ b/2.3-1/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 |