summaryrefslogtreecommitdiff
path: root/macros/ASTManagement/_funcall_string.sci
diff options
context:
space:
mode:
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