diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-06-08 20:22:21 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-06-08 20:22:21 +0200 |
| commit | 258af752a1d6f6dc337c97e8ceabf26bcb974f31 (patch) | |
| tree | dd0a724b9c936b2fc8c497a6d8089d5afcf7c68d /crawl-ref/source/jobs.cc | |
| parent | a2c649a2645682eb974353707775e599f1f2ce96 (diff) | |
| download | crawl-ref-258af752a1d6f6dc337c97e8ceabf26bcb974f31.tar.gz crawl-ref-258af752a1d6f6dc337c97e8ceabf26bcb974f31.zip | |
Turn pairs of assertions with x > min, x <= max into ASSERT_RANGE.
The perl regexp to do so is:
s&ASSERT\(([^\n]+) >= ([^\n]+)\);\s*ASSERT\(\1 < ([^\n]+)\);&ASSERT_RANGE($1, $2, $3);&sg;
Diffstat (limited to 'crawl-ref/source/jobs.cc')
| -rw-r--r-- | crawl-ref/source/jobs.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crawl-ref/source/jobs.cc b/crawl-ref/source/jobs.cc index 2dc58aa859..564f396492 100644 --- a/crawl-ref/source/jobs.cc +++ b/crawl-ref/source/jobs.cc @@ -36,8 +36,7 @@ const char *get_job_abbrev(int which_job) if (which_job == JOB_UNKNOWN) return "Un"; COMPILE_CHECK(ARRAYSZ(Job_Abbrev_List) == NUM_JOBS); - ASSERT(which_job >= 0); - ASSERT(which_job < NUM_JOBS); + ASSERT_RANGE(which_job, 0, NUM_JOBS); return Job_Abbrev_List[which_job]; } @@ -64,8 +63,7 @@ const char *get_job_name(int which_job) if (which_job == JOB_UNKNOWN) return "Unemployed"; COMPILE_CHECK(ARRAYSZ(Job_Name_List) == NUM_JOBS); - ASSERT(which_job >= 0); - ASSERT(which_job < NUM_JOBS); + ASSERT_RANGE(which_job, 0, NUM_JOBS); return Job_Name_List[which_job]; } |