Merge branch 'master' into 9.5-dev · jruby/jruby@ce9385a · GitHub
Skip to content

Commit ce9385a

Browse files
eneboenebo
committed
Merge branch 'master' into 9.5-dev
2 parents 3296e53 + 58eb2bc commit ce9385a

399 files changed

Lines changed: 14700 additions & 10863 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/pom.rb‎

Lines changed: 4 additions & 4 deletions

‎core/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ DO NOT MODIFY - GENERATED CODE
8989
<dependency>
9090
<groupId>com.github.jnr</groupId>
9191
<artifactId>jnr-enxio</artifactId>
92-
<version>0.32.16</version>
92+
<version>0.32.17</version>
9393
<exclusions>
9494
<exclusion>
9595
<groupId>com.github.jnr</groupId>
@@ -100,7 +100,7 @@ DO NOT MODIFY - GENERATED CODE
100100
<dependency>
101101
<groupId>com.github.jnr</groupId>
102102
<artifactId>jnr-unixsocket</artifactId>
103-
<version>0.38.21</version>
103+
<version>0.38.22</version>
104104
<exclusions>
105105
<exclusion>
106106
<groupId>com.github.jnr</groupId>
@@ -111,7 +111,7 @@ DO NOT MODIFY - GENERATED CODE
111111
<dependency>
112112
<groupId>com.github.jnr</groupId>
113113
<artifactId>jnr-posix</artifactId>
114-
<version>3.1.18</version>
114+
<version>3.1.19</version>
115115
<exclusions>
116116
<exclusion>
117117
<groupId>com.github.jnr</groupId>
@@ -133,7 +133,7 @@ DO NOT MODIFY - GENERATED CODE
133133
<dependency>
134134
<groupId>com.github.jnr</groupId>
135135
<artifactId>jnr-ffi</artifactId>
136-
<version>2.2.15</version>
136+
<version>2.2.16</version>
137137
</dependency>
138138
<dependency>
139139
<groupId>com.github.jnr</groupId>

‎core/src/main/java/org/jruby/Main.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ private boolean checkStreamSyntax(Ruby runtime, InputStream in, String filename)
428428
final ThreadContext context = runtime.getCurrentContext();
429429
final IRubyObject $ex = context.getErrorInfo();
430430
try {
431-
runtime.parseFromMain(in, filename);
431+
runtime.parseFromMain(filename, in);
432432
config.getOutput().println("Syntax OK");
433433
return true;
434434
} catch (RaiseException re) {

‎core/src/main/java/org/jruby/ParseResult.java‎

Lines changed: 6 additions & 0 deletions

0 commit comments

Comments
 (0)