fix for latest ruby.

git-svn-id: http://svn.sourceforge.jp/svnroot/bchan/bchanf/trunk@652 20a0b8eb-f62a-4a12-8fe1-b598822500fb

diff --git a/src/tools/hmi_generator.rb b/src/tools/hmi_generator.rb
index 59b1860..cf28bcd 100644 (file)
--- a/src/tools/hmi_generator.rb
+++ b/src/tools/hmi_generator.rb
@@ -1,7 +1,8 @@
+# -*- coding: euc-jp -*-
 #
 # hmi_generator.rb
 #
-# Copyright (c) 2012 project bchan
+# Copyright (c) 2012-2014 project bchan
 #
 # This software is provided 'as-is', without any express or implied
 # warranty. In no event will the authors be held liable for any damages
@@ -25,12 +26,11 @@
 
 require 'yaml'
 require 'erb'
-require 'jcode'
 
 def conv_euc_to_TCArray(str)
   ret = Array.new();
-  str.each_char do |x|
-    i = x.length - 1;
+  str.encode("EUC-JP").each_char do |x|
+    i = x.bytesize - 1;
     val = 0;
     x.each_byte do |ch|
       val += ch << (8 * i);
@@ -2849,9 +2849,7 @@ def generate_source(filename, data)
 
 end
 
-$KCODE = "EUC"
-
-yaml = YAML.load_file(ARGV[0]);
+yaml = YAML.load(File.read(ARGV[0], encoding: 'EUC-JP:UTF-8'));
 data = HMIData.new(yaml);
 
 fname_header = yaml["generator"]["output_header"]

diff --git a/src/tools/panel_generator.rb b/src/tools/panel_generator.rb
index e5e4eca..f624286 100644 (file)
--- a/src/tools/panel_generator.rb
+++ b/src/tools/panel_generator.rb
@@ -1,3 +1,4 @@
+# -*- coding: euc-jp -*-
 #
 # panel_generator.rb
 #
@@ -25,12 +26,11 @@
 
 require 'yaml'
 require 'erb'
-require 'jcode'
 
 def conv_euc_to_TCArray(str)
   ret = Array.new();
-  str.each_char do |x|
-    i = x.length - 1;
+  str.encode("EUC-JP").each_char do |x|
+    i = x.bytesize - 1;
     val = 0;
     x.each_byte do |ch|
       val += ch << (8 * i);
@@ -547,9 +547,7 @@ def generate_source(filename, data)
   fd.close
 end 
 
-$KCODE = "EUC"
-
-yaml = YAML.load_file(ARGV[0]);
+yaml = YAML.load(File.read(ARGV[0], encoding: 'EUC-JP:UTF-8'));
 data = PanelData.new(yaml);
 
 fname_header = yaml["generator"]["output_header"]