Skip to content

Commit 5292a28

Browse files
committed
Fixes according to review.
JerryScript-DCO-1.0-Signed-off-by: Andrey Shitov [email protected]
1 parent df7dddd commit 5292a28

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

jerry-core/rcs/rcs-chunked-list.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
class rcs_chunked_list_t
3838
{
39-
public:
39+
public:
4040
/**
4141
* List node
4242
*/
@@ -65,7 +65,7 @@ class rcs_chunked_list_t
6565

6666
static size_t get_data_space_size (void);
6767

68-
private:
68+
private:
6969
void set_prev (node_t *node_p, node_t *prev_node_p);
7070
void set_next (node_t *node_p, node_t *next_node_p);
7171

jerry-core/rcs/rcs-recordset.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
*/
5858
class rcs_recordset_t
5959
{
60-
public:
60+
public:
6161
/* Constructor */
6262
void init (void)
6363
{
@@ -77,7 +77,7 @@ class rcs_recordset_t
7777
*/
7878
class record_t
7979
{
80-
public:
80+
public:
8181
typedef uint8_t type_t;
8282

8383
type_t get_type (void) const;
@@ -113,7 +113,7 @@ class rcs_recordset_t
113113
static record_t* decompress (cpointer_t pointer_cp);
114114
};
115115

116-
private:
116+
private:
117117
/**
118118
* Offset of 'type' field, in bits
119119
*/
@@ -124,7 +124,7 @@ class rcs_recordset_t
124124
*/
125125
static const uint32_t _type_field_width = 4u;
126126

127-
protected:
127+
protected:
128128
void check_this (void) const;
129129

130130
uint32_t get_field (uint32_t field_pos, uint32_t field_width) const;
@@ -139,7 +139,7 @@ class rcs_recordset_t
139139
static const uint32_t _fields_offset_begin = _type_field_pos + _type_field_width;
140140
};
141141

142-
private:
142+
private:
143143
friend class rcs_record_iterator_t;
144144

145145
/**
@@ -158,7 +158,7 @@ class rcs_recordset_t
158158

159159
void init_free_record (record_t *free_rec_p, size_t size, record_t *prev_rec_p);
160160
bool is_record_free (record_t *record_p);
161-
protected:
161+
protected:
162162
/**
163163
* First type identifier that can be used for storage-specific record types
164164
*/
@@ -220,15 +220,15 @@ typedef rcs_record_t::cpointer_t rcs_cpointer_t;
220220
*/
221221
class rcs_record_iterator_t
222222
{
223-
public:
223+
public:
224224
rcs_record_iterator_t (rcs_record_t* rec_p);
225225
rcs_record_iterator_t (rcs_cpointer_t rec_ext_cp);
226226

227-
protected:
227+
protected:
228228
template<typename T> T read (void);
229229
template<typename T> void write (T value);
230230

231-
private:
231+
private:
232232
rcs_record_t* _record_start_p; /**< start of current record */
233233
uint8_t* _current_pos_p; /**< pointer to current offset in current record */
234234

@@ -240,13 +240,13 @@ class rcs_record_iterator_t
240240
*/
241241
class rcs_free_record_t : public rcs_record_t
242242
{
243-
public:
243+
public:
244244
size_t get_size (void) const;
245245
void set_size (size_t size);
246246

247247
rcs_record_t* get_prev (void) const;
248248
void set_prev (rcs_record_t* prev_rec_p);
249-
private:
249+
private:
250250
/**
251251
* Offset of 'length' field, in bits
252252
*/

tests/unit/test_recordset.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ extern "C"
4343

4444
class test_rcs_record_type_one_t : public rcs_record_t
4545
{
46-
public:
46+
public:
4747
static size_t size (uint32_t elements_count)
4848
{
4949
return JERRY_ALIGNUP (header_size + element_size * elements_count,
@@ -72,7 +72,7 @@ class test_rcs_record_type_one_t : public rcs_record_t
7272
set_pointer (prev_field_pos, prev_field_width, prev_rec_p);
7373
}
7474

75-
private:
75+
private:
7676
static const uint32_t length_field_pos = _fields_offset_begin;
7777
static const uint32_t length_field_width = 12u;
7878

@@ -85,7 +85,7 @@ class test_rcs_record_type_one_t : public rcs_record_t
8585

8686
class test_rcs_record_type_two_t : public rcs_record_t
8787
{
88-
public:
88+
public:
8989
static size_t size (void)
9090
{
9191
return JERRY_ALIGNUP (header_size, RCS_DYN_STORAGE_LENGTH_UNIT);
@@ -111,7 +111,7 @@ class test_rcs_record_type_two_t : public rcs_record_t
111111
set_pointer (prev_field_pos, prev_field_width, prev_rec_p);
112112
}
113113

114-
private:
114+
private:
115115
static const uint32_t prev_field_pos = _fields_offset_begin;
116116
static const uint32_t prev_field_width = rcs_cpointer_t::bit_field_width;
117117

@@ -120,7 +120,7 @@ class test_rcs_record_type_two_t : public rcs_record_t
120120

121121
class test_rcs_recordset_t : public rcs_recordset_t
122122
{
123-
public:
123+
public:
124124
test_rcs_record_type_one_t*
125125
create_record_type_one (uint32_t elements_count)
126126
{
@@ -145,7 +145,7 @@ class test_rcs_recordset_t : public rcs_recordset_t
145145
{
146146
free_record (rec_p);
147147
}
148-
private:
148+
private:
149149
static const int _record_type_one_id = _first_type_id + 0;
150150
static const int _record_type_two_id = _first_type_id + 1;
151151

tools/vera++/scripts/rules/jerry_indentation.tcl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ foreach fileName [getSourceFileNames] {
6565
set real_indent [string length $match]
6666
if {$indent != $real_indent} {
6767
if {[regexp {^[[:blank:]]*(private:|public:|protected:)} $line]} {
68-
if {$indent != $real_indent + 1} {
69-
set exp_indent [expr {$indent - 1}]
68+
if {$indent != $real_indent + 2} {
69+
set exp_indent [expr {$indent - 2}]
7070
report $fileName $lineNumber "Indentation: $real_indent -> $exp_indent. Line: '$line'"
7171
}
7272
} elseif {![regexp {^[[:alnum:]_]{1,}:$} $line] || $real_indent != 0} {
@@ -80,7 +80,7 @@ foreach fileName [getSourceFileNames] {
8080
if {$type == "leftbrace"} {
8181
if {![regexp {^[[:blank:]]*\{[[:blank:]]*$} $line]
8282
&& ![regexp {[^\{=]=[^\{=]\{.*\},?} $line]} {
83-
report $fileName $lineNumber "Left brace is not the only non-space character in the line: '$line'"
83+
report $fileName $lineNumber "Left brace is not the only non-space character in the line: '$line'"
8484
}
8585
}
8686
if {$type == "rightbrace"} {
@@ -91,11 +91,11 @@ foreach fileName [getSourceFileNames] {
9191
}
9292
}
9393
if {$type == "rightbrace"} {
94-
if {![regexp {^[[:blank:]]*\};?((( [a-z_\(][a-z0-9_\(\)]{0,}){1,})?;| /\*.*\*/| //.*)?$} $line]
95-
&& ![regexp {[^\{=]=[^\{=]\{.*\}[,;]?} $line]} {
94+
if {![regexp {^[[:blank:]]*\};?((( [a-z_\(][a-z0-9_\(\)]{0,}){1,})?;| /\*.*\*/| //.*)?$} $line]
95+
&& ![regexp {[^\{=]=[^\{=]\{.*\}[,;]?} $line]} {
9696
report $fileName $lineNumber "Right brace is not the only non-space character in the line and \
97-
is not single right brace followed by \[a-z0-9_() \] string and single semicolon character: '$line'"
98-
}
97+
is not single right brace followed by \[a-z0-9_() \] string and single semicolon character: '$line'"
98+
}
9999
}
100100
}
101101

0 commit comments

Comments
 (0)