Ticket #6831: makeCix_updates.patch
| File makeCix_updates.patch, 5.0 kB (added by dante, 8 months ago) |
|---|
-
util/docscripts/makeCix.php
34 34 $doc = new DOMDocument('1.0'); 35 35 // setup for codeintel: 36 36 $codeintel = $doc->createElement('codeintel'); 37 $codeintel->setAttribute("description"," the Dojo Toolkit 1.1 API");37 $codeintel->setAttribute("description","Dojo Toolkit API - version 1.1.1"); 38 38 $codeintel->setAttribute("version","2.0"); 39 39 $codeintel->setAttribute("encoding","UTF-8"); 40 40 // wrap all the api in one "file" tag: … … 66 66 switch($tt){ 67 67 case "Object" : 68 68 // inspect this object deeper, but append to namespace: 69 $nsdata->appendChild(dojo_inspect($data[$obj],$obj,$doc ));69 $nsdata->appendChild(dojo_inspect($data[$obj],$obj,$doc, "variable")); 70 70 break; 71 71 case "Function" : 72 72 if($info['classlike']){ … … 130 130 131 131 function dojo_inspect($data,$ns,$doc,$t="scope"){ 132 132 // summary: inspect some namespace (as top), with some passed data. 133 134 $elm = $doc->createElement($t); 133 if ($t == "argument") { 134 $elm = $doc->createElement("variable"); 135 $elm->setAttribute("ilk", "argument"); 136 } else { 137 $elm = $doc->createElement($t); 138 } 135 139 $elm->setAttribute("name",$ns); 136 140 137 if($t=="variable"){ $elm->setAttribute("ilk",argument); }138 139 141 foreach ($data as $obj => $info){ 140 142 switch($obj){ 141 143 // these are all the ones we don't _really_ care about in this context: … … 157 159 $sig = $ns."("; 158 160 foreach($info as $key => $val){ 159 161 $sig .= $key.","; 160 $elm->appendChild(dojo_inspect($val,$key,$doc," variable"));162 $elm->appendChild(dojo_inspect($val,$key,$doc,"argument")); 161 163 } 162 164 $sig = substr($sig,0,strlen($sig)-1); 163 165 $sig .= ")"; … … 169 171 case "private" : $elm->setAttribute("attributes","private"); break; 170 172 171 173 case "type" : 172 if($info){ $elm->setAttribute("citdl",$info); } 173 switch ($info){ 174 case "Object" : 175 //$elm->appendChild(dojo_inspect($info,$obj,$doc,"variable")); 176 break; 174 if($info) { 175 switch ($info){ 176 case "Function" : 177 $elm->setAttribute("ilk","function"); 178 break; 179 default: 180 $elm->setAttribute("citdl",$info); 181 break; 182 } 177 183 } 178 184 break; 179 185 … … 182 188 break; 183 189 184 190 // just in case we missed something? 185 default : $elm->appendChild(dojo_inspect($data[$obj],$obj,$doc,"scope")); break; 191 default : 192 $scope_type = "scope"; 193 if (($data[$obj]["instance"] != NULL) || 194 ($data[$obj]["type"] == "Object")) { 195 $scope_type = "variable"; 196 } 197 $elm->appendChild(dojo_inspect($data[$obj],$obj,$doc,$scope_type)); 198 break; 186 199 } 187 200 } 188 201 // give it back as a domNode: … … 236 249 if(!($list[0]==$namespace)){ continue; } 237 250 switch($n){ 238 251 case 8 : 239 // print "UNCAUGHT! ".$item; // way tooooo deep.252 fprintf("UNCAUGHT! %s", $item); // way tooooo deep. 240 253 break; 241 254 case 7 : 242 255 $l1 = $list[1]; … … 245 258 $l4 = $list[4]; 246 259 $l5 = $list[5]; 247 260 $l6 = $list[6]; 248 $ret[$namespace][$l1][$l2][$l3][$l4][$l5][$l6] = $data; 261 if ($ret[$namespace][$l1][$l2][$l3][$l4][$l5][$l6] == NULL) 262 $ret[$namespace][$l1][$l2][$l3][$l4][$l5][$l6] = $data; 263 else 264 $ret[$namespace][$l1][$l2][$l3][$l4][$l5][$l6] = array_merge_recursive($data, $ret[$namespace][$l1][$l2][$l3][$l4][$l5][$l6]); 249 265 break; 250 266 case 6 : 251 267 $l1 = $list[1]; … … 253 269 $l3 = $list[3]; 254 270 $l4 = $list[4]; 255 271 $l5 = $list[5]; 256 $ret[$namespace][$l1][$l2][$l3][$l4][$l5] = $data; 272 if ($ret[$namespace][$l1][$l2][$l3][$l4][$l5] == NULL) 273 $ret[$namespace][$l1][$l2][$l3][$l4][$l5] = $data; 274 else 275 $ret[$namespace][$l1][$l2][$l3][$l4][$l5] = array_merge_recursive($data, $ret[$namespace][$l1][$l2][$l3][$l4][$l5]); 257 276 break; 258 277 case 5 : 259 278 $l1 = $list[1]; 260 279 $l2 = $list[2]; 261 280 $l3 = $list[3]; 262 281 $l4 = $list[4]; 263 $ret[$namespace][$l1][$l2][$l3][$l4] = $data; 282 if ($ret[$namespace][$l1][$l2][$l3][$l4] == NULL) 283 $ret[$namespace][$l1][$l2][$l3][$l4] = $data; 284 else 285 $ret[$namespace][$l1][$l2][$l3][$l4] = array_merge_recursive($data, $ret[$namespace][$l1][$l2][$l3][$l4]); 264 286 break; 265 287 case 4 : 266 288 $l1 = $list[1]; 267 289 $l2 = $list[2]; 268 290 $l3 = $list[3]; 269 $ret[$namespace][$l1][$l2][$l3] = $data; 291 if ($ret[$namespace][$l1][$l2][$l3] == NULL) 292 $ret[$namespace][$l1][$l2][$l3] = $data; 293 else 294 $ret[$namespace][$l1][$l2][$l3] = array_merge_recursive($data, $ret[$namespace][$l1][$l2][$l3]); 270 295 break; 271 296 case 3 : 272 297 $l1 = $list[1]; 273 298 $l2 = $list[2]; 274 $ret[$namespace][$l1][$l2] = $data; 299 300 if ($ret[$namespace][$l1][$l2] == NULL) 301 $ret[$namespace][$l1][$l2] = $data; 302 else 303 $ret[$namespace][$l1][$l2] = array_merge_recursive($data, $ret[$namespace][$l1][$l2]); 275 304 break; 276 305 case 2 : 277 306 $l1 = $list[1];
