From 46213daa86e91437d10a0bc603399f4d999b04ca Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 11:23:20 +0200 Subject: cleanup of handler.php The file contained a few DOS lineendings and trailing spaces --- inc/parser/handler.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'inc/parser') diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 22a50d1b7..0e54425f7 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1489,10 +1489,10 @@ class Doku_Handler_Block { } } - function openParagraph($pos){ + function openParagraph($pos){ if ($this->inParagraph) return; $this->calls[] = array('p_open',array(), $pos); - $this->inParagraph = true; + $this->inParagraph = true; $this->skipEol = true; } @@ -1503,7 +1503,7 @@ class Doku_Handler_Block { * * @author Andreas Gohr */ - function closeParagraph($pos){ + function closeParagraph($pos){ if (!$this->inParagraph) return; // look back if there was any content - we don't want empty paragraphs $content = ''; @@ -1521,17 +1521,17 @@ class Doku_Handler_Block { if(trim($content)==''){ //remove the whole paragraph array_splice($this->calls,$i); - }else{ - // remove ending linebreaks in the paragraph - $i=count($this->calls)-1; + }else{ + // remove ending linebreaks in the paragraph + $i=count($this->calls)-1; if ($this->calls[$i][0] == 'cdata') $this->calls[$i][1][0] = rtrim($this->calls[$i][1][0],DOKU_PARSER_EOL); $this->calls[] = array('p_close',array(), $pos); } - $this->inParagraph = false; + $this->inParagraph = false; $this->skipEol = true; } - + function addCall($call) { $key = count($this->calls); if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) { @@ -1553,7 +1553,7 @@ class Doku_Handler_Block { * @author Andreas Gohr */ function process($calls) { - // open first paragraph + // open first paragraph $this->openParagraph(0); foreach ( $calls as $key => $call ) { $cname = $call[0]; -- cgit v1.2.3 From a86cc527f2653a972a7416116630b5be5c3e380c Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 11:24:19 +0200 Subject: Fix performance issue in close_paragraph Looks like a for loop is faster than array_splice --- inc/parser/handler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc/parser') diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 0e54425f7..24d880e2d 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1520,7 +1520,8 @@ class Doku_Handler_Block { if(trim($content)==''){ //remove the whole paragraph - array_splice($this->calls,$i); + //array_splice($this->calls,$i); // <- this is much slower than the loop below + for($x=$ccount-1; $x>=$i; $x--) unset($this->calls[$x]); }else{ // remove ending linebreaks in the paragraph $i=count($this->calls)-1; -- cgit v1.2.3 From faba9a3522d0d79f3d6172e15804bc23c1215ddf Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 11:32:17 +0200 Subject: added the missing bit to my last commit --- inc/parser/handler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'inc/parser') diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 24d880e2d..6754d2560 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1507,7 +1507,8 @@ class Doku_Handler_Block { if (!$this->inParagraph) return; // look back if there was any content - we don't want empty paragraphs $content = ''; - for($i=count($this->calls)-1; $i>=0; $i--){ + $ccount = count($this->calls); + for($i=$ccount-1; $i>=0; $i--){ if($this->calls[$i][0] == 'p_open'){ break; }elseif($this->calls[$i][0] == 'cdata'){ -- cgit v1.2.3 From a284275484f42c92beaac76c05a80e66d3ab3026 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 13:16:37 +0200 Subject: fix off-by-one error --- inc/parser/handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/parser') diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 6754d2560..fd4304ba5 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1522,7 +1522,7 @@ class Doku_Handler_Block { if(trim($content)==''){ //remove the whole paragraph //array_splice($this->calls,$i); // <- this is much slower than the loop below - for($x=$ccount-1; $x>=$i; $x--) unset($this->calls[$x]); + for($x=$ccount-1; $x>$i; $x--) unset($this->calls[$x]); }else{ // remove ending linebreaks in the paragraph $i=count($this->calls)-1; -- cgit v1.2.3 From d8f7a7f328a68b48d9ef5c0987b6a4915d43735e Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Sat, 15 Oct 2011 14:24:20 +0200 Subject: replace unset with array_pop unset does not reset the Array's internal pointer which messes up later calls. array_pop is still much faster than array_splice --- inc/parser/handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/parser') diff --git a/inc/parser/handler.php b/inc/parser/handler.php index fd4304ba5..55b715ad9 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1522,7 +1522,7 @@ class Doku_Handler_Block { if(trim($content)==''){ //remove the whole paragraph //array_splice($this->calls,$i); // <- this is much slower than the loop below - for($x=$ccount-1; $x>$i; $x--) unset($this->calls[$x]); + for($x=$ccount; $x>$i; $x--) array_pop($this->calls); }else{ // remove ending linebreaks in the paragraph $i=count($this->calls)-1; -- cgit v1.2.3