static int sf_seen_eor = 0;
static int eor_condition = 0;
+/* Maximum righthand column written to. */
+static int max_pos;
+/* Number of skips + spaces to be done for T and X-editing. */
+static int skips;
+/* Number of spaces to be done for T and X-editing. */
+static int pending_spaces;
+
char scratch[SCRATCH_SIZE];
static char *line_buffer = NULL;
do
{
if (is_internal_unit())
- {
+ {
/* readlen may be modified inside salloc_r if
is_internal_unit() is true. */
- readlen = 1;
- }
+ readlen = 1;
+ }
q = salloc_r (current_unit->s, &readlen);
if (q == NULL)
current_unit->bytes_left = 0;
*length = n;
- sf_seen_eor = 1;
+ sf_seen_eor = 1;
break;
}
static void
formatted_transfer (bt type, void *p, int len)
{
- int pos ,m ;
+ int pos;
fnode *f;
+ format_token t;
int n;
int consume_data_flag;
for (;;)
{
/* If reversion has occurred and there is another real data item,
- then we have to move to the next record. */
+ then we have to move to the next record. */
if (g.reversion_flag && n > 0)
- {
- g.reversion_flag = 0;
- next_record (0);
- }
+ {
+ g.reversion_flag = 0;
+ next_record (0);
+ }
consume_data_flag = 1 ;
if (ioparm.library_return != LIBRARY_OK)
f = next_format ();
if (f == NULL)
- return; /* No data descriptors left (already raised). */
+ return; /* No data descriptors left (already raised). */
+
+ /* Now discharge T, TR and X movements to the right. This is delayed
+ until a data producing format to supress trailing spaces. */
+ t = f->format;
+ if (g.mode == WRITING && skips > 0
+ && (t == FMT_I || t == FMT_B || t == FMT_O || t == FMT_Z
+ || t == FMT_F || t == FMT_E || t == FMT_EN || t == FMT_ES
+ || t == FMT_G || t == FMT_L || t == FMT_A || t == FMT_D
+ || t == FMT_STRING))
+ {
+ write_x (skips, pending_spaces);
+ max_pos = current_unit->recl - current_unit->bytes_left;
+ skips = pending_spaces = 0;
+ }
- switch (f->format)
+ switch (t)
{
case FMT_I:
if (n == 0)
break;
case FMT_STRING:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
if (g.mode == READING)
{
format_error (f, "Constant string in input format");
write_constant_string (f);
break;
- /* Format codes that don't transfer data. */
+ /* Format codes that don't transfer data. */
case FMT_X:
case FMT_TR:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
+
+ pos = current_unit->recl - current_unit->bytes_left + f->u.n;
+ skips = f->u.n;
+ pending_spaces = pos - max_pos;
+
+ /* Writes occur just before the switch on f->format, above, so that
+ trailing blanks are suppressed. */
if (g.mode == READING)
read_x (f);
- else
- write_x (f);
break;
- case FMT_TL:
- case FMT_T:
- if (f->format == FMT_TL)
- pos = current_unit->recl - current_unit->bytes_left - f->u.n;
- else /* FMT_T */
- {
- consume_data_flag = 0;
- pos = f->u.n - 1;
- }
-
- if (pos < 0 || pos >= current_unit->recl )
- {
- generate_error (ERROR_EOR, "T or TL edit position error");
- break ;
- }
- m = pos - (current_unit->recl - current_unit->bytes_left);
-
- if (m == 0)
- break;
-
- if (m > 0)
- {
- f->u.n = m;
- if (g.mode == READING)
- read_x (f);
- else
- write_x (f);
- }
- if (m < 0)
- {
- move_pos_offset (current_unit->s,m);
- current_unit->bytes_left -= m;
- }
+ case FMT_TL:
+ case FMT_T:
+ if (f->format == FMT_TL)
+ pos = current_unit->recl - current_unit->bytes_left - f->u.n;
+ else /* FMT_T */
+ {
+ consume_data_flag = 0;
+ pos = f->u.n - 1;
+ }
+
+ /* Standard 10.6.1.1: excessive left tabbing is reset to the
+ left tab limit. We do not check if the position has gone
+ beyond the end of record because a subsequent tab could
+ bring us back again. */
+ pos = pos < 0 ? 0 : pos;
+
+ skips = skips + pos - (current_unit->recl - current_unit->bytes_left);
+ pending_spaces = pending_spaces + pos - max_pos;
+
+ if (skips == 0)
+ break;
+
+ /* Writes occur just before the switch on f->format, above, so that
+ trailing blanks are suppressed. */
+ if (skips > 0)
+ {
+ if (g.mode == READING)
+ {
+ f->u.n = skips;
+ read_x (f);
+ }
+ }
+ if (skips < 0)
+ {
+ move_pos_offset (current_unit->s, skips);
+ current_unit->bytes_left -= skips;
+ skips = pending_spaces = 0;
+ }
break;
case FMT_S:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
g.sign_status = SIGN_S;
break;
case FMT_SS:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
g.sign_status = SIGN_SS;
break;
case FMT_SP:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
g.sign_status = SIGN_SP;
break;
case FMT_BN:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
g.blank_status = BLANK_NULL;
break;
case FMT_BZ:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
g.blank_status = BLANK_ZERO;
break;
case FMT_P:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
g.scale_factor = f->u.k;
break;
case FMT_DOLLAR:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
g.seen_dollar = 1;
break;
case FMT_SLASH:
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
next_record (0);
break;
particular preventing another / descriptor from being
processed) unless there is another data item to be
transferred. */
- consume_data_flag = 0 ;
+ consume_data_flag = 0 ;
if (n == 0)
return;
break;
if ((consume_data_flag > 0) && (n > 0))
{
n--;
- p = ((char *) p) + len;
+ p = ((char *) p) + len;
}
+
+ if (g.mode == READING)
+ skips = 0;
+
+ pos = current_unit->recl - current_unit->bytes_left;
+ max_pos = (max_pos > pos) ? max_pos : pos;
+
}
return;
{
current_unit->recl = file_length(current_unit->s);
if (g.mode==WRITING)
- empty_internal_buffer (current_unit->s);
+ empty_internal_buffer (current_unit->s);
}
/* Check the action. */
if (ioparm.namelist_name != NULL && ionml != NULL)
{
- if(ioparm.format != NULL)
- generate_error (ERROR_OPTION_CONFLICT,
- "A format cannot be specified with a namelist");
+ if(ioparm.format != NULL)
+ generate_error (ERROR_OPTION_CONFLICT,
+ "A format cannot be specified with a namelist");
}
else if (current_unit->flags.form == FORM_FORMATTED &&
- ioparm.format == NULL && !ioparm.list_format)
+ ioparm.format == NULL && !ioparm.list_format)
generate_error (ERROR_OPTION_CONFLICT,
- "Missing format for FORMATTED data transfer");
+ "Missing format for FORMATTED data transfer");
if (is_internal_unit () && current_unit->flags.form == FORM_UNFORMATTED)
/* Check to see if we might be reading what we wrote before */
if (g.mode == READING && current_unit->mode == WRITING)
- flush(current_unit->s);
+ flush(current_unit->s);
/* Position the file. */
if (sseek (current_unit->s,
- (ioparm.rec - 1) * current_unit->recl) == FAILURE)
+ (ioparm.rec - 1) * current_unit->recl) == FAILURE)
generate_error (ERROR_OS, NULL);
}
if (g.mode == WRITING
&& current_unit->flags.access == ACCESS_SEQUENTIAL
&& current_unit->current_record == 0)
- struncate(current_unit->s);
+ struncate(current_unit->s);
current_unit->mode = g.mode;
else
{
if (ioparm.list_format)
- {
- transfer = list_formatted_read;
- init_at_eol();
- }
+ {
+ transfer = list_formatted_read;
+ init_at_eol();
+ }
else
transfer = formatted_transfer;
}
current_unit->read_bad = 1;
}
+ /* Reset counters for T and X-editing. */
+ if (current_unit->flags.form == FORM_FORMATTED)
+ max_pos = skips = pending_spaces = 0;
+
/* Start the data transfer if we are doing a formatted transfer. */
if (current_unit->flags.form == FORM_FORMATTED && !ioparm.list_format
&& ioparm.namelist_name == NULL && ionml == NULL)
}
do
- {
- p = salloc_r (current_unit->s, &length);
-
- /* In case of internal file, there may not be any '\n'. */
- if (is_internal_unit() && p == NULL)
- {
- break;
- }
-
- if (p == NULL)
- {
- generate_error (ERROR_OS, NULL);
- break;
- }
-
- if (length == 0)
- {
- current_unit->endfile = AT_ENDFILE;
- break;
- }
- }
+ {
+ p = salloc_r (current_unit->s, &length);
+
+ /* In case of internal file, there may not be any '\n'. */
+ if (is_internal_unit() && p == NULL)
+ {
+ break;
+ }
+
+ if (p == NULL)
+ {
+ generate_error (ERROR_OS, NULL);
+ break;
+ }
+
+ if (length == 0)
+ {
+ current_unit->endfile = AT_ENDFILE;
+ break;
+ }
+ }
while (*p != '\n');
break;
case UNFORMATTED_DIRECT:
if (sfree (current_unit->s) == FAILURE)
- goto io_error;
+ goto io_error;
break;
case UNFORMATTED_SEQUENTIAL:
p = salloc_w (current_unit->s, &length);
if (!is_internal_unit())
- {
- if (p)
- *p = '\n'; /* No CR for internal writes. */
- else
- goto io_error;
- }
+ {
+ if (p)
+ *p = '\n'; /* No CR for internal writes. */
+ else
+ goto io_error;
+ }
if (sfree (current_unit->s) == FAILURE)
goto io_error;
if ((ionml != NULL) && (ioparm.namelist_name != NULL))
{
if (ioparm.namelist_read_mode)
- namelist_read();
+ namelist_read();
else
- namelist_write();
+ namelist_write();
}
transfer = NULL;
void
st_read (void)
{
+
library_start ();
data_transfer_init (1);
break;
case AT_ENDFILE:
- if (!is_internal_unit())
- {
- generate_error (ERROR_END, NULL);
- current_unit->endfile = AFTER_ENDFILE;
- }
+ if (!is_internal_unit())
+ {
+ generate_error (ERROR_END, NULL);
+ current_unit->endfile = AFTER_ENDFILE;
+ }
break;
case AFTER_ENDFILE:
void
st_write (void)
{
+
library_start ();
data_transfer_init (0);
}
case NO_ENDFILE:
if (current_unit->current_record > current_unit->last_record)
- {
- /* Get rid of whatever is after this record. */
- if (struncate (current_unit->s) == FAILURE)
- generate_error (ERROR_OS, NULL);
- }
+ {
+ /* Get rid of whatever is after this record. */
+ if (struncate (current_unit->s) == FAILURE)
+ generate_error (ERROR_OS, NULL);
+ }
current_unit->endfile = AT_ENDFILE;
break;
projects / gcc.git / commitdiff