summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@raeburn.org>2016-10-27 02:53:07 -0400
committerKen Raeburn <raeburn@raeburn.org>2017-06-21 22:34:32 -0400
commit0b3a0f30b288945e739f1ac7c2f9d8a2fdd352ac (patch)
tree9b1d5022ed8b38bef02a1ed83c3b839e6a72a84b /src
parent63ec338c988f3ac661fd68591d688b3874c88511 (diff)
downloademacs-0b3a0f30b288945e739f1ac7c2f9d8a2fdd352ac.tar.gz
Short-circuit substitutions for some simple types.
Values that don't contain other values cannot be circular, so checking for circular objects is a waste of cycles. * src/lread.c (substitute_object_recurse): If the subtree being examined is a symbol, number, or property-less string, just return it.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lread.c b/src/lread.c
index f8493982c67..263638651db 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -3414,6 +3414,13 @@ substitute_object_recurse (Lisp_Object object, Lisp_Object placeholder, Lisp_Obj
if (EQ (placeholder, subtree))
return object;
+ /* For common object types that can't contain other objects, don't
+ bother looking them up; we're done. */
+ if (SYMBOLP (subtree)
+ || (STRINGP (subtree) && !string_intervals (subtree))
+ || NUMBERP (subtree))
+ return subtree;
+
/* If we've been to this node before, don't explore it again. */
if (!EQ (Qnil, Fmemq (subtree, seen_list)))
return subtree;