From f239f0bbac2cbd366ebe7cb367f64ba7a555c4f9 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Thu, 3 Nov 2016 09:46:19 +0800 Subject: Expand env! - option_env! yeild None::<&'static str> instead of just None --- src/expand/env.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/expand/env.cpp b/src/expand/env.cpp index db51fa67..8e087858 100644 --- a/src/expand/env.cpp +++ b/src/expand/env.cpp @@ -59,7 +59,16 @@ class CExpanderOptionEnv: const char* var_val_cstr = getenv(varname.c_str()); if( !var_val_cstr ) { - return box$( TTStreamO(TokenTree(Token(TOK_IDENT, "None"))) ); + ::std::vector< TokenTree> rv; + rv.reserve(7); + rv.push_back( Token(TOK_IDENT, "None") ); + rv.push_back( Token(TOK_DOUBLE_COLON) ); + rv.push_back( Token(TOK_LT) ); + rv.push_back( Token(TOK_AMP) ); + rv.push_back( Token(TOK_LIFETIME, "static") ); + rv.push_back( Token(TOK_IDENT, "str") ); + rv.push_back( Token(TOK_GT) ); + return box$( TTStreamO(TokenTree( {}, mv$(rv) )) ); } else { ::std::vector< TokenTree> rv; -- cgit v1.2.3