aboutsummaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
Diffstat (limited to 'ruby')
-rw-r--r--ruby/action.cc46
-rw-r--r--ruby/environment.cc22
-rw-r--r--ruby/repository.cc12
3 files changed, 40 insertions, 40 deletions
diff --git a/ruby/action.cc b/ruby/action.cc
index 8792d1419..65022a29e 100644
--- a/ruby/action.cc
+++ b/ruby/action.cc
@@ -255,14 +255,14 @@ namespace
parts += fp_unneeded;
ptr = new FetchActionOptions(make_named_values<FetchActionOptions>(
- value_for<n::errors>(make_shared_ptr(new Sequence<FetchActionFailure>)),
- value_for<n::exclude_unmirrorable>(v_exclude_unmirrorable),
- value_for<n::fetch_parts>(parts),
- value_for<n::ignore_not_in_manifest>(false),
- value_for<n::ignore_unfetched>(false),
- value_for<n::make_output_manager>(&make_standard_output_manager),
- value_for<n::safe_resume>(v_safe_resume),
- value_for<n::want_phase>(std::tr1::bind(return_literal_function(wp_yes)))
+ n::errors() = make_shared_ptr(new Sequence<FetchActionFailure>),
+ n::exclude_unmirrorable() = v_exclude_unmirrorable,
+ n::fetch_parts() = parts,
+ n::ignore_not_in_manifest() = false,
+ n::ignore_unfetched() = false,
+ n::make_output_manager() = &make_standard_output_manager,
+ n::safe_resume() = v_safe_resume,
+ n::want_phase() = std::tr1::bind(return_literal_function(wp_yes))
));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<FetchActionOptions>::free, ptr));
@@ -356,10 +356,10 @@ namespace
}
ptr = new FetchActionFailure(make_named_values<FetchActionFailure>(
- value_for<n::failed_automatic_fetching>(v_failed_automatic_fetching),
- value_for<n::failed_integrity_checks>(v_failed_integrity_checks),
- value_for<n::requires_manual_fetching>(v_requires_manual_fetching),
- value_for<n::target_file>(v_target_file)
+ n::failed_automatic_fetching() = v_failed_automatic_fetching,
+ n::failed_integrity_checks() = v_failed_integrity_checks,
+ n::requires_manual_fetching() = v_requires_manual_fetching,
+ n::target_file() = v_target_file
));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<FetchActionFailure>::free, ptr));
@@ -473,7 +473,7 @@ namespace
easy_action_new(VALUE self)
{
O_ options(make_named_values<O_>(
- value_for<n::make_output_manager>(&make_standard_output_manager)
+ n::make_output_manager() = &make_standard_output_manager
));
std::tr1::shared_ptr<Action> * a(new std::tr1::shared_ptr<Action>(new A_(options)));
@@ -528,11 +528,11 @@ namespace
}
ptr = new InstallActionOptions(make_named_values<InstallActionOptions>(
- value_for<n::destination>(v_destination),
- value_for<n::make_output_manager>(&make_standard_output_manager),
- value_for<n::perform_uninstall>(&cannot_perform_uninstall),
- value_for<n::replacing>(make_shared_ptr(new PackageIDSequence)),
- value_for<n::want_phase>(&want_all_phases)
+ n::destination() = v_destination,
+ n::make_output_manager() = &make_standard_output_manager,
+ n::perform_uninstall() = &cannot_perform_uninstall,
+ n::replacing() = make_shared_ptr(new PackageIDSequence),
+ n::want_phase() = &want_all_phases
));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<InstallActionOptions>::free, ptr));
@@ -620,11 +620,11 @@ namespace
}
ptr = new UninstallActionOptions(make_named_values<UninstallActionOptions>(
- value_for<n::config_protect>(v_config_protect),
- value_for<n::if_for_install_id>(make_null_shared_ptr()),
- value_for<n::ignore_for_unmerge>(&ignore_nothing),
- value_for<n::is_overwrite>(false),
- value_for<n::make_output_manager>(&make_standard_output_manager)
+ n::config_protect() = v_config_protect,
+ n::if_for_install_id() = make_null_shared_ptr(),
+ n::ignore_for_unmerge() = &ignore_nothing,
+ n::is_overwrite() = false,
+ n::make_output_manager() = &make_standard_output_manager
));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<UninstallActionOptions>::free, ptr));
diff --git a/ruby/environment.cc b/ruby/environment.cc
index 67de47656..bb18efaa0 100644
--- a/ruby/environment.cc
+++ b/ruby/environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
* Copyright (c) 2007, 2008 Richard Brown
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -385,16 +385,16 @@ namespace
std::tr1::shared_ptr<Environment> * e = new std::tr1::shared_ptr<Environment>(new
NoConfigEnvironment(make_named_values<no_config_environment::Params>(
- value_for<n::accept_unstable>(false),
- value_for<n::disable_metadata_cache>(false),
- value_for<n::extra_accept_keywords>(""),
- value_for<n::extra_params>(std::tr1::shared_ptr<Map<std::string, std::string> >()),
- value_for<n::extra_repository_dirs>(extra_repository_dirs),
- value_for<n::master_repository_name>(master_repository_name),
- value_for<n::profiles_if_not_auto>(""),
- value_for<n::repository_dir>(FSEntry(path)),
- value_for<n::repository_type>(no_config_environment::ncer_auto),
- value_for<n::write_cache>(write_cache)
+ n::accept_unstable() = false,
+ n::disable_metadata_cache() = false,
+ n::extra_accept_keywords() = "",
+ n::extra_params() = std::tr1::shared_ptr<Map<std::string, std::string> >(),
+ n::extra_repository_dirs() = extra_repository_dirs,
+ n::master_repository_name() = master_repository_name,
+ n::profiles_if_not_auto() = "",
+ n::repository_dir() = FSEntry(path),
+ n::repository_type() = no_config_environment::ncer_auto,
+ n::write_cache() = write_cache
)));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::tr1::shared_ptr<Environment> >::free, e));
rb_obj_call_init(tdata, argc, argv);
diff --git a/ruby/repository.cc b/ruby/repository.cc
index a910637f3..6f10a5c26 100644
--- a/ruby/repository.cc
+++ b/ruby/repository.cc
@@ -499,8 +499,8 @@ namespace
std::tr1::shared_ptr<Repository> * r = new std::tr1::shared_ptr<Repository>(new FakeRepository(
make_named_values<FakeRepositoryParams>(
- value_for<n::environment>(value_to_environment(argv[0]).get()),
- value_for<n::name>(RepositoryName(StringValuePtr(argv[1]))))));
+ n::environment() = value_to_environment(argv[0]).get(),
+ n::name() = RepositoryName(StringValuePtr(argv[1])))));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::tr1::shared_ptr<Repository> >::free, r));
rb_obj_call_init(tdata, argc, argv);
return tdata;
@@ -527,10 +527,10 @@ namespace
std::tr1::shared_ptr<Repository> * r = new std::tr1::shared_ptr<Repository>(new
FakeInstalledRepository(make_named_values<FakeInstalledRepositoryParams>(
- value_for<n::environment>(value_to_environment(argv[0]).get()),
- value_for<n::name>(RepositoryName(StringValuePtr(argv[1]))),
- value_for<n::suitable_destination>(true),
- value_for<n::supports_uninstall>(true)
+ n::environment() = value_to_environment(argv[0]).get(),
+ n::name() = RepositoryName(StringValuePtr(argv[1])),
+ n::suitable_destination() = true,
+ n::supports_uninstall() = true
)));
VALUE tdata(Data_Wrap_Struct(self, 0, &Common<std::tr1::shared_ptr<Repository> >::free, r));
rb_obj_call_init(tdata, argc, argv);