diff options
| -rw-r--r-- | src/libextra/rl.rs | 33 | ||||
| -rw-r--r-- | src/librustc/middle/trans/debuginfo.rs | 330 | ||||
| -rw-r--r-- | src/librustpkg/tests.rs | 7 | ||||
| -rw-r--r-- | src/libsyntax/ext/build.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/nested-enum-same-names.rs | 16 | ||||
| -rw-r--r-- | src/test/run-pass/rl-human-test.rs | 24 |
6 files changed, 244 insertions, 168 deletions
diff --git a/src/libextra/rl.rs b/src/libextra/rl.rs index 7c7b6de9a3a..7662a159ba4 100644 --- a/src/libextra/rl.rs +++ b/src/libextra/rl.rs @@ -30,31 +30,40 @@ pub mod rustrt { macro_rules! locked { ($expr:expr) => { - // FIXME #9105: can't use a static mutex in pure Rust yet. - rustrt::rust_take_linenoise_lock(); - let x = $expr; - rustrt::rust_drop_linenoise_lock(); - x + { + // FIXME #9105: can't use a static mutex in pure Rust yet. + rustrt::rust_take_linenoise_lock(); + let x = $expr; + rustrt::rust_drop_linenoise_lock(); + x + } } } /// Add a line to history pub fn add_history(line: &str) -> bool { do line.with_c_str |buf| { - (locked!(rustrt::linenoiseHistoryAdd(buf))) == 1 as c_int + unsafe { + (locked!(rustrt::linenoiseHistoryAdd(buf))) == 1 as c_int + } } } /// Set the maximum amount of lines stored pub fn set_history_max_len(len: int) -> bool { - (locked!(rustrt::linenoiseHistorySetMaxLen(len as c_int))) == 1 as c_int + unsafe { + (locked!(rustrt::linenoiseHistorySetMaxLen(len as c_int))) == 1 + as c_int + } } /// Save line history to a file pub fn save_history(file: &str) -> bool { do file.with_c_str |buf| { // 0 on success, -1 on failure - (locked!(rustrt::linenoiseHistorySave(buf))) == 0 as c_int + unsafe { + (locked!(rustrt::linenoiseHistorySave(buf))) == 0 as c_int + } } } @@ -62,14 +71,18 @@ pub fn save_history(file: &str) -> bool { pub fn load_history(file: &str) -> bool { do file.with_c_str |buf| { // 0 on success, -1 on failure - (locked!(rustrt::linenoiseHistoryLoad(buf))) == 0 as c_int + unsafe { + (locked!(rustrt::linenoiseHistoryLoad(buf))) == 0 as c_int + } } } /// Print out a prompt and then wait for input and return it pub fn read(prompt: &str) -> Option<~str> { do prompt.with_c_str |buf| { - let line = locked!(rustrt::linenoise(buf)); + let line = unsafe { + locked!(rustrt::linenoise(buf)) + }; if line.is_null() { None } else { diff --git a/src/librustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs index 272ce49a377..91f6169b419 100644 --- a/src/librustc/middle/trans/debuginfo.rs +++ b/src/librustc/middle/trans/debuginfo.rs @@ -1086,6 +1086,36 @@ fn pointer_type_metadata(cx: &mut CrateContext, return ptr_metadata; } +trait MemberDescriptionFactory { + fn create_member_descriptions(&self, cx: &mut CrateContext) + -> ~[MemberDescription]; +} + +struct StructMemberDescriptionFactory { + fields: ~[ty::field], + span: Span, +} + +impl MemberDescriptionFactory for StructMemberDescriptionFactory { + fn create_member_descriptions(&self, cx: &mut CrateContext) + -> ~[MemberDescription] { + do self.fields.map |field| { + let name = if field.ident.name == special_idents::unnamed_field.name { + @"" + } else { + token::ident_to_str(&field.ident) + }; + + MemberDescription { + name: name, + llvm_type: type_of::type_of(cx, field.mt.ty), + type_metadata: type_metadata(cx, field.mt.ty, self.span), + offset: ComputedMemberOffset, + } + } + } +} + fn prepare_struct_metadata(cx: &mut CrateContext, struct_type: ty::t, def_id: ast::DefId, @@ -1114,22 +1144,10 @@ fn prepare_struct_metadata(cx: &mut CrateContext, metadata_stub: struct_metadata_stub, llvm_type: struct_llvm_type, file_metadata: file_metadata, - member_description_factory: |cx| { - do fields.map |field| { - let name = if field.ident.name == special_idents::unnamed_field.name { - @"" - } else { - token::ident_to_str(&field.ident) - }; - - MemberDescription { - name: name, - llvm_type: type_of::type_of(cx, field.mt.ty), - type_metadata: type_metadata(cx, field.mt.ty, span), - offset: ComputedMemberOffset, - } - } - } + member_description_factory: @StructMemberDescriptionFactory { + fields: fields, + span: span, + } as @MemberDescriptionFactory, } } @@ -1139,7 +1157,7 @@ enum RecursiveTypeDescription { metadata_stub: DICompositeType, llvm_type: Type, file_metadata: DIFile, - member_description_factory: @fn(cx: &mut CrateContext) -> ~[MemberDescription], + member_description_factory: @MemberDescriptionFactory, }, FinalMetadata(DICompositeType) } @@ -1167,7 +1185,8 @@ impl RecursiveTypeDescription { debug_context(cx).created_types.insert(cache_id, metadata_stub); // ... then create the member descriptions ... - let member_descriptions = member_description_factory(cx); + let member_descriptions = member_description_factory. + create_member_descriptions(cx); // ... and attach them to the stub to complete it. set_members_of_composite_type(cx, @@ -1182,6 +1201,25 @@ impl RecursiveTypeDescription { } } +struct TupleMemberDescriptionFactory { + component_types: ~[ty::t], + span: Span, +} + +impl MemberDescriptionFactory for TupleMemberDescriptionFactory { + fn create_member_descriptions(&self, cx: &mut CrateContext) + -> ~[MemberDescription] { + do self.component_types.map |&component_type| { + MemberDescription { + name: @"", + llvm_type: type_of::type_of(cx, component_type), + type_metadata: type_metadata(cx, component_type, self.span), + offset: ComputedMemberOffset, + } + } + } +} + fn prepare_tuple_metadata(cx: &mut CrateContext, tuple_type: ty::t, component_types: &[ty::t], @@ -1192,8 +1230,6 @@ fn prepare_tuple_metadata(cx: &mut CrateContext, let loc = span_start(cx, span); let file_metadata = file_metadata(cx, loc.file.name); - // Needs to be copied for closure below :( - let component_types = component_types.to_owned(); UnfinishedMetadata { cache_id: cache_id_for_type(tuple_type), @@ -1205,17 +1241,147 @@ fn prepare_tuple_metadata(cx: &mut CrateContext, span), llvm_type: tuple_llvm_type, file_metadata: file_metadata, - member_description_factory: |cx| { - do component_types.map |&component_type| { + member_description_factory: @TupleMemberDescriptionFactory { + component_types: component_types.to_owned(), + span: span, + } as @MemberDescriptionFactory + } +} + +struct GeneralMemberDescriptionFactory { + type_rep: @adt::Repr, + variants: @~[@ty::VariantInfo], + discriminant_type_metadata: ValueRef, + containing_scope: DIScope, + file_metadata: DIFile, + span: Span, +} + +impl MemberDescriptionFactory for GeneralMemberDescriptionFactory { + fn create_member_descriptions(&self, cx: &mut CrateContext) + -> ~[MemberDescription] { + // Capture type_rep, so we don't have to copy the struct_defs array + let struct_defs = match *self.type_rep { + adt::General(ref struct_defs) => struct_defs, + _ => cx.sess.bug("unreachable") + }; + + do struct_defs + .iter() + .enumerate() + .map |(i, struct_def)| { + let (variant_type_metadata, variant_llvm_type, member_desc_factory) = + describe_variant(cx, + struct_def, + self.variants[i], + Some(self.discriminant_type_metadata), + self.containing_scope, + self.file_metadata, + self.span); + + let member_descriptions = + member_desc_factory.create_member_descriptions(cx); + + set_members_of_composite_type(cx, + variant_type_metadata, + variant_llvm_type, + member_descriptions, + self.file_metadata, + codemap::dummy_sp()); MemberDescription { name: @"", - llvm_type: type_of::type_of(cx, component_type), - type_metadata: type_metadata(cx, component_type, span), - offset: ComputedMemberOffset, + llvm_type: variant_llvm_type, + type_metadata: variant_type_metadata, + offset: FixedMemberOffset { bytes: 0 }, } + }.collect() + } +} + +struct EnumVariantMemberDescriptionFactory { + args: ~[(@str, ty::t)], + discriminant_type_metadata: Option<DIType>, + span: Span, +} + +impl MemberDescriptionFactory for EnumVariantMemberDescriptionFactory { + fn create_member_descriptions(&self, cx: &mut CrateContext) + -> ~[MemberDescription] { + do self.args.iter().enumerate().map |(i, &(name, ty))| { + MemberDescription { + name: name, + llvm_type: type_of::type_of(cx, ty), + type_metadata: match self.discriminant_type_metadata { + Some(metadata) if i == 0 => metadata, + _ => type_metadata(cx, ty, self.span) + }, + offset: ComputedMemberOffset, + } + }.collect() + } +} + +fn describe_variant(cx: &mut CrateContext, + struct_def: &adt::Struct, + variant_info: &ty::VariantInfo, + discriminant_type_metadata: Option<DIType>, + containing_scope: DIScope, + file_metadata: DIFile, + span: Span) + -> (DICompositeType, Type, @MemberDescriptionFactory) { + let variant_name = token::ident_to_str(&variant_info.name); + let variant_llvm_type = Type::struct_(struct_def.fields.map(|&t| type_of::type_of(cx, t)), + struct_def.packed); + // Could some consistency checks here: size, align, field count, discr type + + // Find the source code location of the variant's definition + let variant_definition_span = if variant_info.id.crate == ast::LOCAL_CRATE { + match cx.tcx.items.find(&variant_info.id.node) { + Some(&ast_map::node_variant(ref variant, _, _)) => variant.span, + ref node => { + cx.sess.span_warn(span, + fmt!("debuginfo::enum_metadata()::adt_struct_metadata() - Unexpected node \ + type: %?. This is a bug.", node)); + codemap::dummy_sp() } } + } else { + // For definitions from other crates we have no location information available. + codemap::dummy_sp() + }; + + let metadata_stub = create_struct_stub(cx, + variant_llvm_type, + variant_name, + containing_scope, + file_metadata, + variant_definition_span); + + // Get the argument names from the enum variant info + let mut arg_names = match variant_info.arg_names { + Some(ref names) => do names.map |ident| { token::ident_to_str(ident) }, + None => do variant_info.args.map |_| { @"" } + }; + + // If this is not a univariant enum, there is also the (unnamed) discriminant field + if discriminant_type_metadata.is_some() { + arg_names.insert(0, @""); } + + // Build an array of (field name, field type) pairs to be captured in the factory closure. + let args: ~[(@str, ty::t)] = arg_names.iter() + .zip(struct_def.fields.iter()) + .map(|(&s, &t)| (s, t)) + .collect(); + + let member_description_factory = + @EnumVariantMemberDescriptionFactory { + args: args, + discriminant_type_metadata: discriminant_type_metadata, + span: span, + } as @MemberDescriptionFactory; + + (metadata_stub, variant_llvm_type, member_description_factory) } fn prepare_enum_metadata(cx: &mut CrateContext, @@ -1336,42 +1502,14 @@ fn prepare_enum_metadata(cx: &mut CrateContext, metadata_stub: enum_metadata, llvm_type: enum_llvm_type, file_metadata: file_metadata, - member_description_factory: |cx| { - // Capture type_rep, so we don't have to copy the struct_defs array - let struct_defs = match *type_rep { - adt::General(ref struct_defs) => struct_defs, - _ => cx.sess.bug("unreachable") - }; - - do struct_defs - .iter() - .enumerate() - .map |(i, struct_def)| { - let (variant_type_metadata, variant_llvm_type, member_desc_factory) = - describe_variant(cx, - struct_def, - variants[i], - Some(discriminant_type_metadata), - containing_scope, - file_metadata, - span); - - let member_descriptions = member_desc_factory(cx); - - set_members_of_composite_type(cx, - variant_type_metadata, - variant_llvm_type, - member_descriptions, - file_metadata, - codemap::dummy_sp()); - MemberDescription { - name: @"", - llvm_type: variant_llvm_type, - type_metadata: variant_type_metadata, - offset: FixedMemberOffset { bytes: 0 }, - } - }.collect() - } + member_description_factory: @GeneralMemberDescriptionFactory { + type_rep: type_rep, + variants: variants, + discriminant_type_metadata: discriminant_type_metadata, + containing_scope: containing_scope, + file_metadata: file_metadata, + span: span, + } as @MemberDescriptionFactory, } } adt::NullablePointer { nonnull: ref struct_def, nndiscr, _ } => { @@ -1393,76 +1531,6 @@ fn prepare_enum_metadata(cx: &mut CrateContext, } } }; - - fn describe_variant(cx: &mut CrateContext, - struct_def: &adt::Struct, - variant_info: &ty::VariantInfo, - discriminant_type_metadata: Option<DIType>, - containing_scope: DIScope, - file_metadata: DIFile, - span: Span) - -> (DICompositeType, Type, @fn(&mut CrateContext) -> ~[MemberDescription]) { - let variant_name = token::ident_to_str(&variant_info.name); - let variant_llvm_type = Type::struct_(struct_def.fields.map(|&t| type_of::type_of(cx, t)), - struct_def.packed); - // Could some consistency checks here: size, align, field count, discr type - - // Find the source code location of the variant's definition - let variant_definition_span = if variant_info.id.crate == ast::LOCAL_CRATE { - match cx.tcx.items.find(&variant_info.id.node) { - Some(&ast_map::node_variant(ref variant, _, _)) => variant.span, - ref node => { - cx.sess.span_warn(span, - fmt!("debuginfo::enum_metadata()::adt_struct_metadata() - Unexpected node \ - type: %?. This is a bug.", node)); - codemap::dummy_sp() - } - } - } else { - // For definitions from other crates we have no location information available. - codemap::dummy_sp() - }; - - let metadata_stub = create_struct_stub(cx, - variant_llvm_type, - variant_name, - containing_scope, - file_metadata, - variant_definition_span); - - // Get the argument names from the enum variant info - let mut arg_names = match variant_info.arg_names { - Some(ref names) => do names.map |ident| { token::ident_to_str(ident) }, - None => do variant_info.args.map |_| { @"" } - }; - - // If this is not a univariant enum, there is also the (unnamed) discriminant field - if discriminant_type_metadata.is_some() { - arg_names.insert(0, @""); - } - - // Build an array of (field name, field type) pairs to be captured in the factory closure. - let args: ~[(@str, ty::t)] = arg_names.iter() - .zip(struct_def.fields.iter()) - .map(|(&s, &t)| (s, t)) - .collect(); - - let member_description_factory: @fn(cx: &mut CrateContext) -> ~[MemberDescription] = |cx| { - do args.iter().enumerate().map |(i, &(name, ty))| { - MemberDescription { - name: name, - llvm_type: type_of::type_of(cx, ty), - type_metadata: match discriminant_type_metadata { - Some(metadata) if i == 0 => metadata, - _ => type_metadata(cx, ty, span) - }, - offset: ComputedMemberOffset, - } - }.collect() - }; - - (metadata_stub, variant_llvm_type, member_description_factory) - } } enum MemberOffset { diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs index a0e9e49e507..b8ccc49e904 100644 --- a/src/librustpkg/tests.rs +++ b/src/librustpkg/tests.rs @@ -1565,8 +1565,11 @@ fn test_linker_build() { let matches = getopts([], optgroups()); let options = build_session_options(@"rustpkg", matches.get_ref(), - diagnostic::emit); - let sess = build_session(options, diagnostic::emit); + @diagnostic::DefaultEmitter as + @diagnostic::Emitter); + let sess = build_session(options, + @diagnostic::DefaultEmitter as + @diagnostic::Emitter); command_line_test([test_sysroot().to_str(), ~"install", ~"--linker", diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index aa4238ae908..ba2342d7827 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -869,7 +869,7 @@ struct Duplicator { } impl fold::ast_fold for Duplicator { - fn new_id(&self, _: NodeId) -> NodeId { + fn new_id(&self, _: NodeId) -> NodeId { ast::DUMMY_NODE_ID } } diff --git a/src/test/run-pass/nested-enum-same-names.rs b/src/test/run-pass/nested-enum-same-names.rs index 7d9b744ab0f..919b4b59dca 100644 --- a/src/test/run-pass/nested-enum-same-names.rs +++ b/src/test/run-pass/nested-enum-same-names.rs @@ -30,20 +30,4 @@ impl Foo { } } -/* -#2074 duplicate symbols with enum in boxed closure -*/ - -fn foo() { - let one: @fn() -> uint = || { - enum r { a } - a as uint - }; - let two: @fn() -> uint = || { - enum r { a } - a as uint - }; - one(); two(); -} - fn main() {} diff --git a/src/test/run-pass/rl-human-test.rs b/src/test/run-pass/rl-human-test.rs index 558e0b6820d..6a87a6502d2 100644 --- a/src/test/run-pass/rl-human-test.rs +++ b/src/test/run-pass/rl-human-test.rs @@ -22,6 +22,20 @@ use extra::rl; static HISTORY_FILE: &'static str = "rl-human-test-history.txt"; +struct TestCompleter; + +impl rl::CompletionCb for TestCompleter { + fn complete(&self, line: ~str, suggest: &fn(~str)) { + if line.is_empty() { + suggest(~"empty") + } else { + for c in line.rev_iter().take(3) { + suggest(format!("{0}{1}{1}{1}", line, c)) + } + } + } +} + fn main() { // don't run this in robot mode, but still typecheck it. if !cfg!(robot_mode) { @@ -42,14 +56,8 @@ The bool return values of each step are printed.", println!("restricting history length: {}", rl::set_history_max_len(3)); - do rl::complete |line, suggest| { - if line.is_empty() { - suggest(~"empty") - } else { - for c in line.rev_iter().take(3) { - suggest(format!("{0}{1}{1}{1}", line, c)) - } - } + unsafe { + rl::complete(@TestCompleter as @rl::CompletionCb); } println!("adding 'one': {}", rl::add_history("one")); |