summaryrefslogtreecommitdiff
path: root/macros/ASTManagement/_funcall_string.sci
diff options
context:
space:
mode:
authoryash11122017-07-07 22:34:47 +0530
committeryash11122017-07-07 22:34:47 +0530
commit2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch)
tree8fa462e65aca52e5e933dee026a78c31baf0181c /macros/ASTManagement/_funcall_string.sci
parentf577f255fd5c1d30bc770e9b053823ada8684528 (diff)
parent69c573fe2e59236f063aaa94dcd44b556f945cbc (diff)
downloadScilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz
Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2
Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'macros/ASTManagement/_funcall_string.sci')
-rw-r--r--macros/ASTManagement/_funcall_string.sci6
1 files changed, 6 insertions, 0 deletions
diff --git a/macros/ASTManagement/_funcall_string.sci b/macros/ASTManagement/_funcall_string.sci
index 0ee9701..c3101cb 100644
--- a/macros/ASTManagement/_funcall_string.sci
+++ b/macros/ASTManagement/_funcall_string.sci
@@ -6,13 +6,17 @@ function txt=%funcall_string(F)
// name : string, the name of the function
// lhsnb: number, the number of function lhs
+<<<<<<< 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'
@@ -21,4 +25,6 @@ txt=['Funcall : '+F.name
'EndFuncall'
]
end
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
endfunction