Merge pull request #288 from takkii/develop

Update.
takkii · Jan 15, 2023 · 6274b10 · 6274b10
2 parents f08ce0a + 9c57e57
commit 6274b10
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 44 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,19 +1,26 @@
 {
     "version": "0.2.0",
     "configurations": [
+        // {
+        // "name": "Debug zinbeijett File1",
+        // "type": "Ruby",
+        // "request": "launch",
+        // "cwd": "${workspaceRoot}",
+        // "program": "${workspaceRoot}/mini_test_runner.rb"
+        // },
+        // {
+        // "name": "Debug zinbeijett File2",
+        // "type": "Ruby",
+        // "request": "launch",
+        // "cwd": "${workspaceRoot}",
+        // "program": "${workspaceRoot}/unit_test_runner.rb"
+        // },
         {
-        "name": "Debug zinbeijett File1",
-        "type": "Ruby",
-        "request": "launch",
-        "cwd": "${workspaceRoot}",
-        "program": "${workspaceRoot}/mini_test_runner.rb"
-        },
-                {
-        "name": "Debug zinbeijett File2",
-        "type": "Ruby",
-        "request": "launch",
-        "cwd": "${workspaceRoot}",
-        "program": "${workspaceRoot}/unit_test_runner.rb"
+            "name": "Debug zinbeijett File3",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/romaji_runner.rb"
         }
     ]
 }
diff --git a/romaji_runner.rb b/romaji_runner.rb
@@ -19,100 +19,91 @@ def self.run1
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_1.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run2
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_2.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run3
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_3.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run4
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_4.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run5
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_5.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run6
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_6.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run7
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_7.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run8
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_8.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run9
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_9.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 
   def self.run10
     encodig_style
     stdout_rb, _stderr_rb, _status_rb = Open3.capture3("ruby #{File.dirname(__FILE__)}/shell/romaji_runner_10.rb")
 
-    puts stdout_rb.to_s
+    puts stdout_rb
   end
 end
 
 begin
-  run1 = RomajiRunner.run1
-  run2 = RomajiRunner.run2
-  run3 = RomajiRunner.run3
-  run4 = RomajiRunner.run4
-  run5 = RomajiRunner.run5
-  run6 = RomajiRunner.run6
-  run7 = RomajiRunner.run7
-  run8 = RomajiRunner.run8
-  run9 = RomajiRunner.run9
-  run10 = RomajiRunner.run10
-
   puts "Romaji Runner Stop is Ctrl + C. Please Input."
   puts ""
+
   threads = []
-  threads << Thread.new(run1) { |r1| r1 }
-  threads << Thread.fork(run2) { |r2| r2 }
-  threads << Thread.fork(run3) { |r3| r3 }
-  threads << Thread.fork(run4) { |r4| r4 }
-  threads << Thread.fork(run5) { |r5| r5 }
-  threads << Thread.fork(run6) { |r6| r6 }
-  threads << Thread.fork(run7) { |r7| r7 }
-  threads << Thread.fork(run8) { |r8| r8 }
-  threads << Thread.fork(run9) { |r9| r9 }
-  threads << Thread.fork(run10) { |r10| r10 }
+  threads << Thread.new(RomajiRunner.run1) { |r1| r1 }
+  threads << Thread.fork(RomajiRunner.run2) { |r2| r2 }
+  threads << Thread.fork(RomajiRunner.run3) { |r3| r3 }
+  threads << Thread.fork(RomajiRunner.run4) { |r4| r4 }
+  threads << Thread.fork(RomajiRunner.run5) { |r5| r5 }
+  threads << Thread.fork(RomajiRunner.run6) { |r6| r6 }
+  threads << Thread.fork(RomajiRunner.run7) { |r7| r7 }
+  threads << Thread.fork(RomajiRunner.run8) { |r8| r8 }
+  threads << Thread.fork(RomajiRunner.run9) { |r9| r9 }
+  threads << Thread.fork(RomajiRunner.run10) { |r10| r10 }
   threads.each { |thr| thr.join }
-  Thread.current.report_on_exception = false
+
+  # Thread.current.report_on_exception = false
 rescue StandardError => e
   puts e.backtrace
   encodig_style.tanraku_exit