summaryrefslogtreecommitdiff
path: root/macros/ASTManagement/%funcall_string.sci
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/ASTManagement/%funcall_string.sci
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadscilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/ASTManagement/%funcall_string.sci')
-rw-r--r--macros/ASTManagement/%funcall_string.sci6
1 files changed, 0 insertions, 6 deletions
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