cvs: pear /Spreadsheet_Excel_Writer/Writer Parser.php
| From: | Xavier Noguer Gallego | Date: | Sat, 19 Nov 2005 13:35:17 +0000 |
| Subject: | cvs: pear /Spreadsheet_Excel_Writer/Writer Parser.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-36372@lists.php.net to get a copy of this message | ||
xnoguer Sat Nov 19 08:35:17 2005 EDT
Modified files:
/pear/Spreadsheet_Excel_Writer/Writer Parser.php
Log:
submitting to CS because of being asked nicely
http://cvs.php.net/diff.php/pear/Spreadsheet_Excel_Writer/Writer/Parser.php?r1=1.56&r2=1.57&ty=u
Index: pear/Spreadsheet_Excel_Writer/Writer/Parser.php
diff -u pear/Spreadsheet_Excel_Writer/Writer/Parser.php:1.56
pear/Spreadsheet_Excel_Writer/Writer/Parser.php:1.57
--- pear/Spreadsheet_Excel_Writer/Writer/Parser.php:1.56 Fri Nov 11 23:31:05 2005
+++ pear/Spreadsheet_Excel_Writer/Writer/Parser.php Sat Nov 19 08:35:14 2005
@@ -538,61 +538,52 @@
*/
function _convert($token)
{
- if (preg_match("/^\"[^\"]{0,255}\"$/", $token))
- {
+ if (preg_match("/^\"[^\"]{0,255}\"$/", $token)) {
return $this->_convertString($token);
- }
- elseif (is_numeric($token))
- {
+
+ } elseif (is_numeric($token)) {
return $this->_convertNumber($token);
- }
+
// match references like A1 or $A$1
- elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/',$token))
- {
+ } elseif (preg_match('/^\$?([A-Ia-i]?[A-Za-z])\$?(\d+)$/',$token)) {
return $this->_convertRef2d($token);
- }
+
// match external references like Sheet1!A1 or Sheet1:Sheet2!A1
- elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z](\d+)$/u",$token))
- {
+ } elseif (preg_match("/^\w+(\:\w+)?\![A-Ia-i]?[A-Za-z](\d+)$/u",$token)) {
return $this->_convertRef3d($token);
- }
+
// match external references like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z](\d+)$/u",$token))
- {
+ } elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\![A-Ia-i]?[A-Za-z](\d+)$/u",$token)) {
return $this->_convertRef3d($token);
- }
+
// match ranges like A1:B2
- elseif
(preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/",$token))
- {
+ } elseif
(preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\:(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/",$token))
{
return $this->_convertRange2d($token);
- }
+
// match ranges like A1..B2
- elseif
(preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/",$token))
- {
+ } elseif
(preg_match("/^(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)\.\.(\$)?[A-Ia-i]?[A-Za-z](\$)?(\d+)$/",$token))
{
return $this->_convertRange2d($token);
- }
+
// match external ranges like Sheet1!A1 or Sheet1:Sheet2!A1:B2
- elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/u",$token))
- {
+ } elseif
(preg_match("/^\w+(\:\w+)?\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/u",$token))
{
return $this->_convertRange3d($token);
- }
+
// match external ranges like 'Sheet1'!A1 or 'Sheet1:Sheet2'!A1:B2
- elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/u",$token))
- {
+ } elseif (preg_match("/^'[\w -]+(\:[\w
-]+)?'\!([A-Ia-i]?[A-Za-z])?(\d+)\:([A-Ia-i]?[A-Za-z])?(\d+)$/u",$token)) {
return $this->_convertRange3d($token);
- }
- elseif (isset($this->ptg[$token])) // operators (including parentheses)
- {
+
+ // operators (including parentheses)
+ } elseif (isset($this->ptg[$token])) {
return pack("C", $this->ptg[$token]);
- }
+
// commented so argument number can be processed correctly. See toReversePolish().
/*elseif (preg_match("/[A-Z0-9\xc0-\xdc\.]+/",$token))
{
return($this->_convertFunction($token,$this->_func_args));
}*/
+
// if it's an argument, ignore the token (the argument remains)
- elseif ($token == 'arg')
- {
+ } elseif ($token == 'arg') {
return '';
}
// TODO: use real error codes