aerscript/Aer
0
5
Fork 0
Code Issues 6 Pull Requests Releases 2 Wiki Activity

Do not allow to initialize an implicitly-typed variable with an array initializer.
All checks were successful
The build was successful.
Details

Browse Source
This commit is contained in:
Rafal Kupiec 2019-06-08 13:09:35 +02:00
parent 78c416c6b8
commit 0327c3130f
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/compiler.c
View File

@ -2454,6 +2454,10 @@ static sxi32 PH7_CompileVar(ph7_gen_state *pGen) {
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_EQUAL)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_EQUAL)) {
SySet *pInstrContainer; SySet *pInstrContainer;
pGen->pIn++; /* Jump the equal '=' sign */ pGen->pIn++; /* Jump the equal '=' sign */
if(nType == MEMOBJ_NULL && pGen->pIn->nType & PH7_TK_OCB) {
PH7_GenCompileError(&(*pGen), E_ERROR, pGen->pIn->nLine,
"Cannot initialize an implicitly-typed variable '$%z' with an array initializer", pName);
}
/* Swap bytecode container */ /* Swap bytecode container */
pInstrContainer = PH7_VmGetByteCodeContainer(pGen->pVm); pInstrContainer = PH7_VmGetByteCodeContainer(pGen->pVm);
PH7_VmSetByteCodeContainer(pGen->pVm, &sStatic.aByteCode); PH7_VmSetByteCodeContainer(pGen->pVm, &sStatic.aByteCode);
@ -2485,6 +2489,10 @@ static sxi32 PH7_CompileVar(ph7_gen_state *pGen) {
PH7_VmEmitInstr(pGen->pVm, nLine, PH7_OP_POP, 1, 0, 0, 0); PH7_VmEmitInstr(pGen->pVm, nLine, PH7_OP_POP, 1, 0, 0, 0);
/* Check if we have an expression to compile */ /* Check if we have an expression to compile */
if(pGen->pIn < pGen->pEnd && (pGen->pIn[2].nType & PH7_TK_EQUAL)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn[2].nType & PH7_TK_EQUAL)) {
if(nType == MEMOBJ_NULL && pGen->pIn[3].nType & PH7_TK_OCB) {
PH7_GenCompileError(&(*pGen), E_ERROR, pGen->pIn->nLine,
"Cannot initialize an implicitly-typed variable '$%z' with an array initializer", pName);
}
/* Compile the expression */ /* Compile the expression */
rc = PH7_CompileExpr(&(*pGen), EXPR_FLAG_COMMA_STATEMENT, 0); rc = PH7_CompileExpr(&(*pGen), EXPR_FLAG_COMMA_STATEMENT, 0);
if(rc == SXERR_ABORT) { if(rc == SXERR_ABORT) {