OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0025329: ExprIntrp_GenExp can not parse unary plus

Browse Source 
Formatting

Test case for issue CR25329
This commit is contained in:
esa
2014-10-09 15:44:35 +04:00
committed by bugmaster
parent 3910bc6501
commit ab1469893c
3 changed files with 57 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/ExprIntrp/ExprIntrp.yacc
View File

@@ -28,6 +28,7 @@ extern void ExprIntrp_ProductOperator();
extern void ExprIntrp_DivideOperator();
extern void ExprIntrp_ExpOperator();
extern void ExprIntrp_UnaryMinusOperator();
extern void ExprIntrp_UnaryPlusOperator();
extern void ExprIntrp_VariableIdentifier();
extern void ExprIntrp_NumValue();
extern void ExprIntrp_EndFunction();
@@ -78,56 +79,57 @@ extern void ExprIntrp_EndOfEqual();
%%
exprentry : GenExpr
| Assignment
| Assignment
| Deassignment
| FunctionDefinition {ExprIntrp_EndOfFuncDef();}
| RelationList {ExprIntrp_EndOfRelation();}
;
| FunctionDefinition {ExprIntrp_EndOfFuncDef();}
| RelationList {ExprIntrp_EndOfRelation();}
;
Assignment : IDENTIFIER {ExprIntrp_AssignVariable();} ASSIGNOP GenExpr {ExprIntrp_EndOfAssign();}
;
;
Deassignment : DEASSIGNKEY BRACKET IDENTIFIER {ExprIntrp_Deassign();} ENDBRACKET
;
GenExpr : GenExpr SUMOP GenExpr {ExprIntrp_SumOperator();}
| GenExpr MINUSOP GenExpr {ExprIntrp_MinusOperator();}
| GenExpr MULTOP GenExpr {ExprIntrp_ProductOperator();}
| GenExpr DIVIDEOP GenExpr {ExprIntrp_DivideOperator();}
| GenExpr EXPOP GenExpr {ExprIntrp_ExpOperator();}
| PARENTHESIS GenExpr ENDPARENTHESIS
| BRACKET GenExpr ENDBRACKET
| MINUSOP GenExpr {ExprIntrp_UnaryMinusOperator();}
| SingleExpr
GenExpr : GenExpr SUMOP GenExpr {ExprIntrp_SumOperator();}
| GenExpr MINUSOP GenExpr {ExprIntrp_MinusOperator();}
| GenExpr MULTOP GenExpr {ExprIntrp_ProductOperator();}
| GenExpr DIVIDEOP GenExpr {ExprIntrp_DivideOperator();}
| GenExpr EXPOP GenExpr {ExprIntrp_ExpOperator();}
| PARENTHESIS GenExpr ENDPARENTHESIS
| BRACKET GenExpr ENDBRACKET
| MINUSOP GenExpr {ExprIntrp_UnaryMinusOperator();}
| SUMOP GenExpr {ExprIntrp_UnaryPlusOperator();}
| SingleExpr
| Derivation
| ConstantDefinition
| Sumator
| Productor
;
;
SingleExpr : Single
| Function
;
| Function
;
Single : IDENTIFIER {ExprIntrp_VariableIdentifier();}
| VALUE {ExprIntrp_NumValue();}
;
Single : IDENTIFIER {ExprIntrp_VariableIdentifier();}
| VALUE {ExprIntrp_NumValue();}
;
Function : funcident PARENTHESIS ListGenExpr ENDPARENTHESIS {ExprIntrp_EndFunction();}
| DerFunctionId PARENTHESIS ListGenExpr ENDPARENTHESIS {ExprIntrp_EndDerFunction();}
| DiffFuncId {ExprIntrp_EndDifferential();} PARENTHESIS ListGenExpr ENDPARENTHESIS {ExprIntrp_EndDiffFunction();}
;
;
ListGenExpr : GenExpr {ExprIntrp_EndFuncArg();}
| GenExpr COMMA {ExprIntrp_NextFuncArg();} ListGenExpr
;
| GenExpr COMMA {ExprIntrp_NextFuncArg();} ListGenExpr
;
funcident : IDENTIFIER {ExprIntrp_StartFunction();}
;
;
FunctionDefinition : FunctionDef {ExprIntrp_DefineFunction();} ASSIGNOP GenExpr
;
;
DerFunctionId : IDENTIFIER {ExprIntrp_StartDerivate();} DERIVATE {ExprIntrp_EndDerivate();}
;
@@ -140,15 +142,15 @@ DiffId : IDENTIFIER {ExprIntrp_StartDifferential();}
| DiffFuncId
;
FunctionDef : IDENTIFIER {ExprIntrp_StartFunction();} BRACKET ListArg ENDBRACKET
;
FunctionDef : IDENTIFIER {ExprIntrp_StartFunction();} BRACKET ListArg ENDBRACKET
;
ListArg : unarg {ExprIntrp_EndFuncArg();}
| unarg COMMA {ExprIntrp_NextFuncArg();} ListArg
;
ListArg : unarg {ExprIntrp_EndFuncArg();}
| unarg COMMA {ExprIntrp_NextFuncArg();} ListArg
;
unarg : IDENTIFIER {ExprIntrp_VariableIdentifier();}
;
unarg : IDENTIFIER {ExprIntrp_VariableIdentifier();}
;
Derivation : DERIVKEY BRACKET GenExpr COMMA IDENTIFIER {ExprIntrp_Derivation();} ENDBRACKET {ExprIntrp_EndDerivation();}
| DERIVKEY BRACKET GenExpr COMMA IDENTIFIER {ExprIntrp_Derivation();} COMMA VALUE {ExprIntrp_DerivationValue();} ENDBRACKET {ExprIntrp_EndDerivation();}
@@ -163,11 +165,11 @@ Sumator : SUMKEY BRACKET GenExpr COMMA IDENTIFIER {ExprIntrp_Variable
Productor : PRODKEY BRACKET GenExpr COMMA IDENTIFIER {ExprIntrp_VariableIdentifier();} COMMA GenExpr COMMA GenExpr COMMA VALUE {ExprIntrp_NumValue();} ENDBRACKET {ExprIntrp_Productor();}
;
RelationList : SingleRelation
| SingleRelation RELSEPARATOR RelationList
| SingleRelation '\n' RelationList
;
RelationList : SingleRelation
| SingleRelation RELSEPARATOR RelationList
| SingleRelation '\n' RelationList
;
SingleRelation : GenExpr EQUALOP GenExpr {ExprIntrp_EndOfEqual();}
;
SingleRelation : GenExpr EQUALOP GenExpr {ExprIntrp_EndOfEqual();}
;

6
src/ExprIntrp/ExprIntrp_yaccintrf.cxx
View File

@@ -430,6 +430,12 @@ extern "C" void ExprIntrp_UnaryMinusOperator()
ExprIntrp_Recept.Push(res->ShallowSimplified());
}
extern "C" void ExprIntrp_UnaryPlusOperator()
{
Handle(Expr_GeneralExpression) op = ExprIntrp_Recept.Pop();
ExprIntrp_Recept.Push(op);
}
extern "C" void ExprIntrp_VariableIdentifier()
{
const TCollection_AsciiString& thename = ExprIntrp_GetResult();