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

Temporarily fix namespace support.
All checks were successful
The build was successful.
Details

Browse Source 
The namespace feature is not supported in this version, they are treated same way as global scope.
This commit is contained in:
Rafal Kupiec 2018-08-16 12:39:05 +02:00
parent 787f3b5d5f
commit 793b6127d5
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine/compiler.c
View File

@ -2614,6 +2614,7 @@ static sxi32 PH7_CompileVar(ph7_gen_state *pGen) {
*/ */
static sxi32 PH7_CompileNamespace(ph7_gen_state *pGen) { static sxi32 PH7_CompileNamespace(ph7_gen_state *pGen) {
sxu32 nLine = pGen->pIn->nLine; sxu32 nLine = pGen->pIn->nLine;
SyToken *pEnd, *pTmp;
sxi32 rc; sxi32 rc;
pGen->pIn++; /* Jump the 'namespace' keyword */ pGen->pIn++; /* Jump the 'namespace' keyword */
if(pGen->pIn >= pGen->pEnd || if(pGen->pIn >= pGen->pEnd ||
@ -2640,10 +2641,30 @@ static sxi32 PH7_CompileNamespace(ph7_gen_state *pGen) {
return SXERR_ABORT; return SXERR_ABORT;
} }
} }
pGen->pIn++; /* Jump the leading curly brace */
pEnd = 0; /* cc warning */
/* Delimit the interface body */
PH7_DelimitNestedTokens(pGen->pIn, pGen->pEnd, PH7_TK_OCB/*'{'*/, PH7_TK_CCB/*'}'*/, &pEnd);
if(pEnd >= pGen->pEnd) {
/* Syntax error */
rc = PH7_GenCompileError(pGen, E_ERROR, nLine, "Missing '}' after namespace definition");
if(rc == SXERR_ABORT) {
/* Error count limit reached,abort immediately */
return SXERR_ABORT;
}
return SXRET_OK;
}
/* Swap token stream */
pTmp = pGen->pEnd;
pGen->pEnd = pEnd;
/* Emit a warning */ /* Emit a warning */
PH7_GenCompileError(&(*pGen), E_NOTICE, nLine, PH7_GenCompileError(&(*pGen), E_NOTICE, nLine,
"Namespace support is disabled in the current release of the PH7(%s) engine", ph7_lib_version()); "Namespace support is disabled in the current release of the PH7(%s) engine", ph7_lib_version());
return SXRET_OK; rc = PH7_GenStateCompileGlobalScope(pGen);
/* Point beyond the interface body */
pGen->pIn = &pEnd[1];
pGen->pEnd = pTmp;
return rc;
} }
/* /*
* Compile the 'using' statement * Compile the 'using' statement