Changeset 12538

Timestamp:

02/19/08 15:43:47 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Improve function signature

Files:

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

util/branches/dev/jsdoc/jsdoc.module

@@ -1380 +1380 @@
   $query = db_query("SELECT name, type, summary, optional, repeating FROM {jsdoc_parameters} WHERE vid = %d ORDER BY weight", $object->vid);
   while ($parameter = db_fetch_array($query)) {
-    $parameter['jsdoc_formatted'] = _jsdoc_format_type($parameter['type'], $parameter['optional'], $parameter['recurring']);
+    $parameter['jsdoc_formatted'] = _jsdoc_format_type($parameter['type'], $parameter['optional'], $parameter['repeating']);
     $object->jsdoc_parameters[$parameter['name']] = $parameter;
   }
@@ -3015 +3015 @@
     $parameter->name = $item['name'];
     $parameter->optional = $item['optional'];
-    $parameter->recurring = $item['recurring'];
+    $parameter->repeating = $item['repeating'];
     $parameter->types = false;
     if ($cleaned) {
@@ -3023 +3023 @@
     }
 
-    $type = $parameter->type;
+    $type = $item['type'];
     $types = array();
     if (strpos($type, '|') !== false) {
@@ -3070 +3070 @@
                 $found = 0;
                 $field_type = str_replace('...', '', $field_type, $found);
-                $recurring = ($found > 0);
+                $repeating = ($found > 0);
 
                 $field_obj = jsdoc_object_node_load($field_type, jsdoc_get_project($node), jsdoc_get_version($node), jsdoc_get_all_provide_nids($node, array(3, 4)));
                 $field_type = (object)array(
                   'title' => $field_obj->title,
-                  'recurring' => $recurring,
+                  'repeating' => $repeating,
                   'optional' => $optional,
                   'summary' => jsdoc_get_teaser($field_obj)
@@ -3100 +3100 @@
 }
 
-function _jsdoc_format_type($type, $classlike = false, $optional = false, $recurring = false) {
+function _jsdoc_format_type($type, $classlike = false, $optional = false, $repeating = false) {
   $output = array();
   $name = '';
@@ -3114 +3114 @@
       $output['type'] .= '?';
     }
-    if ($recurring) {
+    if ($repeating) {
       $output['type'] .= '...';
     }
@@ -3583 +3583 @@
         $signature .= '?';
       }
-      if ($parameter->recurring) {
+      if ($parameter->repeating) {
         $signature .= '...';
       }
@@ -4098 +4098 @@
   $output .= '<div class="fieldset-wrapper">';
   foreach ($children as $child) {
-    $output .= '<div class="form-item">';
+    $output .= '<div class=F"form-item">';
     if ($child->type) {
       $output .= '<em>' . $child->type->a . '</em> ';
@@ -4201 +4201 @@
 
         $field_types = array();
-        $recurring = false;
+        $repeating = false;
         $optional = false;
         if ($field->types) {
           foreach ($field->types as $type) {
-            if ($type->recurring) {
-              $recurring = true;
+            if ($type->repeating) {
+              $repeating = true;
             }
             if ($type->optional) {
@@ -4220 +4220 @@
         }
         $output .= $field->a;
-        if ($recurring) {
-          $output .= ' <small><em>recurring</em></small>';
+        if ($repeating) {
+          $output .= ' <small><em>repeating</em></small>';
         }
         if ($optional) {