h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-07 18:11:13 -03:00
Code Issues Packages Projects Releases Wiki Activity

Make tok_first return a wcstring instead of a wchar_t*

Browse Source
This commit is contained in:
ridiculousfish
2012-11-21 22:23:48 -08:00
parent 7117c4a5ee
commit 6fc9e6f21e
4 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tokenizer.cpp
View File

@@ -642,24 +642,26 @@ const wchar_t *tok_string(tokenizer_t *tok)
return tok?tok->orig_buff:0;
}
wchar_t *tok_first(const wchar_t *str)
wcstring tok_first(const wchar_t *str)
{
wchar_t *res=0;
CHECK(str, 0);
tokenizer_t t(str, TOK_SQUASH_ERRORS);
switch (tok_last_type(&t))
wcstring result;
if (str)
{
case TOK_STRING:
// fwprintf( stderr, L"Got token %ls\n", tok_last( &t ));
res = wcsdup(tok_last(&t));
break;
default:
break;
tokenizer_t t(str, TOK_SQUASH_ERRORS);
switch (tok_last_type(&t))
{
case TOK_STRING:
{
const wchar_t *tmp = tok_last(&t);
if (tmp != NULL)
result = tmp;
break;
}
default:
break;
}
}
return res;
return result;
}
int tok_get_pos(tokenizer_t *tok)