updated notes

Signed-off-by: Andre Simon <as@andre-simon.de>

AStyle/doc/notes.html

@@ -15,19 +15,43 @@
 
 </head>
 
-
 <body>
 
     <h1>Artistic Style Release Notes</h1>
 
+    <h3>Artistic Style 3.6.3 (October 2024)</h3>
+    <ul>
+    <li>Fix indent after single open parenthse (https://gitlab.com/saalen/astyle/-/issues/45)</li>
+    <li>Fix padding of operator char * methods (https://sourceforge.net/p/astyle/bugs/273/)</li>
+    <li>Fix padding of user defined type cast (https://sourceforge.net/p/astyle/bugs/250/)</li>
+    <li>Fix bitfield line break with macros (https://sourceforge.net/p/astyle/bugs/148/ )</li>
+    <li>Fix GSC modulo padding (https://gitlab.com/saalen/astyle/-/issues/55)</li>
+    <li>Removed flawed option --add-braces=nested (https://gitlab.com/saalen/astyle/-/issues/27)</li>
+    </ul>
+
+    <h3>Artistic Style 3.6.2 (September 2024)</h3>
+    <ul>
+        <li>Reverted alignment of user defined types using --align-pointer (https://gitlab.com/saalen/astyle/-/issues/35)</li>
+    </ul>
+
+    <h3>Artistic Style 3.6.1 (September 2024)</h3>
+    <ul>
+        <li>Fix setting of --pad-negation and --pad-include options (https://sourceforge.net/p/astyle/bugs/580/)</li>
+        <li>Fix --pad-include with UTF-8 BOM (https://sourceforge.net/p/astyle/bugs/580/)</li>
+        <li>Improve multiplication recognition with --align-pointer=type (https://sourceforge.net/p/astyle/bugs/572/)</li>
+        <li>Improve --align-pointer=type after parens and brackets (https://sourceforge.net/p/astyle/bugs/578/)</li>
+        <li>Removed VMS compilation options</li>
+        <li>Updated JNI interface to use Arduino IDE conventions</li>
+    </ul>
+
     <h3>Artistic Style 3.6 (August 2024)</h3>
     <ul>
         <li>Add option --pad-include (https://sourceforge.net/p/astyle/tickets/117/)</li>
-        <li>combined GHC and GSC style options</li>
-        <li>improve combination of --align-pointer=type and --pad-oper (https://sourceforge.net/p/astyle/tickets/578/)</li>
-        <li>improve multiplication recognition with --align-pointer=type (https://sourceforge.net/p/astyle/tickets/572/)</li>
-        <li>update compiler options in build files</li>
-        <li>fix indent of assignments within macros ( https://gitlab.com/saalen/astyle/-/issues/47)</li>
+        <li>Combined GHC and GSC style options</li>
+        <li>Improve combination of --align-pointer=type and --pad-oper (https://sourceforge.net/p/astyle/bugs/578/)</li>
+        <li>Improve multiplication recognition with --align-pointer=type (https://sourceforge.net/p/astyle/bugs/572/)</li>
+        <li>Update compiler options in build files</li>
+        <li>Fix indent of assignments within macros ( https://gitlab.com/saalen/astyle/-/issues/47)</li>
     </ul>
 
     <h3>Artistic Style 3.5.2 (July 2024)</h3>

AStyle/sh-completion/gen-completions

@@ -92,6 +92,9 @@ parser:flag "--pad-comma"
 parser:flag "--pad-negation"
    :description "Insert space padding after negations"
 
+parser:flag "--pad-include"
+   :description "Insert space padding after include directives"
+
 parser:flag "--pad-paren"
    :description "Insert space padding around parenthesis on both the outside and the inside"
 

AStyle/src/ASEnhancer.cpp

@@ -1,5 +1,5 @@
 // ASEnhancer.cpp
-// Copyright (c) 2023 The Artistic Style Authors.
+// Copyright (c) 2024 The Artistic Style Authors.
 // This code is licensed under the MIT License.
 // License.md describes the conditions under which this software may be distributed.
 
@@ -104,7 +104,7 @@ void ASEnhancer::enhance(std::string& line, bool isInNamespace, bool isInPreproc
 		nextLineIsDeclareIndent = false;
 	}
 
-	if (line.length() == 0
+	if (line.empty()
 	        && !isInEventTable
 	        && !isInDeclareSection
 	        && !emptyLineFill)
@@ -238,7 +238,7 @@ size_t ASEnhancer::findCaseColon(std::string_view line, size_t caseIndex) const
  */
 int ASEnhancer::indentLine(std::string& line, int indent) const
 {
-	if (line.length() == 0
+	if (line.empty()
 	        && !emptyLineFill)
 		return 0;
 

AStyle/src/ASLocalizer.cpp

@@ -1,5 +1,5 @@
 // ASLocalizer.cpp
-// Copyright (c) 2023 The Artistic Style Authors.
+// Copyright (c) 2024 The Artistic Style Authors.
 // This code is licensed under the MIT License.
 // License.md describes the conditions under which this software may be distributed.
 //
@@ -43,12 +43,8 @@
 	#include <Windows.h>
 #endif
 
-#ifdef __VMS
-	#define __USE_STD_IOSTREAM 1
-	#include <assert>
-#else
-	#include <cassert>
-#endif
+#include <cassert>
+
 
 #include <clocale>		// needed by some compilers
 #include <cstdio>

AStyle/src/ASLocalizer.h

@@ -1,5 +1,5 @@
 // ASLocalizer.h
-// Copyright (c) 2023 The Artistic Style Authors.
+// Copyright (c) 2024 The Artistic Style Authors.
 // This code is licensed under the MIT License.
 // License.md describes the conditions under which this software may be distributed.
 

AStyle/src/ASResource.cpp

@@ -1,5 +1,5 @@
 // ASResource.cpp
-// Copyright (c) 2023 The Artistic Style Authors.
+// Copyright (c) 2024 The Artistic Style Authors.
 // This code is licensed under the MIT License.
 // License.md describes the conditions under which this software may be distributed.
 
@@ -663,9 +663,9 @@ const std::string* ASBase::findHeader(std::string_view line, int i,
 		// the following accessor definitions are NOT headers
 		// goto default; is NOT a header
 		// default(int) keyword in C# is NOT a header
-		if ((header == &AS_GET
-		        || header == &AS_SET
-		        || header == &AS_DEFAULT)
+		if ((header == &ASResource::AS_GET
+		        || header == &ASResource::AS_SET
+		        || header == &ASResource::AS_DEFAULT)
 		        && (peekChar == '.' || peekChar == ';' || peekChar == '(' || peekChar == '='))
 			break;
 		return header;

AStyle/src/astyle.h

@@ -1,5 +1,5 @@
 // astyle.h
-// Copyright (c) 2023 The Artistic Style Authors.
+// Copyright (c) 2024 The Artistic Style Authors.
 // This code is licensed under the MIT License.
 // License.md describes the conditions under which this software may be distributed.
 
@@ -10,15 +10,10 @@
 // headers
 //-----------------------------------------------------------------------------
 
-#ifdef __VMS
-	#define __USE_STD_IOSTREAM 1
-	#include <assert>
-#else
-	#include <cassert>
-#endif
+#include <cassert>
 
 #include <cctype>
-#include <iostream>		// for cout
+#include <iostream>
 #include <memory>
 #include <string>
 #include <string_view>
@@ -28,36 +23,7 @@
 	#include <cstring>              // need both string and cstring for GCC
 #endif
 
-//-----------------------------------------------------------------------------
-// declarations
-//-----------------------------------------------------------------------------
-
-#ifdef _MSC_VER
-	#pragma warning(disable: 4267)  // conversion from size_t to int
-#endif
-
-#ifdef __BORLANDC__
-	#pragma warn -8004	            // variable is assigned a value that is never used
-#endif
-
-#ifdef __GNUC__
-	#pragma GCC diagnostic ignored "-Wconversion"
-#endif
-
-#ifdef __INTEL_COMPILER
-	// #pragma warning disable 383  // value copied to temporary, reference to temporary used
-	// #pragma warning disable 981  // operands are evaluated in unspecified order
-#endif
-
-#ifdef __clang__
-	#pragma clang diagnostic ignored "-Wshorten-64-to-32"
-#endif
-
-#define ASTYLE_VERSION "3.6"
-
-//-----------------------------------------------------------------------------
-// astyle namespace
-//-----------------------------------------------------------------------------
+#define ASTYLE_VERSION "3.6.3"
 
 namespace astyle {
 
@@ -244,17 +210,17 @@ public:
 class ASResource
 {
 public:
-	void buildAssignmentOperators(std::vector<const std::string*>* assignmentOperators);
-	void buildCastOperators(std::vector<const std::string*>* castOperators);
-	void buildHeaders(std::vector<const std::string*>* headers, int fileType, bool beautifier = false);
-	void buildIndentableMacros(std::vector<const std::pair<const std::string, const std::string>* >* indentableMacros);
-	void buildIndentableHeaders(std::vector<const std::string*>* indentableHeaders);
-	void buildNonAssignmentOperators(std::vector<const std::string*>* nonAssignmentOperators);
-	void buildNonParenHeaders(std::vector<const std::string*>* nonParenHeaders, int fileType, bool beautifier = false);
-	void buildOperators(std::vector<const std::string*>* operators, int fileType);
-	void buildPreBlockStatements(std::vector<const std::string*>* preBlockStatements, int fileType);
-	void buildPreCommandHeaders(std::vector<const std::string*>* preCommandHeaders, int fileType);
-	void buildPreDefinitionHeaders(std::vector<const std::string*>* preDefinitionHeaders, int fileType);
+	static void buildAssignmentOperators(std::vector<const std::string*>* assignmentOperators);
+	static void buildCastOperators(std::vector<const std::string*>* castOperators);
+	static void buildHeaders(std::vector<const std::string*>* headers, int fileType, bool beautifier = false);
+	static void buildIndentableMacros(std::vector<const std::pair<const std::string, const std::string>* >* indentableMacros);
+	static void buildIndentableHeaders(std::vector<const std::string*>* indentableHeaders);
+	static void buildNonAssignmentOperators(std::vector<const std::string*>* nonAssignmentOperators);
+	static void buildNonParenHeaders(std::vector<const std::string*>* nonParenHeaders, int fileType, bool beautifier = false);
+	static void buildOperators(std::vector<const std::string*>* operators, int fileType);
+	static void buildPreBlockStatements(std::vector<const std::string*>* preBlockStatements, int fileType);
+	static void buildPreCommandHeaders(std::vector<const std::string*>* preCommandHeaders, int fileType);
+	static void buildPreDefinitionHeaders(std::vector<const std::string*>* preDefinitionHeaders, int fileType);
 
 public:
 	static const std::string AS_IF, AS_ELSE;
@@ -307,7 +273,7 @@ public:
 // Functions definitions are at the end of ASResource.cpp.
 //-----------------------------------------------------------------------------
 
-class ASBase : protected ASResource
+class ASBase
 {
 private:
 	// all variables should be set by the "init" function
@@ -417,6 +383,9 @@ protected:
 	std::string extractPreprocessorStatement(std::string_view line) const;
 	std::string trim(std::string_view str) const;
 	std::string rtrim(std::string_view str) const;
+	bool isNumericVariable(std::string_view word) const;
+	bool lineStartsWithNumericType(std::string_view line) const;
+
 
 	// variables set by ASFormatter - must be updated in activeBeautifierStack
 	int  inLineNumber;
@@ -474,6 +443,15 @@ private:  // functions
 	std::vector<std::vector<const std::string*>*>* copyTempStacks(const ASBeautifier& other) const;
 	std::pair<int, int> computePreprocessorIndent();
 
+	bool handleHeaderSection(std::string_view line, size_t *i, bool closingBraceReached, bool *haveCaseIndent);
+	bool handleColonSection(std::string_view line, size_t *i, bool tabIncrementIn, char *ch);
+	void handleEndOfStatement(size_t i, bool *closingBraceReached, char *ch);
+	void handleParens(std::string_view line, size_t i, bool tabIncrementIn, bool * isInOperator, char ch);
+	void handleClosingParen(std::string_view line, size_t i, bool tabIncrementIn);
+	void handlePotentialHeaderSection(std::string_view line, size_t *i, bool tabIncrementIn, bool *isInOperator);
+	void handlePotentialOperatorSection(std::string_view line, size_t i, bool tabIncrementIn, bool haveAssignmentThisLine, bool isInOperator);
+
+
 private:  // variables
 	int beautifierFileType;
 	std::vector<const std::string*>* headers;
@@ -702,11 +680,12 @@ public:	// functions
 	void init(ASSourceIterator* si) override;
 
 	bool hasMoreLines() const;
-	std::string nextLine();
-	LineEndFormat getLineEndFormat() const;
+        void extracted();
+        std::string nextLine();
+        LineEndFormat getLineEndFormat() const;
 	bool getIsLineReady() const;
 	void setFormattingStyle(FormatStyle style);
-	void setAddBracesMode(int state);
+	void setAddBracesMode(bool state);
 	void setAddOneLineBracesMode(bool state);
 	void setRemoveBracesMode(bool state);
 	void setAttachClass(bool state);
@@ -805,7 +784,6 @@ private:  // functions
 	bool isMultiStatementLine() const;
 	bool isNextWordSharpNonParenHeader(int startChar) const;
 	bool isNonInStatementArrayBrace() const;
-	bool isNumericVariable(std::string_view word) const;
 	bool isOkToSplitFormattedLine();
 	bool isPointerOrReference() const;
 	bool isPointerOrReferenceCentered() const;
@@ -889,6 +867,27 @@ private:  // functions
 	                         bool endOnEmptyLine = false,
 	                         const std::shared_ptr<ASPeekStream>& streamArg = nullptr) const;
 
+
+
+	bool handleImmediatelyPostHeaderSection();
+	bool handlePassedSemicolonSection();
+	void handleAttachedReturnTypes();
+	void handleClosedBracesOrParens();
+	void handleBraces();
+	void handleBreakLine();
+	bool handlePotentialHeader(const std::string *);
+	void handleEndOfBlock();
+	void handleColonSection();
+	void handlePotentialHeaderPart2();
+	void handlePotentialOperator(const std::string *);
+	void handleParens();
+	void handleOpenParens();
+
+	void formatFirstOpenBrace(BraceType braceType);
+	void formatOpenBrace();
+	void formatCloseBrace(BraceType braceType);
+
+
 private:  // variables
 	int formatterFileType;
 	std::vector<const std::string*>* headers;

AStyle/src/astyle_main.h

@@ -1,5 +1,5 @@
 // astyle_main.h
-// Copyright (c) 2023 The Artistic Style Authors.
+// Copyright (c) 2024 The Artistic Style Authors.
 // This code is licensed under the MIT License.
 // License.md describes the conditions under which this software may be distributed.
 
@@ -332,7 +332,7 @@ private:	// functions
 	bool isOption(const std::string& arg, const char* op);
 	bool isOption(const std::string& arg, const char* a, const char* b);
 	bool isParamOption(const std::string& arg, const char* option);
-	bool isPathExclued(const std::string& subPath);
+	bool isPathExcluded(const std::string& subPath);
 	void launchDefaultBrowser(const char* filePathIn = nullptr) const;
 	void printHelp() const;
 	void printMsg(const char* msg, const std::string& data) const;
@@ -387,6 +387,7 @@ private:
 void  STDCALL javaErrorHandler(int errorNumber, const char* errorMessage);
 char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded);
 // the following function names are constructed from method names in the calling java program
+
 extern "C" EXPORT
 jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
 extern "C" EXPORT
@@ -394,6 +395,13 @@ jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
                                                 jobject obj,
                                                 jstring textInJava,
                                                 jstring optionsJava);
+extern "C" EXPORT
+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
+extern "C" EXPORT
+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
+                                                jobject obj,
+                                                jstring textInJava,
+                                                jstring optionsJava);
 #endif //  ASTYLE_JNI
 
 //----------------------------------------------------------------------------

AStyleDev/doc/jni.html

@@ -92,14 +92,14 @@
         ErrorHandler method.</p>
     <p>
         The function will NOT fail for an invalid option in the formatting options. In this case, an error message is
-        sent to the error handling function and the formatted source code is returned without using the invalid 
+        sent to the error handling function and the formatted source code is returned without using the invalid
         option.</p>
 
     <h4>Remarks</h4>
 
     <p>
         The ASyleMain function must be called from the class AStyleInterface. The name of the function in Artistic Style
-        is Java_AStyleInterface_AStyleMain. If the class name is changed, or the method name is changed, the function
+        is Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain. If the class name is changed, or the method name is changed, the function
         names in the Artistic Style shared library must also be changed.</p>
     <p>
         The call to AStyleMain should be placed in a try/catch block that contains an UnsatisfiedLinkError to handle not
@@ -127,7 +127,7 @@
 
     <p>
         The AStyleGetVersion function must be called from the class AStyleInterface. The name of the function in Artistic
-        Style is Java_AStyleInterface_AStyleGetVersion. If the class name is changed, or the method name is changed, the
+        Style is Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion. If the class name is changed, or the method name is changed, the
         function names in the Artistic Style shared library must also be changed.</p>
     <p>
         The call to AStyleMain should be placed in a try/catch block that contains an UnsatisfiedLinkError to handle not
@@ -183,7 +183,7 @@
     <p>
         &nbsp;</p>
     <div class="hl">
-        <pre class="hl">         
+        <pre class="hl">
 <span class="hl slc">// Example.java</span>
 
 <span class="hl com">/*</span>
@@ -328,7 +328,7 @@
     <p>
         &nbsp;</p>
     <div class="hl">
-        <pre class="hl">        
+        <pre class="hl">
 <span class="hl slc">// AStyleInterface.java</span>
 
 <span class="hl com">/**</span>
@@ -497,4 +497,3 @@
 </body>
 
 </html>
-

AStyleDev/scripts/astyle-clean.sh

@@ -38,7 +38,7 @@ fi
 # astyle  -R  "%indir%\*.cpp"  "%indir%\*.h"
 # if [ $? -ne 0 ] ; then  read -sn1 -p "Error executing astyle!"; fi
 
-# variables for fle processing
+# variables for file processing
 #echo "processing files..."
 fileHasSpaces=false         # a file or directory name has spaces
 extLength=${#fileext}       # length of the file extension

AStyleDev/src-p/ExampleByte.py

@@ -104,7 +104,7 @@ def get_library_name():
     elif platform.system() == "Darwin":
         libext = ".dylib"
     else:
-        error("Cannot indentify platform: " + platform.system())
+        error("Cannot identify platform: " + platform.system())
     # IronPython needs the '.'
     for file_name in os.listdir('.'):
         if (os.path.isfile(file_name)
@@ -138,7 +138,7 @@ def get_source_code_bytes(file_path):
     """
     # read the file as a byte string by declaring it as binary
     # version 3 will read unicode if not declared as binary
-    # IronPython must be explicitely converted to bytes???
+    # IronPython must be explicitly converted to bytes???
     try:
         file_in = open(file_path, 'rb')
         bytes_in = bytes(file_in.read())

AStyleDev/src-p/ExampleUnicode.py

@@ -44,7 +44,7 @@ def main():
         text_in = get_source_code(file_path)
         # unicode must be encoded to utf-8 bytes
         # encoding to utf-8 will not cause an exception
-        # IronPython must be explicitely converted to bytes???
+        # IronPython must be explicitly converted to bytes???
         if __is_unicode__ or __is_iron_python__:
             text_in = bytes(text_in.encode('utf-8'))
             options_in = bytes(options.encode('utf-8'))
@@ -119,7 +119,7 @@ def get_library_name():
     elif platform.system() == "Darwin":
         libext = ".dylib"
     else:
-        error("Cannot indentify platform: " + platform.system())
+        error("Cannot identify platform: " + platform.system())
     # IronPython needs the '.'
     for file_name in os.listdir('.'):
         if (os.path.isfile(file_name)

AStyleWxTest/file-py/aswx_aboutdlg.py

@@ -1,6 +1,6 @@
 #! /usr/bin/python3
 
-"""Check AboutDlgBase.h to AboutDlg.h to verify that all virtual fuctions
+"""Check AboutDlgBase.h to AboutDlg.h to verify that all virtual functions
    are overridden.
 """
 

AStyleWxTest/file-py/aswx_astyledlg.py

@@ -1,7 +1,7 @@
 #! /usr/bin/python3
 
-"""Check AStyleDlgBase.h to AstyleDlg.h to verify that all virtual fuctions are overridden.
-   Check AStyleDlgBase.h to AstyleDlgBase.cpp to verify that all identifiers have an exent
+"""Check AStyleDlgBase.h to AstyleDlg.h to verify that all virtual functions are overridden.
+   Check AStyleDlgBase.h to AstyleDlgBase.cpp to verify that all identifiers have an extent
    and therefore a preview display.
    Check AStyleDlgBase.h to AstyleDlg.cpp to verify that all radio buttons hhave a
    bind event so a mouse click will be displayed in the preview widdow..

AStyleWxTest/file-py/aswx_astyleiface.py

@@ -67,7 +67,7 @@ def find_class_diffs(header_variables, class_variables):
 # -----------------------------------------------------------------------------
 
 def get_constructor_variables(class_variables, astyleiface_path):
-    """Read the AStyleIFace file and save the class constuctor variables."""
+    """Read the AStyleIFace file and save the class constructor variables."""
 
     class_lines = [0, 0]    # line numbers for class constructor
     class_total = 0			# total variables for class constructor

AStyleWxTest/file-py/aswx_editordlg.py

@@ -1,6 +1,6 @@
 #! /usr/bin/python3
 
-"""Check EditorDlgBase.h to EditorDlg.h to verify that all virtual fuctions
+"""Check EditorDlgBase.h to EditorDlg.h to verify that all virtual functions
    are overridden.
 """
 

AStyleWxTest/file-py/aswx_virtual.py

@@ -1,6 +1,6 @@
 #! /usr/bin/python3
 
-"""Check AStyleIFace.h to Main_Test.h to verify that all virtual fuctions are overridden.
+"""Check AStyleIFace.h to Main_Test.h to verify that all virtual functions are overridden.
 """
 
 # to disable the print statement and use the print() function (version 3 format)

AStyleWxTest/file-py/change_static_wx30.py

@@ -86,7 +86,7 @@ def change_static_configs(line, file_path):
         line = line.replace("true", "false")
     #
     # TESTS FOR VS 2010 ONLY
-    # Later relases use macros defined in a "props" file
+    # Later releases use macros defined in a "props" file
     # and macros are used for the variables.
     if "_vc10_" in file_path:
         line = change_vs2010_multiple_lines(line)
@@ -99,7 +99,7 @@ def change_static_configs(line, file_path):
 def change_vs2010_multiple_lines(line):
     """ TESTS FOR VS 2010 ONLY
         These tests change data that is defined in a Static ItemDefinitionGroup.
-        Later relases use macros defined in a "props" file.
+        Later releases use macros defined in a "props" file.
         Return the updated line.
     """
     old_lib = "wxmsw30" + "u_"
@@ -124,7 +124,7 @@ def change_vs2010_multiple_lines(line):
 def change_vs2010_single_line_data(line):
     """ TESTS FOR VS 2010 ONLY
         These tests change data that is defined on a single line.
-        Later relases use macros defined in a "props" file.
+        Later releases use macros defined in a "props" file.
         Return the updated line.
     """
     old_lib = "wxmsw30" + "u_"

AStyleWxTest/file-py/cppcheck_wx.py

@@ -505,9 +505,9 @@ def process_file_suppressions(file_suppression_list):
     """ Generate suppressions for an entire file.
     """
     file_suppression_list.append("// Suppressed on the Command Line\n")
-    file_suppression_list.append("// functionStatic is supressed for the entire project.\n")
-    file_suppression_list.append("// noValidConfiguration is supressed for the entire project.\n")
-    #~ file_suppression_list.append("// purgedConfiguration is supressed for the entire project.\n")
+    file_suppression_list.append("// functionStatic is suppressed for the entire project.\n")
+    file_suppression_list.append("// noValidConfiguration is suppressed for the entire project.\n")
+    #~ file_suppression_list.append("// purgedConfiguration is suppressed for the entire project.\n")
     file_suppression_list.append("//\n")
 
 # -----------------------------------------------------------------------------

AStyleWxTest/file-py/dist_copy_wx.py

@@ -24,11 +24,11 @@ AS_RELEASE = "3.2"
 #EXTRACT_ALL = False
 EXTRACT_ALL = True
 
-# inut from AStyleWx directory
+# input from AStyleWx directory
 __astylewx_dir = libastylewx.get_astylewx_directory()
-# inut from AStyleWxTest directory
+# input from AStyleWxTest directory
 __astylewxtest_dir = libastylewx.get_astylewxtest_directory()
-# inut from AStyle directory
+# input from AStyle directory
 __astyle_dir = libastylewx.get_astyle_directory()
 # output to Project directory
 __base_dir = libastylewx.get_project_directory()