sbdl 1.18.1__tar.gz → 1.18.2__tar.gz

sbdl-1.18.2/PKG-INFO

@@ -0,0 +1,23 @@
+Metadata-Version: 2.4
+Name: sbdl
+Version: 1.18.2
+Summary: System Behaviour Description Language (Compiler)
+Home-page: https://sbdl.dev
+Author: Michael A. Hicks
+Author-email: michael@mahicks.org
+License: Proprietary
+Requires-Python: >=3.6
+Requires-Dist: networkx
+Requires-Dist: matplotlib
+Requires-Dist: docx2txt
+Requires-Dist: pandas
+Requires-Dist: openpyxl
+Requires-Dist: docxtpl
+Requires-Dist: jinja2
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

sbdl-1.18.2/sbdl.egg-info/PKG-INFO

@@ -0,0 +1,23 @@
+Metadata-Version: 2.4
+Name: sbdl
+Version: 1.18.2
+Summary: System Behaviour Description Language (Compiler)
+Home-page: https://sbdl.dev
+Author: Michael A. Hicks
+Author-email: michael@mahicks.org
+License: Proprietary
+Requires-Python: >=3.6
+Requires-Dist: networkx
+Requires-Dist: matplotlib
+Requires-Dist: docx2txt
+Requires-Dist: pandas
+Requires-Dist: openpyxl
+Requires-Dist: docxtpl
+Requires-Dist: jinja2
+Dynamic: author
+Dynamic: author-email
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary

{sbdl-1.18.1 → sbdl-1.18.2}/sbdl.py

@@ -215,8 +215,8 @@ _B=None
 _A=True
 import argparse,base64,datetime,csv,functools,getpass,hashlib,importlib,io,json,os,pathlib,platform,re,shlex,string,subprocess,sys,tarfile,tempfile,textwrap,time,traceback,types,unittest,urllib.request,urllib.parse,warnings,zlib,zipfile
 __NAME=_j
-__VERSION='1.18.1'
-__VERSION_DEV='71c6d0f'
+__VERSION='1.18.2'
+__VERSION_DEV='9a63197'
 __VERSION_DSL='25.6'
 __VERSION_REST_API='1.1.0'
 __AUTHOR='contact@sbdl.dev'
@@ -644,6 +644,16 @@ class SBDL_Parser:
 			else:result_l=''.join(result_l)
 			return result_l,index
 		def fudge_recurse(possible_directive):nonlocal errors;fudge_value=SBDL_Parser.Tokens.macro_delimeters[0]+possible_directive+SBDL_Parser.Tokens.macro_delimeters[1];fudged_value,errors_l=self.replace_directives(fudge_value,macro_definitions,throw_error,print_l);errors+=errors_l;return fudged_value if fudged_value!=fudge_value else possible_directive
+		def smart_flatten_macro_definition(macro_content):
+			resultant_content=macro_content
+			if isinstance(macro_content,str):resultant_content=macro_content
+			elif isinstance(macro_content,list):resultant_content=SBDL_Parser.Attributes.separator.join([smart_flatten_macro_definition(x)for x in macro_content])
+			elif isinstance(macro_content,dict):
+				if SBDL_Parser.Attributes.identifier in macro_content:
+					m_identifier=macro_content[SBDL_Parser.Attributes.identifier];resultant_content=m_identifier
+					if SBDL_Parser.Attributes.stereotype in macro_content:m_stereotype=macro_content[SBDL_Parser.Attributes.stereotype];resultant_content=f"{m_identifier}{SBDL_Parser.Tokens.stereotype_separator}{m_stereotype}"
+					else:resultant_content=m_identifier
+			return resultant_content
 		if get_config_value(_A4,number=_A)and result!=_B and isinstance(result,str):
 			if get_config_value(_AP,number=_A):macro_definitions[SBDL_Parser.Macros.define]=define_directive;macro_definitions[SBDL_Parser.Macros.define_append]=define_directive_append;macro_definitions[SBDL_Parser.Macros.define_from_func]=define_directive_from_function;macro_definitions[SBDL_Parser.Macros.define_from_index]=define_directive_from_index;macro_definitions[SBDL_Parser.Macros.define_from_file]=define_directive_from_file;macro_definitions[SBDL_Parser.Macros.define_from_file_hash]=define_directive_from_file_hash
 			else:macro_definitions.pop(SBDL_Parser.Macros.define,_B);macro_definitions.pop(SBDL_Parser.Macros.define_append,_B);macro_definitions.pop(SBDL_Parser.Macros.define_from_func,_B);macro_definitions.pop(SBDL_Parser.Macros.define_from_index,_B);macro_definitions.pop(SBDL_Parser.Macros.define_from_file,_B);macro_definitions.pop(SBDL_Parser.Macros.define_from_file_hash,_B)
@@ -668,7 +678,7 @@ class SBDL_Parser:
 							print_l(B.format('[Index Not Found]'),debug=_A);errors+=1
 							if throw_error:raise self.MacroReplaceException('Attempted replacement for non-existent definition index: "{}:{}"'.format(macro,index_fudge))
 					print_l('C_DEF REPLACE: "{}" --> "{}"'.format(input_str,replace_content),debug=_A)
-					if replace_content!=_B and replace_content!=str(_B)and errors==0:result=result.replace(amatch,str(replace_content))
+					if replace_content!=_B and replace_content!=str(_B)and errors==0:result=result.replace(amatch,str(smart_flatten_macro_definition(replace_content)))
 				else:
 					print_l(B.format('[Definition Not Found]'),debug=_A);errors+=1
 					if throw_error:raise self.MacroReplaceException('Attempted replacement for non-existent definition: "{}"'.format(macro),first_pass_can_ignore=_A)

{sbdl-1.18.1 → sbdl-1.18.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
   name='sbdl',
-  version='1.18.1',
+  version='1.18.2',
   description = "System Behaviour Description Language (Compiler)",
   author = "Michael A. Hicks",
   author_email = "michael@mahicks.org",

sbdl-1.18.1/PKG-INFO

@@ -1,9 +0,0 @@
-Metadata-Version: 2.1
-Name: sbdl
-Version: 1.18.1
-Summary: System Behaviour Description Language (Compiler)
-Home-page: https://sbdl.dev
-Author: Michael A. Hicks
-Author-email: michael@mahicks.org
-License: Proprietary
-Requires-Python: >=3.6

sbdl-1.18.1/sbdl.egg-info/PKG-INFO

@@ -1,9 +0,0 @@
-Metadata-Version: 2.1
-Name: sbdl
-Version: 1.18.1
-Summary: System Behaviour Description Language (Compiler)
-Home-page: https://sbdl.dev
-Author: Michael A. Hicks
-Author-email: michael@mahicks.org
-License: Proprietary
-Requires-Python: >=3.6