Commit 23683759 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 34289

parent 7a80f70e
...@@ -2305,12 +2305,6 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara ...@@ -2305,12 +2305,6 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
cBaseFunction.prototype.getArguments = function () { cBaseFunction.prototype.getArguments = function () {
return this.argumentsCurrent; return this.argumentsCurrent;
}; };
cBaseFunction.prototype.getMaxArguments = function () {
return this.argumentsMax;
};
cBaseFunction.prototype.getMinArguments = function () {
return this.argumentsMin;
};
cBaseFunction.prototype.Assemble = function (arg) { cBaseFunction.prototype.Assemble = function (arg) {
var str = ""; var str = "";
for (var i = 0; i < arg.length; i++) { for (var i = 0; i < arg.length; i++) {
...@@ -4501,13 +4495,13 @@ parserFormula.prototype.parse = function(local, digitDelim) { ...@@ -4501,13 +4495,13 @@ parserFormula.prototype.parse = function(local, digitDelim) {
this.elemArr.pop(); this.elemArr.pop();
if (this.elemArr.length != 0 && ( func = this.elemArr[this.elemArr.length - 1] ).type == cElementType.func) { if (this.elemArr.length != 0 && ( func = this.elemArr[this.elemArr.length - 1] ).type == cElementType.func) {
p = this.elemArr.pop(); p = this.elemArr.pop();
if (top_elem.getArguments() > func.getMaxArguments()) { if (top_elem.getArguments() > func.argumentsMax) {
this.outStack = []; this.outStack = [];
this.elemArr = []; this.elemArr = [];
this.error.push(c_oAscError.ID.FrmlWrongMaxArgument); this.error.push(c_oAscError.ID.FrmlWrongMaxArgument);
return false; return false;
} else { } else {
if (top_elem.getArguments() >= func.getMinArguments()) { if (top_elem.getArguments() >= func.argumentsMin) {
func.setArgumentsCount(top_elem.getArguments()); func.setArgumentsCount(top_elem.getArguments());
if (!func.checkArguments()) { if (!func.checkArguments()) {
bError = true; bError = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment