Input files were not recognized when the end-of-line character does not match with...

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@413 a2be9bc6-48de-4e38-9406-05402d4bc13c

diff --git a/Scripts/loadsave.rb b/Scripts/loadsave.rb
index 1a0786a..84c581c 100755 (executable)
--- a/Scripts/loadsave.rb
+++ b/Scripts/loadsave.rb
@@ -699,7 +699,7 @@ end_of_header
          return nil
        end
        warn_message = ""
-       verbose = 0
+       verbose = nil
        bond_defined = false
        @tokens = []
        special_positions = []

diff --git a/Scripts/startup.rb b/Scripts/startup.rb
index 6802dd3..960c3e1 100755 (executable)
--- a/Scripts/startup.rb
+++ b/Scripts/startup.rb
@@ -72,6 +72,45 @@ module Kernel
   end
 end
 
+class IO
+  alias :gets_original :gets
+  def gets(rs = $/)
+    if rs != $/
+         return gets_original(rs)
+       end
+    if @end_of_line
+         s = gets_original(@end_of_line)
+         if s && s.chomp!(@end_of_line)
+           s += $/
+         end
+       else
+         s = ""
+         while c = getc
+           if c == 13
+                 #  \r or \r\n
+                 if (c = getc) && c != 10
+                   ungetc(c)
+                   @end_of_line = "\r"
+                 else
+                   @end_of_line = "\r\n"
+                 end
+                 break
+               elsif c == 10
+                 #  \n
+                 @end_of_line = "\n"
+                 break
+               else
+                 s += c.chr
+               end
+         end
+         if @end_of_line
+           s += $/
+         end
+    end
+       return s
+  end
+end
+
 load "transform.rb"
 load "molecule.rb"
 load "loadsave.rb"