Macintosh-SW/mpw
1
0
Fork 0
mirror of https://github.com/ksherlock/mpw.git synced 2024-11-29 15:49:31 +00:00
Code Issues Projects Releases Wiki Activity

loadtrap.rl -- negative number support (for error numbers)

Browse Source
This commit is contained in:
Kelvin Sherlock 2013-08-21 21:29:37 -04:00
parent ff84c1d3f1
commit 4b4122bee2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/loadtrap.rl
View File

@ -45,6 +45,9 @@ namespace {
| |
'$' xdigit+ @addx '$' xdigit+ @addx
| |
'-'? @{ negative = true; }
digit+ @{value = value * 10 + (fc - '0'); }
|
[A-Za-z_] @{ stringValue.push_back(fc); } [A-Za-z_] @{ stringValue.push_back(fc); }
[A-Za-z0-9_]+ @{ stringValue.push_back(fc); } [A-Za-z0-9_]+ @{ stringValue.push_back(fc); }
; ;
@ -79,6 +82,7 @@ namespace {
std::string name; std::string name;
std::string stringValue; std::string stringValue;
uint32_t value; uint32_t value;
bool negative = false;
value = 0; value = 0;
const char *eof = pe; const char *eof = pe;
@ -91,6 +95,7 @@ namespace {
{ {
return false; return false;
} }
if (negative) value = (-value) & 0xffff;
// name lookup // name lookup
if (!stringValue.empty()) if (!stringValue.empty())
@ -104,12 +109,14 @@ namespace {
value = iter->second; value = iter->second;
} }
#if 0
// if loading globals, wouldn't need to do this... // if loading globals, wouldn't need to do this...
if (value > 0xafff || value < 0xa000) if (value > 0xafff || value < 0xa000)
{ {
fprintf(stderr, "Invalid trap number: $%04x\n", value); fprintf(stderr, "Invalid trap number: $%04x\n", value);
return false; return false;
} }
#endif
map.emplace(name, (uint16_t)value); map.emplace(name, (uint16_t)value);