From 0d377698eaee9e31cf7ef79f20664454c3de8d5b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 10 Dec 2021 12:23:18 +0200
Subject: Add support for `ucc` (upper-camel-case) value in --function-naming
 option

---
 xsd/xsd/cxx/tree/name-processor.cxx | 26 ++++++++++++++++++++++++++
 xsd/xsd/cxx/tree/options.cli        |  6 +++---
 xsd/xsd/cxx/tree/validator.cxx      |  2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'xsd/xsd/cxx/tree')

diff --git a/xsd/xsd/cxx/tree/name-processor.cxx b/xsd/xsd/cxx/tree/name-processor.cxx
index 6ca616e..325870a 100644
--- a/xsd/xsd/cxx/tree/name-processor.cxx
+++ b/xsd/xsd/cxx/tree/name-processor.cxx
@@ -129,6 +129,12 @@ namespace CXX
               accessor_regex.push_back ("/([^,]+),([^,]+),([^,]+)/\\l$1\\u$2\\u$3/");
               accessor_regex.push_back ("/([^,]+)/\\l$1/");
             }
+            else if (fn == "ucc")
+            {
+              accessor_regex.push_back ("/([^,]+),([^,]+)/\\u$1\\u$2/");
+              accessor_regex.push_back ("/([^,]+),([^,]+),([^,]+)/\\u$1\\u$2\\u$3/");
+              accessor_regex.push_back ("/([^,]+)/\\u$1/");
+            }
             else
             {
               // Java: add get.
@@ -169,6 +175,11 @@ namespace CXX
               modifier_regex.push_back ("/([^,]+),([^,]+)/\\l$1\\u$2/");
               modifier_regex.push_back ("/([^,]+)/\\l$1/");
             }
+            else if (fn == "ucc")
+            {
+              modifier_regex.push_back ("/([^,]+),([^,]+)/\\u$1\\u$2/");
+              modifier_regex.push_back ("/([^,]+)/\\u$1/");
+            }
             else
             {
               // Java: add set.
@@ -202,6 +213,10 @@ namespace CXX
             {
               parser_regex.push_back ("/(.+)/\\l$1/");
             }
+            else if (fn == "ucc")
+            {
+              parser_regex.push_back ("/(.+)/\\u$1/");
+            }
             else if (fn == "java")
             {
               // Java: add parse.
@@ -219,6 +234,10 @@ namespace CXX
             {
               serializer_regex.push_back ("/(.+)/\\l$1/");
             }
+            else if (fn == "ucc")
+            {
+              serializer_regex.push_back ("/(.+)/\\u$1/");
+            }
             else if (fn == "java")
             {
               // Java: add serialize.
@@ -244,6 +263,11 @@ namespace CXX
               const_regex.push_back ("/([^,]+),([^,]+),([^,]+)/\\l$1_\\u$2_\\u$3/");
               const_regex.push_back ("/([^,]+),([^,]+)/\\l$1\\u$2/");
             }
+            else if (fn == "ucc")
+            {
+              const_regex.push_back ("/([^,]+),([^,]+),([^,]+)/\\u$1_\\u$2_\\u$3/");
+              const_regex.push_back ("/([^,]+),([^,]+)/\\u$1\\u$2/");
+            }
             else
             {
               // Java: all uppercase.
@@ -2173,6 +2197,8 @@ namespace CXX
 
           if (fn == "knr")
             n.context ().set ("tree-node-key", String ("tree_node_key"));
+          else if (fn == "ucc")
+            n.context ().set ("tree-node-key", String ("TreeNodeKey"));
           else
             n.context ().set ("tree-node-key", String ("treeNodeKey"));
 
diff --git a/xsd/xsd/cxx/tree/options.cli b/xsd/xsd/cxx/tree/options.cli
index 1f0b23f..0230429 100644
--- a/xsd/xsd/cxx/tree/options.cli
+++ b/xsd/xsd/cxx/tree/options.cli
@@ -257,9 +257,9 @@ namespace CXX
       {
         "<style>",
         "Specify the function naming convention that should be used in the
-         generated code. Valid styles are \cb{knr} (default), \cb{lcc}, and
-         \cb{java}. See the NAMING CONVENTION section below for more
-         information."
+         generated code. Valid styles are \cb{knr} (default), \cb{lcc},
+         \cb{ucc}, and \cb{java}. See the NAMING CONVENTION section below
+         for more information."
       };
 
       NarrowStrings --type-regex
diff --git a/xsd/xsd/cxx/tree/validator.cxx b/xsd/xsd/cxx/tree/validator.cxx
index 46deb6c..9785560 100644
--- a/xsd/xsd/cxx/tree/validator.cxx
+++ b/xsd/xsd/cxx/tree/validator.cxx
@@ -587,7 +587,7 @@ namespace CXX
 
       NarrowString fn (ops.function_naming ());
 
-      if (fn != "knr" && fn != "lcc" && fn != "java")
+      if (fn != "knr" && fn != "lcc" && fn != "ucc" && fn != "java")
       {
         wcerr << "error: unknown function naming style specified: '" <<
           fn.c_str () << "'" << endl;
-- 
cgit v1.1