From b23faff27c5c5dcd5543496599b11b98d3d4a8ec Mon Sep 17 00:00:00 2001 From: Larry Doolittle Date: Fri, 5 Jun 2015 09:11:10 -0700 Subject: [PATCH] Just a few more spelling fixes Includes some user-visible messages --- design_dump.cc | 2 +- elab_expr.cc | 2 +- elab_lval.cc | 2 +- ivlpp/lexor.lex | 4 ++-- parse.y | 8 ++++---- tgt-blif/lpm_cmp_gt.cc | 2 +- vhdlpp/parse.y | 10 +++++----- vpi/Makefile.in | 2 +- vvp/parse.y | 2 +- vvp/vvp.man.in | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/design_dump.cc b/design_dump.cc index b92bd2c4e..5a97b5ec0 100644 --- a/design_dump.cc +++ b/design_dump.cc @@ -1894,7 +1894,7 @@ void Design::dump(ostream&o) const cur->second->dump(o); } - o << "$ROOT CLASSESS:" << endl; + o << "$ROOT CLASSES:" << endl; for (map::const_iterator cur = classes_.begin() ; cur != classes_.end() ; ++cur) { cur->second->dump_scope(o); diff --git a/elab_expr.cc b/elab_expr.cc index 308e41606..027c83bba 100644 --- a/elab_expr.cc +++ b/elab_expr.cc @@ -2924,7 +2924,7 @@ bool PEIdent::calculate_bits_(Design*des, NetScope*scope, NetEConst*msb_c = dynamic_cast(msb_ex); if (msb_c == 0) { cerr << index_tail.msb->get_fileline() << ": error: " - "Bit select expressionsmust be constant." + "Bit select expressions must be constant." << endl; cerr << index_tail.msb->get_fileline() << ": : " "This msb expression violates the rule: " diff --git a/elab_lval.cc b/elab_lval.cc index 7677921b1..108142ddc 100644 --- a/elab_lval.cc +++ b/elab_lval.cc @@ -485,7 +485,7 @@ NetAssign_* PEIdent::elaborate_lval_method_class_member_(Design*des, if (debug_elaborate) { cerr << get_fileline() << ": PEIdent::elaborate_lval_method_class_member_: " - << "Found initialzers for property " << class_type->get_prop_name(pidx) << endl; + << "Found initializers for property " << class_type->get_prop_name(pidx) << endl; } } } diff --git a/ivlpp/lexor.lex b/ivlpp/lexor.lex index fc382fd70..b87eb0ae7 100644 --- a/ivlpp/lexor.lex +++ b/ivlpp/lexor.lex @@ -738,7 +738,7 @@ static int is_defined(const char*name) * particular, keep the names and name lengths in a compact stretch of * memory. Note that we do not keep the argument names once the * definition is fully processed, because arguments are always - * positional and the definition string hs replaced with position + * positional and the definition string is replaced with position * tokens. */ static char* def_buf = 0; @@ -820,7 +820,7 @@ static void def_add_arg(void) val[val_length] = 0; } - /* Strip white space from betwen arg and "=". */ + /* Strip white space from between arg and "=". */ length = strlen(arg); while (length>0 && isspace(arg[length-1])) { length -= 1; diff --git a/parse.y b/parse.y index fe3eef5c3..93ecec22e 100644 --- a/parse.y +++ b/parse.y @@ -1796,7 +1796,7 @@ property_expr /* IEEE1800-2012 A.2.10 */ /* The property_qualifier rule is as literally described in the LRM, but the use is usually as { property_qualifier }, which is - implemented bt the property_qualifier_opt rule below. */ + implemented by the property_qualifier_opt rule below. */ property_qualifier /* IEEE1800-2005 A.1.8 */ : class_item_qualifier @@ -2101,7 +2101,7 @@ tf_port_item /* IEEE1800-2005: A.2.7 */ } else { // Otherwise, the decorations for this identifier // indicate the type. Save the type for any right - // context thta may come later. + // context that may come later. port_declaration_context.port_type = use_port_type; if ($2 == 0) { $2 = new vector_type_t(IVL_VT_LOGIC, false, 0); @@ -3389,7 +3389,7 @@ expr_primary /* An identifier followed by an expression list in parentheses is a function call. If a system identifier, then a system function - call. It can also be a call to a class method (functino). */ + call. It can also be a call to a class method (function). */ | hierarchy_identifier '(' expression_list_with_nuls ')' { list*expr_list = $3; @@ -6115,7 +6115,7 @@ statement_item /* This is roughly statement_item in the LRM */ { yyerror(@1, "error: Malformed conditional expression."); $$ = $5; } - /* SytemVerilog adds the compressed_statement */ + /* SystemVerilog adds the compressed_statement */ | compressed_statement ';' { $$ = $1; } diff --git a/tgt-blif/lpm_cmp_gt.cc b/tgt-blif/lpm_cmp_gt.cc index 331aab0db..831c9a1c9 100644 --- a/tgt-blif/lpm_cmp_gt.cc +++ b/tgt-blif/lpm_cmp_gt.cc @@ -51,7 +51,7 @@ static int print_lpm_cmp_gt_s(FILE*fd, ivl_lpm_t net) return 0; } - fprintf(stderr, "%s:%u: sorry: blif: Signed agnitude compare not implemented yet\n", + fprintf(stderr, "%s:%u: sorry: blif: Signed magnitude compare not implemented yet\n", ivl_lpm_file(net), ivl_lpm_lineno(net)); return 1; diff --git a/vhdlpp/parse.y b/vhdlpp/parse.y index f75cd19e2..8188052ba 100644 --- a/vhdlpp/parse.y +++ b/vhdlpp/parse.y @@ -903,7 +903,7 @@ configuration_items_opt constant_declaration : K_constant identifier_list ':' subtype_indication VASSIGN expression ';' - { // The syntax allows mutliple names to have the same type/value. + { // The syntax allows multiple names to have the same type/value. for (std::list::iterator cur = $2->begin() ; cur != $2->end() ; ++cur) { active_scope->bind_name(*cur, $4, $6); @@ -918,7 +918,7 @@ constant_declaration /* Some error handling... */ | K_constant identifier_list ':' subtype_indication VASSIGN error ';' - { // The syntax allows mutliple names to have the same type/value. + { // The syntax allows multiple names to have the same type/value. errormsg(@6, "Error in value expression for constants.\n"); yyerrok; for (std::list::iterator cur = $2->begin() @@ -1966,7 +1966,7 @@ process_statement ; /* - * A process_sentitivity_list is: + * A process_sensitivity_list is: * if the list is not present, or * or a non-empty list of actual expressions. */ @@ -2282,9 +2282,9 @@ signal_declaration_assign_opt * * This is functionally a list of terms, with the adding_operator used * as a list element separator instead of a ','. The LRM rule, - * however, is right-recursive, which is not to nice is real LALR + * however, is right-recursive, which is not too nice in real LALR * parsers. The solution is to rewrite it as below, to make it - * left-recursive. This is must more effecient use of the parse stack. + * left-recursive. This is much more efficient use of the parse stack. * * Note that although the concatenation operator '&' is syntactically * an addition operator, it is handled differently during elaboration diff --git a/vpi/Makefile.in b/vpi/Makefile.in index 50e367d6a..fe35b07c6 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -95,7 +95,7 @@ distclean: clean rm -f vpi_config.h stamp-vpi_config-h # The -U flag is used to skip checking paths that depend on that define having -# an explict value (i.e. the define is expected to be real code). +# an explicit value (i.e. the define is expected to be real code). cppcheck: $(O:.o=.c) $(OPP:.o=.cc) $(M:.o=.c) $(V:.o=.c) cppcheck --enable=all -f --suppressions-list=$(srcdir)/cppcheck.sup \ -UYY_USER_INIT \ diff --git a/vvp/parse.y b/vvp/parse.y index 32946dcdf..90a132a91 100644 --- a/vvp/parse.y +++ b/vvp/parse.y @@ -893,7 +893,7 @@ statement | K_TRANVP T_NUMBER T_NUMBER T_NUMBER ',' T_SYMBOL ',' T_SYMBOL T_SYMBOL ';' { compile_island_tranvp($6, $8, $9, $2, $3, $4); } - /* Other statemehts */ + /* Other statements */ | T_LABEL K_CLASS T_STRING '[' T_NUMBER ']' { compile_class_start($1, $3, $5); } diff --git a/vvp/vvp.man.in b/vvp/vvp.man.in index 650e853c4..20b6cb5ab 100644 --- a/vvp/vvp.man.in +++ b/vvp/vvp.man.in @@ -163,7 +163,7 @@ its behavior. These can be used to make semi-permanent changes. This selects the output format for the waveform output. Normally, waveforms are dumped in vcd format, but this variable can be used to select lxt format, which is far more compact, though limited to -gtkwave or compatible viewers. It can also be used to suppress VCD +GTKWave or compatible viewers. It can also be used to suppress VCD output, a time-saver for regression tests. .SH INTERACTIVE MODE