From 5880700ab4139a66356988acab8b738757bf05ab Mon Sep 17 00:00:00 2001 From: dick Date: Mon, 17 Mar 1986 17:47:04 +0000 Subject: [PATCH] some long lines split --- lang/cem/cemcom/LLlex.c | 3 ++- lang/cem/cemcom/arith.c | 3 ++- lang/cem/cemcom/ch7bin.c | 5 ++++- lang/cem/cemcom/ch7mon.c | 5 +++-- lang/cem/cemcom/domacro.c | 5 +++-- lang/cem/cemcom/dumpidf.c | 3 ++- lang/cem/cemcom/eval.c | 28 ++++++++++++++++++---------- lang/cem/cemcom/expr.c | 13 ++++++++----- lang/cem/cemcom/input.c | 9 +++++++-- lang/cem/cemcom/main.c | 4 +++- lang/cem/cemcom/replace.c | 3 ++- lang/cem/cemcom/scan.c | 3 ++- lang/cem/cemcom/stack.c | 18 +++++++++++++----- lang/cem/cemcom/statement.g | 3 ++- 14 files changed, 71 insertions(+), 34 deletions(-) diff --git a/lang/cem/cemcom/LLlex.c b/lang/cem/cemcom/LLlex.c index 0c3e9f98f..fce9dac6c 100644 --- a/lang/cem/cemcom/LLlex.c +++ b/lang/cem/cemcom/LLlex.c @@ -497,7 +497,8 @@ string_token(nm, stop_char) else { str[pos++] = '\\'; if (pos == str_size) - str = Srealloc(str, str_size += RSTRSIZE); + str = Srealloc(str, + str_size += RSTRSIZE); ch = nch; } } diff --git a/lang/cem/cemcom/arith.c b/lang/cem/cemcom/arith.c index ab63a9c9b..29755d4d9 100644 --- a/lang/cem/cemcom/arith.c +++ b/lang/cem/cemcom/arith.c @@ -450,7 +450,8 @@ field2arith(expp) register arith bits_in_type = atype->tp_size * 8; ch7bin(expp, LEFT, - intexpr(bits_in_type - fd->fd_width - fd->fd_shift, INT) + intexpr(bits_in_type - fd->fd_width - fd->fd_shift, + INT) ); ch7bin(expp, RIGHT, intexpr(bits_in_type - fd->fd_width, INT)); } diff --git a/lang/cem/cemcom/ch7bin.c b/lang/cem/cemcom/ch7bin.c index cae35b112..12d926786 100644 --- a/lang/cem/cemcom/ch7bin.c +++ b/lang/cem/cemcom/ch7bin.c @@ -105,8 +105,11 @@ ch7bin(expp, oper, expr) } if ((*expp)->ex_type->tp_fund == POINTER) { pointer_arithmetic(expp, oper, &expr); - if (expr->ex_type->tp_size != (*expp)->ex_type->tp_size) + if ( expr->ex_type->tp_size != + (*expp)->ex_type->tp_size + ) { ch7cast(&expr, CAST, (*expp)->ex_type); + } pointer_binary(expp, oper, expr); } else { diff --git a/lang/cem/cemcom/ch7mon.c b/lang/cem/cemcom/ch7mon.c index 3018c116d..5c1441928 100644 --- a/lang/cem/cemcom/ch7mon.c +++ b/lang/cem/cemcom/ch7mon.c @@ -78,7 +78,7 @@ ch7mon(oper, expp) */ if (def->df_sc == REGISTER) { expr_error(*expp, - "& on register variable not allowed"); + "& on register variable not allowed"); (*expp)->ex_type = error_type; break; /* break case '&' */ } @@ -113,7 +113,8 @@ ch7mon(oper, expp) if (is_fp_cst(*expp)) switch_sign_fp(*expp); else - *expp = new_oper((*expp)->ex_type, NILEXPR, oper, *expp); + *expp = new_oper((*expp)->ex_type, + NILEXPR, oper, *expp); break; case '!': if ((*expp)->ex_type->tp_fund == FUNCTION) diff --git a/lang/cem/cemcom/domacro.c b/lang/cem/cemcom/domacro.c index 5407591a6..f2d76d9eb 100644 --- a/lang/cem/cemcom/domacro.c +++ b/lang/cem/cemcom/domacro.c @@ -529,8 +529,9 @@ get_text(formals, length) if (c == '\\') { /* check for "\\\n" */ LoadChar(c); if (c == '\n') { - /* more than one line is used for the - replacement text. Replace "\\\n" by " ". + /* More than one line is used for the + replacement text. + Replace "\\\n" by " ". */ text[pos++] = ' '; ++LineNumber; diff --git a/lang/cem/cemcom/dumpidf.c b/lang/cem/cemcom/dumpidf.c index e370512b8..b2732bfd5 100644 --- a/lang/cem/cemcom/dumpidf.c +++ b/lang/cem/cemcom/dumpidf.c @@ -246,7 +246,8 @@ type2str(tp) sprintf(buf, ""); return buf; } - sprintf(buf, "(@%lx, #%ld, &%d) ", tp, (long)tp->tp_size, tp->tp_align); + sprintf(buf, "(@%lx, #%ld, &%d) ", + tp, (long)tp->tp_size, tp->tp_align); while (ops) { switch (tp->tp_fund) { case POINTER: diff --git a/lang/cem/cemcom/eval.c b/lang/cem/cemcom/eval.c index 094cf6255..719338bb2 100644 --- a/lang/cem/cemcom/eval.c +++ b/lang/cem/cemcom/eval.c @@ -57,14 +57,16 @@ arith tmp_pointer_var(); int code: indicates whether the expression tree must be turned into EM code or not. E.g. the expression statement "12;" delivers the expression "12" to - EVAL while this should not result in any EM code + EVAL while this should not result in any EM + code label false_label: label true_label: if the expression is a logical or relational expression and if the loop of the program depends on the resulting value then EVAL - generates jumps to the specified program labels, - in case they are specified (i.e. are non-zero) + generates jumps to the specified program + labels, in case they are specified + (i.e. are non-zero) */ EVAL(expr, val, code, true_label, false_label) @@ -242,7 +244,9 @@ EVAL(expr, val, code, true_label, false_label) EVAL(leftop, RVAL, code, NO_LABEL, NO_LABEL); EVAL(rightop, RVAL, code, NO_LABEL, NO_LABEL); if (gencode) - if (tp->tp_fund == INT || tp->tp_fund == LONG) { + if ( tp->tp_fund == INT + || tp->tp_fund == LONG + ) { if (tp->tp_unsigned) C_rmu(tp->tp_size); else @@ -279,23 +283,25 @@ EVAL(expr, val, code, true_label, false_label) EVAL(rightop, RVAL, code, NO_LABEL, NO_LABEL); if (gencode) { /* The operands have the same type */ + arith size = leftop->ex_type->tp_size; + switch (tp->tp_fund) { case INT: case LONG: if (leftop->ex_type->tp_unsigned) - C_cmu(leftop->ex_type->tp_size); + C_cmu(size); else - C_cmi(leftop->ex_type->tp_size); + C_cmi(size); break; case FLOAT: case DOUBLE: - C_cmf(leftop->ex_type->tp_size); + C_cmf(size); break; case POINTER: C_cmp(); break; case ENUM: - C_cmi(leftop->ex_type->tp_size); + C_cmi(size); break; default: CRASH(); @@ -537,10 +543,12 @@ EVAL(expr, val, code, true_label, false_label) EVAL(leftop, RVAL, TRUE, l_true, l_false); C_df_ilb(l_true); - EVAL(rightop->OP_LEFT, RVAL, code, NO_LABEL, NO_LABEL); + EVAL(rightop->OP_LEFT, RVAL, code, + NO_LABEL, NO_LABEL); C_bra(l_end); C_df_ilb(l_false); - EVAL(rightop->OP_RIGHT, RVAL, code, NO_LABEL, NO_LABEL); + EVAL(rightop->OP_RIGHT, RVAL, code, + NO_LABEL, NO_LABEL); C_df_ilb(l_end); break; } diff --git a/lang/cem/cemcom/expr.c b/lang/cem/cemcom/expr.c index ac646a323..7dea8edb4 100644 --- a/lang/cem/cemcom/expr.c +++ b/lang/cem/cemcom/expr.c @@ -225,11 +225,14 @@ intexpr(ivalue, fund) expr->ex_type = long_type; break; case UNSIGNED: - /* We cannot make a test like "ivalue <= max_unsigned" - because, if sizeof(long) == int_size holds, max_unsigned - may be a negative long in which case the comparison - results in an unexpected answer. We assume that - the type "unsigned long" is not part of portable C ! + /* We cannot make a test like + ivalue <= max_unsigned + because, if + sizeof(long) == int_size + holds, max_unsigned may be a negative long in + which case the comparison results in an unexpected + answer. We assume that the type "unsigned long" + is not part of portable C ! */ expr->ex_type = (ivalue & ~max_unsigned) ? long_type : uint_type; diff --git a/lang/cem/cemcom/input.c b/lang/cem/cemcom/input.c index e3015cdd7..2838d8231 100644 --- a/lang/cem/cemcom/input.c +++ b/lang/cem/cemcom/input.c @@ -95,8 +95,10 @@ readfile(filename, size) char *cbuf; /* pointer to buffer to be returned */ register tmp; - if ((fd = sys_open(filename, OP_RDONLY)) < 0) /* can't open this file */ + if ((fd = sys_open(filename, OP_RDONLY)) < 0) { + /* can't open this file */ return (char *) 0; + } if ((*size = sys_fsize(fd)) < 0) fatal("(readfile) cannot get size of file"); @@ -374,8 +376,11 @@ loadbuf() #ifndef READ_IN_ONE #ifndef NOPP - if (FilDes >= 0 && (head->bh_size = readblock(FilDes, head->bh_text)) > 0) + if ( FilDes >= 0 + && (head->bh_size = readblock(FilDes, head->bh_text)) > 0 + ) { return ipp = &(head->bh_text[1]), *ipp++; + } #else NOPP if (FilDes >= 0 && (isize = readblock(FilDes, &ibuf[0])) > 0) return ipp = &ibuf[1], *ipp++; diff --git a/lang/cem/cemcom/main.c b/lang/cem/cemcom/main.c index b2b199f74..b2e1a9d59 100644 --- a/lang/cem/cemcom/main.c +++ b/lang/cem/cemcom/main.c @@ -309,7 +309,9 @@ preprocess() lastlineno = dot.tk_line; if (!options['P']) printf("\n#line %ld \"%s\"\n", - lastlineno, lastfilenm); + lastlineno, + lastfilenm + ); } } else { diff --git a/lang/cem/cemcom/replace.c b/lang/cem/cemcom/replace.c index 24c93586b..c76b5d7ac 100644 --- a/lang/cem/cemcom/replace.c +++ b/lang/cem/cemcom/replace.c @@ -138,7 +138,8 @@ macro2buffer(idef, actpars, siztext) text[pos++] = *p; if (pos == size) { - text = Srealloc(text, size += RSTRSIZE); + text = Srealloc(text, + size += RSTRSIZE); } } } diff --git a/lang/cem/cemcom/scan.c b/lang/cem/cemcom/scan.c index c34edf4bb..d75f87433 100644 --- a/lang/cem/cemcom/scan.c +++ b/lang/cem/cemcom/scan.c @@ -165,7 +165,8 @@ copyact(ch1, ch2, level) break; case ',': - if (!level) { /* next parameter encountered */ + if (!level) { + /* next parameter encountered */ copy(EOS); if (++nr_of_params >= NPARAMS) { diff --git a/lang/cem/cemcom/stack.c b/lang/cem/cemcom/stack.c index 060d793c3..50ed04f6f 100644 --- a/lang/cem/cemcom/stack.c +++ b/lang/cem/cemcom/stack.c @@ -46,7 +46,8 @@ stack_level() { local_level->sl_next = stl; stl->sl_previous = local_level; stl->sl_level = ++level; - stl->sl_local_offset = stl->sl_max_block = local_level->sl_local_offset; + stl->sl_local_offset = + stl->sl_max_block = local_level->sl_local_offset; local_level = stl; } @@ -143,12 +144,16 @@ unstack_level() free_def(def); update_ahead(idf); } - while ((sdef = idf->id_sdef) && sdef->sd_level >= level) { + while ( (sdef = idf->id_sdef) + && sdef->sd_level >= level + ) { /* unlink it from the sdef list under the idf block */ idf->id_sdef = sdef->next; free_sdef(sdef); } - while ((tag = idf->id_struct) && tag->tg_level >= level) { + while ( (tag = idf->id_struct) + && tag->tg_level >= level + ) { /* unlink it from the struct list under the idf block */ idf->id_struct = tag->next; free_tag(tag); @@ -163,8 +168,11 @@ unstack_level() */ lastlvl = local_level; local_level = local_level->sl_previous; - if (level > L_LOCAL && lastlvl->sl_max_block < local_level->sl_max_block) - local_level->sl_max_block = lastlvl->sl_max_block; + if ( level > L_LOCAL + && lastlvl->sl_max_block < local_level->sl_max_block + ) { + local_level->sl_max_block = lastlvl->sl_max_block; + } free_stack_level(lastlvl); local_level->sl_next = (struct stack_level *) 0; level = local_level->sl_level; diff --git a/lang/cem/cemcom/statement.g b/lang/cem/cemcom/statement.g index af127420b..da25a9471 100644 --- a/lang/cem/cemcom/statement.g +++ b/lang/cem/cemcom/statement.g @@ -258,7 +258,8 @@ for_statement { C_df_ilb(l_continue); if (e_incr) - code_expr(e_incr, RVAL, FALSE, NO_LABEL, NO_LABEL); + code_expr(e_incr, RVAL, FALSE, + NO_LABEL, NO_LABEL); C_bra(l_test); C_df_ilb(l_break); stat_unstack(); -- 2.34.1