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: 1ad761b9035d
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 32b8c22a6ac6
Choose a head ref
  • 4 commits
  • 43 files changed
  • 2 contributors

Commits on Apr 10, 2017

  1. Copy the full SHA
    1bbd1a4 View commit details
  2. Copy the full SHA
    5b3edca View commit details
  3. More typos

    olleolleolle committed Apr 10, 2017
    Copy the full SHA
    ffd0c41 View commit details

Commits on Apr 12, 2017

  1. Merge pull request #4559 from olleolleolle/fix/misspellings

    Copy-editing: misspellings
    headius authored Apr 12, 2017
    Copy the full SHA
    32b8c22 View commit details
Showing with 53 additions and 52 deletions.
  1. +1 −1 core/src/main/java/org/jruby/FlagRegistry.java
  2. +1 −1 core/src/main/java/org/jruby/Ruby.java
  3. +1 −1 core/src/main/java/org/jruby/RubyBasicObject.java
  4. +1 −1 core/src/main/java/org/jruby/RubyFileTest.java
  5. +1 −1 core/src/main/java/org/jruby/RubyGlobal.java
  6. +1 −1 core/src/main/java/org/jruby/RubyObject.java
  7. +1 −1 core/src/main/java/org/jruby/ast/ConstDeclNode.java
  8. +1 −1 core/src/main/java/org/jruby/ast/DRegexpNode.java
  9. +1 −1 core/src/main/java/org/jruby/ast/NilImplicitNode.java
  10. +1 −1 core/src/main/java/org/jruby/ast/java_signature/ParameterNode.java
  11. +2 −2 core/src/main/java/org/jruby/embed/variable/GlobalVariable.java
  12. +2 −2 core/src/main/java/org/jruby/ext/bigdecimal/RubyBigDecimal.java
  13. +1 −1 core/src/main/java/org/jruby/ext/fiber/FiberQueue.java
  14. +1 −1 core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
  15. +1 −1 core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
  16. +2 −2 core/src/main/java/org/jruby/ext/socket/SocketUtilsIPV6.java
  17. +1 −1 core/src/main/java/org/jruby/ir/IRBuilder.java
  18. +1 −1 core/src/main/java/org/jruby/ir/IRScope.java
  19. +1 −1 core/src/main/java/org/jruby/ir/instructions/ModuleVersionGuardInstr.java
  20. +1 −1 core/src/main/java/org/jruby/ir/instructions/SearchConstInstr.java
  21. +2 −2 core/src/main/java/org/jruby/ir/interpreter/FullInterpreterContext.java
  22. +1 −1 core/src/main/java/org/jruby/ir/operands/ImmutableLiteral.java
  23. +1 −1 core/src/main/java/org/jruby/ir/operands/Operand.java
  24. +1 −1 core/src/main/java/org/jruby/ir/persistence/IRReader.java
  25. +1 −1 core/src/main/java/org/jruby/ir/targets/DRegexpObjectSite.java
  26. +2 −2 core/src/main/java/org/jruby/ir/transformations/inlining/CloneInfo.java
  27. +1 −1 core/src/main/java/org/jruby/lexer/JavaSignatureLexer.java
  28. +1 −1 core/src/main/java/org/jruby/lexer/StrftimeLexer.java
  29. +2 −2 core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
  30. +1 −1 core/src/main/java/org/jruby/parser/JavaSignatureParser.java
  31. +1 −1 core/src/main/java/org/jruby/parser/JavaSignatureParser.y
  32. +1 −1 core/src/main/java/org/jruby/parser/ParserSupport.java
  33. +1 −1 core/src/main/java/org/jruby/parser/StaticScope.java
  34. +1 −1 core/src/main/java/org/jruby/runtime/Binding.java
  35. +1 −1 core/src/main/java/org/jruby/runtime/Helpers.java
  36. +1 −1 core/src/main/java/org/jruby/runtime/IRBlockBody.java
  37. +2 −2 core/src/main/java/org/jruby/runtime/load/LoadService.java
  38. +1 −1 core/src/main/java/org/jruby/runtime/marshal/DataType.java
  39. +2 −2 core/src/main/java/org/jruby/util/Pack.java
  40. +1 −1 core/src/main/java/org/jruby/util/SipHashInline.java
  41. +1 −1 core/src/main/java/org/jruby/util/cli/OutputStrings.java
  42. +2 −2 core/src/main/java/org/jruby/util/collections/NonBlockingHashMapLong.java
  43. +2 −1 core/src/main/java/org/jruby/util/io/ChannelDescriptor.java
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/FlagRegistry.java
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ public class FlagRegistry {
*
* The bit index for the new flag will be calculated at runtime, by walking parent classes
* and looking for previously-registered flags. Ancestors should register all their flags
* before decendants (which means they should not be registered in a static initializer
* before descendants (which means they should not be registered in a static initializer
* unless the parent is known to have fully run its own static initializers).
*
* @param klass the class for which to register a new flag
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/Ruby.java
Original file line number Diff line number Diff line change
@@ -646,7 +646,7 @@ public IRubyObject runWithGetsLoop(Node scriptNode, boolean printing, boolean pr
public IRubyObject runWithGetsLoop(RootNode scriptNode, boolean printing, boolean processLineEnds, boolean split) {
ThreadContext context = getCurrentContext();

// We do not want special scope types in IR so we ammend the AST tree to contain the elements representing
// We do not want special scope types in IR so we amend the AST tree to contain the elements representing
// a while gets; ...your code...; end
scriptNode = addGetsLoop(scriptNode, printing, processLineEnds, split);

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyBasicObject.java
Original file line number Diff line number Diff line change
@@ -943,7 +943,7 @@ public void copySpecialInstanceVariables(IRubyObject clone) {
*
* The internal helper that ensures a RubyString instance is returned
* so dangerous casting can be omitted
* Prefered over callMethod(context, "inspect")
* Preferred over callMethod(context, "inspect")
*/
static RubyString inspect(ThreadContext context, IRubyObject object) {
return RubyString.objAsString(context, invokedynamic(context, object, INSPECT));
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyFileTest.java
Original file line number Diff line number Diff line change
@@ -204,7 +204,7 @@ public static IRubyObject readable_p(ThreadContext context, IRubyObject recv, IR
return runtime.newBoolean(fileResource(filename).canRead());
}

// Not exposed by filetest, but so similiar in nature that it is stored here
// Not exposed by filetest, but so similar in nature that it is stored here
public static IRubyObject rowned_p(IRubyObject recv, IRubyObject filename) {
FileStat stat = fileResource(filename).stat();

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyGlobal.java
Original file line number Diff line number Diff line change
@@ -214,7 +214,7 @@ public static void createGlobals(ThreadContext context, Ruby runtime) {
runtime.defineVariable(new LastMatchGlobalVariable(runtime, "$+"), FRAME);
runtime.defineVariable(new BackRefGlobalVariable(runtime, "$~"), FRAME);

// On platforms without a c-library accessable through JNA, getpid will return hashCode
// On platforms without a c-library accessible through JNA, getpid will return hashCode
// as $$ used to. Using $$ to kill processes could take down many runtimes, but by basing
// $$ on getpid() where available, we have the same semantics as MRI.
globals.defineReadonly("$$", new PidAccessor(runtime), GLOBAL);
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/RubyObject.java
Original file line number Diff line number Diff line change
@@ -524,7 +524,7 @@ public int hashCode() {
*
* The internal helper that ensures a RubyString instance is returned
* so dangerous casting can be omitted
* Prefered over callMethod(context, "inspect")
* Preferred over callMethod(context, "inspect")
*/
public static RubyString inspect(ThreadContext context, IRubyObject object) {
return (RubyString)rbInspect(context, object);
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ast/ConstDeclNode.java
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ public class ConstDeclNode extends AssignableNode implements INameNode {
private final String name;
private final INameNode constNode;

// TODO: Split this into two sub-classes so that name and constNode can be specified seperately.
// TODO: Split this into two sub-classes so that name and constNode can be specified separately.
public ConstDeclNode(ISourcePosition position, String name, INameNode constNode, Node valueNode) {
super(position, valueNode, valueNode != null && valueNode.containsVariableAssignment());

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ast/DRegexpNode.java
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@
import org.jruby.util.RegexpOptions;

/**
* A regexp which contains some expressions which will need to be evaluated everytime the regexp
* A regexp which contains some expressions which will need to be evaluated every time the regexp
* is used for a match.
*/
public class DRegexpNode extends DNode implements ILiteralNode {
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ast/NilImplicitNode.java
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

/**
* A node which behaves like a nil node, but is not actually present in the AST as a syntactical
* element (e.g. IDE's should ignore occurences of this node. We have this as seperate subclass
* element (e.g. IDE's should ignore occurrences of this node. We have this as separate subclass
* so that IDE consumers can more easily ignore these.
*/
public class NilImplicitNode extends NilNode implements InvisibleNode {
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast.java_signature;

// Fixme: varargs and variableNames with [] on them should ammend type on construction to save
// Fixme: varargs and variableNames with [] on them should amend type on construction to save
// consumer the effort.
public class ParameterNode {
private final TypeNode type;
Original file line number Diff line number Diff line change
@@ -94,7 +94,7 @@ public static void retrieve(IRubyObject receiver, BiVariableMap vars) {
for ( final String name : globalVars.getNames() ) {
if ( isPredefined(name) ) continue;
IRubyObject value = globalVars.get(name);
// reciever of gvar should to topSelf always
// receiver of gvar should to topSelf always
updateGlobalVar(vars, getTopSelf(receiver), name, value);
}
}
@@ -239,4 +239,4 @@ public boolean isReceiverIdentical(RubyObject recv) {
return true;
}

}
}
Original file line number Diff line number Diff line change
@@ -1185,7 +1185,7 @@ public IRubyObject ceil(ThreadContext context, IRubyObject arg) {

int n = RubyNumeric.fix2int(arg);

if (value.scale() <= n) return this; // no rounding neccessary
if (value.scale() <= n) return this; // no rounding necessary

return new RubyBigDecimal(getRuntime(), value.setScale(n, RoundingMode.CEILING));
}
@@ -1203,7 +1203,7 @@ public IRubyObject ceil(ThreadContext context) {
return RubyBignum.newBignum(context.runtime, ceil);
}

// FIXME: Do we really need this Java inheritence for coerce?
// FIXME: Do we really need this Java inheritance for coerce?
@Override
public IRubyObject coerce(IRubyObject other) {
return coerce(getRuntime().getCurrentContext(), other);
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/fiber/FiberQueue.java
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
import java.util.concurrent.BlockingQueue;

/**
* A RubyThread-aware BlockingQueue wrapper used by Fiber for transfering values.
* A RubyThread-aware BlockingQueue wrapper used by Fiber for transferring values.
*/
public class FiberQueue {
protected BlockingQueue<IRubyObject> queue;
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/fiber/ThreadFiber.java
Original file line number Diff line number Diff line change
@@ -215,7 +215,7 @@ public static IRubyObject yield(ThreadContext context, IRubyObject recv, IRubyOb

if (currentFiberData.parent == null) throw runtime.newFiberError("can't yield from root fiber");

if (currentFiberData.prev == null) throw runtime.newFiberError("BUG: yield occured with null previous fiber. Report this at http://bugs.jruby.org");
if (currentFiberData.prev == null) throw runtime.newFiberError("BUG: yield occurred with null previous fiber. Report this at http://bugs.jruby.org");

if (currentFiberData.queue.isShutdown()) throw runtime.newFiberError("dead fiber yielded");

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ext/ripper/RipperLexer.java
Original file line number Diff line number Diff line change
@@ -2133,7 +2133,7 @@ private int tilde() throws IOException {
* Parse a number from the input stream.
*
*@param c The first character of the number.
*@return A int constant wich represents a token.
*@return A int constant which represents a token.
*/
private int parseNumber(int c) throws IOException {
setState(EXPR_END);
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/ext/socket/SocketUtilsIPV6.java
Original file line number Diff line number Diff line change
@@ -217,15 +217,15 @@ public IPv6Address add(int value) {
* Subtraction. Will never underflow, but wraps around when the lowest
* ip address has been reached.
*
* @param value value to substract
* @param value value to subtract
* @return new IPv6 address
*/
public IPv6Address subtract(int value) {
final long newLowBits = lowBits - value;

if (value >= 0) {
if (isLessThanUnsigned(lowBits, newLowBits)) {
// oops, we subtracted something postive and the result is bigger -> overflow detected (carry over one bit from high to low)
// oops, we subtracted something positive and the result is bigger -> overflow detected (carry over one bit from high to low)
return new IPv6Address(highBits - 1, newLowBits);
} else {
// no overflow
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ir/IRBuilder.java
Original file line number Diff line number Diff line change
@@ -3230,7 +3230,7 @@ public Operand buildOpAsgn(OpAsgnNode opAsgnNode) {

// set attr
addInstr(CallInstr.create(scope, callType, writerValue, opAsgnNode.getVariableNameAsgn(), v1, new Operand[] {setValue}, null));
// Returning writerValue is incorrect becuase the assignment method
// Returning writerValue is incorrect because the assignment method
// might return something else other than the value being set!
if (!opAsgnNode.isLazy()) return setValue;

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ir/IRScope.java
Original file line number Diff line number Diff line change
@@ -582,7 +582,7 @@ public synchronized FullInterpreterContext prepareFullBuild() {
// Always add call protocol instructions now since we are removing support for implicit stuff in interp.
if (!isUnsafeScope()) new AddCallProtocolInstructions().run(this);

fullInterpreterContext.generateInstructionsForIntepretation();
fullInterpreterContext.generateInstructionsForInterpretation();

return fullInterpreterContext;
}
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ public Label getFailurePathLabel() {
return (Label) getOperand2();
}

// FIXME: We should remove this and only save what we care about..live Module cannot be neccesary here?
// FIXME: We should remove this and only save what we care about..live Module cannot be necessary here?
public RubyModule getModule() {
return module;
}
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

// Const search:
// - looks up lexical scopes
// - then inheritance hierarcy if lexical search fails
// - then inheritance hierarchy if lexical search fails
// - then invokes const_missing if inheritance search fails
public class SearchConstInstr extends OneOperandResultBaseInstr implements FixedArityInstr {
private final String constName;
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ public FullInterpreterContext(IRScope scope, Instr[] instructions) {

/**
* have this interpretercontext fully built? This is slightly more complicated than this simple check, but it
* should work. In -X-C full builds we linearize at the beginning of our generateInstructionsForIntepretation
* should work. In -X-C full builds we linearize at the beginning of our generateInstructionsForInterpretation
* method. Last thing we do essentially is set instructions to be something. For JIT builds last thing we
* need to check is whether we have linearized the BB list.
*/
@@ -91,7 +91,7 @@ public boolean reuseParentDynScope() {
}

/** We plan on running this in full interpreted mode. This will fixup ipc, rpc, and generate instr list */
public void generateInstructionsForIntepretation() {
public void generateInstructionsForInterpretation() {
linearizeBasicBlocks();

// Pass 1. Set up IPCs for labels and instructions and build linear instr list
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ public boolean isCached() {
/**
* retrieve the live value represented by this immutable literal. An
* interesting property of knowing something cannot change at compile
* time is that all information neccesary to construct it is also known
* time is that all information necessary to construct it is also known
* at compile time. We don't pre-create these since we don't want to
* assume the cost of constructing literals which may never be used.
*/
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ir/operands/Operand.java
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ public boolean hasKnownValue() {
*
* Ex: v = [1,2,3]; x = v; y = v
*
* In this case, we cannot replace the occurences of 'v' because we would then get
* In this case, we cannot replace the occurrences of 'v' because we would then get
* x = [1,2,3]; y = [1,2,3] which would then result in two different array objects
* being constructed instead of a single one.
*
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/ir/persistence/IRReader.java
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ public static IRScope load(IRManager manager, final IRReaderDecoder file) throws
int version = file.decodeIntRaw();

if (version != VERSION) {
throw new IOException("Trying to read incompatable persistence format (version found: " +
throw new IOException("Trying to read incompatible persistence format (version found: " +
version + ", version expected: " + VERSION);
}
int headersOffset = file.decodeIntRaw();
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ public RubyRegexp construct(ThreadContext context, RubyString[] pieces) throws T
return cache;
}

// we don't care if this suceeds, just that it ony gets set once
// we don't care if this succeeds, just that it only gets set once
UPDATER.compareAndSet(this, null, cache);

setTarget(Binder.from(type()).dropAll().constant(cache));
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ public Label getRenamedLabel(Label label) {

/**
* Return a new instance of a variable for the newly cloned scope. Maps are maintained
* because Variables typically share the same instance accross a CFG (of the same lexical depth).
* because Variables typically share the same instance across a CFG (of the same lexical depth).
*
* @param variable to be renamed
* @return the new Variable
@@ -94,4 +94,4 @@ public Variable getRenamedVariable(Variable variable) {

return newVariable;
}
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/lexer/JavaSignatureLexer.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/lexer/StrftimeLexer.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/lexer/yacc/RubyLexer.java
Original file line number Diff line number Diff line change
@@ -2020,7 +2020,7 @@ private int tilde() throws IOException {
* Parse a number from the input stream.
*
*@param c The first character of the number.
*@return A int constant wich represents a token.
*@return An int constant which represents a token.
*/
private int parseNumber(int c) throws IOException {
setState(EXPR_END);
@@ -2417,4 +2417,4 @@ private int scanHex(int count, boolean strict, String errorMessage) throws IOExc

return hexValue;
}
}
}
Original file line number Diff line number Diff line change
@@ -978,7 +978,7 @@ public Object yyparse (JavaSignatureLexer yyLex) throws java.io.IOException, Par
case 98:
// line 423 "core/src/main/java/org/jruby/parser/JavaSignatureParser.y"
{
/* We know this is always preceeded by 'type' production.*/
/* We know this is always preceded by 'type' production.*/
yyVals[-3+yyTop] = new ArrayTypeNode(((TypeNode)yyVals[-3+yyTop]));
yyVal = ((String)yyVals[-2+yyTop]);
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/parser/JavaSignatureParser.y
Original file line number Diff line number Diff line change
@@ -421,7 +421,7 @@ formal_parameter : type variable_declarator_id {
variable_declarator_id : IDENTIFIER {
$$ = $1;
} | variable_declarator_id LBRACK RBRACK {
// We know this is always preceeded by 'type' production.
// We know this is always preceded by 'type' production.
$<Object>0 = new ArrayTypeNode($<TypeNode>0);
$$ = $1;
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/parser/ParserSupport.java
Original file line number Diff line number Diff line change
@@ -454,7 +454,7 @@ public boolean checkExpression(Node node) {
/**
* Is this a literal in the sense that MRI has a NODE_LIT for. This is different than
* ILiteralNode. We should pick a different name since ILiteralNode is something we created
* which is similiar but used for a slightly different condition (can I do singleton things).
* which is similar but used for a slightly different condition (can I do singleton things).
*
* @param node to be tested
* @return true if it is a literal
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/parser/StaticScope.java
Original file line number Diff line number Diff line change
@@ -332,7 +332,7 @@ public IRubyObject getConstantDefinedNoObject(String internedName) {
public IRubyObject getConstant(String internedName) {
IRubyObject result = getConstantInner(internedName);

// If we could not find the constant from cref..then try getting from inheritence hierarchy
// If we could not find the constant from cref, then try getting from inheritance hierarchy
return result == null ? cref.getConstantNoConstMissing(internedName) : result;
}

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/Binding.java
Original file line number Diff line number Diff line change
@@ -199,7 +199,7 @@ public void setSelf(IRubyObject self) {
* Gets the dynamicVariables that are local to this block. Parent dynamic scopes are also
* accessible via the current dynamic scope.
*
* @return Returns all relevent variable scoping information
* @return Returns all relevant variable scoping information
*/
public DynamicScope getDynamicScope() {
return dynamicScope;
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/Helpers.java
Original file line number Diff line number Diff line change
@@ -2505,7 +2505,7 @@ public static boolean needsSplat19(int requiredCount, boolean isRest) {
// . Array given to rest should pass itself
// . Array with rest + other args should extract array
// . Array with multiple values and NO rest should extract args if there are more than one argument
// Note: In 1.9 alreadyArray is only relevent from our internal Java code in core libs. We never use it
// Note: In 1.9 alreadyArray is only relevant from our internal Java code in core libs. We never use it
// from interpreter or JIT. FIXME: Change core lib consumers to stop using alreadyArray param.
public static IRubyObject[] restructureBlockArgs19(IRubyObject value, Signature signature, Block.Type type, boolean needsSplat, boolean alreadyArray) {
if (!type.checkArity && signature == Signature.NO_ARGUMENTS) return IRubyObject.NULL_ARRAY;
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/IRBlockBody.java
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ public IRubyObject yieldSpecific(ThreadContext context, Block block, IRubyObject
// Unwrap the array arg
args = IRRuntimeHelpers.convertValueIntoArgArray(context, arg0, signature, true);

// FIXME: arity error is aginst new args but actual error shows arity of original args.
// FIXME: arity error is against new args but actual error shows arity of original args.
if (block.type == Block.Type.LAMBDA) signature.checkArity(context.runtime, args);

return commonYieldPath(context, block, Block.Type.NORMAL, args, null, Block.NULL_BLOCK);
4 changes: 2 additions & 2 deletions core/src/main/java/org/jruby/runtime/load/LoadService.java
Original file line number Diff line number Diff line change
@@ -1239,7 +1239,7 @@ protected LoadServiceResource tryResourceFromLoadPathOrURL(SearchState state, St
}

Outer: for (int i = 0; i < loadPath.size(); i++) {
// TODO this is really inefficient, and potentially a problem everytime anyone require's something.
// TODO this is really inefficient, and potentially a problem every time anyone require's something.
// we should try to make LoadPath a special array object.
String loadPathEntry = getLoadPathEntry(loadPath.eltInternal(i));

@@ -1478,7 +1478,7 @@ protected LoadServiceResource findFileInClasspath(String name) {
}

for (int i = 0; i < loadPath.size(); i++) {
// TODO this is really inefficient, and potentially a problem everytime anyone require's something.
// TODO this is really inefficient, and potentially a problem every time anyone require's something.
// we should try to make LoadPath a special array object.
String entry = getLoadPathEntry(loadPath.eltInternal(i));

2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/runtime/marshal/DataType.java
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

/**
*
* DataType is similiar to T_DATA to represent types which are incapable of getting
* DataType is similar to T_DATA to represent types which are incapable of getting
* marshalled. This is just a marker interface.
*/
public interface DataType {
Loading