Skip to content

S
sdkjs
Commit e07e8b9d authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov
Browse files
Options

переделан парсинг массива 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68473 954022d7-b5bf-4e40-9824-e11837661b57
parent 44f73ec2
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 50 deletions
Excel/apiDefines.js
View file @ e07e8b9d
......@@ -37,19 +37,19 @@ var c_oAscError = {
UserCountExceed: -22,
/* для формул */
FrmlWrongCountParentheses: -30,
FrmlWrongOperator: -31,
FrmlWrongMaxArgument: -32,
FrmlWrongCountArgument: -33,
FrmlWrongFunctionName: -34,
FrmlAnotherParsingError: -35,
FrmlWrongArgumentRange: -36,
FrmlOperandExpected: -37,
FrmlParenthesesCorrectCount: -38,
FrmlWrongReferences: -39,
InvalidReferenceOrName: -40,
LockCreateDefName: -41,
FrmlWrongCountParentheses: -300,
FrmlWrongOperator: -301,
FrmlWrongMaxArgument: -302,
FrmlWrongCountArgument: -303,
FrmlWrongFunctionName: -304,
FrmlAnotherParsingError: -305,
FrmlWrongArgumentRange: -306,
FrmlOperandExpected: -307,
FrmlParenthesesCorrectCount: -308,
FrmlWrongReferences: -309,
InvalidReferenceOrName: -310,
LockCreateDefName: -311,
AutoFilterDataRangeError: -50,
......
Excel/model/FormulaObjects/parserFormula.js
View file @ e07e8b9d
......@@ -1176,7 +1176,6 @@ cRef.prototype.getValue = function () {
}
else if ( cellType === CellValueType.String ) {
res = new cString( this.range.getValueWithoutFormat() );
// res = checkTypeCell( "" + this.range.getValueWithoutFormat() );
}
else {
res = checkTypeCell( "" + this.range.getValueWithoutFormat() );
......@@ -4070,15 +4069,8 @@ parserFormula.prototype = {
else if ( parserHelp.isComma.call( this, this.Formula, this.pCurrPos ) ) {
wasLeftParentheses = false;
wasRigthParentheses = false;
/* if( this.operand_expected ){
this.error.push(c_oAscError.ID.FrmlAnotherParsingError);
this.outStack = [];
this.elemArr = [];
return false;
} */
var wasLeftParentheses = false;
var stackLength = this.elemArr.length;
var top_elem = null;
var stackLength = this.elemArr.length, top_elem = null;
if ( this.elemArr.length != 0 && this.elemArr[stackLength - 1].name == "(" && this.operand_expected ) {
this.outStack.push( new cEmpty() );
top_elem = this.elemArr[stackLength - 1];
......@@ -4117,31 +4109,29 @@ parserFormula.prototype = {
}
/* Array */
else if ( parserHelp.isArray.call( this, this.Formula, this.pCurrPos, digitDelim ) ) {
else if ( parserHelp.isLeftBrace.call(this, this.Formula, this.pCurrPos) ) {
wasLeftParentheses = false;
wasRigthParentheses = false;
var pH = new parserHelper(), tO = {pCurrPos: 0, Formula: this.operand_str, operand_str: ""};
var arr = new cArray(), operator = { isOperator: false, operatorName: ""};
while ( tO.pCurrPos < tO.Formula.length ) {
if ( pH.isArraySeparator.call( tO, tO.Formula, tO.pCurrPos, digitDelim ) ) {
if ( tO.operand_str == (digitDelim ? arrayRowSeparator : arrayRowSeparatorDef) ) {
while ( this.pCurrPos < this.Formula.length && !parserHelp.isRightBrace.call(this, this.Formula, this.pCurrPos) ) {
if ( parserHelp.isArraySeparator.call( this, this.Formula, this.pCurrPos, digitDelim ) ) {
if ( this.operand_str == (digitDelim ? arrayRowSeparator : arrayRowSeparatorDef) ) {
arr.addRow();
}
}
else if ( pH.isBoolean.call( tO, tO.Formula, tO.pCurrPos, local ) ) {
arr.addElement( new cBool( tO.operand_str ) );
else if ( parserHelp.isBoolean.call( this, this.Formula, this.pCurrPos, local ) ) {
arr.addElement( new cBool( this.operand_str ) );
}
else if ( pH.isString.call( tO, tO.Formula, tO.pCurrPos ) ) {
arr.addElement( new cString( tO.operand_str ) );
else if ( parserHelp.isString.call( this, this.Formula, this.pCurrPos ) ) {
arr.addElement( new cString( this.operand_str ) );
}
else if ( pH.isError.call( tO, tO.Formula, tO.pCurrPos ) ) {
arr.addElement( new cError( tO.operand_str ) );
else if ( parserHelp.isError.call( this, this.Formula, this.pCurrPos ) ) {
arr.addElement( new cError( this.operand_str ) );
}
else if ( pH.isNumber.call( tO, tO.Formula, tO.pCurrPos, digitDelim ) ) {
else if ( parserHelp.isNumber.call( this, this.Formula, this.pCurrPos, digitDelim ) ) {
if ( operator.isOperator ) {
if ( operator.operatorName == "+" || operator.operatorName == "-" ) {
tO.operand_str = operator.operatorName + "" + tO.operand_str
this.operand_str = operator.operatorName + "" + this.operand_str
}
else {
this.outStack = [];
......@@ -4150,17 +4140,25 @@ parserFormula.prototype = {
return false;
}
}
arr.addElement( new cNumber( parseFloat( tO.operand_str ) ) );
arr.addElement( new cNumber( parseFloat( this.operand_str ) ) );
operator = { isOperator: false, operatorName: ""};
}
else if ( pH.isOperator.call( tO, tO.Formula, tO.pCurrPos ) ) {
else if ( parserHelp.isOperator.call( this, this.Formula, this.pCurrPos ) ) {
operator.isOperator = true;
operator.operatorName = tO.operand_str;
operator.operatorName = this.operand_str;
}
else{
this.outStack = [];
this.elemArr = [];
/*в массиве используется недопустимый параметр*/
this.error.push( c_oAscError.ID.FrmlAnotherParsingError );
return false;
}
}
if ( !arr.isValidArray() ) {
this.outStack = [];
this.elemArr = [];
/*размер массива не согласован*/
this.error.push( c_oAscError.ID.FrmlAnotherParsingError );
return false;
}
......@@ -4182,8 +4180,6 @@ parserFormula.prototype = {
this.outStack = [];
this.elemArr = [];
return false;
// this.outStack = [new cError(cErrorType.unsupported_function)];
// return this.isParsed = true;
}
/* Booleans */
......@@ -4268,6 +4264,7 @@ parserFormula.prototype = {
found_operand = new cStrucTable( _tableTMP, this.wb, this.ws, this.ws.getCell( this.cellAddress ) );
if(found_operand.type==cElementType.error) {
/*используется неверный именованный диапазон или таблица*/
this.error.push( c_oAscError.ID.FrmlAnotherParsingError );
this.outStack = [];
this.elemArr = [];
......@@ -4341,10 +4338,6 @@ parserFormula.prototype = {
found_operand = null
}
else {
/*this.error.push( c_oAscError.ID.FrmlAnotherParsingError );
this.outStack = [];
this.elemArr = [];
return false;*/
if ( this.operand_str == null || this.operand_str == "'" ) {
this.outStack.push( new cError( cErrorType.wrong_name ) );
this.error.push( c_oAscError.ID.FrmlAnotherParsingError );
......@@ -4357,14 +4350,10 @@ parserFormula.prototype = {
this.operand_expected = false;
if ( this.operand_str != null ) {
if ( this.operand_str == '"' ) {
//this.Formula = this.Formula.substr(0,this.pCurrPos) + '"' + this.Formula.substr(this.pCurrPos);
continue;
}
this.pCurrPos += this.operand_str.length;
}
// break;
/*this.outStack = [new cError(cErrorType.wrong_name)];
return this.isParsed = false;*/
}
if ( wasRigthParentheses ) {
this.elemArr.push( new cMultOperator() );
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7