-
-
Notifications
You must be signed in to change notification settings - Fork 925
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into truffle-head
- 9.4.12.0
- 9.4.11.0
- 9.4.10.0
- 9.4.9.0
- 9.4.8.0
- 9.4.7.0
- 9.4.6.0
- 9.4.5.0
- 9.4.4.0
- 9.4.3.0
- 9.4.2.0
- 9.4.1.0
- 9.4.0.0
- 9.3.15.0
- 9.3.14.0
- 9.3.13.0
- 9.3.12.0
- 9.3.11.0
- 9.3.10.0
- 9.3.9.0
- 9.3.8.0
- 9.3.7.0
- 9.3.6.0
- 9.3.5.0
- 9.3.4.0
- 9.3.3.0
- 9.3.2.0
- 9.3.1.0
- 9.3.0.0
- 9.2.21.0
- 9.2.20.1
- 9.2.20.0
- 9.2.19.0
- 9.2.18.0
- 9.2.17.0
- 9.2.16.0
- 9.2.15.0
- 9.2.14.0
- 9.2.13.0
- 9.2.12.0
- 9.2.11.1
- 9.2.11.0
- 9.2.10.0
- 9.2.9.0
- 9.2.8.0
- 9.2.7.0
- 9.2.6.0
- 9.2.5.0
- 9.2.4.1
- 9.2.4.0
- 9.2.3.0
- 9.2.2.0
- 9.2.1.0
- 9.2.0.0
- 9.1.17.0
- 9.1.16.0
- 9.1.15.0
- 9.1.14.0
- 9.1.13.0
- 9.1.12.0
- 9.1.11.0
- 9.1.10.0
- 9.1.9.0
- 9.1.8.0
- 9.1.7.0
- 9.1.6.0
- 9.1.5.0
- 9.1.4.0
- 9.1.3.0
Showing
21 changed files
with
383 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
# Windows symlink support borrowed from djberg96/win32-file and ffi-win32-extensions | ||
|
||
if org.jruby.platform.Platform::IS_WINDOWS | ||
|
||
module JRuby | ||
module Windows | ||
module File | ||
module Constants | ||
FILE_ATTRIBUTE_REPARSE_POINT = 0x00000400 | ||
INVALID_HANDLE_VALUE = (1 << FFI::Platform::ADDRESS_SIZE) - 1 | ||
INVALID_FILE_ATTRIBUTES = (1 << FFI::Platform::ADDRESS_SIZE) - 1 | ||
IO_REPARSE_TAG_SYMLINK = 0xA000000C | ||
end | ||
|
||
module Functions | ||
extend FFI::Library | ||
ffi_lib :kernel32 | ||
|
||
typedef :ulong, :dword | ||
typedef :uintptr_t, :handle | ||
typedef :pointer, :ptr | ||
|
||
def self.attach_pfunc(*args) | ||
attach_function(*args) | ||
private args[0] | ||
end | ||
|
||
attach_pfunc :CloseHandle, [:handle], :bool | ||
attach_pfunc :FindFirstFileW, [:buffer_in, :pointer], :handle | ||
attach_pfunc :CreateSymbolicLinkW, [:buffer_in, :buffer_in, :dword], :bool | ||
attach_pfunc :GetFileAttributesW, [:buffer_in], :dword | ||
|
||
attach_pfunc :CreateFileW, [:buffer_in, :dword, :dword, :pointer, :dword, :dword, :handle], :handle | ||
attach_pfunc :GetDiskFreeSpaceW, [:buffer_in, :pointer, :pointer, :pointer, :pointer], :bool | ||
attach_pfunc :GetDriveTypeW, [:buffer_in], :uint | ||
attach_pfunc :GetFileType, [:handle], :dword | ||
attach_pfunc :GetFinalPathNameByHandleW, [:handle, :buffer_out, :dword, :dword], :dword | ||
attach_pfunc :GetShortPathNameW, [:buffer_in, :buffer_out, :dword], :dword | ||
attach_pfunc :GetLongPathNameW, [:buffer_in, :buffer_out, :dword], :dword | ||
attach_pfunc :QueryDosDeviceA, [:string, :buffer_out, :dword], :dword | ||
attach_pfunc :SetFileTime, [:handle, :ptr, :ptr, :ptr], :bool | ||
attach_pfunc :SystemTimeToFileTime, [:ptr, :ptr], :bool | ||
|
||
ffi_lib :shlwapi | ||
|
||
attach_pfunc :PathFindExtensionW, [:buffer_in], :pointer | ||
attach_pfunc :PathIsRootW, [:buffer_in], :bool | ||
attach_pfunc :PathStripPathW, [:pointer], :void | ||
attach_pfunc :PathRemoveBackslashW, [:buffer_in], :string | ||
attach_pfunc :PathRemoveFileSpecW, [:pointer], :bool | ||
attach_pfunc :PathRemoveExtensionW, [:buffer_in], :void | ||
attach_pfunc :PathStripToRootW, [:buffer_in], :bool | ||
end | ||
|
||
module Structs | ||
class FILETIME < FFI::Struct | ||
layout(:dwLowDateTime, :ulong, :dwHighDateTime, :ulong) | ||
end | ||
|
||
class WIN32_FIND_DATA < FFI::Struct | ||
layout( | ||
:dwFileAttributes, :ulong, | ||
:ftCreationTime, FILETIME, | ||
:ftLastAccessTime, FILETIME, | ||
:ftLastWriteTime, FILETIME, | ||
:nFileSizeHigh, :ulong, | ||
:nFileSizeLow, :ulong, | ||
:dwReserved0, :ulong, | ||
:dwReserved1, :ulong, | ||
:cFileName, [:uint8, 260*2], | ||
:cAlternateFileName, [:uint8, 14*2] | ||
) | ||
end | ||
end | ||
end | ||
end | ||
end | ||
|
||
class File | ||
include Windows::File::Constants | ||
include Windows::File::Structs | ||
extend Windows::File::Functions | ||
|
||
# Creates a symbolic link called +new_name+ for the file or directory | ||
# +old_name+. | ||
# | ||
# This method requires Windows Vista or later to work. Otherwise, it | ||
# returns nil as per MRI. | ||
# | ||
def self.symlink(target, link) | ||
target = string_check(target) | ||
link = string_check(link) | ||
|
||
flags = File.directory?(target) ? 1 : 0 | ||
|
||
wlink = link.wincode | ||
wtarget = target.wincode | ||
|
||
unless CreateSymbolicLinkW(wlink, wtarget, flags) | ||
raise SystemCallError.new('CreateSymbolicLink', FFI.errno) | ||
end | ||
|
||
0 # Comply with spec | ||
end | ||
|
||
# Returns whether or not +file+ is a symlink. | ||
# | ||
def self.symlink?(file) | ||
return false unless File.exist?(file) | ||
|
||
bool = false | ||
wfile = string_check(file).wincode | ||
|
||
attrib = GetFileAttributesW(wfile) | ||
|
||
if attrib == INVALID_FILE_ATTRIBUTES | ||
raise SystemCallError.new('GetFileAttributes', FFI.errno) | ||
end | ||
|
||
if attrib & FILE_ATTRIBUTE_REPARSE_POINT > 0 | ||
begin | ||
find_data = WIN32_FIND_DATA.new | ||
handle = FindFirstFileW(wfile, find_data) | ||
|
||
if handle == INVALID_HANDLE_VALUE | ||
raise SystemCallError.new('FindFirstFile', FFI.errno) | ||
end | ||
|
||
if find_data[:dwReserved0] == IO_REPARSE_TAG_SYMLINK | ||
bool = true | ||
end | ||
ensure | ||
CloseHandle(handle) | ||
end | ||
end | ||
|
||
bool | ||
end | ||
|
||
private | ||
|
||
# Simulate Ruby's string checking | ||
def self.string_check(arg) | ||
return arg if arg.is_a?(String) | ||
return arg.send(:to_str) if arg.respond_to?(:to_str, true) # MRI allows private to_str | ||
return arg.to_path if arg.respond_to?(:to_path) | ||
raise TypeError | ||
end | ||
end | ||
|
||
class String | ||
# Convenience method for converting strings to UTF-16LE for wide character | ||
# functions that require it. | ||
# | ||
def wincode | ||
(self.tr(File::SEPARATOR, File::ALT_SEPARATOR) + 0.chr).encode('UTF-16LE') | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
truffle/src/main/java/org/jruby/truffle/core/array/ArrayToObjectArrayNode.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
* 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 | ||
*/ | ||
package org.jruby.truffle.core.array; | ||
|
||
import com.oracle.truffle.api.dsl.Cached; | ||
import com.oracle.truffle.api.dsl.ImportStatic; | ||
import com.oracle.truffle.api.dsl.NodeChild; | ||
import com.oracle.truffle.api.dsl.Specialization; | ||
import com.oracle.truffle.api.object.DynamicObject; | ||
import org.jruby.truffle.Layouts; | ||
import org.jruby.truffle.language.RubyGuards; | ||
import org.jruby.truffle.language.RubyNode; | ||
|
||
@NodeChild(value = "array", type = RubyNode.class) | ||
@ImportStatic(ArrayGuards.class) | ||
public abstract class ArrayToObjectArrayNode extends RubyNode { | ||
|
||
public Object[] unsplat(Object[] arguments) { | ||
assert arguments.length == 1; | ||
assert RubyGuards.isRubyArray(arguments[0]); | ||
return executeToObjectArray((DynamicObject) arguments[0]); | ||
} | ||
|
||
public abstract Object[] executeToObjectArray(DynamicObject array); | ||
|
||
@Specialization(guards = "isNullArray(array)") | ||
public Object[] toObjectArrayNull(DynamicObject array) { | ||
return new Object[0]; | ||
} | ||
|
||
@Specialization(guards = "strategy.matches(array)", limit = "ARRAY_STRATEGIES") | ||
public Object[] toObjectArrayOther(DynamicObject array, | ||
@Cached("of(array)") ArrayStrategy strategy) { | ||
final int size = Layouts.ARRAY.getSize(array); | ||
return strategy.newMirror(array).getBoxedCopy(size); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters