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: 923bc0a20dc7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24a58e494a50
Choose a head ref
  • 9 commits
  • 13 files changed
  • 1 contributor

Commits on Feb 12, 2016

  1. Duplicated kwargs should issue warning (fixes mri test)

    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    ea406b8 View commit details

  2. Mild massaging of formal_argument to catch constant names

    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    2032e2a View commit details

  3. Use bitfield operations for lex_state management. This is to match MR… 

    …I in

behavior.  Keeping it as an enum would have led to an explosion of enum
values or a second field.  Seems simpler to track MRI.

This fixed one issue in mri test suite as well.
    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    88564ac View commit details

  4. Fixes 'false ? raise do end : tap' in parser and ripper. 

    MRI test covers this case.
    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    fbfe8e1 View commit details

  5. Fix lonely operator on next line: 

    ```ruby
a
&.b
```

in ripper+parser.
    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    712e289 View commit details

  6. Fixes warn_balances tests in MRI. Our output has been updated to match 

    theirs.  We also had a few wrong operators in the warning messages
(e.g. reporting on '*' instead if '**').
    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    985c2f0 View commit details

  7. Emit warning "unexpected fraction part after numeric literal" when 

    numeric literal is like "0x0.0".
    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    c5c232c View commit details

  8. Script lines feature will not concatenate but replace if it is 

    reparsed.  Caught by MRI test.
    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    9c80a41 View commit details

  9. Properly generate 'circular argument reference' warning in main parser. 

    This is an independent fix from us not supporting:
```ruby
def foo(var = var); p var; end; foo
```
    @enebo
    enebo committed Feb 12, 2016
    Copy the full SHA
    24a58e4 View commit details
13 changes: 6 additions & 7 deletions core/src/main/java/org/jruby/ast/SymbolNode.java
View file
Original file line number Diff line number Diff line change
@@ -32,22 +32,15 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;

import java.awt.image.ByteLookupTable;
import java.nio.charset.Charset;
import java.util.List;

import org.jcodings.Encoding;
import org.jcodings.specific.USASCIIEncoding;
import org.jruby.Ruby;
import org.jruby.RubySymbol;

import org.jruby.ast.types.ILiteralNode;
import org.jruby.ast.types.INameNode;
import org.jruby.ast.visitor.NodeVisitor;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.ByteList;
import org.jruby.util.StringSupport;

@@ -84,6 +77,12 @@ public SymbolNode(ISourcePosition position, ByteList value) {
}
}

public boolean equals(Object other) {
return other instanceof SymbolNode &&
name.equals(((SymbolNode) other).getName()) &&
encoding == ((SymbolNode) other).getEncoding();
}

public NodeType getNodeType() {
return NodeType.SYMBOLNODE;
}
Loading