octave-nkf: src/file-io.cc comparison

comparison src/file-io.cc @ 636:fae2bd91c027

[project @ 1994-08-23 18:39:50 by jwe]

author	jwe
date	Tue, 23 Aug 1994 18:39:50 +0000
parents	aecbe369233b
children	ae87e84f1be3

comparison

equal deleted inserted replaced

-:5338832d2cf6
+:fae2bd91c027
 	  if (strcmp (file.name (), file_name) == 0)
 	    return p;
 	  file_list.next (p);
 	}
 }
-else if (arg.is_scalar_type ())
+else
 {
 double file_num = arg.double_value ();
-if ((double) NINT (file_num) != file_num)
-	error ("file number not an integer value");
+if (! error_state)
+	{
+	  if ((double) NINT (file_num) != file_num)
+	    error ("file number not an integer value");
+	  else
+	    {
+	      Pix p = file_list.first ();
+	      file_info file;
+	      for (int i = 0; i < file_count; i++)
+		{
+		  file = file_list (p);
+		  if (file.number () == file_num)
+		    return p;
+		  file_list.next (p);
+		}
+	      error ("no file with that number");
+	    }
+	}
 else
-	{
+	error ("inapproriate file specifier");
-	  Pix p = file_list.first ();
+}
-	  file_info file;
-	  for (int i = 0; i < file_count; i++)
-	    {
-	      file = file_list (p);
-	      if (file.number () == file_num)
-		return p;
-	      file_list.next (p);
-	    }
-	  error ("no file with that number");
-	}
-}
-else
-error ("inapproriate file specifier");
 return 0;
 }
 static Pix
-fopen_file_for_user (const tree_constant& arg, const char *mode,
+fopen_file_for_user (const char *name, const char *mode,
 		     const char *warn_for)
 {
-char *file_name = arg.string_value ();
+FILE *file_ptr = fopen (name, mode);
-FILE *file_ptr = fopen (file_name, mode);
 if (file_ptr)
 {
-file_info file (++file_count, file_name, file_ptr, mode);
+file_info file (++file_count, name, file_ptr, mode);
 file_list.append (file);
 Pix p = file_list.first ();
 file_info file_from_list;
 for (int i = 0; i < file_count; i++)
 	{
 	  file_from_list = file_list (p);
-	  if (strcmp (file_from_list.name (), file_name) == 0)
+	  if (strcmp (file_from_list.name (), name) == 0)
 	    return p;
 	  file_list.next (p);
 	}
 }
-error ("%s: unable to open file `%s'", warn_for, file_name);
+error ("%s: unable to open file `%s'", warn_for, name);
 return 0;
 }
 static Pix
-file_io_get_file (const tree_constant arg, const char *mode,
+file_io_get_file (const tree_constant& arg, const char *mode,
 		  const char *warn_for)
 {
 Pix p = return_valid_file (arg);
 if (! p)
 	  int status = stat (name, &buffer);
 	  if (status == 0)
 	    {
 	      if ((buffer.st_mode & S_IFREG) == S_IFREG)
-		p = fopen_file_for_user (arg, mode, warn_for);
+		p = fopen_file_for_user (name, mode, warn_for);
 	      else
 		error ("%s: invalid file type", warn_for);
 	    }
 	  else if (status < 0 && *mode != 'r')
-	    p = fopen_file_for_user (arg, mode, warn_for);
+	    p = fopen_file_for_user (name, mode, warn_for);
 	  else
 	    error ("%s: can't stat file `%s'", warn_for, name);
 	}
 else
 	error ("%s: invalid file specifier", warn_for);
 int success = fclose (file.fptr ());
 file_list.del (p);
 file_count--;
-retval.resize (1);
 if (success == 0)
-retval(0) = tree_constant (1.0); // succeeded
+retval(0) = 1.0; // succeeded
 else
 {
 error ("fclose: error on closing file");
-retval(0) = tree_constant (0.0); // failed
+retval(0) = 0.0; // failed
 }
 return retval;
 }
 if (file.number () == 1)
 flush_output_to_pager ();
 else
 success = fflush (file.fptr ());
-retval.resize (1);
 if (success == 0)
-retval(0) = tree_constant (1.0); // succeeded
+retval(0) = 1.0; // succeeded
 else
 {
 error ("fflush: write error");
-retval(0) = tree_constant (0.0); // failed
+retval(0) = 0.0; // failed
 }
 return retval;
 }
 Pix p = file_io_get_file (args(1), "r", "fgets");
 if (! p)
 return retval;
