enum BUILTIN -> BUILTIN

dlang · May 15, 2013 · a6c559b · a6c559b
1 parent 6957edb
commit a6c559b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/builtin.c b/src/builtin.c
@@ -30,7 +30,7 @@
  * Determine if function is a builtin one that we can
  * evaluate at compile time.
  */
-enum BUILTIN FuncDeclaration::isBuiltin()
+BUILTIN FuncDeclaration::isBuiltin()
 {
     static const char FeZe [] = "FNaNbNfeZe";      // @safe pure nothrow real function(real)
     static const char FeZe2[] = "FNaNbNeeZe";      // @trusted pure nothrow real function(real)
@@ -154,7 +154,7 @@ uinteger_t eval_bswap(Expression *arg0)
  * Return result; NULL if cannot evaluate it.
  */
 
-Expression *eval_builtin(Loc loc, enum BUILTIN builtin, Expressions *arguments)
+Expression *eval_builtin(Loc loc, BUILTIN builtin, Expressions *arguments)
 {
     assert(arguments && arguments->dim);
     Expression *arg0 = (*arguments)[0];

diff --git a/src/declaration.h b/src/declaration.h
@@ -572,7 +572,7 @@ enum BUILTIN
 #endif
 };
 
-Expression *eval_builtin(Loc loc, enum BUILTIN builtin, Expressions *arguments);
+Expression *eval_builtin(Loc loc, BUILTIN builtin, Expressions *arguments);
 
 #else
 enum BUILTIN { };
@@ -640,7 +640,7 @@ class FuncDeclaration : public Declaration
     ReturnStatements *returns;
 
 #if DMDV2
-    enum BUILTIN builtin;               // set if this is a known, builtin
+    BUILTIN builtin;               // set if this is a known, builtin
                                         // function we can evaluate at compile
                                         // time
 
@@ -694,7 +694,7 @@ class FuncDeclaration : public Declaration
     int isMain();
     int isWinMain();
     int isDllMain();
-    enum BUILTIN isBuiltin();
+    BUILTIN isBuiltin();
     int isExport();
     int isImportedSymbol();
     int isAbstract();

diff --git a/src/interpret.c b/src/interpret.c
@@ -5571,7 +5571,7 @@ Expression *evaluateIfBuiltin(InterState *istate, Loc loc,
     }
     if (!pthis)
     {
-        enum BUILTIN b = fd->isBuiltin();
+        BUILTIN b = fd->isBuiltin();
         if (b)
         {   Expressions args;
             args.setDim(nargs);

diff --git a/src/optimize.c b/src/optimize.c
@@ -555,7 +555,7 @@ Expression *CallExp::optimize(int result, bool keepLvalue)
         FuncDeclaration *fd = ((VarExp *)e1)->var->isFuncDeclaration();
         if (fd)
         {
-            enum BUILTIN b = fd->isBuiltin();
+            BUILTIN b = fd->isBuiltin();
             if (b)
             {
                 e = eval_builtin(b, arguments);