Mercurial > octave-libgccjit

comparison src/ls-mat-ascii.cc @ 8946:e7e928088e90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix CRLF issues with text-mode reading in windows when loading ascii data
author Benjamin Lindner <lindnerb@users.sourceforge.net>
date Tue, 10 Mar 2009 01:01:50 -0400
parents eb63fbe60fab
children 985792c9e0da
comparison
equal deleted inserted replaced
8945:45f8197ffd51 8946:e7e928088e90
49 #include "defun.h" 49 #include "defun.h"
50 #include "error.h" 50 #include "error.h"
51 #include "gripes.h" 51 #include "gripes.h"
52 #include "lex.h" 52 #include "lex.h"
53 #include "load-save.h" 53 #include "load-save.h"
54 #include "ls-ascii-helper.h"
55 #include "ls-mat-ascii.h"
54 #include "oct-obj.h" 56 #include "oct-obj.h"
55 #include "oct-map.h" 57 #include "oct-map.h"
56 #include "ov-cell.h" 58 #include "ov-cell.h"
57 #include "pager.h" 59 #include "pager.h"
58 #include "pt-exp.h" 60 #include "pt-exp.h"
61 #include "utils.h" 63 #include "utils.h"
62 #include "variables.h" 64 #include "variables.h"
63 #include "version.h" 65 #include "version.h"
64 #include "dMatrix.h" 66 #include "dMatrix.h"
65 67
66 #include "ls-mat-ascii.h"
67
68 static std::string 68 static std::string
69 get_mat_data_input_line (std::istream& is) 69 get_mat_data_input_line (std::istream& is)
70 { 70 {
71 std::string retval; 71 std::string retval;
72 72
78 78
79 char c; 79 char c;
80 while (is.get (c)) 80 while (is.get (c))
81 { 81 {
82 if (c == '\n' || c == '\r') 82 if (c == '\n' || c == '\r')
83 break; 83 {
84 skip_until_newline (is, false);
85 break;
86 }
84 87
85 if (c == '%' || c == '#') 88 if (c == '%' || c == '#')
86 { 89 {
87 // skip to end of line 90 skip_until_newline (is, false);
88 while (is.get (c))
89 if (c == '\n' || c == '\r')
90 break;
91
92 break; 91 break;
93 } 92 }
94 93
95 if (! is.eof ()) 94 if (! is.eof ())
96 { 95 {