XSC improvements

.github/workflows/linux.yml

@@ -51,15 +51,14 @@ jobs:
       if: matrix.Repo != ''
     - name: Add packages
       run: |
-        sudo apt-get --yes install libxerces-c-dev libssl-dev ${{ matrix.PackageDeps }}
+        sudo apt-get --yes install libxerces-c-dev ${{ matrix.PackageDeps }}
     - name: create $ACE_ROOT/ace/config.h
       run: |
         '#include "ace/config-linux.h"' > ${env:ACE_ROOT}/ace/config.h
       shell: pwsh
     - name: create $ACE_ROOT/include/makeinclude/platform_macros.GNU
       run: |
         'xerces3=1' > ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
-        'ssl=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
         'xsc=1' >> ${env:ACE_ROOT}/include/makeinclude/platform_macros.GNU
       shell: pwsh
     - name: add optional optional macros
@@ -117,3 +116,14 @@ jobs:
           Pop-Location
         }
       shell: pwsh
+    - name: Run DanceX11 generated-code test
+      run: |
+        Push-Location ${env:XSC_ROOT}/Tests/DanceX11
+        try {
+          perl run_test.pl
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        }
+        finally {
+          Pop-Location
+        }
+      shell: pwsh

CCF/CodeGenerationKit/IndentationCxx.hpp

@@ -44,7 +44,9 @@ namespace Indentation
       position_ (0),
       paren_balance_ (0),
       spaces_ (2),
-      construct_ (OTHER)
+      construct_ (OTHER),
+      last_non_whitespace_ (0),
+      inline_initializer_ (false)
     {
       indentation_.push (0);
     }
@@ -94,6 +96,16 @@ namespace Indentation
           if (this->construct_ != CXX_COMMENT &&
               this->construct_ != STRING_LITERAL)
           {
+            if (this->last_non_whitespace_ == '=' ||
+                this->last_non_whitespace_ == '_')
+            {
+              this->output_indentation ();
+              result = this->write (c);
+              ++ this->position_;
+              this->inline_initializer_ = true;
+              break;
+            }
+
             // Make sure there is a new line in the buffer. We then need to
             // move the correct position on the newline.
             this->ensure_new_line ();
@@ -114,6 +126,15 @@ namespace Indentation
         case '}':
           if (!(this->construct_ == CXX_COMMENT || this->construct_ == STRING_LITERAL))
           {
+            if (this->inline_initializer_)
+            {
+              this->output_indentation ();
+              result = this->write (c);
+              ++ this->position_;
+              this->inline_initializer_ = false;
+              break;
+            }
+
             // Remove the current indentation value, if it exists.
             if (this->indentation_.size () > 1)
               this->indentation_.pop ();
@@ -138,8 +159,7 @@ namespace Indentation
             this->hold_.push_back (c);
 
 
-            // Add double newline after '}'.
-            this->hold_.push_back ('\n');
+            // Add a newline after '}'.
             this->hold_.push_back ('\n');
 
             // Set position to the start of the line.
@@ -319,6 +339,9 @@ namespace Indentation
           // Update the position.
           ++ this->position_;
         }
+
+        if (c != ' ' && c != '\t' && c != '\n' && c != '\r')
+          this->last_non_whitespace_ = c;
       }
       catch (const Full &)
       {
@@ -431,6 +454,12 @@ namespace Indentation
     /// The type of construct.
     Construct construct_;
 
+    /// Last non-whitespace input character.
+    char_type last_non_whitespace_;
+
+    /// Whether the current brace pair is an inline initializer.
+    bool inline_initializer_;
+
     /// Type definition of the holding queue.
     using Hold = std::deque<int_type>;