diff options
| author | Brian Anderson <[email protected]> | 2011-03-13 19:40:25 -0400 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-03-13 19:40:25 -0400 |
| commit | bbb6836da003be71744b6e6ea7af1fd4674f8291 (patch) | |
| tree | fc7780f767666cced8406818806216bee3863c91 /src/boot/me/semant.ml | |
| parent | Remove extra blocks from the translation of expr_block (diff) | |
| parent | Add llvmext/include to the list of include directories to hopefully put out t... (diff) | |
| download | rust-bbb6836da003be71744b6e6ea7af1fd4674f8291.tar.xz rust-bbb6836da003be71744b6e6ea7af1fd4674f8291.zip | |
Merge branch 'master' into recursive-elseif
Conflicts:
src/comp/middle/typeck.rs
Diffstat (limited to 'src/boot/me/semant.ml')
| -rw-r--r-- | src/boot/me/semant.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/me/semant.ml b/src/boot/me/semant.ml index 3ce5eba2..3419bb34 100644 --- a/src/boot/me/semant.ml +++ b/src/boot/me/semant.ml @@ -20,7 +20,7 @@ type glue = | GLUE_yield | GLUE_exit_main_task | GLUE_exit_task - | GLUE_copy of Ast.ty (* One-level copy. *) + | GLUE_take of Ast.ty (* One-level refcounts++. *) | GLUE_drop of Ast.ty (* De-initialize local memory. *) | GLUE_free of Ast.ty (* Drop body + free() box ptr. *) | GLUE_sever of Ast.ty (* Null all box state slots. *) @@ -2776,7 +2776,7 @@ let glue_str (cx:ctxt) (g:glue) : string = | GLUE_yield -> "glue$yield" | GLUE_exit_main_task -> "glue$exit_main_task" | GLUE_exit_task -> "glue$exit_task" - | GLUE_copy ty -> "glue$copy$" ^ (ty_str cx ty) + | GLUE_take ty -> "glue$take$" ^ (ty_str cx ty) | GLUE_drop ty -> "glue$drop$" ^ (ty_str cx ty) | GLUE_free ty -> "glue$free$" ^ (ty_str cx ty) | GLUE_sever ty -> "glue$sever$" ^ (ty_str cx ty) |