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

Commits on Nov 3, 2014

  1. Copy the full SHA
    414f2fb View commit details
  2. Update to invokebinder 1.4.

    headius committed Nov 3, 2014
    Copy the full SHA
    0d39c5a View commit details
Showing with 3 additions and 4 deletions.
  1. +1 −1 core/.classpath
  2. +1 −1 core/pom.rb
  3. +1 −1 core/pom.xml
  4. +0 −1 core/src/main/java/org/jruby/parser/Parser.java
2 changes: 1 addition & 1 deletion core/.classpath
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
<classpathentry kind="var" path="M2_REPO/org/jruby/jcodings/jcodings/1.0.12-SNAPSHOT/jcodings-1.0.12-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jruby/extras/bytelist/1.0.12-SNAPSHOT/bytelist-1.0.12-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jruby/yecht/1.0/yecht-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/com/headius/invokebinder/1.4-SNAPSHOT/invokebinder-1.4-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/com/headius/invokebinder/1.4/invokebinder-1.4.jar"/>
<classpathentry kind="var" path="M2_REPO/com/headius/options/1.1/options-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/com/headius/coro-mock/1.0/coro-mock-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/com/headius/unsafe-mock/8.0/unsafe-mock-8.0.jar"/>
2 changes: 1 addition & 1 deletion core/pom.rb
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
jar 'org.jruby.extras:bytelist:1.0.12-SNAPSHOT'
jar 'org.jruby.jcodings:jcodings:1.0.12-SNAPSHOT'

jar 'com.headius:invokebinder:1.4-SNAPSHOT'
jar 'com.headius:invokebinder:1.4'
jar 'com.headius:options:1.1'
jar 'com.headius:coro-mock:1.0', :scope => 'provided'
jar 'com.headius:unsafe-mock', '${unsafe.version}', :scope => 'provided'
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@
<dependency>
<groupId>com.headius</groupId>
<artifactId>invokebinder</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.4</version>
</dependency>
<dependency>
<groupId>com.headius</groupId>
1 change: 0 additions & 1 deletion core/src/main/java/org/jruby/parser/Parser.java
Original file line number Diff line number Diff line change
@@ -122,7 +122,6 @@ public Node parse(String file, LexerSource lexerSource, DynamicScope blockScope,
// but I am not sure which conditions leads to this...so lame message.
throw runtime.newSyntaxError("Problem reading source: " + e);
} catch (SyntaxException e) {
e.printStackTrace();
switch (e.getPid()) {
case UNKNOWN_ENCODING:
case NOT_ASCII_COMPATIBLE: