Error in parser @-macro is fixed: macro in end of line are ignored before this fix. Thanks Max Vasilyev 2:5057/77

This commit is contained in:
Stas Degteff 2011-02-11 20:13:47 +00:00
parent d6cc923213
commit f842f826fb
3 changed files with 7 additions and 1 deletions

View File

@ -10,6 +10,9 @@ _____________________________________________________________________________
‡ ¬¥âª¨ ¤«ï GoldED+ 1.1.5, /snapshot/ ‡ ¬¥âª¨ ¤«ï GoldED+ 1.1.5, /snapshot/
_____________________________________________________________________________ _____________________________________________________________________________
! ˆá¯à ¢«¥­  ®è¨¡ª  ®¡à ¡®âª¨ @-¬ ªà®á®¢: à ­¥¥ ¬ ªà®á ¢ ª®­æ¥ áâப¨ ­¥
®¡à ¡ â뢠«áï.
! …᫨ ­¥â ­¨ ®¤­®£® URLHANDLER ¨ ¢ë§ë¢ ¥âáï READpeekURLs, Golded+ ⥯¥àì ­¥ ! …᫨ ­¥â ­¨ ®¤­®£® URLHANDLER ¨ ¢ë§ë¢ ¥âáï READpeekURLs, Golded+ ⥯¥àì ­¥
¯ ¤ ¥â á segmentation fault. ¯ ¤ ¥â á segmentation fault.

View File

@ -10,6 +10,9 @@ ______________________________________________________________________
Notes for GoldED+ 1.1.5, /snapshot/ Notes for GoldED+ 1.1.5, /snapshot/
______________________________________________________________________ ______________________________________________________________________
! Error in parser @-macro is fixed: macro in end of line are ignored
before this fix.
! If not defined any URLHANDLER and key "READpeekURLs" is pressed, ! If not defined any URLHANDLER and key "READpeekURLs" is pressed,
Golded+ does not trap now (segmentation fault fixed). Golded+ does not trap now (segmentation fault fixed).

View File

@ -50,7 +50,7 @@ static bool tokenxchg(std::string &input, std::string::iterator &pos,
size_t toklen = strlen(tok); size_t toklen = strlen(tok);
const char* inp_str_tok=it2str(input, pos); const char* inp_str_tok=it2str(input, pos);
if ( (strnieql(inp_str_tok, tok, toklen)) && (isspace(inp_str_tok[toklen]) || ispunct(inp_str_tok[toklen])) ) if ( (strnieql(inp_str_tok, tok, toklen)) && (isspace(inp_str_tok[toklen]) || ispunct(inp_str_tok[toklen]) || inp_str_tok[toklen]=='\0') )
{ {
std::string str = src; std::string str = src;
std::string::iterator tokend = pos+toklen; std::string::iterator tokend = pos+toklen;