Changeset 12666

Timestamp:

02/23/08 19:56:43 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Separate between a private field and whether its parent is private

Files:

• util/branches/dev/jsdoc/jsdoc.module (modified) (3 diffs)

util/branches/dev/jsdoc/jsdoc.module

@@ -1562 +1562 @@
 
 function jsdoc_is_private(&$node) {
-  if ($node->type == 'jsdoc_object') {
-    return $node->jsdoc_private || $node->jsdoc_private_parent;
+  if ($node->type == 'jsdoc_object' || isset($node->jsdoc_private)) {
+    return $node->jsdoc_private;
   }
 
@@ -1569 +1569 @@
   if (db_num_rows($query) == 1) {
     $result = db_fetch_object($query);
-    return $result->private || $result->private_parent;
-  }
+    $node->jsdoc_private_parent = $result->private_parent;
+    return $node->jsdoc_private = $result->private;
+  }
+}
+
+function jsdoc_has_private_parent(&$node) {
+  if ($node->type != 'jsdoc_object' && !isset($node->jsdoc_private_parent)) {
+    jsdoc_is_private($node);
+  }
+  return $node->jsdoc_private_parent;
 }
 
@@ -2583 +2591 @@
     'singleton' => jsdoc_is_initialized($node),
     'namespace' => jsdoc_is_namespace($node),
-    'private' => jsdoc_is_private($node)
+    'private' => jsdoc_is_private($node),
+    'private_parent' => jsdoc_has_private_parent($node)
   );