Permalink
Browse files

Revert "Setup .gitattributes for eol normalization"

This commit is overly eager on fixing the existing files' EOLs.
I also have reservations about enforcing EOL rules, and would like to
discuss it a little further.

This reverts commit b111911.
  • Loading branch information...
1 parent 37fe6d2 commit 1c39df758df31b4aacef614775f58130a44661b3 @BanzaiMan BanzaiMan committed Dec 7, 2012
Showing with 4,434 additions and 4,448 deletions.
  1. +0 −14 .gitattributes
  2. +21 −21 bench/shootout/nsieve.ruby-2.ruby
  3. +33 −33 bench/shootout/regexmatch.ruby
  4. +1 −1 bench/shootout/sumcol.ruby-2.ruby
  5. +26 −26 bench/yarv/bm_app_erb.rb
  6. +8 −8 bench/yarv/bm_app_uri.rb
  7. +13 −13 bench/yarv/bm_io_file_create.rb
  8. +15 −15 bench/yarv/bm_io_file_read.rb
  9. +14 −14 bench/yarv/bm_io_file_write.rb
  10. +57 −57 bench/yarv/bm_so_binary_trees.rb
  11. +45 −45 bench/yarv/bm_so_fannkuch.rb
  12. +81 −81 bench/yarv/bm_so_fasta.rb
  13. +48 −48 bench/yarv/bm_so_k_nucleotide.rb
  14. +57 −57 bench/yarv/bm_so_mandelbrot.rb
  15. +564 −564 bench/yarv/bm_so_meteor_contest.rb
  16. +148 −148 bench/yarv/bm_so_nbody.rb
  17. +35 −35 bench/yarv/bm_so_nsieve.rb
  18. +42 −42 bench/yarv/bm_so_nsieve_bits.rb
  19. +31 −31 bench/yarv/bm_so_partial_sums.rb
  20. +92 −92 bench/yarv/bm_so_pidigits.rb
  21. +30 −30 bench/yarv/bm_so_reverse_complement.rb
  22. +50 −50 bench/yarv/bm_so_spectralnorm.rb
  23. +6 −6 bench/yarv/bm_vm1_ivar_set.rb
  24. +6 −6 bench/yarv/bm_vm2_eval.rb
  25. +238 −238 bench/yarv/driver.rb
  26. +19 −19 bench/yarv/make_fasta_output.rb
  27. +15 −15 bench/yarv/prepare_so_count_words.rb
  28. +2 −2 bench/yarv/prepare_so_k_nucleotide.rb
  29. +2 −2 bench/yarv/prepare_so_reverse_complement.rb
  30. +6 −6 bin/gem.bat
  31. +6 −6 bin/irb.bat
  32. +6 −6 bin/jirb.bat
  33. +6 −6 bin/jirb_swing.bat
  34. +6 −6 bin/jruby.bat
  35. +9 −9 bin/jrubyd.bat
  36. +2 −2 bin/rake.bat
  37. +6 −6 bin/rdoc.bat
  38. +6 −6 bin/ri.bat
  39. +49 −49 docs/LICENSE.ant
  40. +9 −9 docs/README.coverage
  41. +762 −762 install/jruby.install4j
  42. +520 −520 lib/ruby/shared/ffi/platform/x86_64-windows/platform.conf
  43. +15 −15 spec/regression/JRUBY-6570_autoload_from_instance_method_spec.rb
  44. +20 −20 spec/regression/JRUBY-6748_new_thread_not_in_thread_list_spec.rb
  45. +82 −82 src/org/jruby/ast/ArgsPushNode.java
  46. +37 −37 src/org/jruby/ast/IArgumentNode.java
  47. +7 −7 src/org/jruby/javasupport/ParameterTypes.java
  48. +51 −51 src/org/jruby/runtime/builtin/Variable.java
  49. +44 −44 src/org/jruby/runtime/component/VariableEntry.java
  50. +64 −64 test/externals/ruby1.9/rexml/data/testsrc.xml
  51. +4 −4 test/externals/ruby1.9/rexml/data/ticket_61.xml
  52. +1 −1 test/org/jruby/javasupport/test/test_java_class_resource_methods.properties
  53. +214 −214 test/test_block_arg_processing.rb
  54. +668 −668 test/test_integer_overflows.rb
  55. +2 −2 test/test_line_endings-windows.txt
  56. +34 −34 test/test_string_sub.rb
  57. +40 −40 test/test_string_to_number.rb
  58. +50 −50 test/test_variables.rb
  59. +9 −9 test/test_vietnamese_charset.rb
