[llvm-commits] CVS: llvm-java/tools/class2llvm/class2llvm.cpp

[Alkis Evlogimenos]

Changes in directory llvm-java/tools/class2llvm:

class2llvm.cpp updated: 1.7 -> 1.8

---
Log message:

Implement class lookup by name given the CLASSPATH environment
variable. Classfile now includes a getClassFile() API that looks up a
class specified by its fully qualified name, in the directories
specified by CLASSPATH and caches the parsed ClassFile object for
later queries.


---
Diffs of the changes:  (+2 -18)

Index: llvm-java/tools/class2llvm/class2llvm.cpp
diff -u llvm-java/tools/class2llvm/class2llvm.cpp:1.7 llvm-java/tools/class2llvm/class2llvm.cpp:1.8
--- llvm-java/tools/class2llvm/class2llvm.cpp:1.7	Fri Jul  2 05:49:01 2004
+++ llvm-java/tools/class2llvm/class2llvm.cpp	Tue Jul  6 08:31:34 2004
@@ -20,26 +20,12 @@
 #include <Support/CommandLine.h>
 
 #include <cstddef>
-#include <fstream>
 #include <iostream>
-#include <memory>
 
 using namespace llvm;
 
 static cl::opt<std::string>
-InputFilename(cl::Positional, cl::desc("<input bytecode>"), cl::init("-"));
-
-namespace {
-
-    std::auto_ptr<std::istream> getInputStream(const std::string& fn) {
-        std::auto_ptr<std::istream> in;
-        if (fn == "-") in.reset(new std::istream(std::cin.rdbuf()));
-        else in.reset(new std::ifstream(fn.c_str()));
-
-        return in;
-    }
-
-}
+InputFilename(cl::Positional, cl::desc("<input bytecode>"));
 
 int main(int argc, char* argv[])
 {
@@ -48,9 +34,7 @@
                                 "classfile to llvm utility");
 
     try {
-        std::auto_ptr<std::istream> in(getInputStream(InputFilename));
-        
-        std::auto_ptr<Java::ClassFile> cf(Java::ClassFile::readClassFile(*in));
+        const Java::ClassFile* cf(Java::ClassFile::getClassFile(InputFilename));
 
         Java::Compiler compiler;