Skip to content

Commit d63fb7a

Browse files
authored
Merge pull request diffblue#3115 from johnnonweiler/doc/reduce-doxygen-warnings-2
Reduce doxygen warnings
2 parents 4d2905f + eea5403 commit d63fb7a

File tree

9 files changed

+38
-42
lines changed

9 files changed

+38
-42
lines changed

jbmc/src/java_bytecode/character_refine_preprocess.cpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ codet character_refine_preprocesst::convert_char_function(
3535

3636
/// The returned expression is true when the first argument is in the interval
3737
/// defined by the lower and upper bounds (included)
38-
/// \param arg: Expression we want to bound
38+
/// \param chr: Expression we want to bound
3939
/// \param lower_bound: Integer lower bound
4040
/// \param upper_bound: Integer upper bound
4141
/// \return A Boolean expression
@@ -65,7 +65,7 @@ exprt character_refine_preprocesst::in_list_expr(
6565

6666
/// Determines the number of char values needed to represent the specified
6767
/// character (Unicode code point).
68-
/// \param expr: An expression of type character
68+
/// \param chr: An expression of type character
6969
/// \param type: A type for the output
7070
/// \return A integer expression of the given type
7171
exprt character_refine_preprocesst::expr_of_char_count(
@@ -308,7 +308,7 @@ codet character_refine_preprocesst::convert_hash_code(conversion_inputt &target)
308308
/// Returns the leading surrogate (a high surrogate code unit) of the surrogate
309309
/// pair representing the specified supplementary character (Unicode code point)
310310
/// in the UTF-16 encoding.
311-
/// \param expr: An expression of type character
311+
/// \param chr: An expression of type character
312312
/// \param type: A type for the output
313313
/// \return An expression of the given type
314314
exprt character_refine_preprocesst::expr_of_high_surrogate(
@@ -342,7 +342,7 @@ exprt character_refine_preprocesst::expr_of_is_ascii_lower_case(
342342
}
343343

344344
/// Determines if the specified character is an ASCII uppercase character.
345-
/// \param expr: An expression of type character
345+
/// \param chr: An expression of type character
346346
/// \param type: A type for the output
347347
/// \return A Boolean expression
348348
exprt character_refine_preprocesst::expr_of_is_ascii_upper_case(
@@ -356,7 +356,7 @@ exprt character_refine_preprocesst::expr_of_is_ascii_upper_case(
356356
/// TODO: for now this is only for ASCII characters, the
357357
/// following unicode categories are not yet considered:
358358
/// TITLECASE_LETTER MODIFIER_LETTER OTHER_LETTER LETTER_NUMBER
359-
/// \param expr: An expression of type character
359+
/// \param chr: An expression of type character
360360
/// \param type: A type for the output
361361
/// \return An expression of the given type
362362
exprt character_refine_preprocesst::expr_of_is_letter(
@@ -374,7 +374,7 @@ exprt character_refine_preprocesst::expr_of_is_letter(
374374
/// TITLECASE_LETTER MODIFIER_LETTER OTHER_LETTER LETTER_NUMBER
375375
/// and contributory property Other_Alphabetic as defined by the
376376
/// Unicode Standard.
377-
/// \param expr: An expression of type character
377+
/// \param chr: An expression of type character
378378
/// \param type: A type for the output
379379
/// \return An expression of the given type
380380
exprt character_refine_preprocesst::expr_of_is_alphabetic(
@@ -396,7 +396,7 @@ codet character_refine_preprocesst::convert_is_alphabetic(
396396
/// Determines whether the specified character (Unicode code point) is in the
397397
/// Basic Multilingual Plane (BMP). Such code points can be represented using a
398398
/// single char.
399-
/// \param expr: An expression of type character
399+
/// \param chr: An expression of type character
400400
/// \param type: A type for the output
401401
/// \return A Boolean expression
402402
exprt character_refine_preprocesst::expr_of_is_bmp_code_point(
@@ -417,7 +417,7 @@ codet character_refine_preprocesst::convert_is_bmp_code_point(
417417
}
418418

419419
/// Determines if a character is defined in Unicode.
420-
/// \param expr: An expression of type character
420+
/// \param chr: An expression of type character
421421
/// \param type: A type for the output
422422
/// \return An expression of the given type
423423
exprt character_refine_preprocesst::expr_of_is_defined(
@@ -475,11 +475,11 @@ codet character_refine_preprocesst::convert_is_defined_int(
475475
/// DECIMAL_DIGIT_NUMBER.
476476
///
477477
/// TODO: for now we only support these ranges of digits:
478-
/// '\u0030' through '\u0039', ISO-LATIN-1 digits ('0' through '9')
479-
/// '\u0660' through '\u0669', Arabic-Indic digits
480-
/// '\u06F0' through '\u06F9', Extended Arabic-Indic digits
481-
/// '\u0966' through '\u096F', Devanagari digits
482-
/// '\uFF10' through '\uFF19', Fullwidth digits
478+
/// '\\u0030' through '\\u0039', ISO-LATIN-1 digits ('0' through '9')
479+
/// '\\u0660' through '\\u0669', Arabic-Indic digits
480+
/// '\\u06F0' through '\\u06F9', Extended Arabic-Indic digits
481+
/// '\\u0966' through '\\u096F', Devanagari digits
482+
/// '\\uFF10' through '\\uFF19', Fullwidth digits
483483
/// Many other character ranges contain digits as well.
484484
/// \param chr: An expression of type character
485485
/// \param type: A type for the output
@@ -519,7 +519,7 @@ codet character_refine_preprocesst::convert_is_digit_int(
519519

520520
/// Determines if the given char value is a Unicode high-surrogate code unit
521521
/// (also known as leading-surrogate code unit).
522-
/// \param expr: An expression of type character
522+
/// \param chr: An expression of type character
523523
/// \param type: A type for the output
524524
/// \return A Boolean expression
525525
exprt character_refine_preprocesst::expr_of_is_high_surrogate(
@@ -539,11 +539,11 @@ codet character_refine_preprocesst::convert_is_high_surrogate(
539539
}
540540

541541
/// Determines if the character is one of ignorable in a Java identifier, that
542-
/// is, it is in one of these ranges: '\u0000' through '\u0008' '\u000E' through
543-
/// '\u001B' '\u007F' through '\u009F'
542+
/// is, it is in one of these ranges: '\\u0000' through '\\u0008' '\\u000E'
543+
/// through '\\u001B' '\\u007F' through '\\u009F'
544544
///
545545
/// TODO: For now, we ignore the FORMAT general category value
546-
/// \param expr: An expression of type character
546+
/// \param chr: An expression of type character
547547
/// \param type: A type for the output
548548
/// \return A Boolean expression
549549
exprt character_refine_preprocesst::expr_of_is_identifier_ignorable(
@@ -770,7 +770,7 @@ codet character_refine_preprocesst::convert_is_low_surrogate(
770770
/// specification.
771771
///
772772
/// TODO: For now only ASCII characters are considered
773-
/// \param expr: An expression of type character
773+
/// \param chr: An expression of type character
774774
/// \param type: A type for the output
775775
/// \return An expression of the given type
776776
exprt character_refine_preprocesst::expr_of_is_mirrored(
@@ -812,7 +812,7 @@ codet character_refine_preprocesst::convert_is_space(conversion_inputt &target)
812812

813813
/// Determines if the specified character is white space according to Unicode
814814
/// (SPACE_SEPARATOR, LINE_SEPARATOR, or PARAGRAPH_SEPARATOR)
815-
/// \param expr: An expression of type character
815+
/// \param chr: An expression of type character
816816
/// \param type: A type for the output
817817
/// \return A Boolean expression
818818
exprt character_refine_preprocesst::expr_of_is_space_char(
@@ -846,7 +846,7 @@ codet character_refine_preprocesst::convert_is_space_char_int(
846846

847847
/// Determines whether the specified character (Unicode code point) is in the
848848
/// supplementary character range.
849-
/// \param expr: An expression of type character
849+
/// \param chr: An expression of type character
850850
/// \param type: A type for the output
851851
/// \return A Boolean expression
852852
exprt character_refine_preprocesst::expr_of_is_supplementary_code_point(
@@ -866,7 +866,7 @@ codet character_refine_preprocesst::convert_is_supplementary_code_point(
866866
}
867867

868868
/// Determines if the given char value is a Unicode surrogate code unit.
869-
/// \param expr: An expression of type character
869+
/// \param chr: An expression of type character
870870
/// \param type: A type for the output
871871
/// \return A Boolean expression
872872
exprt character_refine_preprocesst::expr_of_is_surrogate(
@@ -902,7 +902,7 @@ codet character_refine_preprocesst::convert_is_surrogate_pair(
902902
}
903903

904904
/// Determines if the specified character is a titlecase character.
905-
/// \param expr: An expression of type character
905+
/// \param chr: An expression of type character
906906
/// \param type: A type for the output
907907
/// \return A Boolean expression
908908
exprt character_refine_preprocesst::expr_of_is_title_case(
@@ -939,7 +939,7 @@ codet character_refine_preprocesst::convert_is_title_case_int(
939939

940940
/// Determines if the specified character is in the LETTER_NUMBER category of
941941
/// Unicode
942-
/// \param expr: An expression of type character
942+
/// \param chr: An expression of type character
943943
/// \param type: A type for the output
944944
/// \return A Boolean expression
945945
exprt character_refine_preprocesst::expr_of_is_letter_number(
@@ -966,7 +966,7 @@ exprt character_refine_preprocesst::expr_of_is_letter_number(
966966
///
967967
/// TODO: For now we do not allow connecting punctuation, combining mark,
968968
/// non-spacing mark
969-
/// \param expr: An expression of type character
969+
/// \param chr: An expression of type character
970970
/// \param type: A type for the output
971971
/// \return A Boolean expression
972972
exprt character_refine_preprocesst::expr_of_is_unicode_identifier_part(
@@ -1074,9 +1074,9 @@ codet character_refine_preprocesst::convert_is_valid_code_point(
10741074
/// Determines if the specified character is white space according to Java. It
10751075
/// is the case when it one of the following: * a Unicode space character
10761076
/// (SPACE_SEPARATOR, LINE_SEPARATOR, or PARAGRAPH_SEPARATOR) but is not also a
1077-
/// non-breaking space ('\u00A0', '\u2007', '\u202F'). * it is one of these:
1077+
/// non-breaking space ('\\u00A0', '\\u2007', '\\u202F'). * it is one of these:
10781078
/// U+0009 U+000A U+000B U+000C U+000D U+001C U+001D U+001E U+001F
1079-
/// \param expr: An expression of type character
1079+
/// \param chr: An expression of type character
10801080
/// \param type: A type for the output
10811081
/// \return A Boolean expression
10821082
exprt character_refine_preprocesst::expr_of_is_whitespace(
@@ -1115,7 +1115,7 @@ codet character_refine_preprocesst::convert_is_whitespace_int(
11151115
/// Returns the trailing surrogate (a low surrogate code unit) of the surrogate
11161116
/// pair representing the specified supplementary character (Unicode code point)
11171117
/// in the UTF-16 encoding.
1118-
/// \param expr: An expression of type character
1118+
/// \param chr: An expression of type character
11191119
/// \param type: A type for the output
11201120
/// \return A integer expression of the given type
11211121
exprt character_refine_preprocesst::expr_of_low_surrogate(
@@ -1138,7 +1138,7 @@ codet character_refine_preprocesst::convert_low_surrogate(
11381138

11391139
/// Returns the value obtained by reversing the order of the bytes in the
11401140
/// specified char value.
1141-
/// \param expr: An expression of type character
1141+
/// \param chr: An expression of type character
11421142
/// \param type: A type for the output
11431143
/// \return A character expression of the given type
11441144
exprt character_refine_preprocesst::expr_of_reverse_bytes(
@@ -1164,7 +1164,7 @@ codet character_refine_preprocesst::convert_reverse_bytes(
11641164
/// (Basic Multilingual Plane or Plane 0) value, the resulting char array has
11651165
/// the same value as codePoint. If the specified code point is a supplementary
11661166
/// code point, the resulting char array has the corresponding surrogate pair.
1167-
/// \param expr: An expression of type character
1167+
/// \param chr: An expression of type character
11681168
/// \param type: A type for the output
11691169
/// \return A character array expression of the given type
11701170
exprt character_refine_preprocesst::expr_of_to_chars(

jbmc/src/java_bytecode/java_bytecode_convert_class.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ static void find_and_replace_parameters(
10681068

10691069
/// Convert parsed annotations into the symbol table
10701070
/// \param parsed_annotations: The parsed annotations to convert
1071-
/// \param annotations: The java_annotationt collection to populate
1071+
/// \param java_annotations: The java_annotationt collection to populate
10721072
void convert_annotations(
10731073
const java_bytecode_parse_treet::annotationst &parsed_annotations,
10741074
std::vector<java_annotationt> &java_annotations)

src/analyses/local_safe_pointers.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ void local_safe_pointerst::operator()(const goto_programt &goto_program)
177177
/// \param out: stream to write output to
178178
/// \param goto_program: GOTO program analysed (the same one passed to
179179
/// operator())
180-
/// \param ns: global namespace
181180
void local_safe_pointerst::output(
182181
std::ostream &out, const goto_programt &goto_program)
183182
{
@@ -219,7 +218,6 @@ void local_safe_pointerst::output(
219218
/// \param out: stream to write output to
220219
/// \param goto_program: GOTO program analysed (the same one passed to
221220
/// operator())
222-
/// \param ns: global namespace
223221
void local_safe_pointerst::output_safe_dereferences(
224222
std::ostream &out, const goto_programt &goto_program)
225223
{

src/goto-instrument/wmm/goto2graph.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1517,7 +1517,7 @@ void instrumentert::print_outputs(memory_modelt model, bool hide_internals)
15171517
table.close();
15181518
}
15191519

1520-
/// Note: can be distributed (#define DISTRIBUTED)
1520+
/// Note: can be distributed (\#define DISTRIBUTED)
15211521
#if 1
15221522
// #ifdef _WIN32
15231523
void instrumentert::collect_cycles_by_SCCs(memory_modelt model)

src/solvers/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ allocates a new string before calling a primitive.
308308
\copybrief add_axioms_for_parse_int
309309
\link add_axioms_for_parse_int More... \endlink
310310

311-
\subsection deprecated Deprecated primitives:
311+
\subsection solvers-deprecated Deprecated primitives:
312312

313313
* `cprover_string_concat_code_point`, `cprover_string_code_point_at`,
314314
`cprover_string_code_point_before`, `cprover_string_code_point_count`:

src/solvers/refinement/string_constraint.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ class string_constraintt final
104104
};
105105

106106
/// Used for debug printing.
107-
/// \param [in] ns: namespace for `from_expr`
108-
/// \param [in] identifier: identifier for `from_expr`
109107
/// \param [in] expr: constraint to render
110108
/// \return rendered string
111109
inline std::string to_string(const string_constraintt &expr)
@@ -176,8 +174,6 @@ class string_not_contains_constraintt : public exprt
176174
};
177175

178176
/// Used for debug printing.
179-
/// \param [in] ns: namespace for `from_expr`
180-
/// \param [in] identifier: identifier for `from_expr`
181177
/// \param [in] expr: constraint to render
182178
/// \return rendered string
183179
inline std::string to_string(const string_not_contains_constraintt &expr)

src/util/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ efficient to store many copies of the same string. The static list of strings
8989
is initially populated from `irep_ids.def`, so for example the fourth entry
9090
in `irep_ids.def` is `“IREP_ID_ONE(type)”`, so the string “type” has index 3.
9191
You can refer to this \ref irep_idt as `ID_type`. The other kind of line you
92-
see is `IREP_ID_TWO(C_source_location, #source_location)`, which means the
93-
\ref irep_idt for the string “#source_location” can be referred to as
92+
see is \c "IREP_ID_TWO(C_source_location, #source_location)", which means the
93+
\ref irep_idt for the string “\#source_location” can be referred to as
9494
`ID_C_source_location`. The “C” is for comment, meaning that it should be
9595
stored in the [comments](\ref irept::dt::comments). Any strings that need
9696
to be stored as [irep_idt](\ref irep_idt)s which aren't in `irep_ids.def`

src/util/expr_iterator.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
// Forward declarations - table of contents
2121

22-
/// \file Forward depth-first search iterators
22+
/// \file
23+
/// Forward depth-first search iterators
2324
/// These iterators' copy operations are expensive, so use auto&, and avoid
2425
/// std::next(), std::prev() and post-increment iterator
2526
///

src/util/irep_ids.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ Author: Reuben Thomas, [email protected]
2222
#include <string>
2323
#endif
2424

25-
/// \file The irep_ids are generated using a technique called
25+
/// \file
26+
/// The irep_ids are generated using a technique called
2627
/// [X-macros](https://en.wikipedia.org/wiki/X_Macro).
2728
/// The ids are defined in the file irep_ids.def, using a pair of macros
2829
/// `IREP_ID_ONE` and `IREP_ID_TWO`.

0 commit comments

Comments
 (0)