Merge pull request #3293 from yebblies/builtinfree

[DDMD] [refactor] Move FuncDeclaration::isBuiltin into a free function
dlang · Feb 20, 2014 · 503b17d · 503b17d
2 parents ecc3cc5 + 091a046
commit 503b17d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/builtin.c b/src/builtin.c
@@ -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;
 }
 
 /**************************************

diff --git a/src/declaration.h b/src/declaration.h
@@ -545,6 +545,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);
@@ -664,7 +665,6 @@ class FuncDeclaration : public Declaration
     bool isMain();
     bool isWinMain();
     bool isDllMain();
-    BUILTIN isBuiltin();
     bool isExport();
     bool isImportedSymbol();
     bool isCodeseg();

diff --git a/src/interpret.c b/src/interpret.c
@@ -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++)