Convert to use new Pass framework...

[oota-llvm.git] / tools / as / as.cpp

diff --git a/tools/as/as.cpp b/tools/as/as.cpp
index da05a36f7fcd6daf4c0b5a73b85f99c5d423dc2f..59049748354e6984b2775d3bd758869e82297993 100644 (file)
--- a/tools/as/as.cpp
+++ b/tools/as/as.cpp
@@ -9,18 +9,18 @@
 //
 //===------------------------------------------------------------------------===
 
-#include <iostream.h>
-#include <fstream.h>
-#include <string>
 #include "llvm/Module.h"
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Writer.h"
-#include "llvm/Tools/CommandLine.h"
+#include "Support/CommandLine.h"
+#include <fstream>
+#include <string>
+#include <memory>
 
 cl::String InputFilename ("", "Parse <arg> file, compile to bytecode", 0, "-");
-cl::String OutputFilename("o", "Override output filename", 0, "");
-cl::Flag   Force         ("f", "Overwrite output files", 0, false);
+cl::String OutputFilename("o", "Override output filename", cl::NoFlags, "");
+cl::Flag   Force         ("f", "Overwrite output files", cl::NoFlags, false);
 cl::Flag   DumpAsm       ("d", "Print assembly as parsed", cl::Hidden, false);
 
 int main(int argc, char **argv) {
@@ -29,46 +29,55 @@ int main(int argc, char **argv) {
   ostream *Out = 0;
   try {
     // Parse the file now...
-    Module *C = ParseAssemblyFile(InputFilename.getValue());
-    if (C == 0) {
+    std::auto_ptr<Module> C(ParseAssemblyFile(InputFilename));
+    if (C.get() == 0) {
       cerr << "assembly didn't read correctly.\n";
       return 1;
     }
   
-    if (DumpAsm.getValue())
-      cerr << "Here's the assembly:\n" << C;
+    if (DumpAsm)
+      cerr << "Here's the assembly:\n" << C.get();
 
-    if (OutputFilename.getValue() != "") {   // Specified an output filename?
-      Out = new ofstream(OutputFilename.getValue().c_str(), 
-                        (Force.getValue() ? 0 : ios::noreplace)|ios::out);
+    if (OutputFilename != "") {   // Specified an output filename?
+      if (!Force && std::ifstream(OutputFilename.c_str())) {
+        // If force is not specified, make sure not to overwrite a file!
+        cerr << "Error opening '" << OutputFilename << "': File exists!\n"
+             << "Use -f command line argument to force output\n";
+        return 1;
+      }
+      Out = new std::ofstream(OutputFilename.c_str());
     } else {
-      if (InputFilename.getValue() == "-") {
-       OutputFilename.setValue("-");
+      if (InputFilename == "-") {
+       OutputFilename = "-";
        Out = &cout;
       } else {
-       string IFN = InputFilename.getValue();
+       std::string IFN = InputFilename;
        int Len = IFN.length();
        if (IFN[Len-3] == '.' && IFN[Len-2] == 'l' && IFN[Len-1] == 'l') {
          // Source ends in .ll
-         OutputFilename.setValue(string(IFN.begin(), IFN.end()-3));
+         OutputFilename = std::string(IFN.begin(), IFN.end()-3);
         } else {
-         OutputFilename.setValue(IFN);   // Append a .bc to it
+         OutputFilename = IFN;   // Append a .bc to it
        }
-       OutputFilename.setValue(OutputFilename.getValue() + ".bc");
-       Out = new ofstream(OutputFilename.getValue().c_str(), 
-                          (Force.getValue() ? 0 : ios::noreplace)|ios::out);
+       OutputFilename += ".bc";
+
+        if (!Force && std::ifstream(OutputFilename.c_str())) {
+          // If force is not specified, make sure not to overwrite a file!
+          cerr << "Error opening '" << OutputFilename << "': File exists!\n"
+               << "Use -f command line argument to force output\n";
+          return 1;
+        }
+
+       Out = new std::ofstream(OutputFilename.c_str());
       }
+    }
   
-      if (!Out->good()) {
-        cerr << "Error opening " << OutputFilename.getValue() << "!\n";
-       delete C;
-       return 1;
-      }
+    if (!Out->good()) {
+      cerr << "Error opening " << OutputFilename << "!\n";
+      return 1;
     }
    
-    WriteBytecodeToFile(C, *Out);
-
-    delete C;
+    WriteBytecodeToFile(C.get(), *Out);
   } catch (const ParseException &E) {
     cerr << E.getMessage() << endl;
     return 1;