Skip to content

Commit fe118a0

Browse files
committed
Merge pull request #748 from dmarcotte/fix_dash_c_spec
Fix dash_c_spec
2 parents 42ac270 + 4449ace commit fe118a0

File tree

3 files changed

+16
-21
lines changed

3 files changed

+16
-21
lines changed

spec/tags/1.8/ruby/command_line/dash_c_tags.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

spec/tags/1.9/ruby/command_line/dash_c_tags.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/org/jruby/Main.java

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,6 @@
3737
***** END LICENSE BLOCK *****/
3838
package org.jruby;
3939

40-
import java.io.InputStream;
41-
import java.io.PrintStream;
42-
import java.io.File;
43-
import java.io.FileDescriptor;
44-
45-
import java.io.FileInputStream;
46-
import java.io.FileNotFoundException;
47-
import java.io.IOException;
48-
import java.lang.management.ManagementFactory;
49-
import java.lang.management.RuntimeMXBean;
50-
import java.util.ArrayList;
51-
import java.util.List;
52-
import java.util.Map;
53-
import java.util.Properties;
5440
import org.jruby.exceptions.MainExitException;
5541
import org.jruby.exceptions.RaiseException;
5642
import org.jruby.exceptions.ThreadKill;
@@ -64,6 +50,20 @@
6450
import org.jruby.util.log.Logger;
6551
import org.jruby.util.log.LoggerFactory;
6652

53+
import java.io.File;
54+
import java.io.FileDescriptor;
55+
import java.io.FileInputStream;
56+
import java.io.FileNotFoundException;
57+
import java.io.IOException;
58+
import java.io.InputStream;
59+
import java.io.PrintStream;
60+
import java.lang.management.ManagementFactory;
61+
import java.lang.management.RuntimeMXBean;
62+
import java.util.ArrayList;
63+
import java.util.List;
64+
import java.util.Map;
65+
import java.util.Properties;
66+
6767
/**
6868
* Class used to launch the interpreter.
6969
* This is the main class as defined in the jruby.mf manifest.
@@ -429,14 +429,13 @@ private boolean checkFileSyntax(Ruby runtime, String filename) {
429429
}
430430

431431
private boolean checkStreamSyntax(Ruby runtime, InputStream in, String filename) {
432-
PrintStream error = config.getError();
433432
try {
434433
runtime.parseFromMain(in, filename);
435-
error.println("Syntax OK for " + filename);
434+
config.getOutput().println("Syntax OK");
436435
return true;
437436
} catch (RaiseException re) {
438437
if (re.getException().getMetaClass().getBaseName().equals("SyntaxError")) {
439-
error.println("SyntaxError in " + re.getException().message(runtime.getCurrentContext()));
438+
config.getError().println("SyntaxError in " + re.getException().message(runtime.getCurrentContext()));
440439
} else {
441440
throw re;
442441
}

0 commit comments

Comments
 (0)