Changeset 38

Timestamp:

10/09/11 00:54:12 (7 months ago)

Author:

sevo

Message:

- partially fixed classic vb property handling (fixes #2)

Location:

trunk

Files:

• samples/ClassicVB/VB6Class.cls (modified) (3 diffs)
• vbfilter.awk (modified) (3 diffs)

trunk/samples/ClassicVB/VB6Class.cls

@@ -20 +20 @@
     Private someInteger As Integer ' simple private integer value
     Public someString As String    ' simple public string value
+    Private someObject As Object   ' some object
 
     ''' <summary>
@@ -26 +27 @@
     ''' <value>some string</value>
     ''' <returns>some string</returns>
+    Public Property Let StringProperty(value As String)
+            someString = value
+    End Property
     Public Property Get StringProperty() As String
             StringProperty = someString
-    End Property
-    Public Property Set StringProperty(ByVal value As String)
-            someString = value
     End Property
 
@@ -40 +41 @@
     Public Property Get IntegerProperty() As Integer
             IntegerProperty = someInteger
+    End Property
+
+    ''' <summary>
+    ''' reference property
+    ''' </summary>
+    ''' <value>some object</value>
+    ''' <returns>some object</returns>
+    Public Property Set ObjectProperty(value As Object)
+            Set someObject = value
+    End Property
+    Public Property Get ObjectProperty() As Object
+            ObjectProperty = someObject
+    End Property
+
+    ''' <summary>
+    ''' not working property
+    ''' </summary>
+    ''' <remarks>
+    ''' this property will be seen as ReadOnly by the Doxygen vbfilter
+    ''' because Set does not preceed get!
+    ''' </remarks>
+    Public Property Get TestProperty() As Object
+            ObjectProperty = someObject
+    End Property
+    Public Property Set TestProperty(value As Object)
+            Set someObject = value
     End Property
 

trunk/vbfilter.awk

@@ -64 +64 @@
         insideComment=0;
         insideImports=0;
+        instideVB6Property=0;
         isInherited=0;
         lastLine="";
@@ -718 +719 @@
 # Properties
 #############################################################################
-# skip VB6 Set/Let Property methods
-/.*Property[[:blank:]]+Set[[:blank:]]+/ ||
-/.*Property[[:blank:]]+Let[[:blank:]]+/ { next; }
 
 /^Property[[:blank:]]+/ ||
@@ -732 +730 @@
                 $0=gensub("[(][)]","","g");
         }
+        
         # add c# styled get/set methods
-        if (match($0,"ReadOnly")) {
+        if ((match($0,"ReadOnly")) || (match($0,"Get"))) {
                 #sub("ReadOnly[[:blank:]]","");
-                $0=$0 "\n" appShift "{ get { }; }";
-        } else {
-                $0=$0 "\n" appShift "{ get{ }; set{ }; }";
-        }
-        print appShift $0;
-        next;
-}
+                if (instideVB6Property == 1)
+                {
+                        instideVB6Property = 0;
+                        $0=gensub(" Get| Set| Let","","g");
+                        print appShift $0 "\n" appShift "{ get; set; }";
+                }
+                else
+                {
+                        $0=gensub(" Get| Set| Let","","g");
+                        print appShift $0 "\n" appShift "{ get; }";
+                }
+        } else {
+                if ((match($0, "Let") || match($0, "Set"))) {
+                        instideVB6Property = 1;
+                        next;
+                }
+                        $0=gensub(" Get| Set| Let","","g");
+                print appShift $0 "\n" appShift "{ get; set; }";
+                next;
+        }
+        instideVB6Property = 0;
+        next;
+}
+
 
 /.*Operator[[:blank:]]+/ {