From 78071f10f78238a7bc9b9db3c6c5530ba59c95a0 Mon Sep 17 00:00:00 2001 From: Adolfo Builes Date: Mon, 21 Sep 2020 14:50:57 -0500 Subject: [PATCH] Downcase value when comparing if the source is plural or singular. --- lib/xdrgen/generators/elixir.rb | 7 ++----- lib/xdrgen/generators/javascript.rb | 15 ++++++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lib/xdrgen/generators/elixir.rb b/lib/xdrgen/generators/elixir.rb index b02c1d3e7..680da31a9 100644 --- a/lib/xdrgen/generators/elixir.rb +++ b/lib/xdrgen/generators/elixir.rb @@ -164,7 +164,7 @@ def name(named) parent = name named.parent_defn if named.is_a?(AST::Concerns::NestedDefinition) # NOTE: classify will strip plurality, so we restore it if necessary - plural = named.name.pluralize == named.name + plural = named.name.downcase.pluralize == named.name.downcase base = named.name.underscore.classify result = plural ? base.pluralize : base @@ -172,10 +172,7 @@ def name(named) end def const_name(named) - # NOTE: classify will strip plurality, so we restore it if necessary - plural = named.name.pluralize == named.name - base = named.name.underscore.upcase - plural ? base.pluralize : base + named.name.underscore.upcase end def member_name(member) diff --git a/lib/xdrgen/generators/javascript.rb b/lib/xdrgen/generators/javascript.rb index 6e4508622..b0e7d3b87 100644 --- a/lib/xdrgen/generators/javascript.rb +++ b/lib/xdrgen/generators/javascript.rb @@ -170,7 +170,15 @@ def name(named) parent = name named.parent_defn if named.is_a?(AST::Concerns::NestedDefinition) # NOTE: classify will strip plurality, so we restore it if necessary - plural = named.name.pluralize == named.name + # + # Downcase the value since pluralize adds a lower case `s`. + # + # Without downcasing, the following appears as singular, but it's plural: + # + # "BEGIN_SPONSORING_FUTURE_RESERVEs" == "BEGIN_SPONSORING_FUTURE_RESERVES" + # => false + # + plural = named.name.downcase.pluralize == named.name.downcase base = named.name.underscore.classify result = plural ? base.pluralize : base @@ -178,10 +186,7 @@ def name(named) end def const_name(named) - # NOTE: classify will strip plurality, so we restore it if necessary - plural = named.name.pluralize == named.name - base = named.name.underscore.upcase - plural ? base.pluralize : base + named.name.underscore.upcase end def member_name(member)