From d305bcc6c081d0f7b0f496fc6fda2833359c064a Mon Sep 17 00:00:00 2001
From: thibault <thibault@xotic>
Date: Mon, 17 Apr 2023 04:43:52 -0400
Subject: [PATCH] Fix #25 (and attempt to fix readthedocs build)

---
 doc/source/org-doc.rst           | 32 ++++++++++++++++++--------------
 hpp2plantuml.org                 | 23 +++++++++++++----------
 setup.py                         |  4 ++--
 src/hpp2plantuml/hpp2plantuml.py |  3 +++
 tests/simple_classes.puml        |  2 +-
 tests/simple_classes_nodep.puml  |  2 +-
 tests/test_hpp2plantuml.py       |  4 +++-
 7 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/doc/source/org-doc.rst b/doc/source/org-doc.rst
index cb55853..80566b9 100644
--- a/doc/source/org-doc.rst
+++ b/doc/source/org-doc.rst
@@ -654,6 +654,9 @@ to the `sec-module-class-member`_.
             super().__init__(class_variable, member_scope)
 
             self._type = _cleanup_type(class_variable['type'])
+            if class_variable.get('array', 0):
+                self._type += '[]'
+
 
         def get_type(self):
             """Variable type accessor
@@ -2298,15 +2301,17 @@ the representation of variables.
 .. table:: List of test segments and corresponding PlantUML strings.
     :name: tbl-unittest-class_var
 
-    +---------------------------------------------+-------------------+
-    | C++                                         | plantuml          |
-    +=============================================+===================+
-    | "class Test {\npublic:\nint member; };"     | "+member : int"   |
-    +---------------------------------------------+-------------------+
-    | "class Test {\nprivate:\nint \* member; };" | "-member : int\*" |
-    +---------------------------------------------+-------------------+
-    | "class Test {\nprotected:\nint &member; };" | "#member : int&"  |
-    +---------------------------------------------+-------------------+
+    +------------------------------------------------+-------------------+
+    | C++                                            | plantuml          |
+    +================================================+===================+
+    | "class Test {\npublic:\nint member; };"        | "+member : int"   |
+    +------------------------------------------------+-------------------+
+    | "class Test {\nprivate:\nint \* member; };"    | "-member : int\*" |
+    +------------------------------------------------+-------------------+
+    | "class Test {\nprotected:\nint &member; };"    | "#member : int&"  |
+    +------------------------------------------------+-------------------+
+    | "class Test {\nprotected:\nint member[10]; };" | "#member : int[]" |
+    +------------------------------------------------+-------------------+
 
 
 .. code:: python
@@ -2705,7 +2710,7 @@ The comparison takes into account the white space, indentation, etc.
 
 
     class anon_union_1 {
-    	+vec : float
+    	+vec : float[]
     }
 
 
@@ -2898,7 +2903,7 @@ The comparison takes into account the white space, indentation, etc.
 
 
     class anon_union_1 {
-    	+vec : float
+    	+vec : float[]
     }
 
 
@@ -3390,14 +3395,13 @@ options.  Most of it is taken from `this post <https://hynek.me/articles/sharing
 .. code:: python
     :name: py-setup-import
 
-
     # %% Imports
     import os
     import sys
     import re
     import codecs
 
-    from setuptools import setup, find_namespace_packages, Command
+    from setuptools import setup, find_packages, Command
     try:
         import sphinx
         import sphinx.ext.apidoc
@@ -3418,7 +3422,7 @@ The non-boilerplate part of the ``setup.py`` file defines the package informatio
     ###################################################################
 
     NAME = "hpp2plantuml"
-    PACKAGES = find_namespace_packages(where="src")
+    PACKAGES = find_packages(where="src")
     META_PATH = os.path.join("src", NAME, "__init__.py")
     KEYWORDS = ["class"]
     CLASSIFIERS = [
diff --git a/hpp2plantuml.org b/hpp2plantuml.org
index 29190e4..4e63210 100644
--- a/hpp2plantuml.org
+++ b/hpp2plantuml.org
@@ -639,6 +639,9 @@ class ClassVariable(ClassMember):
         super().__init__(class_variable, member_scope)
 
         self._type = _cleanup_type(class_variable['type'])
+        if class_variable.get('array', 0):
+            self._type += '[]'
+
 
     def get_type(self):
         """Variable type accessor
@@ -2268,11 +2271,12 @@ the representation of variables.
 
 #+NAME: tbl-unittest-class_var
 #+CAPTION: List of test segments and corresponding PlantUML strings.