-int length = 0;
-if (args(2).is_scalar_type ())
+double dlen = args(2).double_value ();
-{
-length = (int) args(2).double_value ();
+if (error_state)
-if ((double) NINT (length) != length)
+return retval;
-	{
-	  error ("fgets: length not an integer value");
+int length = NINT (dlen);
-	  return retval;
-	}
+if ((double) length != dlen)
+{
+error ("fgets: length not an integer value");
+return retval;
 }
 file_info file = file_list (p);
-char string[length+1];
+char string [length+1];
 char *success = fgets (string, length+1, file.fptr ());
 if (! success)
 {
-retval.resize (1);
+retval(0) = -1.0;
-retval(0) = tree_constant (-1.0);
 return retval;
 }
 if (nargout == 2)
-{
+retval(1) = (double) strlen (string);
-retval.resize (2);
-retval(1) = tree_constant ((double) strlen (string));
+retval(0) = string;
-}
-else
-retval.resize (1);
-retval(0) = tree_constant (string);
 return retval;
 }
 DEFUN ("fopen", Ffopen, Sfopen, 3, 1,
 if (p)
 {
 file_info file = file_list (p);
-retval.resize (1);
+retval(0) = (double) file.number ();
-retval(0) = tree_constant ((double) file.number ());
 return retval;
 }
 if (! args(2).is_string ())
 int number = file_count++;
 file_info file (number, name, file_ptr, mode);
 file_list.append (file);
-retval.resize (1);
+retval(0) = (double) number;
-retval(0) = tree_constant ((double) number);
 return retval;
 }
 DEFUN ("freport", Ffreport, Sfreport, 1, 1,
 if (! p)
 return retval;
 long origin = SEEK_SET;
-long offset = 0;
-if (args(2).is_scalar_type ())
+double doff = args(2).double_value ();
-{
-offset = (long) args(2).double_value ();
+if (error_state)
-if ((double) NINT (offset) != offset)
+return retval;
-	{
-	  error ("fseek: offset not an integer value");
+long offset = NINT (doff);
+if ((double) offset != doff)
+{
+error ("fseek: offset not an integer value");
+return retval;
+}
+if (nargin == 4)
+{
+double dorig = args(3).double_value ();
+if (error_state)
+	return retval;
+origin = NINT (dorig);
+if ((double) dorig != origin)
+	{
+	  error ("fseek: origin not an integer value");
 	  return retval;
 	}
-}
-if (nargin == 4 && args(3).is_scalar_type ())
-{
-origin = (long) args(3).double_value ();
 if (origin == -1)
 	origin = SEEK_CUR;
 else if (origin == -2)
 	origin = SEEK_END;
 else
 	{
-	  if ((double) NINT (origin) != origin)
+	  error ("fseek: invalid value for origin");
-	    {
+	  return retval;
-	      error ("fseek: origin not an integer value");
-	      return retval;
-	    }
 	}
 }
 file_info file = file_list (p);
 int success = fseek (file.fptr (), offset, origin);
-retval.resize (1);
 if (success == 0)
-retval(0) = tree_constant (1.0); // succeeded
+retval(0) = 1.0; // succeeded
 else
 {
 error ("fseek: file error");
-retval(0) = tree_constant (0.0); // failed
+retval(0) = 0.0; // failed
 }
 return retval;
 }
 if (p)
 {
 file_info file = file_list (p);
 long offset = ftell (file.fptr ());
-retval.resize (1);
-retval(0) = tree_constant ((double) offset);
+retval(0) = (double) offset;
 if (offset == -1L)
 	error ("ftell: write error");
 }
 	{
 	  error ("%s: not enough arguments", type);
 	  return -1;
 	}
-if (! args(fmt_arg_count).is_scalar_type ())
+double tmp_len = args(fmt_arg_count++).double_value ();
+if (error_state)
 	{
 	  error ("%s: `*' must be replaced by an integer", type);
 	  return -1;
 	}
-fmt << NINT (args(fmt_arg_count++).double_value ());
+fmt << NINT (tmp_len);
 s++;
 chars_from_fmt_str++;
 }
 else
 {
 	{
 	  error ("%s: not enough arguments", type);
 	  return -1;
 	}
-if (! args(fmt_arg_count).is_scalar_type ())
+double tmp_len = args(fmt_arg_count++).double_value ();
+if (error_state)
 	{
 	  error ("%s: `*' must be replaced by an integer", type);
 	  return -1;
 	}
-fmt << NINT (args(fmt_arg_count++).double_value ());
+fmt << NINT (tmp_len);
 s++;
 chars_from_fmt_str++;
 }
 else
 {
 }
 switch (*s)
 {
 case 'd': case 'i': case 'o': case 'u': case 'x': case 'X':
+{
-if (! args(fmt_arg_count).is_scalar_type ())
+	double d = args(fmt_arg_count++).double_value ();
-	goto invalid_conversion;
-else
+	int val = NINT (d);
-	{
-	  chars_from_fmt_str++;
+	if (error_state || (double) val != d)
-	  fmt << *s << ends;
+	  goto invalid_conversion;
-	  double d = args(fmt_arg_count++).double_value ();
+	else
-	  if ((int) d != d)
+	  {
-	    goto invalid_conversion;
+	    chars_from_fmt_str++;
-	  else
+	    fmt << *s << ends;
-	    {
+	    char *tmp_fmt = fmt.str ();
-	      char *s = fmt.str ();
+	    sb.form (tmp_fmt, val);
-	      sb.form (s, (int) d);
+	    delete [] tmp_fmt;
-	      delete [] s;
+	    return chars_from_fmt_str;
-	      return chars_from_fmt_str;
+	  }
-	    }
+}
-	}
 case 'e': case 'E': case 'f': case 'g': case 'G':
+{
-if (! args(fmt_arg_count).is_scalar_type ())
+	double val = args(fmt_arg_count++).double_value ();
-	goto invalid_conversion;
-else
+	if (error_state)
-	{
+	  goto invalid_conversion;
-	  chars_from_fmt_str++;
+	else
-	  fmt << *s << ends;
+	  {
-	  char *s = fmt.str ();
+	    chars_from_fmt_str++;
-	  sb.form (s, args(fmt_arg_count++).double_value ());
+	    fmt << *s << ends;
-	  delete [] s;
+	    char *tmp_fmt = fmt.str ();
-	  return chars_from_fmt_str;
+	    sb.form (tmp_fmt, val);
-	}
+	    delete [] tmp_fmt;
+	    return chars_from_fmt_str;
+	  }
+}
 case 's':
+{
-if (! args(fmt_arg_count).is_string ())
+	char *val = args(fmt_arg_count++).string_value ();
-	goto invalid_conversion;
-else
+	if (error_state)
-	{
+	  goto invalid_conversion;
-	  chars_from_fmt_str++;
+	else
-	  fmt << *s << ends;
+	  {
-	  char *s = fmt.str ();
+	    chars_from_fmt_str++;
-	  sb.form (s, args(fmt_arg_count++).string_value ());
+	    fmt << *s << ends;
-	  delete [] s;
+	    char *tmp_fmt = fmt.str ();
-	  return chars_from_fmt_str;
+	    sb.form (tmp_fmt, val);
-	}
+	    delete [] tmp_fmt;
+	    return chars_from_fmt_str;
+	  }
+}
 case 'c':
+{
-if (! args(fmt_arg_count).is_string ())
+	char *val = args(fmt_arg_count++).string_value ();
-	goto invalid_conversion;
-else
+	if (error_state || strlen (val) != 1)
-	{
+	  goto invalid_conversion;
-	  chars_from_fmt_str++;
+	else
-	  fmt << *s << ends;
+	  {
-	  char *str = args(fmt_arg_count++).string_value ();
+	    chars_from_fmt_str++;
-	  if (strlen (str) != 1)
+	    fmt << *s << ends;
-	    goto invalid_conversion;
+	    char *tmp_fmt = fmt.str ();
-	  else
+	    sb.form (tmp_fmt, *val);
-	    {
+	    delete [] tmp_fmt;
-	      char *s = fmt.str ();
+	    return chars_from_fmt_str;
-	      sb.form (s, *str);
+	  }
-	      delete [] s;
+}
-	      return chars_from_fmt_str;
-	    }
-	}
 default:
 goto invalid_format;
 }
 char *fmt;
 file_info file;
 if (strcmp (type, "fprintf") == 0)
 {
-if (args(2).is_string ())
+Pix p = file_io_get_file (args(1), "a+", type);
-	{
-	  fmt = args(2).string_value ();
+if (! p)
-	  fmt_arg_count++;
+	return retval;
-	}
-else
+file = file_list (p);
+if (file.mode () == "r")
+	{
+	  error ("%s: file is read only", type);
+	  return retval;
+	}
+fmt = args(2).string_value ();
+if (error_state)
 	{
 	  error ("%s: format must be a string", type);
 	  return retval;
 	}
-Pix p = file_io_get_file (args(1), "a+", type);
+fmt_arg_count += 2;
+}
-if (! p)
+else
-	return retval;
+{
+fmt = args(1).string_value ();
-file = file_list (p);
+if (error_state)
-if (file.mode () == "r")
+	{
-	{
+	  error ("%s: invalid format string", type);
-	  error ("%s: file is read only", type);
 	  return retval;
 	}
-fmt = args(2).string_value ();
 fmt_arg_count++;
-}
-else if (args(1).is_string ())
-{
-fmt = args(1).string_value ();
-fmt_arg_count++;
-}
-else
-{
-error ("%s: invalid format string", type);
-return retval;
 }
 // Scan fmt for % escapes and print out the arguments.
 ostrstream output_buf;
 	warning ("%s: unknown failure writing to file", type);
 delete [] msg;
 }
 else if (strcmp (type, "sprintf") == 0)
 {
-retval.resize (1);
 char *msg = output_buf.str ();
-retval(0) = tree_constant (msg);
+retval(0) = msg;
 delete [] msg;
 }
 return retval;
 }
 	int temp;
 	char *str = fmt.str ();
 	success = fscanf (fptr, str, &temp);
 	delete [] str;
 	if (success > 0 && store_value)
