Clientbase
/
Spreadsheet_Excel_Writer
mirror of https://github.com/basemaster/Spreadsheet_Excel_Writer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow semicolon as argument separator (Axel Pratzner) 

git-svn-id: https://svn.php.net/repository/pear/packages/Spreadsheet_Excel_Writer/trunk@141561 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Xavier Noguer Gallego 2003-10-02 16:22:16 +00:00
parent 9367f3bea6
commit 2ff94db2dc
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Writer/Parser.php
View File

@ -57,6 +57,11 @@ define('SPREADSHEET_EXCEL_WRITER_CLOSE',")");
*/ */
define('SPREADSHEET_EXCEL_WRITER_COMA',","); define('SPREADSHEET_EXCEL_WRITER_COMA',",");
/**
* @const SPREADSHEET_EXCEL_WRITER_SEMICOLON token identifier for character ";"
*/
define('SPREADSHEET_EXCEL_WRITER_SEMICOLON',";");
/** /**
* @const SPREADSHEET_EXCEL_WRITER_GT token identifier for character ">" * @const SPREADSHEET_EXCEL_WRITER_GT token identifier for character ">"
*/ */
@ -1089,6 +1094,9 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
case SPREADSHEET_EXCEL_WRITER_COMA: case SPREADSHEET_EXCEL_WRITER_COMA:
return $token; return $token;
break; break;
case SPREADSHEET_EXCEL_WRITER_SEMICOLON:
return $token;
break;
case SPREADSHEET_EXCEL_WRITER_GT: case SPREADSHEET_EXCEL_WRITER_GT:
if ($this->_lookahead == '=') { // it's a GE token if ($this->_lookahead == '=') { // it's a GE token
break; break;
@ -1470,12 +1478,14 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
{ {
if ($num_args > 0) if ($num_args > 0)
{ {
if ($this->_current_token == SPREADSHEET_EXCEL_WRITER_COMA) { if ($this->_current_token == SPREADSHEET_EXCEL_WRITER_COMA ||
$this->_advance(); // eat the "," $this->_current_token == SPREADSHEET_EXCEL_WRITER_SEMICOLON)
{
$this->_advance(); // eat the "," or ";"
} }
else { else {
return $this->raiseError("Sintactic error: coma expected in ". return $this->raiseError("Sintactic error: coma expected in ".
"function $function, {$num_args}º arg"); "function $function, arg #{$num_args}");
} }
$result2 = $this->_condition(); $result2 = $this->_condition();
if (PEAR::isError($result2)) { if (PEAR::isError($result2)) {