diff options
Diffstat (limited to 'Build/source/utils/asymptote/runstring.cc')
-rw-r--r-- | Build/source/utils/asymptote/runstring.cc | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/Build/source/utils/asymptote/runstring.cc b/Build/source/utils/asymptote/runstring.cc index 8e2ed80d908..5ff0646ce38 100644 --- a/Build/source/utils/asymptote/runstring.cc +++ b/Build/source/utils/asymptote/runstring.cc @@ -385,6 +385,8 @@ void gen_runstring12(stack *Stack) bool forcemath=vm::pop<bool>(Stack,false); string * format=vm::pop<string *>(Stack); #line 261 "runstring.in" + if(*format == "%") {Stack->push<string>(""); return;} // Temporary workaround for github Issue #29. + bool tex=getSetting<string>("tex") != "none"; bool texify=forcemath; ostringstream out; @@ -509,12 +511,12 @@ void gen_runstring12(stack *Stack) {Stack->push<string>(out.str()); return;} } -#line 386 "runstring.in" +#line 388 "runstring.in" // Int hex(string s); void gen_runstring13(stack *Stack) { string s=vm::pop<string>(Stack); -#line 387 "runstring.in" +#line 389 "runstring.in" istringstream is(s); is.setf(std::ios::hex,std::ios::basefield); Int value; @@ -524,45 +526,45 @@ void gen_runstring13(stack *Stack) error(buf); } -#line 397 "runstring.in" +#line 399 "runstring.in" // Int ascii(string s); void gen_runstring14(stack *Stack) { string s=vm::pop<string>(Stack); -#line 398 "runstring.in" +#line 400 "runstring.in" {Stack->push<Int>(s.empty() ? -1 : (unsigned char) s[0]); return;} } -#line 402 "runstring.in" +#line 404 "runstring.in" // string string(Int x); void gen_runstring15(stack *Stack) { Int x=vm::pop<Int>(Stack); -#line 403 "runstring.in" +#line 405 "runstring.in" ostringstream buf; buf << x; {Stack->push<string>(buf.str()); return;} } -#line 409 "runstring.in" +#line 411 "runstring.in" // string string(real x, Int digits=DBL_DIG); void gen_runstring16(stack *Stack) { Int digits=vm::pop<Int>(Stack,DBL_DIG); real x=vm::pop<real>(Stack); -#line 410 "runstring.in" +#line 412 "runstring.in" ostringstream buf; buf.precision(digits); buf << x; {Stack->push<string>(buf.str()); return;} } -#line 417 "runstring.in" +#line 419 "runstring.in" // string time(string format=defaulttimeformat); void gen_runstring17(stack *Stack) { string format=vm::pop<string>(Stack,defaulttimeformat); -#line 418 "runstring.in" +#line 420 "runstring.in" #ifdef HAVE_STRFTIME const time_t bintime=time(NULL); if(!strftime(Time,nTime,format.c_str(),localtime(&bintime))) {Stack->push<string>(""); return;} @@ -572,13 +574,13 @@ void gen_runstring17(stack *Stack) #endif } -#line 428 "runstring.in" +#line 430 "runstring.in" // string time(Int seconds, string format=defaulttimeformat); void gen_runstring18(stack *Stack) { string format=vm::pop<string>(Stack,defaulttimeformat); Int seconds=vm::pop<Int>(Stack); -#line 429 "runstring.in" +#line 431 "runstring.in" #ifdef HAVE_STRFTIME const time_t bintime=seconds; if(!strftime(Time,nTime,format.c_str(),localtime(&bintime))) {Stack->push<string>(""); return;} @@ -590,13 +592,13 @@ void gen_runstring18(stack *Stack) #endif } -#line 441 "runstring.in" +#line 443 "runstring.in" // Int seconds(string t=emptystring, string format=emptystring); void gen_runstring19(stack *Stack) { string format=vm::pop<string>(Stack,emptystring); string t=vm::pop<string>(Stack,emptystring); -#line 442 "runstring.in" +#line 444 "runstring.in" #if defined(HAVE_STRPTIME) const time_t bintime=time(NULL); tm tm=*localtime(&bintime); @@ -639,19 +641,19 @@ void gen_runstring_venv(venv &ve) addFunc(ve, run::gen_runstring11, primString() , SYM(format), formal(primString(), SYM(format), false, false), formal(primInt(), SYM(x), false, false), formal(primString() , SYM(locale), true, false)); #line 259 "runstring.in" addFunc(ve, run::gen_runstring12, primString() , SYM(format), formal(primString(), SYM(format), false, false), formal(primBoolean(), SYM(forcemath), true, false), formal(primString() , SYM(separator), false, false), formal(primReal(), SYM(x), false, false), formal(primString() , SYM(locale), true, false)); -#line 386 "runstring.in" +#line 388 "runstring.in" addFunc(ve, run::gen_runstring13, primInt(), SYM(hex), formal(primString() , SYM(s), false, false)); -#line 397 "runstring.in" +#line 399 "runstring.in" addFunc(ve, run::gen_runstring14, primInt(), SYM(ascii), formal(primString() , SYM(s), false, false)); -#line 402 "runstring.in" +#line 404 "runstring.in" addFunc(ve, run::gen_runstring15, primString() , SYM(string), formal(primInt(), SYM(x), false, false)); -#line 409 "runstring.in" +#line 411 "runstring.in" addFunc(ve, run::gen_runstring16, primString() , SYM(string), formal(primReal(), SYM(x), false, false), formal(primInt(), SYM(digits), true, false)); -#line 417 "runstring.in" +#line 419 "runstring.in" addFunc(ve, run::gen_runstring17, primString() , SYM(time), formal(primString() , SYM(format), true, false)); -#line 428 "runstring.in" +#line 430 "runstring.in" addFunc(ve, run::gen_runstring18, primString() , SYM(time), formal(primInt(), SYM(seconds), false, false), formal(primString() , SYM(format), true, false)); -#line 441 "runstring.in" +#line 443 "runstring.in" addFunc(ve, run::gen_runstring19, primInt(), SYM(seconds), formal(primString() , SYM(t), true, false), formal(primString() , SYM(format), true, false)); } |