-	  values(fmt_arg_count++) = tree_constant ((double) temp);
+	  values(fmt_arg_count++) = (double) temp;
 }
 break;
 case 'e': case 'E': case 'f': case 'g': case 'G':
 {
 	double temp;
 	char *str = fmt.str ();
 	success = fscanf (fptr, str, &temp);
 	delete [] str;
 	if (success > 0 && store_value)
-	  values(fmt_arg_count++) = tree_constant (temp);
+	  values(fmt_arg_count++) = temp;
 }
 break;
 case 's':
 {
 	    string_width = 0;
 	    long original_position = ftell (fptr);
 	    int c;
-	    while ((c = getc (fptr)) != EOF
+	    while ((c = getc (fptr)) != EOF && isspace (c))
-		   && (c == ' ' || c == '\n' || c != '\t'))
 	      ; // Don't count leading whitespace.
 	    if (c != EOF)
 	      string_width++;
 	    for (;;)
 	      {
 		c = getc (fptr);
-		if (c != EOF && c != ' ' && c != '\n' && c != '\t')
+		if (c != EOF && ! isspace (c))
 		  string_width++;
 		else
 		  break;
 	      }
 	    fseek (fptr, original_position, SEEK_SET);
 	  }
 	chars_from_fmt_str++;
-	char temp[string_width+1];
+	char temp [string_width+1];
 	fmt << *s << ends;
 	char *str = fmt.str ();
 	success = fscanf (fptr, str, temp);
 	delete [] str;
