Merge branch 'master' into intoinside/issue1

Author: intoinside

.gitignore

@@ -13,9 +13,10 @@
 # Doxygen
 html/*
 xml/*
-lib/output
+output
 
 # IDE and tool files
 .idea
 .ra
 .vscode
+.code-workspace

Doxyfile

@@ -24,29 +24,22 @@
 import re
 from pathlib import Path
 
-def replace_body_in_curly_brackets(string_to_elaborate):
-    """Function printing python version."""
-    new_string_to_elaborate = re.sub(r"(\{[^\{\}]*\})", r";", string_to_elaborate)
-    while new_string_to_elaborate != string_to_elaborate:
-        string_to_elaborate = new_string_to_elaborate
-        new_string_to_elaborate = re.sub(r"(\{[^\{\}]*\})", r";", string_to_elaborate)
-
-    return string_to_elaborate
-
 def remove_assert(content):
     """Function printing python version."""
-    # match .assert "macroName(x)", { macroName(1) }, { lda #1 }
-    content = re.sub(r".assert [\.\|\"\w\(\)\,\s+\{\}\%\#\$\;\[\]]+\}", "", content)
+    # match .assert "macroName(x)", macroName(1), lda #0
+    # on single line without curly braces
+    content = re.sub(r".assert [^{}]*(?=\n|$)", r"", content)
 
-    # match .assert "macroName(x)", macroName(1), 1
-    content = re.sub(r"(.assert [^\,]+\,[^\,]+\,[^\n]+)", r"", content)
+    # match .assert "macroName(x)", { macroName(1) }, { lda #0 }
+    # on single or multiple line with curly braces
+    content = re.sub(r".assert [^\}]+\}[^\}]+\}", r"", content)
 
     return content
 
 def remove_assert_error(content):
     """Function printing python version."""
     # match .asserterror "macroName(x)", { macroName(1) }
-    content = re.sub(r"(.asserterror [^\,]+\,[^\}]+\})", r"", content)
+    content = re.sub(r".asserterror [^\}]+\}", r"", content)
 
     return content
 
@@ -67,7 +60,7 @@ def remove_importonce(content):
 def remove_import(content):
     """Function printing python version."""
     # remove import
-    content = re.sub(r"#import[\w\"\\\/\.\s]*\n", "", content)
+    content = re.sub(r"#import[^\"]+\"[^\"]+\"\n", "", content)
 
     return content
 
@@ -78,27 +71,56 @@ def remove_inital_dot_from_keywords(content):
     content = content.replace('.macro ', 'macro ')
     content = content.replace('.function ', 'function ')
     content = content.replace('.label ', 'label ')
+    content = content.replace('.const ', 'const ')
     content = content.replace('.pseudocommand ', 'pseudocommand ')
+    content = content.replace('.struct ', 'struct ')
 
     return content
 
-def add_semicolor_to_label_declaration(content):
+def fix_struct_definition(content):
     """Function printing python version."""
-    # add semicolor at the end of label declaration
-    content = re.sub(r'(label[^\n]+)', r'\1;', content)
+    # add a comma on the last field definition on struct before
+    # closing curly brace
+    content = re.sub(r"((.struct)[\s@\w]+\{[^\}]+)", r"\1,", content)
+    content = re.sub(r"((.struct)[\s@\w]+\{[^\}]+\})", r"\1;", content)
 
     return content
 
-def convert_file(filename):
+def add_semicolon_to_label_declaration(content):
     """Function printing python version."""
-    print("Processing " + filename)
-    head, tail = os.path.split(filename)
+    # add semicolon at the end of label declaration
+    content = re.sub(r'(label[^\n\,]+)', r'\1;', content)
+
+    return content
+
+def add_semicolon_to_const_declaration(content):
+    """Function printing python version."""
+    # add semicolon at the end of const declaration
+    content = re.sub(r'(const[^\n\,]+)', r'\1;', content)
+
+    return content
 
-    output_filename = head + '/output/' + tail
+def remove_some_newline(content):
+    """Function printing python version."""
+    content = re.sub(r"[\n]{2,}\/\*\*", r"\n\n/**", content)
 
-    print("Reading...")
-    content = open(filename, 'r', encoding='utf8').read()
+    return content
+
+def check_folder(path_to_folder):
+    """Function printing python version."""
+    if os.path.isdir(path_to_folder) is False:
+        print("Creating " + path_to_folder)
+        os.makedirs(path_to_folder, exist_ok=True)
 
+def read_file(filename):
+    """Function printing python version."""
+    print("Processing " + filename)
+
+    with open(filename, 'r', encoding='utf8') as file_to_open:
+        return file_to_open.read()
+
+def convert_file(content):
+    """Function printing python version."""
     print("Editing...")
 
     content = remove_assert(content)
@@ -111,30 +133,23 @@ def convert_file(filename):
 
     content = remove_import(content)
 
-    # we need to clean macro/function body, but first check if there
-    # is a namespace (we don't have to clean namespace body)
-    namespace_index = content.find(".namespace ")
-    if namespace_index != -1:
-        # there is a namespace, preserve it and clean any body inside it
-        namespace_index = content.find("{", namespace_index) + 1
-        content_in_namespace = content[namespace_index:]
-
-        content_in_namespace_replaced = replace_body_in_curly_brackets(content_in_namespace)
-
-        content = content.replace(content_in_namespace, content_in_namespace_replaced)
-    else:
-        # there is no namespace, clean all bodies
-        content = replace_body_in_curly_brackets(content)
+    content = fix_struct_definition(content)
 
     content = remove_inital_dot_from_keywords(content)
 
-    content = add_semicolor_to_label_declaration(content)
+    content = add_semicolon_to_label_declaration(content)
+    
+    content = add_semicolon_to_const_declaration(content)
 
-    # finish... save the new file
-    print("Saving " + output_filename + "...")
-    out_file = open(output_filename, 'w', encoding='utf8')
-    out_file.write(content)
-    out_file.close()
+    content = remove_some_newline(content)
+    return content
+
+def write_file(filename, content):
+    """Function printing python version."""
+    print("Saving " + filename + "...")
+    with open(filename, 'w', encoding='utf8') as out_file:
+        out_file.write(content)
+        out_file.close()
 
 def usage():
     """Function printing python version."""
@@ -154,11 +169,22 @@ def usage():
     print(usage())
 else:
     print("Using " + sys.argv[1] + " command line arguments")
-    head_argument, tail_argument = os.path.split(sys.argv[1])
-    if os.path.isdir(head_argument + '/output') is False:
-        print("Creating " + head_argument + '/output')
-        os.makedirs(head_argument + '/output', exist_ok=True)
+    src_path = os.path.abspath(sys.argv[1])
+    if src_path[-1] != '/':
+        src_path += '/'
 
-    for file in Path(sys.argv[1]).glob("*.asm"):
+    out_path = src_path + "../output"
+    check_folder(out_path)
+
+    print(out_path)
+
+    for file in Path(src_path).rglob("*.asm"):
+        relative_path = os.path.relpath(file, src_path)
+        output_file = out_path + "/" + relative_path
         if os.path.isdir(file) is False:
-            convert_file(str(file))
+            output_file_path = os.path.split(output_file)[0]
+            check_folder(output_file_path)
+
+            content_to_elaborate = read_file(str(file))
+            content_to_elaborate = convert_file(content_to_elaborate)
+            write_file(output_file, content_to_elaborate)

KickAssemblerToDoxygen.py

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+  ],
+  "settings": {}
+}

base.code-workspace

@@ -144,3 +144,17 @@ upstartEnd:
       }
     }
 }
+
+/**
+ * @brief Generates the negative value for the argument
+ *
+ * @param[in] value Value to negated
+ *
+ * @since 1.2.0
+*/
+.function neg(value) {
+  .return value ^ $FF
+}
+.assert "neg($00) gives $FF", neg($00), $FF
+.assert "neg($FF) gives $00", neg($FF), $00
+.assert "neg(%10101010) gives %01010101", neg(%10101010), %01010101