Changeset 40

Timestamp:

10/10/11 00:04:41 (5 months ago)

Author:

sevo

Message:

- added support for nested classes
- updated .NET example

Location:

trunk

Files:

• README.txt (modified) (1 diff)
• samples/DotNET/class_with_interface.vb (modified) (2 diffs)
• vbfilter.awk (modified) (8 diffs)

trunk/README.txt

@@ -125 +125 @@
                   (in most cases your Project or Solution folder!)
 
+5. open vbfilter.awk in your favorite editor and edit the options in
+   the Configuration section as you like.
 
-5. run Doc\make.bat or Doc/make.sh to generate the documentation.
+6. run Doc\make.bat or Doc/make.sh to generate the documentation.
 
 

trunk/samples/DotNET/class_with_interface.vb

@@ -77 +77 @@
     Implements ISample
 
+        ''' <summary>
+        ''' nested class declared inside SampleClass
+        ''' </summary>
+    Public Class NestedClass
+        Inherits Object
+        Public someString As String    ' simple public string value
+
+            ''' <summary>
+            ''' some event
+            ''' </summary>
+            ''' <param name="Sender">sender of object type</param>
+            ''' <param name="args">event arguments</param>
+            ''' <remarks></remarks>
+            Public Event SomeEvent(ByVal Sender As Object, ByVal args As EventArgs)
+
+    End Class
+
     Private someInteger As Integer ' simple private integer value
     Public longArray() As Long     ' long array
     Public someString As String    ' simple public string value
-        
+    Public nestedClassObject As New NestedClass  ' NestedClass instance
 
     ''' <summary>
@@ -172 +189 @@
 
     End Sub
+        
+    ''' <summary>
+    ''' method handles event from nested class
+    ''' </summary>
+    Public Sub nestedClassObject_OnSomeEvent(ByVal Sender As Object, ByVal args As EventArgs) Handles nestedClassObject.SomeEvent
+
+    End Sub
+
 
     ''' <summary>

trunk/vbfilter.awk

@@ -1 +1 @@
 #----------------------------------------------------------------------------
-# vbfilter.awk - doxygen VB .NET filter script - v2.4
+# vbfilter.awk - doxygen VB .NET filter script - v2.4.1
 #
 # Creation:     26.05.2010  Vsevolod Kukol
@@ -64 +64 @@
         fileHeader=0;
         fullLine=1;
-        insideClass=0;
+        classNestCounter=0;
+        className[1]="";
         insideVB6Class=0;
         insideVB6ClassName="";
         insideVB6Header=0;
-        insideSubClass=0;
         insideNamespace=0;
         insideComment=0;
@@ -299 +299 @@
                 
                 if (isInherited==1){
-                        isInherited=0;
-                        if (lastLine!="") print appShift lastLine;
-                        print appShift "{"
-                        AddShift()
-                        lastLine="";
+                        endOfInheritance();
                 }
                 print appShift "/**"
@@ -725 +721 @@
 
 #############################################################################
+# Rewrite Subs handling events if csharpStyledOutput=1
+#############################################################################
+
+/.*[[:blank:]]Handles[[:blank:]]+/ && (csharpStyledOutput==1) {
+        name=gensub(/(.*)[[:blank:]]+Handles[[:blank:]]+(\w+)/,"\\2","g",$0);
+        print appShift "/// \\remark Handles the " name " event.";
+        $0=  gensub(/(.*)[[:blank:]]+Handles[[:blank:]]+(.*)/,"\\1","g",$0);
+}
+                
+#############################################################################
 # namespaces
 #############################################################################
@@ -757 +763 @@
         sub("Structure","struct");
         sub("Type","struct");
-        
-        # handle subclasses
-        if (insideClass==1) {
-                insideSubClass=1;
-        } else {
-                insideClass=1;
-        }
+        if(isInherited) {
+                endOfInheritance();
+        }
+        classNestCounter++;
         
         # save class name for constructor handling
-        className=gensub(".+class[[:blank:]]+([^ ]*).*","\\1","g");
-        
+        className[classNestCounter]=gensub(".+class[[:blank:]]+([^ ]*).*","\\1","g");
         isInherited=1;
         print appShift $0;
@@ -774 +776 @@
 
 # handle constructors
-/.*Sub[[:blank:]]+New.*/ && className!="" {
-        sub("New", "New " className);
-}
-
+/.*Sub[[:blank:]]+New.*/ && className[classNestCount]!="" {
+        sub("New", "New " className[classNestCount]);
+}
+
+function endOfInheritance()
+{
+                isInherited=0;
+                if (lastLine!="") print appShift lastLine;
+                print appShift "{";
+                AddShift();
+                lastLine="";
+                return 0;
+}
 
 # handle inheritance
@@ -797 +808 @@
         }
         else {
-                isInherited=0;
-                if (lastLine!="") print appShift lastLine;
-                print appShift "{";
-                AddShift();
-                lastLine="";
+                endOfInheritance();
         }
 }
@@ -809 +816 @@
  /.*End[[:blank:]]+Structure/ ||
  /.*End[[:blank:]]+Type/) &&
- (insideClass==1 || insideSubClass==1){
-        if (insideSubClass==1) {
-                insideSubClass=0;
-        } else {
-                insideClass=0;
-        }
+ (classNestCounter >= 1){
         ReduceShift();
         print appShift "}";
-        className="";
+        delete className[classNestCounter+1];
         next;
 }