Commitd49a53f

Edward Z. Yang ext:(%22)

committed

Fix error in lastFourChars impl for early versions of PHP.

1 parent9c3d808 commitd49a53fCopy full SHA for d49a53f

File tree

+24

-6

lines changed

+24

-6

lines changed

Lines changed: 14 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,17 @@ public function parse() {`
`105`	`105`	`$lastFourChars ='';`
`106`	`106`	`//echo "\n\n";`
`107`	`107`	`while($state !==null) {`
`108`		`-//echo $state . "\n";`
	`108`	`+/*`
	`109`	`+ echo $state . ' ';`
	`110`	`+ switch ($this->content_model) {`
	`111`	`+ case self::PCDATA: echo 'PCDATA'; break;`
	`112`	`+ case self::RCDATA: echo 'RCDATA'; break;`
	`113`	`+ case self::CDATA: echo 'CDATA'; break;`
	`114`	`+ case self::PLAINTEXT: echo 'PLAINTEXT'; break;`
	`115`	`+ }`
	`116`	`+ if ($this->escape) echo " escape";`
	`117`	`+ echo "\n";`
	`118`	`+ */`
`109`	`119`	`switch($state) {`
`110`	`120`	`case'data':`
`111`	`121`
`@@ -114,7 +124,8 @@ public function parse() {`
`114`	`124`
`115`	`125`	`/* Consume the next input character */`
`116`	`126`	`$char =$this->stream->char();`
`117`		`-$lastFourChars =substr($lastFourChars .$char, -4);`
	`127`	`+$lastFourChars .=$char;`
	`128`	`+if (strlen($lastFourChars) >4)$lastFourChars =substr($lastFourChars, -4);`
`118`	`129`
`119`	`130`	`// see below for meaning`
`120`	`131`	`$amp_cond =`
`@@ -218,7 +229,7 @@ public function parse() {`
`218`	`229`	`'data' =>$char .$chars`
`219`	`230`	`));`
`220`	`231`
`221`		`-$lastFourChars=substr($lastFourChars .$chars, -4);`
	`232`	`+$lastFourChars.=$chars;`
`222`	`233`
`223`	`234`	`$state ='data';`
`224`	`235`	`}`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1682,7 +1682,6 @@ public function emitToken($token, $mode = null) {`
`1682`	`1682`
`1683`	`1683`	`/* If node has the same tag name as the end tag token,`
`1684`	`1684`	`then: */`
`1685`		`-if ($token['name'] ==='label')var_dump($node->tagName);`
`1686`	`1685`	`if($token['name'] ===$node->tagName) {`
`1687`	`1686`	`/* Generate implied end tags. */`
`1688`	`1687`	`$this->generateImpliedEndTags();`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,19 @@ public function invoke($test) {`
`31`	`31`	`);`
`32`	`32`	`if ($expect !=$result) {`
`33`	`33`	`echo"Input:";str_dump($test->input);`
`34`		`-echo"Expected:";var_dump($expect);`
`35`		`-echo"Actual:";var_dump($result);`
	`34`	`+echo"\nExpected:\n";echo$this->tokenDump($expect);`
	`35`	`+echo"\nActual:\n";echo$this->tokenDump($result);`
	`36`	`+echo"\n";`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`	`}`
	`40`	`+privatefunctiontokenDump($tokens) {`
	`41`	`+$ret ='';`
	`42`	`+foreach ($tokensas$i =>$token) {`
	`43`	`+$ret .= ($i+1).".{$token[0]}:{$token[1]}\n";`
	`44`	`+ }`
	`45`	`+return$ret;`
	`46`	`+ }`
`39`	`47`	`publicfunctiontokenize($test,$flag) {`
`40`	`48`	`$flag =constant("HTML5_Tokenizer::$flag");`
`41`	`49`	`if (!isset($test->lastStartTag))$test->lastStartTag =null;`

Comments

(0)