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

Remove duplicate line counting code. Make the remaining implementation have a two element cache.

Browse Source 
darcs-hash:20060205131035-ac50b-885c6ba87a6d16aa48dfa7ee4608ae8891c71724.gz
This commit is contained in:
axel
2006-02-05 23:10:35 +10:00
parent a53a9aa293
commit 58667673d9
4 changed files with 64 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
parser.c
View File

@@ -37,6 +37,7 @@ The fish parser. Contains functions for parsing code.
#include "event.h"
#include "translate.h"
#include "intern.h"
#include "parse_util.h"
/**
Maximum number of block levels in code. This is not the same as
@@ -1122,11 +1123,13 @@ int parser_get_lineno()
{
const wchar_t *whole_str;
const wchar_t *function_name;
int lineno;
static const wchar_t *prev_str = 0;
/* static const wchar_t *prev_str = 0;
static int i=0;
static int lineno=1;
*/
if( !current_tokenizer )
return -1;
@@ -1135,20 +1138,7 @@ int parser_get_lineno()
if( !whole_str )
return -1;
if( whole_str != prev_str || i>current_tokenizer_pos )
{
prev_str = whole_str;
i=0;
lineno = 0;
}
for( ; i<current_tokenizer_pos && whole_str[i]; i++ )
{
if( whole_str[i] == L'\n' )
{
lineno++;
}
}
lineno = parse_util_lineno( whole_str, current_tokenizer_pos );
if( (function_name = is_function()) )
{