+	temp[string_width] = '\0';
 	if (success > 0 && store_value)
-	  values(fmt_arg_count++) = tree_constant (temp);
+	  values(fmt_arg_count++) = temp;
 }
 break;
 case 'c':
 {
 	if (string_width < 1)
 	  string_width = 1;
 	chars_from_fmt_str++;
-	char temp[string_width+1];
+	char temp [string_width+1];
 	memset (temp, '\0', string_width+1);
 	fmt << *s << ends;
 	char *str = fmt.str ();
 	success = fscanf (fptr, str, temp);
 	delete [] str;
 	temp[string_width] = '\0';
 	if (success > 0 && store_value)
-	  values(fmt_arg_count++) = tree_constant (temp);
+	  values(fmt_arg_count++) = temp;
 }
 break;
 default:
 goto invalid_format;
 fmt_arg_count = 0;
 if (strcmp (type, "scanf") != 0)
 {
-if (args(2).is_string ())
+scanf_fmt = args(2).string_value ();
-	scanf_fmt = args(2).string_value ();
-else
+if (error_state)
 	{
 	  error ("%s: format must be a string", type);
 	  return retval;
 	}
 }
 return retval;
 }
 // Scan scanf_fmt for % escapes and assign the arguments.
-retval.resize (nargout ? nargout : 1);
+retval.resize (nargout);
 char *ptr = scanf_fmt;
 for (;;)
 {
 // Get type and number of bytes per element to read.
 char *prec = "uchar";
 if (nargin > 3)
 {
-if (args(3).is_string ())
+prec = args(3).string_value ();
-	prec = args(3).string_value ();
-else
+if (error_state)
 	{
 	  error ("fread: precision must be a specified as a string");
 	  return retval;
 	}
 }
 if (nargin > 2)
 {
 if (args(2).is_scalar_type ())
 	{
-	  tree_constant tmpa = args(2).make_numeric ();
+	  dnr = args(2).double_value ();
-	  dnr = tmpa.double_value ();
+	  if (error_state)
+	    return retval;
 	  dnc = 1.0;
 	}
-else if (args(2).is_matrix_type ())
+else
 	{
 	  ColumnVector tmp = args(2).vector_value ();
-	  if (tmp.length () == 2)
+	  if (error_state || tmp.length () != 2)
-	    {
-	      dnr = tmp.elem (0);
-	      dnc = tmp.elem (1);
-	    }
-	  else
 	    {
 	      error ("fread: invalid size specification\n");
 	      return retval;
 	    }
+	  dnr = tmp.elem (0);
+	  dnc = tmp.elem (1);
 	}
 if ((xisinf (dnr)) && (xisinf (dnc)))
 	{
 	  error ("fread: number of rows and columns cannot both be infinite");
 // Read data.
 int count = m.read (fptr, prec);
 if (nargout > 1)
-{
+retval(1) = (double) count;
-retval.resize (2);
-retval(1) = tree_constant ((double) count);
+retval(0) = m;
-}
-else
-retval.resize (1);
-retval(0) = tree_constant (m);
 return retval;
 }
 DEFUN ("fwrite", Ffwrite, Sfwrite, 4, 1,
 // Get type and number of bytes per element to read.
 char *prec = "uchar";
 if (nargin > 3)
 {
-if (args(3).is_string ())
+prec = args(3).string_value ();
-	prec = args(3).string_value ();
-else
+if (error_state)
 	{
 	  error ("fwrite: precision must be a specified as a string");
 	  return retval;
 	}
 }
 file_info file = file_list (p);
 Matrix m = args(2).matrix_value ();
-int count = m.write (file.fptr (), prec);
+if (! error_state)
+{
-retval.resize (1);
+int count = m.write (file.fptr (), prec);
-retval(0) = tree_constant ((double) count);
+retval(0) = (double) count;
+}
 return retval;
 }
 DEFUN ("feof", Ffeof, Sfeof, 2, 1,
 if (! p)
 return retval;
 file_info file = file_list (p);
-retval.resize (1);
 retval(0) = (double) feof (file.fptr ());
 return retval;
 }
 file_info file = file_list (p);
 int ierr = ferror (file.fptr ());
 if (nargout > 1)
-{
+retval(1) = (double) ierr;
-retval.resize (2);
-retval(1) = tree_constant ((double) ierr);
+retval(0) = strsave (strerror (ierr));
-}
-else
-retval.resize (1);
-retval(0) = tree_constant (strsave (strerror (ierr)));
 return retval;
 }
 /*

Mercurial > hg > octave-nkf

comparison src/file-io.cc @ 636:fae2bd91c027