h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-26 16:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ast

Browse Source 
Conflicts:
	function.cpp
	parser.cpp
	parser.h
This commit is contained in:
ridiculousfish
2013-12-20 17:44:37 -08:00
parent 739e529416 e38217683c
commit ed70195c7e
29 changed files with 398 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
function.cpp
View File

@@ -189,11 +189,11 @@ void function_add(const function_data_t &data, const parser_t &parser)
/* Create and store a new function */
const wchar_t *filename = reader_current_filename();
int def_offset = -1;
if (parser.current_block != NULL)
if (parser.current_block() != NULL)
{
def_offset = parser.line_number_of_character_at_offset(parser.current_block->tok_pos);
def_offset = parser.line_number_of_character_at_offset(parser.current_block()->tok_pos);
}
const function_map_t::value_type new_pair(data.name, function_info_t(data, filename, def_offset, is_autoload));