1 files changed, 12 insertions, 16 deletions
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index d921248ccb..e5185d0498 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -50,10 +50,9 @@ Stats("stats", llvm::cl::desc("Print performance metrics and statistics"));
 
 enum ProgActions {
   EmitLLVM,                     // Emit a .ll file.
-  ParseASTPrint,                // Parse ASTs and print them.
-  ParseASTDump,                 // Parse ASTs and dump them.
-  ParseASTView,                 // Parse ASTs and view them in Graphviz.
-  BuildAST,                     // Parse ASTs.  
+  ASTPrint,                     // Parse ASTs and print them.
+  ASTDump,                      // Parse ASTs and dump them.
+  ASTView,                      // Parse ASTs and view them in Graphviz.
   ParseCFGDump,                 // Parse ASTS. Build CFGs. Print CFGs.
   ParseCFGView,                 // Parse ASTS. Build CFGs. View CFGs.
   AnalysisLiveVariables,        // Print results of live-variable analysis.
@@ -84,14 +83,12 @@ ProgAction(llvm::cl::desc("Choose output type:"), llvm::cl::ZeroOrMore,
                         "Run parser and perform semantic analysis"),
              clEnumValN(ParsePrintCallbacks, "parse-print-callbacks",
                         "Run parser and print each callback invoked"),
-             clEnumValN(BuildAST, "parse-ast",
-                        "Run parser and build ASTs"),
-             clEnumValN(ParseASTPrint, "parse-ast-print",
-                        "Run parser, build ASTs, then print ASTs"),
-             clEnumValN(ParseASTDump, "parse-ast-dump",
-                        "Run parser, build ASTs, then dump them"),
-             clEnumValN(ParseASTView, "parse-ast-view",
-                        "Run parser, build ASTs, and view them with GraphViz."),
+             clEnumValN(ASTPrint, "ast-print",
+                        "Build ASTs and then pretty-print them"),
+             clEnumValN(ASTDump, "ast-dump",
+                        "Build ASTs and then debug dump them"),
+             clEnumValN(ASTView, "parse-ast-view",
+                        "Build ASTs and view them with GraphViz."),
              clEnumValN(ParseCFGDump, "dump-cfg",
                         "Run parser, then build and print CFGs."),
              clEnumValN(ParseCFGView, "view-cfg",
@@ -764,19 +761,18 @@ static void ProcessInputFile(Preprocessor &PP, unsigned MainFileID,
     break;
       
   case ParseSyntaxOnly:              // -fsyntax-only
-  case BuildAST:
     Consumer = new ASTConsumer();
     break;
 
-  case ParseASTPrint:
+  case ASTPrint:
     Consumer = CreateASTPrinter();
     break;
 
-  case ParseASTDump:
+  case ASTDump:
     Consumer = CreateASTDumper();
     break;
 
-  case ParseASTView:
+  case ASTView:
     Consumer = CreateASTViewer();      
     break;