Rename TreeConstructer to TreeBuilder.

Edward Z. Yang ext:(%22) · Edward Z. Yang ext:(%22) · commit 45a220c2732a · 2009-06-01T20:10:09.000-04:00
--HG--
rename : php/library/HTML5/TreeConstructer.php =&gt; php/library/HTML5/TreeBuilder.php
diff --git a/library/HTML5/Tokenizer.php b/library/HTML5/Tokenizer.php
@@ -86,7 +86,7 @@ class HTML5_Tokenizer {
      */
     public function __construct($data) {
         $this->stream = new HTML5_InputStream($data);
-        $this->tree = new HTML5_TreeConstructer;
+        $this->tree = new HTML5_TreeBuilder;
         $this->content_model = self::PCDATA;
     }
 
diff --git a/library/HTML5/TreeBuilder.php b/library/HTML5/TreeBuilder.php
@@ -32,7 +32,7 @@
 //      XSCRIPT - with regards to scripting mode
 //      XENCODING - with regards to encoding (for reparsing tests)
 
-class HTML5_TreeConstructer {
+class HTML5_TreeBuilder {
     public $stack = array();
     public $content_model;
 
@@ -100,7 +100,7 @@ class HTML5_TreeConstructer {
     private function strConst($number) {
         static $lookup;
         if (!$lookup) {
-            $r = new ReflectionClass('HTML5_TreeConstructer');
+            $r = new ReflectionClass('HTML5_TreeBuilder');
             $lookup = array_flip($r->getConstants());
         }
         return $lookup[$number];
@@ -146,7 +146,7 @@ public function emitToken($token, $mode = null) {
 
         /*
         $backtrace = debug_backtrace();
-        if ($backtrace[1]['class'] !== 'HTML5_TreeConstructer') echo "--\n";
+        if ($backtrace[1]['class'] !== 'HTML5_TreeBuilder') echo "--\n";
         echo $this->strConst($mode);
         if ($this->original_mode) echo " (originally ".$this->strConst($this->original_mode).")";
         echo "\n  ";
diff --git a/tests/HTML5/TestData.php b/tests/HTML5/TestData.php
@@ -110,24 +110,24 @@ public static function strDom($node, $prefix = '| ') {
                 case XML_ELEMENT_NODE:
                     $ns = '';
                     switch ($next->namespaceURI) {
-                    case HTML5_TreeConstructer::NS_MATHML:
+                    case HTML5_TreeBuilder::NS_MATHML:
                         $ns = 'math '; break;
-                    case HTML5_TreeConstructer::NS_SVG:
+                    case HTML5_TreeBuilder::NS_SVG:
                         $ns = 'svg '; break;
                     }
                     $text = "<{$ns}{$next->tagName}>";
                     foreach ($next->attributes as $attr) {
                         $ans = '';
                         switch ($attr->namespaceURI) {
-                        case HTML5_TreeConstructer::NS_MATHML:
+                        case HTML5_TreeBuilder::NS_MATHML:
                             $ans = 'math '; break;
-                        case HTML5_TreeConstructer::NS_SVG:
+                        case HTML5_TreeBuilder::NS_SVG:
                             $ans = 'svg '; break;
-                        case HTML5_TreeConstructer::NS_XLINK:
+                        case HTML5_TreeBuilder::NS_XLINK:
                             $ans = 'xlink '; break;
-                        case HTML5_TreeConstructer::NS_XML:
+                        case HTML5_TreeBuilder::NS_XML:
                             $ans = 'xml '; break;
-                        case HTML5_TreeConstructer::NS_XMLNS:
+                        case HTML5_TreeBuilder::NS_XMLNS:
                             $ans = 'xmlns '; break;
                         }
                         // XSKETCHY: needed for our horrible xlink hack
diff --git a/tests/HTML5/TestableTokenizer.php b/tests/HTML5/TestableTokenizer.php
@@ -45,7 +45,7 @@ protected function emitToken($token, $checkStream = true) {
                 $attr = new stdclass();
                 foreach ($token['attr'] as $keypair) {
                     // XXX this is IMPORTANT behavior, check if it's
-                    // in TreeConstructer
+                    // in TreeBuilder
                     $name = $keypair['name'];
                     if (isset($attr->$name)) continue;
                     $attr->$name = $keypair['value'];

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class HTML5_Tokenizer {`
`86`	`86`	`*/`
`87`	`87`	`public function __construct($data) {`
`88`	`88`	`$this->stream = new HTML5_InputStream($data);`
`89`		`- $this->tree = new HTML5_TreeConstructer;`
	`89`	`+ $this->tree = new HTML5_TreeBuilder;`
`90`	`90`	`$this->content_model = self::PCDATA;`
`91`	`91`	`}`
`92`	`92`