Skip to content

Commit dbb10ad

Browse files
KOLANICHKOLANICH
committed
Transformed OptionType enum into enum class
1 parent ba4e0e1 commit dbb10ad

File tree

2 files changed

+41
-41
lines changed

2 files changed

+41
-41
lines changed

‎anyoption.cpp‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ bool AnyOption::alloc() {
139139
mem_allocated = true;
140140
for (i = 0; i < max_options; i++) {
141141
options[i] = NULL;
142-
optiontype[i] = INVALID_OPT;
142+
optiontype[i] = OptionType::INVALID_OPT;
143143
optionindex[i] = -1;
144144
}
145145
optionchars = (char *)malloc((max_char_options + 1) * sizeof(char));
@@ -151,7 +151,7 @@ bool AnyOption::alloc() {
151151
}
152152
for (i = 0; i < max_char_options; i++) {
153153
optionchars[i] = '0';
154-
optchartype[i] = INVALID_OPT;
154+
optchartype[i] = OptionType::INVALID_OPT;
155155
optcharindex[i] = -1;
156156
}
157157

@@ -202,7 +202,7 @@ bool AnyOption::doubleOptStorage() {
202202
/* init new storage */
203203
for (unsigned int i = max_options; i < 2 * max_options; i++) {
204204
options[i] = NULL;
205-
optiontype[i] = INVALID_OPT;
205+
optiontype[i] = OptionType::INVALID_OPT;
206206
optionindex[i] = -1;
207207
}
208208
max_options = 2 * max_options;
@@ -234,7 +234,7 @@ bool AnyOption::doubleCharStorage() {
234234
/* init new storage */
235235
for (unsigned int i = max_char_options; i < 2 * max_char_options; i++) {
236236
optionchars[i] = '0';
237-
optchartype[i] = INVALID_OPT;
237+
optchartype[i] = OptionType::INVALID_OPT;
238238
optcharindex[i] = -1;
239239
}
240240
max_char_options = 2 * max_char_options;
@@ -347,98 +347,98 @@ void AnyOption::useFiileName(const char *_filename) {
347347
*/
348348

349349
void AnyOption::setCommandOption(const char *opt) {
350-
addOption(opt, COMMAND_OPT);
350+
addOption(opt, OptionType::COMMAND_OPT);
351351
g_value_counter++;
352352
}
353353

354354
void AnyOption::setCommandOption(char opt) {
355-
addOption(opt, COMMAND_OPT);
355+
addOption(opt, OptionType::COMMAND_OPT);
356356
g_value_counter++;
357357
}
358358

359359
void AnyOption::setCommandOption(const char *opt, char optchar) {
360-
addOption(opt, COMMAND_OPT);
361-
addOption(optchar, COMMAND_OPT);
360+
addOption(opt, OptionType::COMMAND_OPT);
361+
addOption(optchar, OptionType::COMMAND_OPT);
362362
g_value_counter++;
363363
}
364364

365365
void AnyOption::setCommandFlag(const char *opt) {
366-
addOption(opt, COMMAND_FLAG);
366+
addOption(opt, OptionType::COMMAND_FLAG);
367367
g_value_counter++;
368368
}
369369

370370
void AnyOption::setCommandFlag(char opt) {
371-
addOption(opt, COMMAND_FLAG);
371+
addOption(opt, OptionType::COMMAND_FLAG);
372372
g_value_counter++;
373373
}
374374

375375
void AnyOption::setCommandFlag(const char *opt, char optchar) {
376-
addOption(opt, COMMAND_FLAG);
377-
addOption(optchar, COMMAND_FLAG);
376+
addOption(opt, OptionType::COMMAND_FLAG);
377+
addOption(optchar, OptionType::COMMAND_FLAG);
378378
g_value_counter++;
379379
}
380380

381381
void AnyOption::setFileOption(const char *opt) {
382-
addOption(opt, FILE_OPT);
382+
addOption(opt, OptionType::FILE_OPT);
383383
g_value_counter++;
384384
}
385385

386386
void AnyOption::setFileOption(char opt) {
387-
addOption(opt, FILE_OPT);
387+
addOption(opt, OptionType::FILE_OPT);
388388
g_value_counter++;
389389
}
390390

391391
void AnyOption::setFileOption(const char *opt, char optchar) {
392-
addOption(opt, FILE_OPT);
393-
addOption(optchar, FILE_OPT);
392+
addOption(opt, OptionType::FILE_OPT);
393+
addOption(optchar, OptionType::FILE_OPT);
394394
g_value_counter++;
395395
}
396396

397397
void AnyOption::setFileFlag(const char *opt) {
398-
addOption(opt, FILE_FLAG);
398+
addOption(opt, OptionType::FILE_FLAG);
399399
g_value_counter++;
400400
}
401401

402402
void AnyOption::setFileFlag(char opt) {
403-
addOption(opt, FILE_FLAG);
403+
addOption(opt, OptionType::FILE_FLAG);
404404
g_value_counter++;
405405
}
406406

407407
void AnyOption::setFileFlag(const char *opt, char optchar) {
408-
addOption(opt, FILE_FLAG);
409-
addOption(optchar, FILE_FLAG);
408+
addOption(opt, OptionType::FILE_FLAG);
409+
addOption(optchar, OptionType::FILE_FLAG);
410410
g_value_counter++;
411411
}
412412

413413
void AnyOption::setOption(const char *opt) {
414-
addOption(opt, COMMON_OPT);
414+
addOption(opt, OptionType::COMMON_OPT);
415415
g_value_counter++;
416416
}
417417

418418
void AnyOption::setOption(char opt) {
419-
addOption(opt, COMMON_OPT);
419+
addOption(opt, OptionType::COMMON_OPT);
420420
g_value_counter++;
421421
}
422422

423423
void AnyOption::setOption(const char *opt, char optchar) {
424-
addOption(opt, COMMON_OPT);
425-
addOption(optchar, COMMON_OPT);
424+
addOption(opt, OptionType::COMMON_OPT);
425+
addOption(optchar, OptionType::COMMON_OPT);
426426
g_value_counter++;
427427
}
428428

429429
void AnyOption::setFlag(const char *opt) {
430-
addOption(opt, COMMON_FLAG);
430+
addOption(opt, OptionType::COMMON_FLAG);
431431
g_value_counter++;
432432
}
433433

434434
void AnyOption::setFlag(const char opt) {
435-
addOption(opt, COMMON_FLAG);
435+
addOption(opt, OptionType::COMMON_FLAG);
436436
g_value_counter++;
437437
}
438438

439439
void AnyOption::setFlag(const char *opt, char optchar) {
440-
addOption(opt, COMMON_FLAG);
441-
addOption(optchar, COMMON_FLAG);
440+
addOption(opt, OptionType::COMMON_FLAG);
441+
addOption(optchar, OptionType::COMMON_FLAG);
442442
g_value_counter++;
443443
}
444444

@@ -615,11 +615,11 @@ int AnyOption::parseGNU(char *arg) {
615615
int AnyOption::matchOpt(char *opt) {
616616
for (unsigned int i = 0; i < option_counter; i++) {
617617
if (strcmp(options[i], opt) == 0) {
618-
if (optiontype[i] == COMMON_OPT ||
619-
optiontype[i] == COMMAND_OPT) { /* found option return index */
618+
if (optiontype[i] == OptionType::COMMON_OPT ||
619+
optiontype[i] == OptionType::COMMAND_OPT) { /* found option return index */
620620
return i;
621-
} else if (optiontype[i] == COMMON_FLAG ||
622-
optiontype[i] == COMMAND_FLAG) { /* found flag, set it */
621+
} else if (optiontype[i] == OptionType::COMMON_FLAG ||
622+
optiontype[i] == OptionType::COMMAND_FLAG) { /* found flag, set it */
623623
setFlagOn(opt);
624624
return -1;
625625
}
@@ -634,13 +634,13 @@ int AnyOption::matchOpt(char *opt) {
634634
bool AnyOption::matchChar(char c) {
635635
for (int i = 0; i < optchar_counter; i++) {
636636
if (optionchars[i] == c) { /* found match */
637-
if (optchartype[i] == COMMON_OPT ||
637+
if (optchartype[i] == OptionType::COMMON_OPT ||
638638
optchartype[i] ==
639-
COMMAND_OPT) { /* an option store and stop scanning */
639+
OptionType::COMMAND_OPT) { /* an option store and stop scanning */
640640
return true;
641-
} else if (optchartype[i] == COMMON_FLAG ||
641+
} else if (optchartype[i] == OptionType::COMMON_FLAG ||
642642
optchartype[i] ==
643-
COMMAND_FLAG) { /* a flag store and keep scanning */
643+
OptionType::COMMAND_FLAG) { /* a flag store and keep scanning */
644644
setFlagOn(c);
645645
return false;
646646
}
@@ -920,7 +920,7 @@ void AnyOption::valuePairs(char *type, char *value) {
920920
if (strlen(chomp(type)) == 1) { /* this is a char option */
921921
for (int i = 0; i < optchar_counter; i++) {
922922
if (optionchars[i] == type[0]) { /* match */
923-
if (optchartype[i] == COMMON_OPT || optchartype[i] == FILE_OPT) {
923+
if (optchartype[i] == OptionType::COMMON_OPT || optchartype[i] == OptionType::FILE_OPT) {
924924
setValue(type[0], chomp(value));
925925
return;
926926
}
@@ -930,7 +930,7 @@ void AnyOption::valuePairs(char *type, char *value) {
930930
/* if no char options matched */
931931
for (unsigned int i = 0; i < option_counter; i++) {
932932
if (strcmp(options[i], type) == 0) { /* match */
933-
if (optiontype[i] == COMMON_OPT || optiontype[i] == FILE_OPT) {
933+
if (optiontype[i] == OptionType::COMMON_OPT || optiontype[i] == OptionType::FILE_OPT) {
934934
setValue(type, chomp(value));
935935
return;
936936
}
@@ -946,7 +946,7 @@ void AnyOption::justValue(char *type) {
946946
if (strlen(chomp(type)) == 1) { /* this is a char option */
947947
for (int i = 0; i < optchar_counter; i++) {
948948
if (optionchars[i] == type[0]) { /* match */
949-
if (optchartype[i] == COMMON_FLAG || optchartype[i] == FILE_FLAG) {
949+
if (optchartype[i] == OptionType::COMMON_FLAG || optchartype[i] == OptionType::FILE_FLAG) {
950950
setFlagOn(type[0]);
951951
return;
952952
}
@@ -956,7 +956,7 @@ void AnyOption::justValue(char *type) {
956956
/* if no char options matched */
957957
for (unsigned int i = 0; i < option_counter; i++) {
958958
if (strcmp(options[i], type) == 0) { /* match */
959-
if (optiontype[i] == COMMON_FLAG || optiontype[i] == FILE_FLAG) {
959+
if (optiontype[i] == OptionType::COMMON_FLAG || optiontype[i] == OptionType::FILE_FLAG) {
960960
setFlagOn(type);
961961
return;
962962
}

‎anyoption.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <stdlib.h>
1212
#include <string>
1313

14-
enum OptionType {
14+
enum class OptionType {
1515
INVALID_OPT = 0,
1616
COMMON_OPT = 1,
1717
COMMAND_OPT = 2,

0 commit comments

Comments
 (0)