From 60632a5628277dd6765483169f463d68814badd8 Mon Sep 17 00:00:00 2001 From: Viktor Ivarsson Date: Fri, 16 Aug 2024 09:19:32 +0200 Subject: [PATCH] Improve readability for `#entity` * Early return if there is no `entities` * Early return if there is no match for `reference` in `entities` Co-Authored-By: NAITOH Jun --- lib/rexml/parsers/baseparser.rb | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index 306e9d16..a0893d16 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -505,14 +505,13 @@ def pull_event private :pull_event def entity( reference, entities ) - value = nil - value = entities[ reference ] if entities - if value - record_entity_expansion - return unnormalize( value, entities ) - end + return unless entities + + value = entities[ reference ] + return if value.nil? - nil + record_entity_expansion + unnormalize( value, entities ) end # Escapes all possible entities