jyapayne/llvmpy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix writing to file-like obj in python3.3

Browse source
This commit is contained in:
Siu Kwan Lam 2013-02-24 13:21:42 -06:00
commit d270f47328
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
llvmpy/include/llvm_binding/conversion.h
View file

@ -9,7 +9,7 @@ int py_bytes_to(PyObject *bytesobj, llvm::StringRef &strref){
// type check // type check
if (!PyBytes_Check(bytesobj)) { if (!PyBytes_Check(bytesobj)) {
// raises TypeError // raises TypeError
PyErr_SetString(PyExc_TypeError, "Expecting a str"); PyErr_SetString(PyExc_TypeError, "Expecting a bytes");
return 0; return 0;
} }
// get len and buffer // get len and buffer

11
llvmpy/include/llvm_binding/extra.h
View file

@ -477,9 +477,13 @@ PyObject* llvm_ParseBitCodeFile(llvm::StringRef Buf, llvm::LLVMContext& Ctx,
if (FObj) { if (FObj) {
std::string ErrStr; std::string ErrStr;
M = ParseBitcodeFile(MB, Ctx, &ErrStr); M = ParseBitcodeFile(MB, Ctx, &ErrStr);
if (-1 == PyFile_WriteString(ErrStr.c_str(), FObj)) { auto_pyobject buf = PyBytes_FromString(ErrStr.c_str());
if (NULL == PyObject_CallMethod(FObj, "write", "O", *buf)){
return NULL; return NULL;
} }
// if (-1 == PyFile_WriteString(ErrStr.c_str(), FObj)) {
// return NULL;
// }
} else { } else {
M = ParseBitcodeFile(MB, Ctx); M = ParseBitcodeFile(MB, Ctx);
} }
@ -497,9 +501,8 @@ PyObject* llvm_WriteBitcodeToFile(const llvm::Module *M, PyObject* FObj)
llvm::WriteBitcodeToFile(M, rso); llvm::WriteBitcodeToFile(M, rso);
rso.flush(); rso.flush();
StringRef ref = rso.str(); StringRef ref = rso.str();
PyObject* buf = PyBytes_FromStringAndSize(ref.data(), ref.size()); auto_pyobject buf = PyBytes_FromStringAndSize(ref.data(), ref.size());
puts(PyString_AsString(PyObject_Str(PyObject_Type(buf)))); return PyObject_CallMethod(FObj, "write", "O", *buf);
return PyObject_CallMethod(FObj, "write", "O", buf);
} }
static static