Commit45a220c

Edward Z. Yang ext:(%22)

committed

Rename TreeConstructer to TreeBuilder.

--HG--rename : php/library/HTML5/TreeConstructer.php => php/library/HTML5/TreeBuilder.php

1 parent03d4a25 commit45a220cCopy full SHA for 45a220c

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class HTML5_Tokenizer {`
`86`	`86`	`*/`
`87`	`87`	`publicfunction__construct($data) {`
`88`	`88`	`$this->stream =newHTML5_InputStream($data);`
`89`		`-$this->tree =newHTML5_TreeConstructer;`
	`89`	`+$this->tree =newHTML5_TreeBuilder;`
`90`	`90`	`$this->content_model =self::PCDATA;`
`91`	`91`	`}`
`92`	`92`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`// XSCRIPT - with regards to scripting mode`
`33`	`33`	`// XENCODING - with regards to encoding (for reparsing tests)`
`34`	`34`
`35`		`-classHTML5_TreeConstructer {`
	`35`	`+classHTML5_TreeBuilder {`
`36`	`36`	`public$stack =array();`
`37`	`37`	`public$content_model;`
`38`	`38`
`@@ -100,7 +100,7 @@ class HTML5_TreeConstructer {`
`100`	`100`	`privatefunctionstrConst($number) {`
`101`	`101`	`static$lookup;`
`102`	`102`	`if (!$lookup) {`
`103`		`-$r =newReflectionClass('HTML5_TreeConstructer');`
	`103`	`+$r =newReflectionClass('HTML5_TreeBuilder');`
`104`	`104`	`$lookup =array_flip($r->getConstants());`
`105`	`105`	`}`
`106`	`106`	`return$lookup[$number];`
`@@ -146,7 +146,7 @@ public function emitToken($token, $mode = null) {`
`146`	`146`
`147`	`147`	`/*`
`148`	`148`	`$backtrace = debug_backtrace();`
`149`		`- if ($backtrace[1]['class'] !== 'HTML5_TreeConstructer') echo "--\n";`
	`149`	`+ if ($backtrace[1]['class'] !== 'HTML5_TreeBuilder') echo "--\n";`
`150`	`150`	`echo $this->strConst($mode);`
`151`	`151`	`if ($this->original_mode) echo " (originally ".$this->strConst($this->original_mode).")";`
`152`	`152`	`echo "\n ";`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,24 +110,24 @@ public static function strDom($node, $prefix = '\| ') {`
`110`	`110`	`caseXML_ELEMENT_NODE:`
`111`	`111`	`$ns ='';`
`112`	`112`	`switch ($next->namespaceURI) {`
`113`		`-caseHTML5_TreeConstructer::NS_MATHML:`
	`113`	`+caseHTML5_TreeBuilder::NS_MATHML:`
`114`	`114`	`$ns ='math';break;`
`115`		`-caseHTML5_TreeConstructer::NS_SVG:`
	`115`	`+caseHTML5_TreeBuilder::NS_SVG:`
`116`	`116`	`$ns ='svg';break;`
`117`	`117`	`}`
`118`	`118`	`$text ="<{$ns}{$next->tagName}>";`
`119`	`119`	`foreach ($next->attributesas$attr) {`
`120`	`120`	`$ans ='';`
`121`	`121`	`switch ($attr->namespaceURI) {`
`122`		`-caseHTML5_TreeConstructer::NS_MATHML:`
	`122`	`+caseHTML5_TreeBuilder::NS_MATHML:`
`123`	`123`	`$ans ='math';break;`
`124`		`-caseHTML5_TreeConstructer::NS_SVG:`
	`124`	`+caseHTML5_TreeBuilder::NS_SVG:`
`125`	`125`	`$ans ='svg';break;`
`126`		`-caseHTML5_TreeConstructer::NS_XLINK:`
	`126`	`+caseHTML5_TreeBuilder::NS_XLINK:`
`127`	`127`	`$ans ='xlink';break;`
`128`		`-caseHTML5_TreeConstructer::NS_XML:`
	`128`	`+caseHTML5_TreeBuilder::NS_XML:`
`129`	`129`	`$ans ='xml';break;`
`130`		`-caseHTML5_TreeConstructer::NS_XMLNS:`
	`130`	`+caseHTML5_TreeBuilder::NS_XMLNS:`
`131`	`131`	`$ans ='xmlns';break;`
`132`	`132`	`}`
`133`	`133`	`// XSKETCHY: needed for our horrible xlink hack`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function emitToken($token, $checkStream = true) {`
`45`	`45`	`$attr =newstdclass();`
`46`	`46`	`foreach ($token['attr']as$keypair) {`
`47`	`47`	`// XXX this is IMPORTANT behavior, check if it's`
`48`		`-// inTreeConstructer`
	`48`	`+// inTreeBuilder`
`49`	`49`	`$name =$keypair['name'];`
`50`	`50`	`if (isset($attr->$name))continue;`
`51`	`51`	`$attr->$name =$keypair['value'];`

Comments

(0)