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

Fix #5: Included files content is unavailable during compilation #21

Manually merged
belliash merged 20 commits from include_fix into master 2018-08-01 16:18:03 +02:00
Conversation 0 Commits 20 Files Changed 7 -4
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 72f2cc2c1b - Show all commits

2
engine/oop.c
View File

@ -68,8 +68,6 @@ PH7_PRIVATE ph7_class *PH7_NewRawClass(ph7_vm *pVm, const SyString *pName, sxu32
SyHashInit(&pClass->hAttr, &pVm->sAllocator, 0, 0); SyHashInit(&pClass->hAttr, &pVm->sAllocator, 0, 0);
SyHashInit(&pClass->hDerived, &pVm->sAllocator, 0, 0); SyHashInit(&pClass->hDerived, &pVm->sAllocator, 0, 0);
SySetInit(&pClass->aInterface, &pVm->sAllocator, sizeof(ph7_class *)); SySetInit(&pClass->aInterface, &pVm->sAllocator, sizeof(ph7_class *));
SySetInit(&pClass->sExtends, &pVm->sAllocator, sizeof(SyString));
SySetInit(&pClass->sImplements, &pVm->sAllocator, sizeof(SyString));
pClass->nLine = nLine; pClass->nLine = nLine;
/* All done */ /* All done */
return pClass; return pClass;

2
include/ph7int.h
View File

@ -1046,8 +1046,6 @@ struct ph7_class {
SyHash hMethod; /* Class methods */ SyHash hMethod; /* Class methods */
sxu32 nLine; /* Line number on which this class was declared */ sxu32 nLine; /* Line number on which this class was declared */
SySet aInterface; /* Implemented interface container */ SySet aInterface; /* Implemented interface container */
SySet sExtends; /* List of inherited classes / interfaces */
SySet sImplements; /* List of implemented interfaces */
}; };
/* Class configuration flags */ /* Class configuration flags */
#define PH7_CLASS_FINAL 0x001 /* Class is final [cannot be extended] */ #define PH7_CLASS_FINAL 0x001 /* Class is final [cannot be extended] */