development_tools: use begin/end
A more widely used style than relying on `if`/`else` returns.
This commit is contained in:
		
							parent
							
								
									c1688be780
								
							
						
					
					
						commit
						a3f03e2066
					
				@ -42,42 +42,43 @@ class DevelopmentTools
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def gcc_40_build_version
 | 
			
		||||
      @gcc_40_build_version ||=
 | 
			
		||||
      @gcc_40_build_version ||= begin
 | 
			
		||||
        if (path = locate("gcc-4.0")) &&
 | 
			
		||||
           build_version = `#{path} --version 2>/dev/null`[/build (\d{4,})/, 1]
 | 
			
		||||
          Version.new build_version
 | 
			
		||||
        else
 | 
			
		||||
          Version::NULL
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
    alias gcc_4_0_build_version gcc_40_build_version
 | 
			
		||||
 | 
			
		||||
    def gcc_42_build_version
 | 
			
		||||
      @gcc_42_build_version ||=
 | 
			
		||||
        begin
 | 
			
		||||
          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")&&
 | 
			
		||||
             build_version = `#{gcc} --version 2>/dev/null`[/build (\d{4,})/, 1]
 | 
			
		||||
            Version.new build_version
 | 
			
		||||
          else
 | 
			
		||||
            Version::NULL
 | 
			
		||||
          end
 | 
			
		||||
      @gcc_42_build_version ||= begin
 | 
			
		||||
        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")&&
 | 
			
		||||
           build_version = `#{gcc} --version 2>/dev/null`[/build (\d{4,})/, 1]
 | 
			
		||||
          Version.new build_version
 | 
			
		||||
        else
 | 
			
		||||
          Version::NULL
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
    alias gcc_build_version gcc_42_build_version
 | 
			
		||||
 | 
			
		||||
    def clang_version
 | 
			
		||||
      @clang_version ||=
 | 
			
		||||
      @clang_version ||= begin
 | 
			
		||||
        if (path = locate("clang")) &&
 | 
			
		||||
           build_version = `#{path} --version`[/(?:clang|LLVM) version (\d\.\d)/, 1]
 | 
			
		||||
          Version.new build_version
 | 
			
		||||
        else
 | 
			
		||||
          Version::NULL
 | 
			
		||||
        end
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def clang_build_version
 | 
			
		||||
      @clang_build_version ||=
 | 
			
		||||
      @clang_build_version ||= begin
 | 
			
		||||
        if (path = locate("clang")) &&
 | 
			
		||||
           build_version = `#{path} --version`[/clang-(\d{2,})/, 1]
 | 
			
		||||
          Version.new build_version
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user