-| C++                                         | plantuml         |
-|---------------------------------------------+------------------|
-| "class Test {\npublic:\nint member; };"     | "+member : int"  |
-| "class Test {\nprivate:\nint * member; };"  | "-member : int*" |
-| "class Test {\nprotected:\nint &member; };" | "#member : int&" |
+| C++                                            | plantuml          |
+|------------------------------------------------+-------------------|
+| "class Test {\npublic:\nint member; };"        | "+member : int"   |
+| "class Test {\nprivate:\nint * member; };"     | "-member : int*"  |
+| "class Test {\nprotected:\nint &member; };"    | "#member : int&"  |
+| "class Test {\nprotected:\nint member[10]; };" | "#member : int[]" |
 
 
 #+NAME: test-unit-class_var
@@ -2641,7 +2645,7 @@ class anon_union_1::anon_struct_2 {
 
 
 class anon_union_1 {
-	+vec : float
+	+vec : float[]
 }
 
 
@@ -2833,7 +2837,7 @@ class anon_union_1::anon_struct_2 {
 
 
 class anon_union_1 {
-	+vec : float
+	+vec : float[]
 }
 
 
@@ -3223,14 +3227,13 @@ options.  Most of it is taken from [[https://hynek.me/articles/sharing-your-labo
 
 #+NAME: py-setup-import
 #+BEGIN_SRC python
-
 # %% Imports
 import os
 import sys
 import re
 import codecs
 
-from setuptools import setup, find_namespace_packages, Command
+from setuptools import setup, find_packages, Command
 try:
     import sphinx
     import sphinx.ext.apidoc
@@ -3250,7 +3253,7 @@ The non-boilerplate part of the =setup.py= file defines the package information.
 ###################################################################
 
 NAME = "hpp2plantuml"
-PACKAGES = find_namespace_packages(where="src")
+PACKAGES = find_packages(where="src")
 META_PATH = os.path.join("src", NAME, "__init__.py")
 KEYWORDS = ["class"]
 CLASSIFIERS = [
diff --git a/setup.py b/setup.py
index 0e5a46d..24c572e 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 import re
 import codecs
 
-from setuptools import setup, find_namespace_packages, Command
+from setuptools import setup, find_packages, Command
 try:
     import sphinx
     import sphinx.ext.apidoc
@@ -17,7 +17,7 @@
 ###################################################################
 
 NAME = "hpp2plantuml"
-PACKAGES = find_namespace_packages(where="src")
+PACKAGES = find_packages(where="src")
 META_PATH = os.path.join("src", NAME, "__init__.py")
 KEYWORDS = ["class"]
 CLASSIFIERS = [
diff --git a/src/hpp2plantuml/hpp2plantuml.py b/src/hpp2plantuml/hpp2plantuml.py
index e7049c9..847f8f5 100644
--- a/src/hpp2plantuml/hpp2plantuml.py
+++ b/src/hpp2plantuml/hpp2plantuml.py
@@ -407,6 +407,9 @@ def __init__(self, class_variable, member_scope='private'):
         super().__init__(class_variable, member_scope)
 
         self._type = _cleanup_type(class_variable['type'])
+        if class_variable.get('array', 0):
+            self._type += '[]'
+
 
     def get_type(self):
         """Variable type accessor
diff --git a/tests/simple_classes.puml b/tests/simple_classes.puml
index 379cbbe..ce47180 100644
--- a/tests/simple_classes.puml
+++ b/tests/simple_classes.puml
@@ -65,7 +65,7 @@ class anon_union_1::anon_struct_2 {
 
 
 class anon_union_1 {
-	+vec : float
+	+vec : float[]
 }
 
 
diff --git a/tests/simple_classes_nodep.puml b/tests/simple_classes_nodep.puml
index 3dd477b..181052b 100644
--- a/tests/simple_classes_nodep.puml
+++ b/tests/simple_classes_nodep.puml
@@ -65,7 +65,7 @@ class anon_union_1::anon_struct_2 {
 
 
 class anon_union_1 {
-	+vec : float
+	+vec : float[]
 }
 
 
diff --git a/tests/test_hpp2plantuml.py b/tests/test_hpp2plantuml.py
index 1fbb462..513efb5 100644
--- a/tests/test_hpp2plantuml.py
+++ b/tests/test_hpp2plantuml.py
@@ -63,7 +63,9 @@ def test_comparison_keys(self):
 private:
 int * member; };""", "-member : int*"], ["""class Test {
 protected:
-int &member; };""", "#member : int&"]]
+int &member; };""", "#member : int&"], ["""class Test {
+protected:
+int member[10]; };""", "#member : int[]"]]
 # %% Test class variables