Advertisement
Guest User

Untitled

a guest
Feb 20th, 2017
75
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.58 KB | None | 0 0
  1. Index: lib/irb/slex.rb
  2. ===================================================================
  3. --- lib/irb/slex.rb (revision 57284)
  4. +++ lib/irb/slex.rb (revision 57293)
  5. @@ -53,7 +53,7 @@
  6. node.preproc=proc
  7. end
  8.  
  9. - #$BMW%A%'%C%/(B?
  10. + # need a check?
  11. def postproc(token)
  12. node = search(token, proc)
  13. node.postproc=proc
  14. Index: lib/getoptlong.rb
  15. ===================================================================
  16. --- lib/getoptlong.rb (revision 57284)
  17. +++ lib/getoptlong.rb (revision 57293)
  18. @@ -1,4 +1,4 @@
  19. -# frozen_string_literal: false
  20. +# frozen_string_literal: true
  21. #
  22. # GetoptLong for Ruby
  23. #
  24. Index: version.h
  25. ===================================================================
  26. --- version.h (revision 57284)
  27. +++ version.h (revision 57293)
  28. @@ -4,7 +4,7 @@
  29.  
  30. #define RUBY_RELEASE_YEAR 2017
  31. #define RUBY_RELEASE_MONTH 1
  32. -#define RUBY_RELEASE_DAY 8
  33. +#define RUBY_RELEASE_DAY 9
  34.  
  35. #include "ruby/version.h"
  36.  
  37. Index: benchmark/driver.rb
  38. ===================================================================
  39. --- benchmark/driver.rb (revision 57284)
  40. +++ benchmark/driver.rb (revision 57293)
  41. @@ -41,10 +41,16 @@
  42. else
  43. h = eval(input.read)
  44. end
  45. + results = h[:results] || h["results"]
  46. obj = allocate
  47. obj.instance_variable_set("@execs", h[:executables] || h["executables"])
  48. - obj.instance_variable_set("@results", h[:results] || h["results"])
  49. + obj.instance_variable_set("@results", results)
  50. obj.instance_variable_set("@opt", opt)
  51. + [1, 2].each do |i|
  52. + loop = results.assoc((n = "loop_whileloop#{i}").intern) || results.assoc(n)
  53. + obj.instance_variable_set("@loop_wl#{i}", loop ? loop[1].map {|t,*|t} : nil)
  54. + end
  55. + obj.instance_variable_set("@measure_target", opt[:measure_target] || opt["measure_target"])
  56. obj
  57. end
  58.  
  59. @@ -153,7 +159,9 @@
  60. numformat = " %1$*2$.3f"
  61. end
  62.  
  63. - name_width ||= @results.map {|v,*| v.size}.max
  64. + name_width ||= @results.map {|v, result|
  65. + v.size + (case v; when /^vm1_/; @loop_wl1; when /^vm2_/; @loop_wl2; end ? 1 : 0)
  66. + }.max
  67. minwidth ||= 7
  68. width = @execs.map{|(_, v)| [v.size, minwidth].max}
  69.  
  70. @@ -413,7 +421,6 @@
  71. }
  72.  
  73. parser.parse!(ARGV)
  74. - opt[:output] ||= "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}#{formats[opt[:format]]}"
  75.  
  76. if input = opt[:rawdata_input]
  77. b = open(input) {|f|
  78. @@ -421,6 +428,7 @@
  79. }
  80. b.show_results
  81. else
  82. + opt[:output] ||= "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}#{formats[opt[:format]]}"
  83. BenchmarkDriver.benchmark(opt)
  84. end
  85. end
  86. Index: vm_insnhelper.c
  87. ===================================================================
  88. --- vm_insnhelper.c (revision 57284)
  89. +++ vm_insnhelper.c (revision 57293)
  90. @@ -1538,8 +1538,6 @@
  91. vm_pop_frame(th, cfp, cfp->ep);
  92. cfp = th->cfp;
  93.  
  94. - RUBY_VM_CHECK_INTS(th);
  95. -
  96. sp_orig = sp = cfp->sp;
  97.  
  98. /* push self */
  99. @@ -1558,6 +1556,8 @@
  100. iseq->body->stack_max);
  101.  
  102. cfp->sp = sp_orig;
  103. + RUBY_VM_CHECK_INTS(th);
  104. +
  105. return Qundef;
  106. }
  107.  
  108. Index: test/io/console/test_io_console.rb
  109. ===================================================================
  110. --- test/io/console/test_io_console.rb (revision 57284)
  111. +++ test/io/console/test_io_console.rb (revision 57293)
  112. @@ -239,9 +239,9 @@
  113. else
  114. assert_equal([80, 25], s.winsize = [80, 25])
  115. assert_equal([80, 25], s.winsize)
  116. - assert_equal([80, 25], m.winsize)
  117. + #assert_equal([80, 25], m.winsize)
  118. assert_equal([100, 40], m.winsize = [100, 40])
  119. - assert_equal([100, 40], s.winsize)
  120. + #assert_equal([100, 40], s.winsize)
  121. assert_equal([100, 40], m.winsize)
  122. end
  123. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement