admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

development_tools: use begin/end

Browse Source 
A more widely used style than relying on `if`/`else` returns.
This commit is contained in:
Mike McQuaid 2016-11-21 08:49:04 +00:00
parent c1688be780
commit a3f03e2066
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/development_tools.rb
View File

@ -42,7 +42,7 @@ class DevelopmentTools
end end
def gcc_40_build_version def gcc_40_build_version
@gcc_40_build_version ||= @gcc_40_build_version ||= begin
if (path = locate("gcc-4.0")) && if (path = locate("gcc-4.0")) &&
build_version = `#{path} --version 2>/dev/null`[/build (\d{4,})/, 1] build_version = `#{path} --version 2>/dev/null`[/build (\d{4,})/, 1]
Version.new build_version Version.new build_version
@ -50,11 +50,11 @@ class DevelopmentTools
Version::NULL Version::NULL
end end
end end
end
alias gcc_4_0_build_version gcc_40_build_version alias gcc_4_0_build_version gcc_40_build_version
def gcc_42_build_version def gcc_42_build_version
@gcc_42_build_version ||= @gcc_42_build_version ||= begin
begin
gcc = locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2") gcc = locate("gcc-4.2") || HOMEBREW_PREFIX.join("opt/apple-gcc42/bin/gcc-4.2")
if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm")&& if gcc.exist? && !gcc.realpath.basename.to_s.start_with?("llvm")&&
build_version = `#{gcc} --version 2>/dev/null`[/build (\d{4,})/, 1] build_version = `#{gcc} --version 2>/dev/null`[/build (\d{4,})/, 1]
@ -67,7 +67,7 @@ class DevelopmentTools
alias gcc_build_version gcc_42_build_version alias gcc_build_version gcc_42_build_version
def clang_version def clang_version
@clang_version ||= @clang_version ||= begin
if (path = locate("clang")) && if (path = locate("clang")) &&
build_version = `#{path} --version`[/(?:clang|LLVM) version (\d\.\d)/, 1] build_version = `#{path} --version`[/(?:clang|LLVM) version (\d\.\d)/, 1]
Version.new build_version Version.new build_version
@ -75,9 +75,10 @@ class DevelopmentTools
Version::NULL Version::NULL
end end
end end
end
def clang_build_version def clang_build_version
@clang_build_version ||= @clang_build_version ||= begin
if (path = locate("clang")) && if (path = locate("clang")) &&
build_version = `#{path} --version`[/clang-(\d{2,})/, 1] build_version = `#{path} --version`[/clang-(\d{2,})/, 1]
Version.new build_version Version.new build_version