Changeset 13235

Timestamp:

03/26/08 18:15:41 (10 months ago)

Author:

pottedmeat

Message:

Refs #5602. Clean up externalized variable calculations in executed functions

Location:

util/trunk/docscripts

Files:

• includes/dojo.inc (modified) (2 diffs)
• lib/parser/DojoFunctionBody.php (modified) (9 diffs)
• lib/parser/DojoFunctionDeclare.php (modified) (3 diffs)

util/trunk/docscripts/includes/dojo.inc

@@ -327 +327 @@
 
   foreach ($executions as $execution) {
+    $execution->removeSwallowedMixins($swallowed_mixins);
     $execution->rollOut($output);
-    $execution->removeSwallowedMixins($swallowed_mixins);
 
     unset($execution);
@@ -341 +341 @@
     $is_prototype = false;
     if ($call->getParameter(0)->isA(DojoVariable) || $call->getParameter(0)->isA(DojoFunctionDeclare)) {
-      if ($call->getParameter(0)->isA(dojoVariable)) {
+      if ($call->getParameter(0)->isA(DojoVariable)) {
         $object = $call->getParameter(0)->getVariable();
         if (strpos($object, '(') !== false) {

util/trunk/docscripts/lib/parser/DojoFunctionBody.php

@@ -279 +279 @@
 
     foreach ($possible_mixins as $i => $mixin) {
-      $parameter = $mixin->getParameter(0);
-      if ($mixin->getName() == 'dojo.extend' && $parameter->isA(DojoFunctionDeclare)) {
-        $code = $this->package->getCode();
-        $line = substr($code[$parameter->start[0]], 0, $parameter->start[1]);
-        $line = substr($line, 0, strrpos($line, $mixin->getName()));
-        preg_match_all('%(?:([a-zA-Z0-9_.$\s]+)\s*=\s*)+%', $line, $matches);
-        foreach ($matches[1] as $match) {
-          $match = trim($match);
-          if (!preg_match('%^var\s+%', $match)) {
-            $found = true;
-            while ($found) {
-              $found = false;
-              foreach ($internals as $internal_name => $external_name) {
-                if ($internal_name == 'this') continue;
-                if (strpos($match, $internal_name . '.') === 0) {
-                  $last = $match;
-                  $match = $external_name . substr($match, strlen($internal_name));
-                  if ($last != $match) {
-                    $found = true;
+      if (($this->start[0] < $mixin->start[0] || ($this->start[0] == $mixin->start[0] && $this->start[1] < $mixin->start[1])) &&
+          ($this->end[0] > $mixin->end[0] || ($this->end[0] == $mixin->end[0] && $this->end[1] > $mixin->end[1]))) {
+        $parameter = $mixin->getParameter(0);
+        if ($mixin->getName() == 'dojo.extend' && $parameter->isA(DojoFunctionDeclare)) {
+          $code = $this->package->getCode();
+          $line = substr($code[$parameter->start[0]], 0, $parameter->start[1]);
+          $line = substr($line, 0, strrpos($line, $mixin->getName()));
+          preg_match_all('%(?:([a-zA-Z0-9_.$\s]+)\s*=\s*)+%', $line, $matches);
+          foreach ($matches[1] as $match) {
+            $match = trim($match);
+            if (!preg_match('%^var\s+%', $match)) {
+              $found = true;
+              while ($found) {
+                $found = false;
+                foreach ($internals as $internal_name => $external_name) {
+                  if ($internal_name == 'this') continue;
+                  if (strpos($match, $internal_name . '.') === 0) {
+                    $last = $match;
+                    $match = $external_name . substr($match, strlen($internal_name));
+                    if ($last != $match) {
+                      $found = true;
+                    }
                   }
                 }
               }
-            }
-            $parameter->getFunction()->setFunctionName($match);
-          }
-        }
-      }
-      elseif ($parameter->isA(DojoVariable)) {
-        $object = $parameter->getVariable();
-        if ($object == "this") {
-          unset($possible_mixins[$i]);
-          continue;
-        }
-        if (($mixin->start[0] > $this->start[0] || ($mixin->start[0] == $this->start[0] && $mixin->start[1] > $this->start[1]))
-            && ($mixin->end[0] < $this->end[0] || ($mixin->end[0] == $this->end[0] && $mixin->end[1] < $this->end[1]))) {
-          if (array_key_exists($object, $internals)) {
-              unset($possible_mixins[$i]);
-          }
-          else {
-            foreach ($internals as $internal_name => $external_name) {
-              if (strpos($object, $internal_name . '.') === 0) {
-                $object = $external_name . substr($object, strlen($internal_name));
+              $parameter->getFunction()->setFunctionName($match);
+            }
+          }
+          $this->externalized_mixins[] = $mixin;
+        }
+        elseif ($parameter->isA(DojoVariable)) {
+          $object = $parameter->getVariable();
+          if ($object == "this") {
+            unset($possible_mixins[$i]);
+          }
+          elseif (($mixin->start[0] > $this->start[0] || ($mixin->start[0] == $this->start[0] && $mixin->start[1] > $this->start[1]))
+              && ($mixin->end[0] < $this->end[0] || ($mixin->end[0] == $this->end[0] && $mixin->end[1] < $this->end[1]))) {
+            if (array_key_exists($object, $internals)) {
+                unset($possible_mixins[$i]);
+            }
+            else {
+              foreach ($internals as $internal_name => $external_name) {
+                if (strpos($object, $internal_name . '.') === 0) {
+                  $object = $external_name . substr($object, strlen($internal_name));
+                }
               }
-            }
-
-            $parameter->setVariable($object);
-          }
-        }
-      }
-      else {
-        unset($possible_mixins[$i]);
-      }
-    }
-  }
-
-  public function getExternalizedObjects($function_name=false){
+
+              $parameter->setVariable($object);
+            }
+          }
+          $this->externalized_mixins[] = $mixin;
+        }
+        else {
+          $this->externalized_mixins[] = $mixin;
+          array_splice($possible_mixins, $i--, 1);
+        }
+      }
+    }
+  }
+
+  public function getExternalizedObjects($function_name=false, $parameter_names=array()){
     if ($this->externalized_objects) {
       return $this->externalized_objects;
@@ -341 +346 @@
     $this->build();
     $lines = Text::chop($this->package->getCode(), $this->start[0], $this->start[1], $this->end[0], $this->end[1], true);
+    foreach ($this->externalized_mixins as $mixin) {
+      $lines = Text::blankOutAtPositions($lines, $mixin->start[0], $mixin->start[1], $mixin->end[0], $mixin->end[1]);
+    }
     $internals = $this->getLocalVariableNames();
 
@@ -373 +381 @@
           $name = $function_name . substr($name, 4);
         }
+
+        if (in_array($name, $parameter_names)) {
+          continue;
+        }
+
         $externalized_object->setName($name);
         $this->externalized_objects[] = $externalized_object;
@@ -448 +461 @@
   }
 
-  public function getExternalizedAllVariableNames($function_name) {
+  public function getExternalizedAllVariableNames($function_name, $parameter_names=array()) {
     if ($this->externalized_avariables) {
       return $this->externalized_avariables;
@@ -463 +476 @@
     }
 
-    $objects = $this->getExternalizedObjects();
+    $objects = $this->getExternalizedObjects(false, $parameter_names);
     foreach ($objects as $object) {
       $object->build();
@@ -525 +538 @@
       }
     }
-      
+
     return $this->externalized_avariables = $variables;
   }
 
-  public function getExternalizedInstanceVariableNames($function_name) {
+  public function getExternalizedInstanceVariableNames($function_name, $parameter_names=array()) {
     if ($this->externalized_ivariables) {
       return $this->externalized_ivariables;
@@ -536 +549 @@
     $ivariables = array();
 
-    $variables = $this->getExternalizedAllVariableNames($function_name);
+    $variables = $this->getExternalizedAllVariableNames($function_name, $parameter_names);
     foreach ($variables as $variable) {
       if (strpos($variable, 'this.') === 0) {
@@ -546 +559 @@
   }
 
-  public function getExternalizedVariableNames($function_name) {
+  public function getExternalizedVariableNames($function_name, $parameter_names=array()) {
     if ($this->externalized_variables) {
       return $this->externalized_variables;
@@ -553 +566 @@
     $evariables = array();
 
-    $variables = $this->getExternalizedAllVariableNames($function_name);
+    $variables = $this->getExternalizedAllVariableNames($function_name, $parameter_names);
     foreach ($variables as $variable) {
       if (strpos($variable, 'this.') !== 0) {

util/trunk/docscripts/lib/parser/DojoFunctionDeclare.php

@@ -132 +132 @@
   }
 
-  public function getVariableNames($function_name){
-    return $this->body->getExternalizedVariableNames($function_name);
+  public function getVariableNames($function_name, $parameter_names=array()){
+    return $this->body->getExternalizedVariableNames($function_name, $parameter_names);
   }
 
@@ -141 +141 @@
 
   public function getObjects(){
-    return $this->body->getExternalizedObjects();
+    return $this->body->getExternalizedObjects(false, $this->getParameterNames());
   }
 
@@ -325 +325 @@
       }
 
-      $variables = $this->body->getExternalizedInstanceVariableNames($function_name);
+      $variables = $this->body->getExternalizedInstanceVariableNames($function_name, $this->getParameterNames());
       foreach($variables as $variable) {
         $output[$function_name . '.' . $variable]['instance'] = $function_name;
       }
 
-      $variables = $this->body->getExternalizedVariableNames($function_name);
+      $variables = $this->body->getExternalizedVariableNames($function_name, $this->getParameterNames());
       foreach($variables as $variable) {
         list($first,) = explode('.', $variable, 2);