Changeset 739 for trunk/rphp

Timestamp:

11/21/08 13:12:06 (7 weeks ago)

Author:

weyrick

Message:

some real error handling

Location:

trunk/rphp

Files:

• compiler/CMakeLists.txt (modified) (1 diff)
• compiler/pAST.h (modified) (4 diffs)
• compiler/pDriver.cpp (modified) (1 diff)
• compiler/pGenSupport.cpp (modified) (4 diffs)
• compiler/pGenSupport.h (modified) (1 diff)
• compiler/pGenerator.cpp (modified) (4 diffs)
• compiler/pGenerator.h (modified) (1 diff)
• compiler/pModule.cpp (modified) (2 diffs)
• compiler/pModule.h (modified) (1 diff)
• compiler/pSourceFile.cpp (modified) (3 diffs)
• compiler/pStandAloneTargets.cpp (modified) (3 diffs)
• frontend/cli/main.cpp (modified) (1 diff)

trunk/rphp/compiler/CMakeLists.txt

@@ -81 +81 @@
   pLinkTarget.cpp
   pLibTargets.cpp
+  pCompileError.cpp
   ${RPHP_LLVM_DEP_FILES}
   ${LLVM_LIBS_INTERPRETER_OBJECTS}

trunk/rphp/compiler/pAST.h

