bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Re-format some obj dtors that were messed up by the pretty-printer

Browse source
This commit is contained in:
Marijn Haverbeke 2011-07-27 16:52:49 +02:00
parent 0334faef1f
commit 2593c50e75
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/comp/lib/llvm.rs
View file

@ -1554,8 +1554,8 @@ fn fn_ty_param_tys(fn_ty: TypeRef) -> TypeRef[] {
/* Memory-managed interface to target data. */ /* Memory-managed interface to target data. */
obj target_data_dtor(TD: TargetDataRef) obj target_data_dtor(TD: TargetDataRef) {
{drop { llvm::LLVMDisposeTargetData(TD); } drop { llvm::LLVMDisposeTargetData(TD); }
} }
type target_data = {lltd: TargetDataRef, dtor: target_data_dtor}; type target_data = {lltd: TargetDataRef, dtor: target_data_dtor};
@ -1567,8 +1567,8 @@ fn mk_target_data(string_rep: str) -> target_data {
/* Memory-managed interface to pass managers. */ /* Memory-managed interface to pass managers. */
obj pass_manager_dtor(PM: PassManagerRef) obj pass_manager_dtor(PM: PassManagerRef) {
{drop { llvm::LLVMDisposePassManager(PM); } drop { llvm::LLVMDisposePassManager(PM); }
} }
type pass_manager = {llpm: PassManagerRef, dtor: pass_manager_dtor}; type pass_manager = {llpm: PassManagerRef, dtor: pass_manager_dtor};
@ -1580,8 +1580,8 @@ fn mk_pass_manager() -> pass_manager {
/* Memory-managed interface to object files. */ /* Memory-managed interface to object files. */
obj object_file_dtor(ObjectFile: ObjectFileRef) obj object_file_dtor(ObjectFile: ObjectFileRef) {
{drop { llvm::LLVMDisposeObjectFile(ObjectFile); } drop { llvm::LLVMDisposeObjectFile(ObjectFile); }
} }
type object_file = {llof: ObjectFileRef, dtor: object_file_dtor}; type object_file = {llof: ObjectFileRef, dtor: object_file_dtor};
@ -1593,8 +1593,8 @@ fn mk_object_file(llmb: MemoryBufferRef) -> object_file {
/* Memory-managed interface to section iterators. */ /* Memory-managed interface to section iterators. */
obj section_iter_dtor(SI: SectionIteratorRef) obj section_iter_dtor(SI: SectionIteratorRef) {
{drop { llvm::LLVMDisposeSectionIterator(SI); } drop { llvm::LLVMDisposeSectionIterator(SI); }
} }
type section_iter = {llsi: SectionIteratorRef, dtor: section_iter_dtor}; type section_iter = {llsi: SectionIteratorRef, dtor: section_iter_dtor};

9
src/lib/io.rs
View file

@ -70,7 +70,8 @@ obj FILE_buf_reader(f: os::libc::FILE, must_close: bool) {
} }
fn tell() -> uint { fn tell() -> uint {
ret os::libc::ftell(f) as uint; ret os::libc::ftell(f) as uint;
}drop { if must_close { os::libc::fclose(f); } } }
drop { if must_close { os::libc::fclose(f); } }
} }
@ -248,7 +249,8 @@ obj FILE_writer(f: os::libc::FILE, must_close: bool) {
} }
fn tell() -> uint { fn tell() -> uint {
ret os::libc::ftell(f) as uint; ret os::libc::ftell(f) as uint;
}drop { if must_close { os::libc::fclose(f); } } }
drop { if must_close { os::libc::fclose(f); } }
} }
obj fd_buf_writer(fd: int, must_close: bool) { obj fd_buf_writer(fd: int, must_close: bool) {
@ -274,7 +276,8 @@ obj fd_buf_writer(fd: int, must_close: bool) {
fn tell() -> uint { fn tell() -> uint {
log_err "need 64-bit native calls for tell, sorry"; log_err "need 64-bit native calls for tell, sorry";
fail; fail;
}drop { if must_close { os::libc::close(fd); } } }
drop { if must_close { os::libc::close(fd); } }
} }
fn file_buf_writer(path: str, flags: vec[fileflag]) -> buf_writer { fn file_buf_writer(path: str, flags: vec[fileflag]) -> buf_writer {

11
src/lib/run_program.rs
View file

@ -73,11 +73,12 @@ fn start_program(prog: str, args: vec[str]) -> @program {
finished = true; finished = true;
self.close_input(); self.close_input();
ret os::waitpid(pid); ret os::waitpid(pid);
}drop { }
self.close_input(); drop {
if !finished { os::waitpid(pid); } self.close_input();
os::libc::fclose(out_file); if !finished { os::waitpid(pid); }
} os::libc::fclose(out_file);
}
} }
ret @new_program(pid, pipe_input.out, os::fd_FILE(pipe_output.in), false); ret @new_program(pid, pipe_input.out, os::fd_FILE(pipe_output.in), false);
} }