RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-26 07:16:03 +03:00
Code Issues Projects Releases Wiki Activity

Workitem 7895 - Excel5 : Formula : Concatenation operator

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@59912 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Progi1984 2010-08-27 07:27:24 +00:00
parent 509f27e5c6
commit ab9d03069d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Classes/PHPExcel/Writer/Excel5/Parser.php
View File

@ -1149,8 +1149,11 @@ class PHPExcel_Writer_Excel5_Parser
return $token; return $token;
break; break;
case "^": case "^":
return $token; return $token;
break; break;
case "&":
return $token;
break;
default: default:
// if it's a reference A1 or $A$1 or $A1 or A$1 // if it's a reference A1 or $A$1 or $A1 or A$1
if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and if (preg_match('/^\$?[A-Ia-i]?[A-Za-z]\$?[0-9]+$/',$token) and
@ -1265,6 +1268,10 @@ class PHPExcel_Writer_Excel5_Parser
$this->_advance(); $this->_advance();
$result2 = $this->_expression(); $result2 = $this->_expression();
$result = $this->_createTree('ptgNE', $result, $result2); $result = $this->_createTree('ptgNE', $result, $result2);
} elseif ($this->_current_token == "&") {
$this->_advance();
$result2 = $this->_expression();
$result = $this->_createTree('ptgConcat', $result, $result2);
} }
return $result; return $result;
} }

2
changelog.txt
View File

@ -24,7 +24,7 @@
Fixed in SVN: Fixed in SVN:
- Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Concatenation operator
2010-08-26 (v1.7.4): 2010-08-26 (v1.7.4):
- Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Power - Bugfix: (Progi1984) Workitem 7895 - Excel5 : Formula : Power