@@ -168 +168 @@
 class var: public expr {
 
-    const pSourceRange name_;
-
-public:
-    var(const pSourceRange& name): expr(varKind), name_(name) { }
+    pIdentString name_;
+
+public:
+    var(const pSourceRange& name): expr(varKind), name_(name.begin(), name.end()) { }
 
     pIdentString name(void) const {
-        return pIdentString(name_.begin(), name_.end());
+        return name_;
     }
 
@@ -200 +200 @@
 class functionInvoke: public expr {
 
-    const pSourceRange name_;
+    pIdentString name_;
     expressionList argList_;
 
@@ -206 +206 @@
     functionInvoke(const pSourceRange& name, expressionList* argList):
         expr(functionInvokeKind),
-        name_(name),
+        name_(name.begin(), name.end()),
         argList_(*argList)
     {
@@ -220 +220 @@
 
     pIdentString name(void) const {
-        return pIdentString(name_.begin(), name_.end());
+        return name_;
     }
     expressionList& argList(void) { return argList_; }

trunk/rphp/compiler/pDriver.cpp

@@ -152 +152 @@
     l.dumpTokens();
     delete source;
-    
+
 }
 

trunk/rphp/compiler/pGenSupport.cpp

@@ -28 +28 @@
 #include <fstream>
 
+#include "pCompileError.h"
 #include "pGenSupport.h"
 
@@ -39 +40 @@
 }
 
-bool pGenSupport::writeBitcode(llvm::Module* m, std::string outFile) {
+void pGenSupport::writeBitcode(llvm::Module* m, std::string outFile) {
 
     assert(m != NULL);
     assert(outFile.length() > 0);
 
-    // TODO: real error handling
     std::ofstream OS(outFile.c_str(), std::ios_base::out|std::ios::trunc|std::ios::binary);
     if (!OS.fail()) {
         llvm::WriteBitcodeToFile(m, OS);
-        return true;
     }
     else {
-        return false;
+        throw pCompileError("unable to write bitcode file ["+outFile+"]");
     }
 
@@ -62 +61 @@
     llvm::MemoryBuffer* mb = llvm::MemoryBuffer::getFile(fileName.c_str(), &errMsg);
     if (errMsg.length()) {
-        // TODO: errors
-        std::cerr << "error loading runtime IR file [" << fileName << "]: " << errMsg << std::endl;
-        exit(1);
+        throw pCompileError("error loading runtime IR file [" + fileName + "]: " + errMsg);
     }
 
     llvm::ModuleProvider* mp = llvm::getBitcodeModuleProvider(mb, &errMsg);
     if (errMsg.length()) {
-        // TODO: errors
-        std::cerr << "error parsing bitcode file [" << fileName << "]: " << errMsg << std::endl;
-        exit(1);
+        throw pCompileError("error parsing bitcode file [" + fileName + "]: " + errMsg);
     }
 
@@ -86 +81 @@
 llvm::Module* pGenSupport::getRuntimeIR() {
 
-    // TODO: ouch!
+    // TODO: needs to be a command line option with a good default
     return readBitcode("../runtime-ir/irRuntime.ir");
 

trunk/rphp/compiler/pGenSupport.h

@@ -35 +35 @@
 public:
     static std::string mangleModuleName(std::string moduleName);
-    static bool writeBitcode(llvm::Module* m, std::string outFile);
+    static void writeBitcode(llvm::Module* m, std::string outFile);
     static llvm::Module* readBitcode(std::string fileName);
     static llvm::Module* getRuntimeIR();

trunk/rphp/compiler/pGenerator.cpp

@@ -31 +31 @@
 #include <llvm/Linker.h>
 
+#include "pCompileError.h"
 #include "pGenerator.h"
 #include "pCompileTarget.h"
@@ -65 +66 @@
     l.LinkInModule(irMod, &errMsg);
     if (errMsg.length()) {
-        // TODO: errors
-        std::cerr << "error linking in runtime ir: " << errMsg << std::endl;
-        exit(1);
+        throw pCompileError("error linking in runtime IR [" + errMsg + "]");
     }
 
@@ -261 +260 @@
 
     // gen lval
+    pIdentString name("lVal");
+    if (n->lVal()->getKind() == AST::varKind) {
+        AST::var* l = static_cast<AST::var*>(n->lVal());
+        name = l->name();
+    }
     visit(n->lVal());
     Value* lVal = valueStack_.back();
@@ -268 +272 @@
     assert(f != NULL);
 
-    currentBlock_.CreateCall2(f, lVal, rVal);
+    currentBlock_.CreateCall2(f, lVal, rVal, name.c_str());
 
 }

trunk/rphp/compiler/pGenerator.h

@@ -40 +40 @@
 namespace rphp {
 
+// TODO: llvm has structures for this. use those?
 typedef boost::unordered_map<pIdentString, llvm::Value*> symbolTableType;
 

trunk/rphp/compiler/pModule.cpp

@@ -43 +43 @@
 {
 
-    // TODO: error handling
     source_ = new pSourceFile(file);
     parser::parseSourceFile(this);
@@ -115 +114 @@
 }
 
-bool pModule::writeBitcode(pFileNameString fileName) {
+void pModule::writeBitcode(pFileNameString fileName) {
 
-    return pGenSupport::writeBitcode(llvmModule_, source_->fileName());
+    pGenSupport::writeBitcode(llvmModule_, source_->fileName());
 
 }

trunk/rphp/compiler/pModule.h

@@ -71 +71 @@
     void applyVisitor(AST::baseVisitor* v);
     bool lowerToIR(pCompileTarget* target);
-    bool writeBitcode(pFileNameString fileName);
+    void writeBitcode(pFileNameString fileName);
     void setLLVMModuleOwnership(bool v) { llvmModuleOwner_ = v; }
     llvm::Module* getLLVMModule() { return llvmModule_; }

trunk/rphp/compiler/pSourceFile.cpp

@@ -30 +30 @@
 #include <stdio.h>
 
+#include "pCompileError.h"
 #include "pSourceFile.h"
 
@@ -40 +41 @@
     std::ifstream instream(file_.get<0>().c_str());
     if (!instream.is_open()) {
-        std::cerr << "Couldn't open file: " << file_.get<0>() << std::endl;
-        exit(-1);
+        throw pCompileError("couldn't open file [" + file_.get<0>() + "]");
     }
     instream.unsetf(std::ios::skipws);
@@ -66 +66 @@
         UnicodeString ubuffer(rawBuffer.data(), rawBuffer.length(), file_.get<1>().c_str());
         if (ubuffer.isBogus()) {
-            std::cerr << "Could not perform character conversion in file: " << file_.get<0>() << " from charset: " << file_.get<1>() << std::endl;
-            exit(-1);
+            throw pCompileError("could not perform character conversion in file [" + file_.get<0>() + "] from charset [" + file_.get<1>() + "]");
         }
 

trunk/rphp/compiler/pStandAloneTargets.cpp

@@ -34 +34 @@
 #include <llvm/System/Program.h>
 
+#include "pCompileError.h"
 #include "pGenSupport.h"
 #include "pStandAloneTargets.h"
@@ -123 +124 @@
     sys::Path ld = sys::Program::FindProgramByName("llvm-ld");
     if (ld.isEmpty()) {
-        // TODO: error handling
-        std::cerr << "unable to link: llvm-ld not found" << std::endl;
-        return;
+        throw pCompileError("unable to link: llvm-ld not found");
     }
 
@@ -163 +162 @@
 
     if (R != 0) {
-        // TODO: error handling
-        std::cerr << errMsg << std::endl;
-        return;
+        throw pCompileError(errMsg);
     }
 

trunk/rphp/frontend/cli/main.cpp

@@ -72 +72 @@
     }
     else if (dumpToks) {
-        driver.dumpTokens(boost::make_tuple(inputFile, encoding));
+        try {
+            driver.dumpTokens(boost::make_tuple(inputFile, encoding));
+        }
+        catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+            return 1;
+        }
+        return 0;
     }
     else if (dumpAST) {
-        driver.dumpAST(boost::make_tuple(inputFile, encoding));
+        try {
+            driver.dumpAST(boost::make_tuple(inputFile, encoding));
+        }
+        catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+            return 1;
+        }
+        return 0;
     }
     else if (dumpIR) {
-        driver.dumpIR(boost::make_tuple(inputFile, encoding));
+        try {
+            driver.dumpIR(boost::make_tuple(inputFile, encoding));
+        }
+        catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+            return 1;
+        }
+        return 0;
     }
     else if (dumpPre) {
-        driver.dumpPre(boost::make_tuple(inputFile, encoding));
+        try {
+            driver.dumpPre(boost::make_tuple(inputFile, encoding));
+        }
+        catch (std::exception& e) {
+            std::cerr << e.what() << std::endl;
+            return 1;
+        }
+        return 0;
     }
     else {