Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4ec2581d94b8
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e4d538c63591
Choose a head ref
  • 5 commits
  • 11 files changed
  • 1 contributor

Commits on Oct 30, 2016

  1. Copy the full SHA
    00af07a View commit details
  2. Copy the full SHA
    d763e4b View commit details
  3. Copy the full SHA
    210bdcf View commit details
  4. [Truffle] Comment typos.

    chrisseaton committed Oct 30, 2016
    Copy the full SHA
    cdd286c View commit details
  5. Copy the full SHA
    e4d538c View commit details
4 changes: 1 addition & 3 deletions lib/ruby/truffle/cext/ruby/defines.h
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/*
* Intentionally blank for now to satisfy Makefile reference
*/
#include "../ruby.h"
4 changes: 1 addition & 3 deletions lib/ruby/truffle/cext/ruby/intern.h
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/*
* Intentionally blank for now to satisfy Makefile reference
*/
#include "../ruby.h"
4 changes: 1 addition & 3 deletions lib/ruby/truffle/cext/ruby/missing.h
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/*
* Intentionally blank for now to satisfy Makefile reference
*/
#include "../ruby.h"
4 changes: 1 addition & 3 deletions lib/ruby/truffle/cext/ruby/ruby.h
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/*
* Intentionally blank for now to satisfy Makefile reference
*/
#include "../ruby.h"
4 changes: 1 addition & 3 deletions lib/ruby/truffle/cext/ruby/st.h
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/*
* Intentionally blank for now to satisfy Makefile reference
*/
#include "../ruby.h"
4 changes: 1 addition & 3 deletions lib/ruby/truffle/cext/ruby/subst.h
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/*
* Intentionally blank for now to satisfy Makefile reference
*/
#include "../ruby.h"
34 changes: 34 additions & 0 deletions spec/truffle/specs/truffle/string/unpack_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
# code is released under a tri EPL/GPL/LGPL license. You can use it,
# redistribute it and/or modify it under the terms of the:
#
# Eclipse Public License version 1.0
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1
# OTHER DEALINGS IN THE SOFTWARE.

require_relative '../../../../ruby/spec_helper'

describe "String#unpack" do
it "should be able to unpack a tarball entry" do
header = "metadata.gz0000444000000000000000000000426712721375272013457 0ustar00wheelwheel00000000000000"
format = 'A100' + # name
'A8' + # mode
'A8' + # uid
'A8' + # gid
'A12' + # size
'A12' + # mtime
'A8' + # checksum
'A' + # typeflag
'A100' + # linkname
'A6' + # magic
'A2' + # version
'A32' + # uname
'A32' + # gname
'A8' + # devmajor
'A8' + # devminor
'A155' # prefix
fields = header.unpack(format)
fields.should == ["metadata.gz0000444000000000000000000000426712721375272013457 0ustar00wheelwheel00000000000000", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""]
end
end
116 changes: 0 additions & 116 deletions spec/truffle/tags/core/array/pack/j_tags.txt

This file was deleted.

144 changes: 0 additions & 144 deletions spec/truffle/tags/core/string/unpack/j_tags.txt

This file was deleted.

1 change: 1 addition & 0 deletions spec/truffle/tags/truffle/string/unpack_tags.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fails:String#unpack should be able to unpack a tarball entry
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ public static String recoverLoop(String format) {

int index = 0;

// Keep going until we reach the end of hte format string
// Keep going until we reach the end of the format string

while (index < format.length()) {
// If we aren't at the start of a new directive, step forward one
@@ -58,7 +58,7 @@ public static String recoverLoop(String format) {

int successfulLengthOfLoopedString = -1;

// Increase the size of the string that will be tried to belooped - but only as far as there is that much
// Increase the size of the string that will be tried to be looped - but only as far as there is that much
// string both before and after the index

while (tryLengthOfLoopedString <= index && index + tryLengthOfLoopedString <= format.length()) {
@@ -88,7 +88,7 @@ public static String recoverLoop(String format) {

int repetitionsCount = 2;

// Where in the string the 2 repititions end
// Where in the string the 2 repetitions end

int indexOfEndOfRepititions = index + successfulLengthOfLoopedString;