From 12df29af552bbd3ccfadf3957ffc1cffd908afc3 Mon Sep 17 00:00:00 2001 From: Cary R Date: Fri, 15 Apr 2011 14:44:05 -0700 Subject: [PATCH] Fix space issues. Thsi patch removes space before end of line, etc. --- elab_expr.cc | 16 ++++++++-------- elaborate.cc | 2 +- tgt-vlog95/numbers.c | 2 +- vhdlpp/parse.y | 2 +- vhdlpp/vhdlint.cc | 2 +- vpi/Makefile.in | 2 +- vpi/sys_queue.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/elab_expr.cc b/elab_expr.cc index 3a5ee321a..1146921a4 100644 --- a/elab_expr.cc +++ b/elab_expr.cc @@ -226,7 +226,7 @@ unsigned PEBinary::test_width(Design*des, NetScope*scope, width_mode_t&mode) NetExpr* PEBinary::elaborate_expr(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag + flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag ivl_assert(*this, left_); ivl_assert(*this, right_); @@ -509,7 +509,7 @@ unsigned PEBComp::test_width(Design*des, NetScope*scope, width_mode_t&) NetExpr* PEBComp::elaborate_expr(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag + flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag ivl_assert(*this, left_); ivl_assert(*this, right_); @@ -714,7 +714,7 @@ unsigned PEBLeftWidth::test_width(Design*des, NetScope*scope, width_mode_t&mode) NetExpr*PEBLeftWidth::elaborate_expr(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag + flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag ivl_assert(*this, left_); @@ -851,7 +851,7 @@ NetExpr*PEBShift::elaborate_expr_leaf(Design*des, NetExpr*lp, NetExpr*rp, } // Special case: the shift is at least the size of the entire - // left operand, and the shift is a signed right shift. + // left operand, and the shift is a signed right shift. // Elaborate as a replication of the top bit of the left // expression. if ((op_=='R' && signed_flag_) && (shift >= expr_wid)) { @@ -1271,7 +1271,7 @@ NetExpr* PECallFunction::elaborate_access_func_(Design*des, NetScope*scope, NetExpr* PECallFunction::elaborate_expr(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag + flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag if (peek_tail_name(path_)[0] == '$') return elaborate_sfunc_(des, scope, expr_wid, flags); @@ -1490,7 +1490,7 @@ static int concat_depth = 0; NetExpr* PEConcat::elaborate_expr(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag + flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag concat_depth += 1; @@ -3421,7 +3421,7 @@ bool NetETernary::test_operand_compat(ivl_variable_type_t l, NetExpr*PETernary::elaborate_expr(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag + flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag ivl_assert(*this, expr_); ivl_assert(*this, tru_); @@ -3567,7 +3567,7 @@ unsigned PEUnary::test_width(Design*des, NetScope*scope, width_mode_t&mode) NetExpr* PEUnary::elaborate_expr(Design*des, NetScope*scope, unsigned expr_wid, unsigned flags) const { - flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag + flags &= ~SYS_TASK_ARG; // don't propagate the SYS_TASK_ARG flag unsigned sub_width = expr_wid; switch (op_) { diff --git a/elaborate.cc b/elaborate.cc index d09f7a072..db1726e85 100644 --- a/elaborate.cc +++ b/elaborate.cc @@ -4725,7 +4725,7 @@ Design* elaborate(listroots) for (unsigned idx = 0; idx < rmod->port_count(); idx += 1) { vector mport = rmod->get_port(idx); for (unsigned pin = 0; pin < mport.size(); pin += 1) { - // This really does more than we need and adds extra + // This really does more than we need and adds extra // stuff to the design that should be cleaned later. (void) mport[pin]->elaborate_port(des, scope); } diff --git a/tgt-vlog95/numbers.c b/tgt-vlog95/numbers.c index 776a97973..7ea1b37f6 100644 --- a/tgt-vlog95/numbers.c +++ b/tgt-vlog95/numbers.c @@ -325,7 +325,7 @@ void emit_string(const char* string) char *cptr = buffer; fprintf(vlog_out, "\""); /* Prune any leading escaped NULL bytes. */ - while ((cptr[0] == '\\') && (cptr[1] == '0') && + while ((cptr[0] == '\\') && (cptr[1] == '0') && (cptr[2] == '0') && (cptr[3] == '0')) cptr += 4; if (*cptr) fprintf(vlog_out, "%s", cptr); free(buffer); diff --git a/vhdlpp/parse.y b/vhdlpp/parse.y index 5fc437eaf..025713134 100644 --- a/vhdlpp/parse.y +++ b/vhdlpp/parse.y @@ -163,7 +163,7 @@ const VType*parse_type_by_name(perm_string name) %token K_xnor K_xor /* Identifiers that are not keywords are identifiers. */ %token IDENTIFIER -%token INT_LITERAL +%token INT_LITERAL %token REAL_LITERAL %token STRING_LITERAL CHARACTER_LITERAL /* compound symbols */ diff --git a/vhdlpp/vhdlint.cc b/vhdlpp/vhdlint.cc index 3add32f50..51f3357b2 100644 --- a/vhdlpp/vhdlint.cc +++ b/vhdlpp/vhdlint.cc @@ -62,7 +62,7 @@ vhdlint::vhdlint(const char* text) } } *new_ptr = 0; - + istringstream str(new_text); delete[] new_text; diff --git a/vpi/Makefile.in b/vpi/Makefile.in index 31a6e54c7..d2d5631c0 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -55,7 +55,7 @@ LDFLAGS = @LDFLAGS@ O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_fileio.o \ sys_finish.o sys_icarus.o sys_plusargs.o sys_queue.o sys_random.o \ sys_random_mti.o sys_readmem.o sys_readmem_lex.o sys_scanf.o sys_sdf.o \ - sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o sys_priv.o \ + sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o sys_priv.o \ sdf_lexor.o sdf_parse.o stringheap.o vams_simparam.o OPP = vcd_priv2.o diff --git a/vpi/sys_queue.c b/vpi/sys_queue.c index f5d91191d..adc281ec2 100644 --- a/vpi/sys_queue.c +++ b/vpi/sys_queue.c @@ -57,7 +57,7 @@ * Routine to add the given time to the the total time (high/low). */ void add_to_wait_time(uint64_t *high, uint64_t *low, uint64_t time) -{ +{ uint64_t carry = 0U; if ((UINT64_MAX - *low) < time) carry = 1U;