mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-20 15:40:26 +00:00
Code Issues Releases Wiki Activity

arg::nomore(); fixes in collatz3

Browse Source
This commit is contained in:
Zeno Rogue 2019-04-22 22:59:37 +02:00
parent 98381f5526
commit 49877fbfc9
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commandline.cpp
View File

@ -65,6 +65,8 @@ namespace arg {
lshift(); if(pos > isize(argument)) { printf("Missing parameter\n"); exit(1); } lshift(); if(pos > isize(argument)) { printf("Missing parameter\n"); exit(1); }
} }
bool nomore() { return pos >= isize(argument); }
const string& args() { return argument[pos]; } const string& args() { return argument[pos]; }
const char* argcs() { return args().c_str(); } const char* argcs() { return args().c_str(); }
int argi() { return atoi(argcs()); } int argi() { return atoi(argcs()); }

1
hyper.h
View File

@ -2292,6 +2292,7 @@ namespace arg {
int argi(); int argi();
ld argf(); ld argf();
bool argis(const string& s); bool argis(const string& s);
bool nomore();
unsigned arghex(); unsigned arghex();
inline void shift_arg_formula(ld& x, const reaction_t& r = reaction_t()) { shift(); x = argf(); inline void shift_arg_formula(ld& x, const reaction_t& r = reaction_t()) { shift(); x = argf();

4
rogueviz.cpp
View File

@ -1721,9 +1721,9 @@ int readArgs() {
shift(); shift();
transmatrix *T = &T2; transmatrix *T = &T2;
while(true) { while(true) {
if(arg::pos >= isize(arg::argument)) break; if(arg::nomore()) break;
else if(argis("fd")) { shift(); *T = *T * xpush(argf()); shift(); } else if(argis("fd")) { shift(); *T = *T * xpush(argf()); shift(); }
else if(argcs()[0] == 't') { shift(); *T = *T * hr::cspin(dimid(argcs()[1]),dimid(argcs()[2]),argf()); shift(); } else if(argcs()[0] == 't') { int x = dimid(argcs()[1]); int y = dimid(argcs()[2]); shift(); *T = *T * hr::cspin(x, y, argf()); shift(); }
else if(argis("/")) { shift(); if(T == &T2) T = &T3; else break; } else if(argis("/")) { shift(); if(T == &T2) T = &T3; else break; }
else break; else break;
} }