Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DDMD] [refactor] Move FuncDeclaration::isBuiltin into a free function #3293

Merged
merged 1 commit into from Feb 20, 2014
Merged

[DDMD] [refactor] Move FuncDeclaration::isBuiltin into a free function #3293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/builtin.c
View file
Open in desktop
Expand Up @@ -210,14 +210,14 @@ void builtin_init()
* Determine if function is a builtin one that we can
* evaluate at compile time.
*/
BUILTIN FuncDeclaration::isBuiltin()
BUILTIN isBuiltin(FuncDeclaration *fd)
{
if (builtin == BUILTINunknown)
if (fd->builtin == BUILTINunknown)
{
builtin_fp fp = builtin_lookup(mangleExact());
builtin = fp ? BUILTINyes : BUILTINno;
builtin_fp fp = builtin_lookup(fd->mangleExact());
fd->builtin = fp ? BUILTINyes : BUILTINno;
}
return builtin;
return fd->builtin;
}

/**************************************
Expand Down
2 changes: 1 addition & 1 deletion src/declaration.h
View file
Open in desktop
Expand Up @@ -547,6 +547,7 @@ enum BUILTIN
};

Expression *eval_builtin(Loc loc, FuncDeclaration *fd, Expressions *arguments);
BUILTIN isBuiltin(FuncDeclaration *fd);

typedef Expression *(*builtin_fp)(Loc loc, FuncDeclaration *fd, Expressions *arguments);
void add_builtin(const char *mangle, builtin_fp fp);
Expand Down Expand Up @@ -665,7 +666,6 @@ class FuncDeclaration : public Declaration
bool isMain();
bool isWinMain();
bool isDllMain();
BUILTIN isBuiltin();
bool isExport();
bool isImportedSymbol();
bool isCodeseg();
Expand Down
2 changes: 1 addition & 1 deletion src/interpret.c
View file
Open in desktop
Expand Up @@ -6890,7 +6890,7 @@ Expression *evaluateIfBuiltin(InterState *istate, Loc loc,
size_t nargs = arguments ? arguments->dim : 0;
if (!pthis)
{
if (fd->isBuiltin() == BUILTINyes)
if (isBuiltin(fd) == BUILTINyes)
{ Expressions args;
args.setDim(nargs);
for (size_t i = 0; i < args.dim; i++)
Expand Down