Fixed bugs and added unit tests

Author: Desperationis

RobotCDocs/FileScanner.py

@@ -10,9 +10,11 @@ class FileScanner(Reader):
     def __init__(self, file):
         super().__init__(file)
 
-        # Given a directory (E.x. \Desktop\File.h), only save
-        # the name of the file (E.x. "File")
-        self.categoryName = self.fileName.split('\\')[-1].split('.')[0]
+        # Given a directory (E.x. \Desktop\File.h), only save the actual file name (File.h)
+        self.docFileName = self.fileName.split('\\')[-1]
+
+        # The name of the file (E.x. "File")
+        self.categoryName = self.docFileName.split('.')[0]
         self.docs = []
 
         try:
@@ -56,6 +58,15 @@ def Parse(self):
                 line = line.replace(' * ', "")
                 line = line.replace(' *', "")
 
+                if '@' in line:
+
+                    # Split the line into words, then get the name of the category.
+                    words = line.split(' ')
+                    for word in words:
+                        if '@' in word:
+                            doc.category = word.split('@')[-1].capitalize()
+                            break
+
                 # Join sentences together to make one long string.
                 doc.description += line
 
@@ -66,16 +77,8 @@ def Parse(self):
                         doc.description += ' '
 
             elif '/*' not in line and '*/' not in line:
-                print('FileScanner.py: Warning: Line %s of %s is missing a \' *\'' % (self.currentLine - 1, self.fileName))
-
-            if '@' in line:
+                print('FileScanner.py: Warning: Line %s of %s is missing a \' *\'; Line will be skipped.' % (self.currentLine + 1, self.docFileName))
 
-                # Split the line into words, then get the name of the category.
-                words = line.split(' ')
-                for word in words:
-                    if '@' in word:
-                        doc.category = word.split('@')[-1].capitalize()
-                        break
 
 
             if '*/' in line:
@@ -84,7 +87,7 @@ def Parse(self):
                 if ';' in doc.declaration:
                     self.docs.append(doc)
                 else:
-                    print('FileScanner.py: Warning: Line %s of %s was skipped due to missing a declaration.' % (self.currentLine - 1, self.fileName))
+                    print('FileScanner.py: Warning: Line %s of %s was skipped due to missing a declaration.' % (self.currentLine + 1, self.docFileName))
 
                 doc = Doc()
                 doc.category = self.categoryName

RobotCDocs/Unit Test/main.c

@@ -0,0 +1,93 @@
+
+
+
+// Here's a nunch of space to test the accruacy of my error logger.
+
+
+
+
+
+
+
+
+
+
+
+
+/*
+ * Test 1.
+ * This line should have a space between this and the last period.
+ * This line should also have a space.
+ * The function below me should have all of types removed.
+*/
+void Test1(tMotor motorPort, byte speed, bool reversed);
+
+
+/*
+ * @test
+ *
+ * Test 2. The function below this should have all pointers removed and be visible.
+ * This function should be listed below the "Test" category.
+*/
+void* Test2(tMotor* motorPort, byte speed, bool* reversed);
+
+/*
+ * @test
+ *
+ * Test 2_2. The function should not be visible at all. There's wayy to many spaces.
+*/
+void* Test2_2                 (tMotor* motorPort, byte speed, bool* reversed);
+
+/*
+ @sensor
+ *
+ * Test 3. Neither the attribute or the next line should work.
+ * This function should be listed in "Main".
+ This line should be ignored.
+*/
+bool test3;
+
+/*
+ * @sensor
+ * @test
+ * This should be under the "Test" category, as it's the most recent.
+*/
+void test4;
+
+/*
+ * @sensor @test
+ * This should be under the "Sensor" category, as it's the leftmost attribute.
+ * The variable below this should have its pointer removed.
+*/
+tMotor* test5;
+
+
+/*
+ * This comment should not work.
+*/
+
+bool test6Failed.
+
+/*
+ * @test7
+ * This should be under the "Test7" category.
+ *                                   This line should still be visible.
+*/
+int* test7;
+
+
+task main() {
+
+
+
+}
+
+// Define the functions. This is required.
+
+void Test1(tMotor motorPort, byte speed, bool reversed) {
+
+}
+
+void* Test2(tMotor* motorPort, byte speed, bool* reversed) {
+
+}

RobotCDocs/setup.txt

@@ -1,8 +1,8 @@
 > Library Name
-Diego's Custom Library
+Unit Test
 
 > Where to look for files
-C:\Users\smart\Desktop\RobotCLibrary
+Unit Test
 
 > Where to output BuiltInVariables.txt
 C:\Program Files (x86)\Robomatter Inc\ROBOTC Development Environment 4.X\Includes\