View
@@ -1,14 +0,0 @@
-* text=auto
-
-# Windows specific files
-*.bat eol=crlf
-
-# *nix specific files
-*.sh eol=lf
-
-# Binary files
-*.svg -text
-
-# Specially treated files
-test/heredoc_CRLF_data.rb -text
-
@@ -1,25 +1,25 @@
# The Computer Language Shootout
# http://shootout.alioth.debian.org/
# contributed by Pavel Valodzka
-
-def nsieve(m)
- is_prime = Array.new(m, true)
- count = 0
- 2.upto(m){|i|
- if is_prime[i]
- (2 * i).step(m, i){|v|
- is_prime[v] = false
- }
- count += 1
- end
- }
- return count
-end
-
-n = (ARGV[0] || 2).to_i
-n = 2 if (n < 2)
-
-3.times {|t|
- m = (1<<n-t)*10000
- printf("Primes up to %8d%9d\n", m, nsieve(m))
+
+def nsieve(m)
+ is_prime = Array.new(m, true)
+ count = 0
+ 2.upto(m){|i|
+ if is_prime[i]
+ (2 * i).step(m, i){|v|
+ is_prime[v] = false
+ }
+ count += 1
+ end
+ }
+ return count
+end
+
+n = (ARGV[0] || 2).to_i
+n = 2 if (n < 2)
+
+3.times {|t|
+ m = (1<<n-t)*10000
+ printf("Primes up to %8d%9d\n", m, nsieve(m))
}
@@ -1,33 +1,33 @@
-#!/usr/bin/ruby
-# -*- mode: ruby -*-
-# $Id: regexmatch.ruby,v 1.2 2005-05-17 05:20:31 bfulgham Exp $
-# http://shootout.alioth.debian.org/
-# modified by: Jon-Carlos Rivera
-
-re = Regexp.new(
- '(?:^|[^\d\(])' + # must be preceeded by non-digit
- '(?:\((\d\d\d)\)|(\d\d\d))' + # match 1 or 2: area code is 3 digits
- '[ ]' + # area code followed by one space
- '(\d\d\d)' + # match 3: prefix of 3 digits
- '[ -]' + # separator is either space or dash
- '(\d\d\d\d)' + # match 4: last 4 digits
- '\D' # must be followed by a non-digit
-)
-
-num = Integer(ARGV[0] || 1)
-
-phones = STDIN.readlines
-
-phonenum, count = "", 0
-
-(1..num).each do |iter|
- phones.each do |line|
- if line =~ re
- phonenum = "(#{($1 || $2)}) #{$3}-#{$4}";
- if iter == num
- count += 1
- puts "#{count}: #{phonenum}"
- end
- end
- end
-end
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: regexmatch.ruby,v 1.2 2005-05-17 05:20:31 bfulgham Exp $
+# http://shootout.alioth.debian.org/
+# modified by: Jon-Carlos Rivera
+
+re = Regexp.new(
+ '(?:^|[^\d\(])' + # must be preceeded by non-digit
+ '(?:\((\d\d\d)\)|(\d\d\d))' + # match 1 or 2: area code is 3 digits
+ '[ ]' + # area code followed by one space
+ '(\d\d\d)' + # match 3: prefix of 3 digits
+ '[ -]' + # separator is either space or dash
+ '(\d\d\d\d)' + # match 4: last 4 digits
+ '\D' # must be followed by a non-digit
+)
+
+num = Integer(ARGV[0] || 1)
+
+phones = STDIN.readlines
+
+phonenum, count = "", 0
+
+(1..num).each do |iter|
+ phones.each do |line|
+ if line =~ re
+ phonenum = "(#{($1 || $2)}) #{$3}-#{$4}";
+ if iter == num
+ count += 1
+ puts "#{count}: #{phonenum}"
+ end
+ end
+ end
+end
@@ -1,5 +1,5 @@
# The Computer Language Benchmarks Game
# http://shootout.alioth.debian.org/
# contributed by Pavel Valodzka
-
+
puts STDIN.inject(0){|a,v| a + v.to_i }
@@ -1,26 +1,26 @@
-#
-# Create many HTML strings with ERB.
-#
-
-require 'erb'
-
-data = DATA.read
-max = 5_000
-title = "hello world!"
-content = "hello world!\n" * 10
-
-max.times{
- ERB.new(data).result(binding)
-}
-
-__END__
-
-<html>
- <head> <%= title %> </head>
- <body>
- <h1> <%= title %> </h1>
- <p>
- <%= content %>
- </p>
- </body>
-</html>
+#
+# Create many HTML strings with ERB.
+#
+
+require 'erb'
+
+data = DATA.read
+max = 5_000
+title = "hello world!"
+content = "hello world!\n" * 10
+
+max.times{
+ ERB.new(data).result(binding)
+}
+
+__END__
+
+<html>
+ <head> <%= title %> </head>
+ <body>
+ <h1> <%= title %> </h1>
+ <p>
+ <%= content %>
+ </p>
+ </body>
+</html>
@@ -1,8 +1,8 @@
-require 'uri'
-
-100_000.times{
- uri = URI.parse('http://www.ruby-lang.org')
- uri.scheme
- uri.host
- uri.port
-}
+require 'uri'
+
+100_000.times{
+ uri = URI.parse('http://www.ruby-lang.org')
+ uri.scheme
+ uri.host
+ uri.port
+}
@@ -1,13 +1,13 @@
-#
-# Create files
-#
-
-max = 50_000
-file = './tmpfile_of_bm_io_file_create'
-
-max.times{
- f = open(file, 'w')
- f.close#(true)
-}
-File.unlink(file)
-
+#
+# Create files
+#
+
+max = 50_000
+file = './tmpfile_of_bm_io_file_create'
+
+max.times{
+ f = open(file, 'w')
+ f.close#(true)
+}
+File.unlink(file)
+
@@ -1,15 +1,15 @@
-#
-# Seek and Read file.
-#
-
-require 'tempfile'
-
-max = 20_000
-str = "Hello world! " * 1000
-f = Tempfile.new('yarv-benchmark')
-f.write str
-
-max.times{
- f.seek 0
- f.read
-}
+#
+# Seek and Read file.
+#
+
+require 'tempfile'
+
+max = 20_000
+str = "Hello world! " * 1000
+f = Tempfile.new('yarv-benchmark')
+f.write str
+
+max.times{
+ f.seek 0
+ f.read
+}
@@ -1,14 +1,14 @@
-#
-# Seek and Write file.
-#
-
-require 'tempfile'
-
-max = 20_000
-str = "Hello world! " * 1000
-f = Tempfile.new('yarv-benchmark')
-
-max.times{
- f.seek 0
- f.write str
-}
+#
+# Seek and Write file.
+#
+
+require 'tempfile'
+
+max = 20_000
+str = "Hello world! " * 1000
+f = Tempfile.new('yarv-benchmark')
+
+max.times{
+ f.seek 0
+ f.write str
+}
Oops, something went wrong.

0 comments on commit 1c39df7

Please sign in to comment.