Skip to content

Commit fb5a4f2

Browse files
committed
Concatener: fix double eval.
1 parent a4ee51b commit fb5a4f2

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

microalg.l

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -313,21 +313,23 @@ Si vous ne l’avez pas déjà fait, commencez par le
313313
")
314314
(put 'Concatener 'text "Commande `Concatener`.")
315315
(de Concatener !arg_lst
316-
# Quelques vérifications :
317-
(for (!arg_num . !arg) !arg_lst
318-
(let (!evaled_arg (eval !arg)
319-
!error_prefix "`Concatener` : l’argument n°")
320-
(ifn (!inited !arg !evaled_arg)
321-
(quit (pack !error_prefix !arg_num " n’est pas initialisé.") !arg) )
322-
)
323-
)
324-
# Le calcul :
325-
(let (result (apply 'pack (mapcar 'eval !arg_lst)))
326-
(if result
327-
result
328-
""
316+
(let (!evaled_arg_lst (mapcar 'eval !arg_lst)
317+
!error_prefix "`Concatener` : l’argument n°")
318+
# Quelques vérifications :
319+
(for (!arg_num . !arg) !arg_lst
320+
(ifn (!inited !arg (car (nth !evaled_arg_lst !arg_num)))
321+
(quit (pack !error_prefix !arg_num " n’est pas initialisé.") !arg)
329322
)
330-
))
323+
)
324+
# Le calcul :
325+
(let (result (apply 'pack !evaled_arg_lst))
326+
(if result
327+
result
328+
""
329+
)
330+
)
331+
)
332+
)
331333

332334
# Gestion des variables
333335
(put 'Initialiser 'doc

0 commit comments

Comments
 (0)