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

Use something more human readable
The build was successful. Details

This commit is contained in:
Rafal Kupiec 2018-08-12 21:16:05 +02:00
parent 6b7591a137
commit 59c15caf4e
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
5 changed files with 203 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
engine/compiler.c
View File

@ -1775,7 +1775,7 @@ static sxi32 PH7_CompileDoWhile(ph7_gen_state *pGen) {
nLine = pGen->pIn->nLine; nLine = pGen->pIn->nLine;
} }
if(pGen->pIn >= pGen->pEnd || pGen->pIn->nType != PH7_TK_KEYWORD || if(pGen->pIn >= pGen->pEnd || pGen->pIn->nType != PH7_TK_KEYWORD ||
SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_TKWRD_WHILE) { SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_KEYWORD_WHILE) {
/* Missing 'while' statement */ /* Missing 'while' statement */
rc = PH7_GenCompileError(pGen, E_ERROR, nLine, "Missing 'while' statement after 'do' block"); rc = PH7_GenCompileError(pGen, E_ERROR, nLine, "Missing 'while' statement after 'do' block");
if(rc == SXERR_ABORT) { if(rc == SXERR_ABORT) {
@ -2120,7 +2120,7 @@ static sxi32 PH7_CompileForeach(ph7_gen_state *pGen) {
while(pCur < pEnd) { while(pCur < pEnd) {
if(pCur->nType & PH7_TK_KEYWORD) { if(pCur->nType & PH7_TK_KEYWORD) {
sxi32 nKeywrd = SX_PTR_TO_INT(pCur->pUserData); sxi32 nKeywrd = SX_PTR_TO_INT(pCur->pUserData);
if(nKeywrd == PH7_TKWRD_AS) { if(nKeywrd == PH7_KEYWORD_AS) {
/* Break with the first 'as' found */ /* Break with the first 'as' found */
break; break;
} }
@ -2365,17 +2365,17 @@ static sxi32 PH7_CompileIf(ph7_gen_state *pGen) {
} }
/* Ensure that the keyword ID is 'else if' or 'else' */ /* Ensure that the keyword ID is 'else if' or 'else' */
nKeyID = (sxu32)SX_PTR_TO_INT(pGen->pIn->pUserData); nKeyID = (sxu32)SX_PTR_TO_INT(pGen->pIn->pUserData);
if((nKeyID & (PH7_TKWRD_ELSE | PH7_TKWRD_ELIF)) == 0) { if((nKeyID & (PH7_KEYWORD_ELSE | PH7_KEYWORD_ELIF)) == 0) {
break; break;
} }
/* Emit the unconditional jump */ /* Emit the unconditional jump */
PH7_VmEmitInstr(pGen->pVm, PH7_OP_JMP, 0, 0, 0, &nJumpIdx); PH7_VmEmitInstr(pGen->pVm, PH7_OP_JMP, 0, 0, 0, &nJumpIdx);
/* Save the instruction index so we can fix it later when the jump destination is resolved */ /* Save the instruction index so we can fix it later when the jump destination is resolved */
PH7_GenStateNewJumpFixup(pCondBlock, PH7_OP_JMP, nJumpIdx); PH7_GenStateNewJumpFixup(pCondBlock, PH7_OP_JMP, nJumpIdx);
if(nKeyID & PH7_TKWRD_ELSE) { if(nKeyID & PH7_KEYWORD_ELSE) {
pToken = &pGen->pIn[1]; pToken = &pGen->pIn[1];
if(pToken >= pGen->pEnd || (pToken->nType & PH7_TK_KEYWORD) == 0 || if(pToken >= pGen->pEnd || (pToken->nType & PH7_TK_KEYWORD) == 0 ||
SX_PTR_TO_INT(pToken->pUserData) != PH7_TKWRD_IF) { SX_PTR_TO_INT(pToken->pUserData) != PH7_KEYWORD_IF) {
break; break;
} }
pGen->pIn++; /* Jump the 'else' keyword */ pGen->pIn++; /* Jump the 'else' keyword */
@ -2389,7 +2389,7 @@ static sxi32 PH7_CompileIf(ph7_gen_state *pGen) {
/* Fix the false jump */ /* Fix the false jump */
PH7_GenStateFixJumps(pCondBlock, PH7_OP_JZ, PH7_VmInstrLength(pGen->pVm)); PH7_GenStateFixJumps(pCondBlock, PH7_OP_JZ, PH7_VmInstrLength(pGen->pVm));
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) && if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) &&
(SX_PTR_TO_INT(pGen->pIn->pUserData) & PH7_TKWRD_ELSE)) { (SX_PTR_TO_INT(pGen->pIn->pUserData) & PH7_KEYWORD_ELSE)) {
/* Compile the else block */ /* Compile the else block */
pGen->pIn++; pGen->pIn++;
rc = PH7_CompileBlock(&(*pGen)); rc = PH7_CompileBlock(&(*pGen));
@ -2711,7 +2711,7 @@ static sxi32 PH7_CompileUsing(ph7_gen_state *pGen) {
break; break;
} }
} }
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) && PH7_TKWRD_AS == SX_PTR_TO_INT(pGen->pIn->pUserData)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) && PH7_KEYWORD_AS == SX_PTR_TO_INT(pGen->pIn->pUserData)) {
pGen->pIn++; /* Jump the 'as' keyword */ pGen->pIn++; /* Jump the 'as' keyword */
/* Compile one or more aliasses */ /* Compile one or more aliasses */
for(;;) { for(;;) {
@ -2871,15 +2871,15 @@ static sxi32 PH7_GenStateCollectFuncArgs(ph7_vm_func *pFunc, ph7_gen_state *pGen
if(pIn->nType & (PH7_TK_ID | PH7_TK_KEYWORD)) { if(pIn->nType & (PH7_TK_ID | PH7_TK_KEYWORD)) {
if(pIn->nType & PH7_TK_KEYWORD) { if(pIn->nType & PH7_TK_KEYWORD) {
sxu32 nKey = (sxu32)(SX_PTR_TO_INT(pIn->pUserData)); sxu32 nKey = (sxu32)(SX_PTR_TO_INT(pIn->pUserData));
if(nKey & PH7_TKWRD_ARRAY) { if(nKey & PH7_KEYWORD_ARRAY) {
sArg.nType = MEMOBJ_HASHMAP; sArg.nType = MEMOBJ_HASHMAP;
} else if(nKey & PH7_TKWRD_BOOL) { } else if(nKey & PH7_KEYWORD_BOOL) {
sArg.nType = MEMOBJ_BOOL; sArg.nType = MEMOBJ_BOOL;
} else if(nKey & PH7_TKWRD_INT) { } else if(nKey & PH7_KEYWORD_INT) {
sArg.nType = MEMOBJ_INT; sArg.nType = MEMOBJ_INT;
} else if(nKey & PH7_TKWRD_STRING) { } else if(nKey & PH7_KEYWORD_STRING) {
sArg.nType = MEMOBJ_STRING; sArg.nType = MEMOBJ_STRING;
} else if(nKey & PH7_TKWRD_FLOAT) { } else if(nKey & PH7_KEYWORD_FLOAT) {
sArg.nType = MEMOBJ_REAL; sArg.nType = MEMOBJ_REAL;
} else { } else {
PH7_GenCompileError(&(*pGen), E_WARNING, pGen->pIn->nLine, PH7_GenCompileError(&(*pGen), E_WARNING, pGen->pIn->nLine,
@ -3120,7 +3120,7 @@ static sxi32 PH7_GenStateCompileFunc(
ph7_vm_func_closure_env sEnv; ph7_vm_func_closure_env sEnv;
int got_this = 0; /* TRUE if $this have been seen */ int got_this = 0; /* TRUE if $this have been seen */
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)
&& SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_TKWRD_USING) { && SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_KEYWORD_USING) {
sxu32 nLine = pGen->pIn->nLine; sxu32 nLine = pGen->pIn->nLine;
/* Closure,record environment variable */ /* Closure,record environment variable */
pGen->pIn++; pGen->pIn++;
@ -3295,9 +3295,9 @@ static sxi32 PH7_CompileFunction(ph7_gen_state *pGen) {
* may only be accessed by the class that defines the member. * may only be accessed by the class that defines the member.
*/ */
static sxi32 PH7_GetProtectionLevel(sxi32 nKeyword) { static sxi32 PH7_GetProtectionLevel(sxi32 nKeyword) {
if(nKeyword == PH7_TKWRD_PRIVATE) { if(nKeyword == PH7_KEYWORD_PRIVATE) {
return PH7_CLASS_PROT_PRIVATE; return PH7_CLASS_PROT_PRIVATE;
} else if(nKeyword == PH7_TKWRD_PROTECTED) { } else if(nKeyword == PH7_KEYWORD_PROTECTED) {
return PH7_CLASS_PROT_PROTECTED; return PH7_CLASS_PROT_PROTECTED;
} }
/* Assume public by default */ /* Assume public by default */
@ -3750,7 +3750,7 @@ static sxi32 PH7_CompileClassInterface(ph7_gen_state *pGen) {
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) {
SyString pBaseName; SyString pBaseName;
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_EXTENDS /* interface b extends a */) { if(nKwrd == PH7_KEYWORD_EXTENDS /* interface b extends a */) {
/* Extract base interface */ /* Extract base interface */
pGen->pIn++; pGen->pIn++;
for(;;) { for(;;) {
@ -3835,12 +3835,12 @@ static sxi32 PH7_CompileClassInterface(ph7_gen_state *pGen) {
} }
/* Extract the current keyword */ /* Extract the current keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_PRIVATE || nKwrd == PH7_TKWRD_PROTECTED) { if(nKwrd == PH7_KEYWORD_PRIVATE || nKwrd == PH7_KEYWORD_PROTECTED) {
/* Emit a warning and switch to public visibility */ /* Emit a warning and switch to public visibility */
PH7_GenCompileError(&(*pGen), E_WARNING, pGen->pIn->nLine, "interface: Access type must be public"); PH7_GenCompileError(&(*pGen), E_WARNING, pGen->pIn->nLine, "interface: Access type must be public");
nKwrd = PH7_TKWRD_PUBLIC; nKwrd = PH7_KEYWORD_PUBLIC;
} }
if(nKwrd != PH7_TKWRD_PUBLIC && nKwrd != PH7_TKWRD_FUNCTION && nKwrd != PH7_TKWRD_CONST && nKwrd != PH7_TKWRD_STATIC) { if(nKwrd != PH7_KEYWORD_PUBLIC && nKwrd != PH7_KEYWORD_FUNCTION && nKwrd != PH7_KEYWORD_CONST && nKwrd != PH7_KEYWORD_STATIC) {
rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine,
"Expecting method signature or constant declaration inside interface '%z'", pName); "Expecting method signature or constant declaration inside interface '%z'", pName);
if(rc == SXERR_ABORT) { if(rc == SXERR_ABORT) {
@ -3849,7 +3849,7 @@ static sxi32 PH7_CompileClassInterface(ph7_gen_state *pGen) {
} }
goto done; goto done;
} }
if(nKwrd == PH7_TKWRD_PUBLIC) { if(nKwrd == PH7_KEYWORD_PUBLIC) {
/* Advance the stream cursor */ /* Advance the stream cursor */
pGen->pIn++; pGen->pIn++;
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0) { if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0) {
@ -3862,7 +3862,7 @@ static sxi32 PH7_CompileClassInterface(ph7_gen_state *pGen) {
goto done; goto done;
} }
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd != PH7_TKWRD_FUNCTION && nKwrd != PH7_TKWRD_CONST && nKwrd != PH7_TKWRD_STATIC) { if(nKwrd != PH7_KEYWORD_FUNCTION && nKwrd != PH7_KEYWORD_CONST && nKwrd != PH7_KEYWORD_STATIC) {
rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine,
"Expecting method signature or constant declaration inside interface '%z'", pName); "Expecting method signature or constant declaration inside interface '%z'", pName);
if(rc == SXERR_ABORT) { if(rc == SXERR_ABORT) {
@ -3872,7 +3872,7 @@ static sxi32 PH7_CompileClassInterface(ph7_gen_state *pGen) {
goto done; goto done;
} }
} }
if(nKwrd == PH7_TKWRD_CONST) { if(nKwrd == PH7_KEYWORD_CONST) {
/* Parse constant */ /* Parse constant */
rc = PH7_GenStateCompileClassConstant(&(*pGen), 0, 0, pClass); rc = PH7_GenStateCompileClassConstant(&(*pGen), 0, 0, pClass);
if(rc != SXRET_OK) { if(rc != SXRET_OK) {
@ -3883,13 +3883,13 @@ static sxi32 PH7_CompileClassInterface(ph7_gen_state *pGen) {
} }
} else { } else {
sxi32 iFlags = 0; sxi32 iFlags = 0;
if(nKwrd == PH7_TKWRD_STATIC) { if(nKwrd == PH7_KEYWORD_STATIC) {
/* Static method,record that */ /* Static method,record that */
iFlags |= PH7_CLASS_ATTR_STATIC; iFlags |= PH7_CLASS_ATTR_STATIC;
/* Advance the stream cursor */ /* Advance the stream cursor */
pGen->pIn++; pGen->pIn++;
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0
|| SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_TKWRD_FUNCTION) { || SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_KEYWORD_FUNCTION) {
rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine,
"Expecting method signature inside interface '%z'", pName); "Expecting method signature inside interface '%z'", pName);
if(rc == SXERR_ABORT) { if(rc == SXERR_ABORT) {
@ -3987,7 +3987,7 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) {
SyString pBaseName; SyString pBaseName;
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_EXTENDS /* class b extends a */) { if(nKwrd == PH7_KEYWORD_EXTENDS /* class b extends a */) {
pGen->pIn++; /* Advance the stream cursor */ pGen->pIn++; /* Advance the stream cursor */
for(;;) { for(;;) {
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_ID) == 0) { if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_ID) == 0) {
@ -4017,7 +4017,7 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
} }
iP1 = 1; iP1 = 1;
} }
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) && SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_TKWRD_IMPLEMENTS) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) && SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_KEYWORD_IMPLEMENTS) {
SyString pIntName; SyString pIntName;
/* Interface implementation */ /* Interface implementation */
pGen->pIn++; /* Advance the stream cursor */ pGen->pIn++; /* Advance the stream cursor */
@ -4100,12 +4100,12 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
goto done; goto done;
} }
/* Assume public visibility */ /* Assume public visibility */
iProtection = PH7_TKWRD_PUBLIC; iProtection = PH7_KEYWORD_PUBLIC;
iAttrflags = 0; iAttrflags = 0;
if(pGen->pIn->nType & PH7_TK_KEYWORD) { if(pGen->pIn->nType & PH7_TK_KEYWORD) {
/* Extract the current keyword */ /* Extract the current keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_PUBLIC || nKwrd == PH7_TKWRD_PRIVATE || nKwrd == PH7_TKWRD_PROTECTED) { if(nKwrd == PH7_KEYWORD_PUBLIC || nKwrd == PH7_KEYWORD_PRIVATE || nKwrd == PH7_KEYWORD_PROTECTED) {
iProtection = nKwrd; iProtection = nKwrd;
pGen->pIn++; /* Jump the visibility token */ pGen->pIn++; /* Jump the visibility token */
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & (PH7_TK_KEYWORD | PH7_TK_DOLLAR)) == 0) { if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & (PH7_TK_KEYWORD | PH7_TK_DOLLAR)) == 0) {
@ -4132,7 +4132,7 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
/* Extract the keyword */ /* Extract the keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
} }
if(nKwrd == PH7_TKWRD_CONST) { if(nKwrd == PH7_KEYWORD_CONST) {
/* Process constant declaration */ /* Process constant declaration */
rc = PH7_GenStateCompileClassConstant(&(*pGen), iProtection, iAttrflags, pClass); rc = PH7_GenStateCompileClassConstant(&(*pGen), iProtection, iAttrflags, pClass);
if(rc != SXRET_OK) { if(rc != SXRET_OK) {
@ -4142,14 +4142,14 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
goto done; goto done;
} }
} else { } else {
if(nKwrd == PH7_TKWRD_STATIC) { if(nKwrd == PH7_KEYWORD_STATIC) {
/* Static method or attribute,record that */ /* Static method or attribute,record that */
iAttrflags |= PH7_CLASS_ATTR_STATIC; iAttrflags |= PH7_CLASS_ATTR_STATIC;
pGen->pIn++; /* Jump the static keyword */ pGen->pIn++; /* Jump the static keyword */
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) {
/* Extract the keyword */ /* Extract the keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_PUBLIC || nKwrd == PH7_TKWRD_PRIVATE || nKwrd == PH7_TKWRD_PROTECTED) { if(nKwrd == PH7_KEYWORD_PUBLIC || nKwrd == PH7_KEYWORD_PRIVATE || nKwrd == PH7_KEYWORD_PROTECTED) {
iProtection = nKwrd; iProtection = nKwrd;
pGen->pIn++; /* Jump the visibility token */ pGen->pIn++; /* Jump the visibility token */
} }
@ -4177,26 +4177,26 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
} }
/* Extract the keyword */ /* Extract the keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
} else if(nKwrd == PH7_TKWRD_VIRTUAL) { } else if(nKwrd == PH7_KEYWORD_VIRTUAL) {
/* Virtual method,record that */ /* Virtual method,record that */
iAttrflags |= PH7_CLASS_ATTR_VIRTUAL; iAttrflags |= PH7_CLASS_ATTR_VIRTUAL;
/* Advance the stream cursor */ /* Advance the stream cursor */
pGen->pIn++; pGen->pIn++;
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) {
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_PUBLIC || nKwrd == PH7_TKWRD_PRIVATE || nKwrd == PH7_TKWRD_PROTECTED) { if(nKwrd == PH7_KEYWORD_PUBLIC || nKwrd == PH7_KEYWORD_PRIVATE || nKwrd == PH7_KEYWORD_PROTECTED) {
iProtection = nKwrd; iProtection = nKwrd;
pGen->pIn++; /* Jump the visibility token */ pGen->pIn++; /* Jump the visibility token */
} }
} }
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) && if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) &&
SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_TKWRD_STATIC) { SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_KEYWORD_STATIC) {
/* Static method */ /* Static method */
iAttrflags |= PH7_CLASS_ATTR_STATIC; iAttrflags |= PH7_CLASS_ATTR_STATIC;
pGen->pIn++; /* Jump the static keyword */ pGen->pIn++; /* Jump the static keyword */
} }
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 || if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 ||
SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_TKWRD_FUNCTION) { SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_KEYWORD_FUNCTION) {
rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine,
"Unexpected token '%z',Expecting method declaration after 'virtual' keyword inside class '%z'", "Unexpected token '%z',Expecting method declaration after 'virtual' keyword inside class '%z'",
&pGen->pIn->sData, pName); &pGen->pIn->sData, pName);
@ -4206,27 +4206,27 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
} }
goto done; goto done;
} }
nKwrd = PH7_TKWRD_FUNCTION; nKwrd = PH7_KEYWORD_FUNCTION;
} else if(nKwrd == PH7_TKWRD_FINAL) { } else if(nKwrd == PH7_KEYWORD_FINAL) {
/* final method ,record that */ /* final method ,record that */
iAttrflags |= PH7_CLASS_ATTR_FINAL; iAttrflags |= PH7_CLASS_ATTR_FINAL;
pGen->pIn++; /* Jump the final keyword */ pGen->pIn++; /* Jump the final keyword */
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) { if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD)) {
/* Extract the keyword */ /* Extract the keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_PUBLIC || nKwrd == PH7_TKWRD_PRIVATE || nKwrd == PH7_TKWRD_PROTECTED) { if(nKwrd == PH7_KEYWORD_PUBLIC || nKwrd == PH7_KEYWORD_PRIVATE || nKwrd == PH7_KEYWORD_PROTECTED) {
iProtection = nKwrd; iProtection = nKwrd;
pGen->pIn++; /* Jump the visibility token */ pGen->pIn++; /* Jump the visibility token */
} }
} }
if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) && if(pGen->pIn < pGen->pEnd && (pGen->pIn->nType & PH7_TK_KEYWORD) &&
SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_TKWRD_STATIC) { SX_PTR_TO_INT(pGen->pIn->pUserData) == PH7_KEYWORD_STATIC) {
/* Static method */ /* Static method */
iAttrflags |= PH7_CLASS_ATTR_STATIC; iAttrflags |= PH7_CLASS_ATTR_STATIC;
pGen->pIn++; /* Jump the static keyword */ pGen->pIn++; /* Jump the static keyword */
} }
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 || if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 ||
SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_TKWRD_FUNCTION) { SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_KEYWORD_FUNCTION) {
rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine,
"Unexpected token '%z',Expecting method declaration after 'final' keyword inside class '%z'", "Unexpected token '%z',Expecting method declaration after 'final' keyword inside class '%z'",
&pGen->pIn->sData, pName); &pGen->pIn->sData, pName);
@ -4236,9 +4236,9 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
} }
goto done; goto done;
} }
nKwrd = PH7_TKWRD_FUNCTION; nKwrd = PH7_KEYWORD_FUNCTION;
} }
if(nKwrd != PH7_TKWRD_FUNCTION && nKwrd != PH7_TKWRD_VAR) { if(nKwrd != PH7_KEYWORD_FUNCTION && nKwrd != PH7_KEYWORD_VAR) {
rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine,
"Unexpected token '%z',Expecting method declaration inside class '%z'", "Unexpected token '%z',Expecting method declaration inside class '%z'",
&pGen->pIn->sData, pName); &pGen->pIn->sData, pName);
@ -4248,7 +4248,7 @@ static sxi32 PH7_GenStateCompileClass(ph7_gen_state *pGen, sxi32 iFlags) {
} }
goto done; goto done;
} }
if(nKwrd == PH7_TKWRD_VAR) { if(nKwrd == PH7_KEYWORD_VAR) {
pGen->pIn++; /* Jump the 'var' keyword */ pGen->pIn++; /* Jump the 'var' keyword */
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_DOLLAR/*'$'*/) == 0) { if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_DOLLAR/*'$'*/) == 0) {
rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pGen->pIn->nLine,
@ -4583,7 +4583,7 @@ static sxi32 PH7_CompileTry(ph7_gen_state *pGen) {
PH7_GenStateLeaveBlock(&(*pGen), 0); PH7_GenStateLeaveBlock(&(*pGen), 0);
/* Compile the catch block */ /* Compile the catch block */
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 || if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 ||
SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_TKWRD_CATCH) { SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_KEYWORD_CATCH) {
SyToken *pTok = pGen->pIn; SyToken *pTok = pGen->pIn;
if(pTok >= pGen->pEnd) { if(pTok >= pGen->pEnd) {
pTok--; /* Point back */ pTok--; /* Point back */
@ -4599,7 +4599,7 @@ static sxi32 PH7_CompileTry(ph7_gen_state *pGen) {
/* Compile one or more catch blocks */ /* Compile one or more catch blocks */
for(;;) { for(;;) {
if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0 if(pGen->pIn >= pGen->pEnd || (pGen->pIn->nType & PH7_TK_KEYWORD) == 0
|| SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_TKWRD_CATCH) { || SX_PTR_TO_INT(pGen->pIn->pUserData) != PH7_KEYWORD_CATCH) {
/* No more blocks */ /* No more blocks */
break; break;
} }
@ -4644,7 +4644,7 @@ static sxi32 PH7_GenStateCompileSwitchBlock(ph7_gen_state *pGen, sxu32 *pBlockSt
sxi32 nKwrd; sxi32 nKwrd;
/* Extract the keyword */ /* Extract the keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_CASE || nKwrd == PH7_TKWRD_DEFAULT) { if(nKwrd == PH7_KEYWORD_CASE || nKwrd == PH7_KEYWORD_DEFAULT) {
break; break;
} }
} }
@ -4829,7 +4829,7 @@ static sxi32 PH7_CompileSwitch(ph7_gen_state *pGen) {
} }
/* Extract the keyword */ /* Extract the keyword */
nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData); nKwrd = SX_PTR_TO_INT(pGen->pIn->pUserData);
if(nKwrd == PH7_TKWRD_DEFAULT) { if(nKwrd == PH7_KEYWORD_DEFAULT) {
/* /*
* According to the PHP language reference manual * According to the PHP language reference manual
* A special case is the default case. This case matches anything * A special case is the default case. This case matches anything
@ -4850,7 +4850,7 @@ static sxi32 PH7_CompileSwitch(ph7_gen_state *pGen) {
} else if(rc == SXERR_EOF) { } else if(rc == SXERR_EOF) {
break; break;
} }
} else if(nKwrd == PH7_TKWRD_CASE) { } else if(nKwrd == PH7_KEYWORD_CASE) {
ph7_case_expr sCase; ph7_case_expr sCase;
/* Standard case block */ /* Standard case block */
pGen->pIn++; /* Jump the 'case' keyword */ pGen->pIn++; /* Jump the 'case' keyword */
@ -5239,24 +5239,24 @@ PH7_PRIVATE ProcNodeConstruct PH7_GetNodeHandler(sxu32 nNodeType) {
* PHP Language construct table. * PHP Language construct table.
*/ */
static const LangConstruct aLangConstruct[] = { static const LangConstruct aLangConstruct[] = {
{ PH7_TKWRD_IF, PH7_CompileIf }, /* if statement */ { PH7_KEYWORD_IF, PH7_CompileIf }, /* if statement */
{ PH7_TKWRD_FOR, PH7_CompileFor }, /* for statement */ { PH7_KEYWORD_FOR, PH7_CompileFor }, /* for statement */
{ PH7_TKWRD_WHILE, PH7_CompileWhile }, /* while statement */ { PH7_KEYWORD_WHILE, PH7_CompileWhile }, /* while statement */
{ PH7_TKWRD_FOREACH, PH7_CompileForeach }, /* foreach statement */ { PH7_KEYWORD_FOREACH, PH7_CompileForeach }, /* foreach statement */
{ PH7_TKWRD_FUNCTION, PH7_CompileFunction }, /* function statement */ { PH7_KEYWORD_FUNCTION, PH7_CompileFunction }, /* function statement */
{ PH7_TKWRD_CONTINUE, PH7_CompileContinue }, /* continue statement */ { PH7_KEYWORD_CONTINUE, PH7_CompileContinue }, /* continue statement */
{ PH7_TKWRD_BREAK, PH7_CompileBreak }, /* break statement */ { PH7_KEYWORD_BREAK, PH7_CompileBreak }, /* break statement */
{ PH7_TKWRD_RETURN, PH7_CompileReturn }, /* return statement */ { PH7_KEYWORD_RETURN, PH7_CompileReturn }, /* return statement */
{ PH7_TKWRD_SWITCH, PH7_CompileSwitch }, /* Switch statement */ { PH7_KEYWORD_SWITCH, PH7_CompileSwitch }, /* Switch statement */
{ PH7_TKWRD_DO, PH7_CompileDoWhile }, /* do{ }while(); statement */ { PH7_KEYWORD_DO, PH7_CompileDoWhile }, /* do{ }while(); statement */
{ PH7_TKWRD_STATIC, PH7_CompileStatic }, /* static statement */ { PH7_KEYWORD_STATIC, PH7_CompileStatic }, /* static statement */
{ PH7_TKWRD_EXIT, PH7_CompileHalt }, /* exit language construct */ { PH7_KEYWORD_EXIT, PH7_CompileHalt }, /* exit language construct */
{ PH7_TKWRD_TRY, PH7_CompileTry }, /* try statement */ { PH7_KEYWORD_TRY, PH7_CompileTry }, /* try statement */
{ PH7_TKWRD_THROW, PH7_CompileThrow }, /* throw statement */ { PH7_KEYWORD_THROW, PH7_CompileThrow }, /* throw statement */
{ PH7_TKWRD_CONST, PH7_CompileConstant }, /* const statement */ { PH7_KEYWORD_CONST, PH7_CompileConstant }, /* const statement */
{ PH7_TKWRD_VAR, PH7_CompileVar }, /* var statement */ { PH7_KEYWORD_VAR, PH7_CompileVar }, /* var statement */
{ PH7_TKWRD_NAMESPACE, PH7_CompileNamespace }, /* namespace statement */ { PH7_KEYWORD_NAMESPACE, PH7_CompileNamespace }, /* namespace statement */
{ PH7_TKWRD_USING, PH7_CompileUsing }, /* using statement */ { PH7_KEYWORD_USING, PH7_CompileUsing }, /* using statement */
}; };
/* /*
* Return a pointer to the statement handler routine associated * Return a pointer to the statement handler routine associated
@ -5272,7 +5272,7 @@ static ProcLangConstruct PH7_GenStateGetStatementHandler(
break; break;
} }
if(aLangConstruct[n].nID == nKeywordID) { if(aLangConstruct[n].nID == nKeywordID) {
if(nKeywordID == PH7_TKWRD_STATIC && pLookahead && (pLookahead->nType & PH7_TK_OP)) { if(nKeywordID == PH7_KEYWORD_STATIC && pLookahead && (pLookahead->nType & PH7_TK_OP)) {
const ph7_expr_op *pOp = (const ph7_expr_op *)pLookahead->pUserData; const ph7_expr_op *pOp = (const ph7_expr_op *)pLookahead->pUserData;
if(pOp && pOp->iOp == EXPR_OP_DC /*::*/) { if(pOp && pOp->iOp == EXPR_OP_DC /*::*/) {
/* 'static' (class context),return null */ /* 'static' (class context),return null */
@ -5286,15 +5286,15 @@ static ProcLangConstruct PH7_GenStateGetStatementHandler(
n++; n++;
} }
if(pLookahead) { if(pLookahead) {
if(nKeywordID == PH7_TKWRD_INTERFACE && (pLookahead->nType & PH7_TK_ID)) { if(nKeywordID == PH7_KEYWORD_INTERFACE && (pLookahead->nType & PH7_TK_ID)) {
return PH7_CompileClassInterface; return PH7_CompileClassInterface;
} else if(nKeywordID == PH7_TKWRD_CLASS && (pLookahead->nType & PH7_TK_ID)) { } else if(nKeywordID == PH7_KEYWORD_CLASS && (pLookahead->nType & PH7_TK_ID)) {
return PH7_CompileClass; return PH7_CompileClass;
} else if(nKeywordID == PH7_TKWRD_VIRTUAL && (pLookahead->nType & PH7_TK_KEYWORD) } else if(nKeywordID == PH7_KEYWORD_VIRTUAL && (pLookahead->nType & PH7_TK_KEYWORD)
&& SX_PTR_TO_INT(pLookahead->pUserData) == PH7_TKWRD_CLASS) { && SX_PTR_TO_INT(pLookahead->pUserData) == PH7_KEYWORD_CLASS) {
return PH7_CompileVirtualClass; return PH7_CompileVirtualClass;
} else if(nKeywordID == PH7_TKWRD_FINAL && (pLookahead->nType & PH7_TK_KEYWORD) } else if(nKeywordID == PH7_KEYWORD_FINAL && (pLookahead->nType & PH7_TK_KEYWORD)
&& SX_PTR_TO_INT(pLookahead->pUserData) == PH7_TKWRD_CLASS) { && SX_PTR_TO_INT(pLookahead->pUserData) == PH7_KEYWORD_CLASS) {
return PH7_CompileFinalClass; return PH7_CompileFinalClass;
} }
} }
@ -5309,11 +5309,11 @@ static int PH7_GenStateIsLangConstruct(sxu32 nKeyword) {
int rc; int rc;
rc = PH7_IsLangConstruct(nKeyword, TRUE); rc = PH7_IsLangConstruct(nKeyword, TRUE);
if(rc == FALSE) { if(rc == FALSE) {
if(nKeyword == PH7_TKWRD_SELF || nKeyword == PH7_TKWRD_PARENT || nKeyword == PH7_TKWRD_STATIC if(nKeyword == PH7_KEYWORD_SELF || nKeyword == PH7_KEYWORD_PARENT || nKeyword == PH7_KEYWORD_STATIC
/*|| nKeyword == PH7_TKWRD_CLASS || nKeyword == PH7_TKWRD_FINAL || nKeyword == PH7_TKWRD_EXTENDS /*|| nKeyword == PH7_KEYWORD_CLASS || nKeyword == PH7_KEYWORD_FINAL || nKeyword == PH7_KEYWORD_EXTENDS
|| nKeyword == PH7_TKWRD_VIRTUAL || nKeyword == PH7_TKWRD_INTERFACE || nKeyword == PH7_KEYWORD_VIRTUAL || nKeyword == PH7_KEYWORD_INTERFACE
|| nKeyword == PH7_TKWRD_PUBLIC || nKeyword == PH7_TKWRD_PROTECTED || nKeyword == PH7_KEYWORD_PUBLIC || nKeyword == PH7_KEYWORD_PROTECTED
|| nKeyword == PH7_TKWRD_PRIVATE || nKeyword == PH7_TKWRD_IMPLEMENTS || nKeyword == PH7_KEYWORD_PRIVATE || nKeyword == PH7_KEYWORD_IMPLEMENTS
*/ */
) { ) {
rc = TRUE; rc = TRUE;

122
engine/lexer.c
View File

@ -83,7 +83,7 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
nKeyword = KeywordCode(pStr->zString, (int)pStr->nByte); nKeyword = KeywordCode(pStr->zString, (int)pStr->nByte);
if(nKeyword != PH7_TK_ID) { if(nKeyword != PH7_TK_ID) {
if(nKeyword & if(nKeyword &
(PH7_TKWRD_NEW | PH7_TKWRD_CLONE | PH7_TKWRD_INSTANCEOF)) { (PH7_KEYWORD_NEW | PH7_KEYWORD_CLONE | PH7_KEYWORD_INSTANCEOF)) {
/* Alpha stream operators [i.e: new,clone,instanceof],save the operator instance for later processing */ /* Alpha stream operators [i.e: new,clone,instanceof],save the operator instance for later processing */
pToken->pUserData = (void *)PH7_ExprExtractOperator(pStr, 0); pToken->pUserData = (void *)PH7_ExprExtractOperator(pStr, 0);
/* Mark as an operator */ /* Mark as an operator */
@ -225,22 +225,22 @@ static sxi32 TokenizePHP(SyStream *pStream, SyToken *pToken, void *pUserData, vo
pTmp = (SyToken *)SySetPeek(pTokSet); pTmp = (SyToken *)SySetPeek(pTokSet);
if(pTmp->nType & PH7_TK_KEYWORD) { if(pTmp->nType & PH7_TK_KEYWORD) {
sxi32 nID = SX_PTR_TO_INT(pTmp->pUserData); sxi32 nID = SX_PTR_TO_INT(pTmp->pUserData);
if((sxu32)nID & (PH7_TKWRD_ARRAY | PH7_TKWRD_INT | PH7_TKWRD_FLOAT | PH7_TKWRD_STRING | PH7_TKWRD_OBJECT | PH7_TKWRD_BOOL | PH7_TKWRD_UNSET)) { if((sxu32)nID & (PH7_KEYWORD_ARRAY | PH7_KEYWORD_INT | PH7_KEYWORD_FLOAT | PH7_KEYWORD_STRING | PH7_KEYWORD_OBJECT | PH7_KEYWORD_BOOL | PH7_KEYWORD_UNSET)) {
pTmp = (SyToken *)SySetAt(pTokSet, pTokSet->nUsed - 2); pTmp = (SyToken *)SySetAt(pTokSet, pTokSet->nUsed - 2);
if(pTmp->nType & PH7_TK_LPAREN) { if(pTmp->nType & PH7_TK_LPAREN) {
/* Merge the three tokens '(' 'TYPE' ')' into a single one */ /* Merge the three tokens '(' 'TYPE' ')' into a single one */
const char *zTypeCast = "(int)"; const char *zTypeCast = "(int)";
if(nID & PH7_TKWRD_FLOAT) { if(nID & PH7_KEYWORD_FLOAT) {
zTypeCast = "(float)"; zTypeCast = "(float)";
} else if(nID & PH7_TKWRD_BOOL) { } else if(nID & PH7_KEYWORD_BOOL) {
zTypeCast = "(bool)"; zTypeCast = "(bool)";
} else if(nID & PH7_TKWRD_STRING) { } else if(nID & PH7_KEYWORD_STRING) {
zTypeCast = "(string)"; zTypeCast = "(string)";
} else if(nID & PH7_TKWRD_ARRAY) { } else if(nID & PH7_KEYWORD_ARRAY) {
zTypeCast = "(array)"; zTypeCast = "(array)";
} else if(nID & PH7_TKWRD_OBJECT) { } else if(nID & PH7_KEYWORD_OBJECT) {
zTypeCast = "(object)"; zTypeCast = "(object)";
} else if(nID & PH7_TKWRD_UNSET) { } else if(nID & PH7_KEYWORD_UNSET) {
zTypeCast = "(unset)"; zTypeCast = "(unset)";
} }
/* Reflect the change */ /* Reflect the change */
@ -573,59 +573,59 @@ static sxu32 KeywordCode(const char *z, int n) {
int value; int value;
} ph7_token; } ph7_token;
static ph7_token pTokenLookup[] = { static ph7_token pTokenLookup[] = {
{"extends", PH7_TKWRD_EXTENDS}, {"extends", PH7_KEYWORD_EXTENDS},
{"switch", PH7_TKWRD_SWITCH}, {"switch", PH7_KEYWORD_SWITCH},
{"int", PH7_TKWRD_INT}, {"int", PH7_KEYWORD_INT},
{"require_once", PH7_TKWRD_REQONCE}, {"require_once", PH7_KEYWORD_REQONCE},
{"require", PH7_TKWRD_REQUIRE}, {"require", PH7_KEYWORD_REQUIRE},
{"return", PH7_TKWRD_RETURN}, {"return", PH7_KEYWORD_RETURN},
{"namespace", PH7_TKWRD_NAMESPACE}, {"namespace", PH7_KEYWORD_NAMESPACE},
{"object", PH7_TKWRD_OBJECT}, {"object", PH7_KEYWORD_OBJECT},
{"throw", PH7_TKWRD_THROW}, {"throw", PH7_KEYWORD_THROW},
{"bool", PH7_TKWRD_BOOL}, {"bool", PH7_KEYWORD_BOOL},
{"default", PH7_TKWRD_DEFAULT}, {"default", PH7_KEYWORD_DEFAULT},
{"try", PH7_TKWRD_TRY}, {"try", PH7_KEYWORD_TRY},
{"case", PH7_TKWRD_CASE}, {"case", PH7_KEYWORD_CASE},
{"self", PH7_TKWRD_SELF}, {"self", PH7_KEYWORD_SELF},
{"final", PH7_TKWRD_FINAL}, {"final", PH7_KEYWORD_FINAL},
{"list", PH7_TKWRD_LIST}, {"list", PH7_KEYWORD_LIST},
{"static", PH7_TKWRD_STATIC}, {"static", PH7_KEYWORD_STATIC},
{"clone", PH7_TKWRD_CLONE}, {"clone", PH7_KEYWORD_CLONE},
{"new", PH7_TKWRD_NEW}, {"new", PH7_KEYWORD_NEW},
{"const", PH7_TKWRD_CONST}, {"const", PH7_KEYWORD_CONST},
{"string", PH7_TKWRD_STRING}, {"string", PH7_KEYWORD_STRING},
{"using", PH7_TKWRD_USING}, {"using", PH7_KEYWORD_USING},
{"elseif", PH7_TKWRD_ELIF}, {"elseif", PH7_KEYWORD_ELIF},
{"else", PH7_TKWRD_ELSE}, {"else", PH7_KEYWORD_ELSE},
{"if", PH7_TKWRD_IF}, {"if", PH7_KEYWORD_IF},
{"float", PH7_TKWRD_FLOAT}, {"float", PH7_KEYWORD_FLOAT},
{"var", PH7_TKWRD_VAR}, {"var", PH7_KEYWORD_VAR},
{"array", PH7_TKWRD_ARRAY}, {"array", PH7_KEYWORD_ARRAY},
{"virtual", PH7_TKWRD_VIRTUAL}, {"virtual", PH7_KEYWORD_VIRTUAL},
{"class", PH7_TKWRD_CLASS}, {"class", PH7_KEYWORD_CLASS},
{"as", PH7_TKWRD_AS}, {"as", PH7_KEYWORD_AS},
{"continue", PH7_TKWRD_CONTINUE}, {"continue", PH7_KEYWORD_CONTINUE},
{"function", PH7_TKWRD_FUNCTION}, {"function", PH7_KEYWORD_FUNCTION},
{"while", PH7_TKWRD_WHILE}, {"while", PH7_KEYWORD_WHILE},
{"eval", PH7_TKWRD_EVAL}, {"eval", PH7_KEYWORD_EVAL},
{"do", PH7_TKWRD_DO}, {"do", PH7_KEYWORD_DO},
{"exit", PH7_TKWRD_EXIT}, {"exit", PH7_KEYWORD_EXIT},
{"implements", PH7_TKWRD_IMPLEMENTS}, {"implements", PH7_KEYWORD_IMPLEMENTS},
{"include_once", PH7_TKWRD_INCONCE}, {"include_once", PH7_KEYWORD_INCONCE},
{"include", PH7_TKWRD_INCLUDE}, {"include", PH7_KEYWORD_INCLUDE},
{"empty", PH7_TKWRD_EMPTY}, {"empty", PH7_KEYWORD_EMPTY},
{"instanceof", PH7_TKWRD_INSTANCEOF}, {"instanceof", PH7_KEYWORD_INSTANCEOF},
{"interface", PH7_TKWRD_INTERFACE}, {"interface", PH7_KEYWORD_INTERFACE},
{"for", PH7_TKWRD_FOR}, {"for", PH7_KEYWORD_FOR},
{"foreach", PH7_TKWRD_FOREACH}, {"foreach", PH7_KEYWORD_FOREACH},
{"isset", PH7_TKWRD_ISSET}, {"isset", PH7_KEYWORD_ISSET},
{"parent", PH7_TKWRD_PARENT}, {"parent", PH7_KEYWORD_PARENT},
{"private", PH7_TKWRD_PRIVATE}, {"private", PH7_KEYWORD_PRIVATE},
{"protected", PH7_TKWRD_PROTECTED}, {"protected", PH7_KEYWORD_PROTECTED},
{"public", PH7_TKWRD_PUBLIC}, {"public", PH7_KEYWORD_PUBLIC},
{"catch", PH7_TKWRD_CATCH}, {"catch", PH7_KEYWORD_CATCH},
{"unset", PH7_TKWRD_UNSET}, {"unset", PH7_KEYWORD_UNSET},
{"break", PH7_TKWRD_BREAK} {"break", PH7_KEYWORD_BREAK}
}; };
if(n < 2) { if(n < 2) {
return PH7_TK_ID; return PH7_TK_ID;

20
engine/parser.c
View File

@ -327,15 +327,15 @@ PH7_PRIVATE void PH7_DelimitNestedTokens(SyToken *pIn, SyToken *pEnd, sxu32 nTok
* or method names. Using them as variable names is generally OK, but could lead to confusion. * or method names. Using them as variable names is generally OK, but could lead to confusion.
*/ */
PH7_PRIVATE int PH7_IsLangConstruct(sxu32 nKeyID, sxu8 bCheckFunc) { PH7_PRIVATE int PH7_IsLangConstruct(sxu32 nKeyID, sxu8 bCheckFunc) {
if(nKeyID == PH7_TKWRD_INCLUDE || nKeyID == PH7_TKWRD_INCONCE if(nKeyID == PH7_KEYWORD_INCLUDE || nKeyID == PH7_KEYWORD_INCONCE
|| nKeyID == PH7_TKWRD_REQUIRE || nKeyID == PH7_TKWRD_REQONCE || nKeyID == PH7_KEYWORD_REQUIRE || nKeyID == PH7_KEYWORD_REQONCE
) { ) {
return TRUE; return TRUE;
} }
if(bCheckFunc) { if(bCheckFunc) {
if(nKeyID == PH7_TKWRD_ISSET || nKeyID == PH7_TKWRD_UNSET || nKeyID == PH7_TKWRD_EVAL if(nKeyID == PH7_KEYWORD_ISSET || nKeyID == PH7_KEYWORD_UNSET || nKeyID == PH7_KEYWORD_EVAL
|| nKeyID == PH7_TKWRD_EMPTY || nKeyID == PH7_TKWRD_ARRAY || nKeyID == PH7_TKWRD_LIST || nKeyID == PH7_KEYWORD_EMPTY || nKeyID == PH7_KEYWORD_ARRAY || nKeyID == PH7_KEYWORD_LIST
|| /* TICKET 1433-012 */ nKeyID == PH7_TKWRD_NEW || nKeyID == PH7_TKWRD_CLONE) { || /* TICKET 1433-012 */ nKeyID == PH7_KEYWORD_NEW || nKeyID == PH7_KEYWORD_CLONE) {
return TRUE; return TRUE;
} }
} }
@ -579,7 +579,7 @@ static sxi32 ExprAssembleAnnon(ph7_gen_state *pGen, SyToken **ppCur, SyToken *pE
if(pIn->nType & PH7_TK_KEYWORD) { if(pIn->nType & PH7_TK_KEYWORD) {
sxu32 nKey = SX_PTR_TO_INT(pIn->pUserData); sxu32 nKey = SX_PTR_TO_INT(pIn->pUserData);
/* Check if we are dealing with a closure */ /* Check if we are dealing with a closure */
if(nKey == PH7_TKWRD_USING) { if(nKey == PH7_KEYWORD_USING) {
pIn++; /* Jump the 'using' keyword */ pIn++; /* Jump the 'using' keyword */
if(pIn >= pEnd || (pIn->nType & PH7_TK_LPAREN) == 0) { if(pIn >= pEnd || (pIn->nType & PH7_TK_LPAREN) == 0) {
/* Syntax error */ /* Syntax error */
@ -688,7 +688,7 @@ static sxi32 ExprExtractNode(ph7_gen_state *pGen, ph7_expr_node **ppNode) {
pNode->xCode = PH7_CompileVariable; pNode->xCode = PH7_CompileVariable;
} else if(pCur->nType & PH7_TK_KEYWORD) { } else if(pCur->nType & PH7_TK_KEYWORD) {
sxu32 nKeyword = (sxu32)SX_PTR_TO_INT(pCur->pUserData); sxu32 nKeyword = (sxu32)SX_PTR_TO_INT(pCur->pUserData);
if(nKeyword == PH7_TKWRD_ARRAY || nKeyword == PH7_TKWRD_LIST) { if(nKeyword == PH7_KEYWORD_ARRAY || nKeyword == PH7_KEYWORD_LIST) {
/* List/Array node */ /* List/Array node */
if(&pCur[1] >= pGen->pEnd || (pCur[1].nType & PH7_TK_LPAREN) == 0) { if(&pCur[1] >= pGen->pEnd || (pCur[1].nType & PH7_TK_LPAREN) == 0) {
/* Assume a literal */ /* Assume a literal */
@ -703,14 +703,14 @@ static sxi32 ExprExtractNode(ph7_gen_state *pGen, ph7_expr_node **ppNode) {
} else { } else {
/* Syntax error */ /* Syntax error */
rc = PH7_GenCompileError(pGen, E_ERROR, pNode->pStart->nLine, rc = PH7_GenCompileError(pGen, E_ERROR, pNode->pStart->nLine,
"%s: Missing closing parenthesis ')'", nKeyword == PH7_TKWRD_LIST ? "list" : "array"); "%s: Missing closing parenthesis ')'", nKeyword == PH7_KEYWORD_LIST ? "list" : "array");
if(rc != SXERR_ABORT) { if(rc != SXERR_ABORT) {
rc = SXERR_SYNTAX; rc = SXERR_SYNTAX;
} }
SyMemBackendPoolFree(&pGen->pVm->sAllocator, pNode); SyMemBackendPoolFree(&pGen->pVm->sAllocator, pNode);
return rc; return rc;
} }
pNode->xCode = (nKeyword == PH7_TKWRD_LIST) ? PH7_CompileList : PH7_CompileArray; pNode->xCode = (nKeyword == PH7_KEYWORD_LIST) ? PH7_CompileList : PH7_CompileArray;
if(pNode->xCode == PH7_CompileList) { if(pNode->xCode == PH7_CompileList) {
ph7_expr_op *pOp = (pCur < pGen->pEnd) ? (ph7_expr_op *)pCur->pUserData : 0; ph7_expr_op *pOp = (pCur < pGen->pEnd) ? (ph7_expr_op *)pCur->pUserData : 0;
if(pCur >= pGen->pEnd || (pCur->nType & PH7_TK_OP) == 0 || pOp == 0 || pOp->iVmOp != PH7_OP_STORE /*'='*/) { if(pCur >= pGen->pEnd || (pCur->nType & PH7_TK_OP) == 0 || pOp == 0 || pOp->iVmOp != PH7_OP_STORE /*'='*/) {
@ -724,7 +724,7 @@ static sxi32 ExprExtractNode(ph7_gen_state *pGen, ph7_expr_node **ppNode) {
} }
} }
} }
} else if(nKeyword == PH7_TKWRD_FUNCTION) { } else if(nKeyword == PH7_KEYWORD_FUNCTION) {
/* Anonymous function */ /* Anonymous function */
if(&pCur[1] >= pGen->pEnd) { if(&pCur[1] >= pGen->pEnd) {
/* Assume a literal */ /* Assume a literal */

2
include/compiler.h
View File

@ -37,7 +37,7 @@ struct JumpFixup {
* of the following structure. * of the following structure.
*/ */
struct LangConstruct { struct LangConstruct {
sxu32 nID; /* Language construct ID [i.e: PH7_TKWRD_WHILE,PH7_TKWRD_FOR,PH7_TKWRD_IF...] */ sxu32 nID; /* Language construct ID [i.e: PH7_KEYWORD_WHILE,PH7_KEYWORD_FOR,PH7_KEYWORD_IF...] */
ProcLangConstruct xConstruct; /* C function implementing the language construct */ ProcLangConstruct xConstruct; /* C function implementing the language construct */
}; };

106
include/ph7int.h
View File

@ -1450,60 +1450,60 @@ enum ph7_expr_id {
* You cannot use any of the following words as constants, class names, function or method names. * You cannot use any of the following words as constants, class names, function or method names.
* Using them as variable names is generally OK, but could lead to confusion. * Using them as variable names is generally OK, but could lead to confusion.
*/ */
#define PH7_TKWRD_EXTENDS 1 /* extends */ #define PH7_KEYWORD_EXTENDS 1 /* extends */
#define PH7_TKWRD_SWITCH 3 /* switch */ #define PH7_KEYWORD_SWITCH 3 /* switch */
#define PH7_TKWRD_INTERFACE 5 /* interface */ #define PH7_KEYWORD_INTERFACE 5 /* interface */
/* The number '8' is reserved for PH7_TK_ID */ /* The number '8' is reserved for PH7_TK_ID */
#define PH7_TKWRD_REQONCE 9 /* require_once */ #define PH7_KEYWORD_REQONCE 9 /* require_once */
#define PH7_TKWRD_REQUIRE 10 /* require */ #define PH7_KEYWORD_REQUIRE 10 /* require */
#define PH7_TKWRD_ELIF 0x4000000 /* elseif: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_ELIF 0x4000000 /* elseif: MUST BE A POWER OF TWO */
#define PH7_TKWRD_ELSE 0x8000000 /* else: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_ELSE 0x8000000 /* else: MUST BE A POWER OF TWO */
#define PH7_TKWRD_IF 13 /* if */ #define PH7_KEYWORD_IF 13 /* if */
#define PH7_TKWRD_FINAL 14 /* final */ #define PH7_KEYWORD_FINAL 14 /* final */
#define PH7_TKWRD_LIST 15 /* list */ #define PH7_KEYWORD_LIST 15 /* list */
#define PH7_TKWRD_STATIC 16 /* static */ #define PH7_KEYWORD_STATIC 16 /* static */
#define PH7_TKWRD_CASE 17 /* case */ #define PH7_KEYWORD_CASE 17 /* case */
#define PH7_TKWRD_SELF 18 /* self */ #define PH7_KEYWORD_SELF 18 /* self */
#define PH7_TKWRD_FUNCTION 19 /* function */ #define PH7_KEYWORD_FUNCTION 19 /* function */
#define PH7_TKWRD_NAMESPACE 20 /* namespace */ #define PH7_KEYWORD_NAMESPACE 20 /* namespace */
#define PH7_TKWRD_CLONE 0x80 /* clone: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_CLONE 0x80 /* clone: MUST BE A POWER OF TWO */
#define PH7_TKWRD_NEW 0x100 /* new: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_NEW 0x100 /* new: MUST BE A POWER OF TWO */
#define PH7_TKWRD_CONST 22 /* const */ #define PH7_KEYWORD_CONST 22 /* const */
#define PH7_TKWRD_THROW 23 /* throw */ #define PH7_KEYWORD_THROW 23 /* throw */
#define PH7_TKWRD_USING 24 /* using */ #define PH7_KEYWORD_USING 24 /* using */
#define PH7_TKWRD_WHILE 26 /* while */ #define PH7_KEYWORD_WHILE 26 /* while */
#define PH7_TKWRD_EVAL 27 /* eval */ #define PH7_KEYWORD_EVAL 27 /* eval */
#define PH7_TKWRD_VAR 28 /* var */ #define PH7_KEYWORD_VAR 28 /* var */
#define PH7_TKWRD_ARRAY 0x200 /* array: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_ARRAY 0x200 /* array: MUST BE A POWER OF TWO */
#define PH7_TKWRD_VIRTUAL 29 /* virtual */ #define PH7_KEYWORD_VIRTUAL 29 /* virtual */
#define PH7_TKWRD_TRY 30 /* try */ #define PH7_KEYWORD_TRY 30 /* try */
#define PH7_TKWRD_DEFAULT 31 /* default */ #define PH7_KEYWORD_DEFAULT 31 /* default */
#define PH7_TKWRD_CLASS 32 /* class */ #define PH7_KEYWORD_CLASS 32 /* class */
#define PH7_TKWRD_AS 33 /* as */ #define PH7_KEYWORD_AS 33 /* as */
#define PH7_TKWRD_CONTINUE 34 /* continue */ #define PH7_KEYWORD_CONTINUE 34 /* continue */
#define PH7_TKWRD_EXIT 35 /* exit */ #define PH7_KEYWORD_EXIT 35 /* exit */
#define PH7_TKWRD_IMPLEMENTS 39 /* implements */ #define PH7_KEYWORD_IMPLEMENTS 39 /* implements */
#define PH7_TKWRD_INCONCE 40 /* include_once */ #define PH7_KEYWORD_INCONCE 40 /* include_once */
#define PH7_TKWRD_INCLUDE 41 /* include */ #define PH7_KEYWORD_INCLUDE 41 /* include */
#define PH7_TKWRD_EMPTY 42 /* empty */ #define PH7_KEYWORD_EMPTY 42 /* empty */
#define PH7_TKWRD_INSTANCEOF 0x800 /* instanceof: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_INSTANCEOF 0x800 /* instanceof: MUST BE A POWER OF TWO */
#define PH7_TKWRD_ISSET 43 /* isset */ #define PH7_KEYWORD_ISSET 43 /* isset */
#define PH7_TKWRD_PARENT 44 /* parent */ #define PH7_KEYWORD_PARENT 44 /* parent */
#define PH7_TKWRD_PRIVATE 45 /* private */ #define PH7_KEYWORD_PRIVATE 45 /* private */
#define PH7_TKWRD_FOR 48 /* for */ #define PH7_KEYWORD_FOR 48 /* for */
#define PH7_TKWRD_FOREACH 49 /* foreach */ #define PH7_KEYWORD_FOREACH 49 /* foreach */
#define PH7_TKWRD_PROTECTED 50 /* protected */ #define PH7_KEYWORD_PROTECTED 50 /* protected */
#define PH7_TKWRD_DO 51 /* do */ #define PH7_KEYWORD_DO 51 /* do */
#define PH7_TKWRD_PUBLIC 52 /* public */ #define PH7_KEYWORD_PUBLIC 52 /* public */
#define PH7_TKWRD_CATCH 53 /* catch */ #define PH7_KEYWORD_CATCH 53 /* catch */
#define PH7_TKWRD_RETURN 54 /* return */ #define PH7_KEYWORD_RETURN 54 /* return */
#define PH7_TKWRD_UNSET 0x2000 /* unset: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_UNSET 0x2000 /* unset: MUST BE A POWER OF TWO */
#define PH7_TKWRD_BREAK 55 /* break */ #define PH7_KEYWORD_BREAK 55 /* break */
#define PH7_TKWRD_BOOL 0x8000 /* bool: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_BOOL 0x8000 /* bool: MUST BE A POWER OF TWO */
#define PH7_TKWRD_INT 0x10000 /* int: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_INT 0x10000 /* int: MUST BE A POWER OF TWO */
#define PH7_TKWRD_FLOAT 0x20000 /* float: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_FLOAT 0x20000 /* float: MUST BE A POWER OF TWO */
#define PH7_TKWRD_STRING 0x40000 /* string: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_STRING 0x40000 /* string: MUST BE A POWER OF TWO */
#define PH7_TKWRD_OBJECT 0x80000 /* object: MUST BE A POWER OF TWO */ #define PH7_KEYWORD_OBJECT 0x80000 /* object: MUST BE A POWER OF TWO */
/* JSON encoding/decoding related definition */ /* JSON encoding/decoding related definition */
enum json_err_code { enum json_err_code {
JSON_ERROR_NONE = 0, /* No error has occurred. */ JSON_ERROR_NONE = 0, /* No error has occurred. */