dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Added dotted notation for macro ${__LINE__} predefine

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2643 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
icemank 2003-06-13 15:59:30 +00:00
parent 5a3d38fbf9
commit bbc605eeac
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.h
View file

@ -109,7 +109,7 @@ class CEXEBuild {
void restore_file_predefine(char *); void restore_file_predefine(char *);
char* set_timestamp_predefine(char *); char* set_timestamp_predefine(char *);
void restore_timestamp_predefine(char *); void restore_timestamp_predefine(char *);
char* set_line_predefine(int); char* set_line_predefine(int, BOOL);
void restore_line_predefine(char *); void restore_line_predefine(char *);
#endif #endif
int parseScript(); int parseScript();

29
Source/script.cpp
View file

@ -91,17 +91,26 @@ void CEXEBuild::restore_timestamp_predefine(char *oldtimestamp)
} }
} }
char *CEXEBuild::set_line_predefine(int linecnt) char *CEXEBuild::set_line_predefine(int linecnt, BOOL is_macro)
{ {
char linebuf[32] = ""; char* linebuf = NULL;
wsprintf(linebuf,"%d",linecnt); char temp[8] = "";
wsprintf(temp,"%d",linecnt);
char *oldline = definedlist.find("__LINE__"); char *oldline = definedlist.find("__LINE__");
if(oldline) { if(oldline) {
oldline = strdup(oldline); oldline = strdup(oldline);
definedlist.del("__LINE__"); definedlist.del("__LINE__");
} }
if(is_macro && oldline) {
linebuf = (char *)malloc(strlen(oldline)+strlen(temp)+2);
wsprintf(linebuf,"%s.%s",oldline,temp);
}
else {
linebuf = strdup(temp);
}
definedlist.add("__LINE__",linebuf); definedlist.add("__LINE__",linebuf);
free(linebuf);
return oldline; return oldline;
} }
@ -434,7 +443,7 @@ int CEXEBuild::parseScript()
#ifdef NSIS_SUPPORT_STANDARD_PREDEFINES #ifdef NSIS_SUPPORT_STANDARD_PREDEFINES
// Added by Sunil Kamath 11 June 2003 // Added by Sunil Kamath 11 June 2003
char *oldline = set_line_predefine(linecnt); char *oldline = set_line_predefine(linecnt, FALSE);
#endif #endif
ps_addtoline(str,linedata,hist); ps_addtoline(str,linedata,hist);
@ -471,18 +480,17 @@ int CEXEBuild::process_oneline(char *line, char *filename, int linenum)
BOOL is_macro = !strncmp(filename,"macro:",strlen("macro:")); BOOL is_macro = !strncmp(filename,"macro:",strlen("macro:"));
if(!is_commandline) { // Don't set the predefines for command line /X option if(!is_commandline) { // Don't set the predefines for command line /X option
if(is_macro) { if(!is_macro) {
oldline = set_line_predefine(last_linecnt+linecnt-1); // This is done so that line numbers are
} //handled properly when macros are inserted.
else {
oldfilename = set_file_predefine(curfilename); oldfilename = set_file_predefine(curfilename);
oldtimestamp = set_timestamp_predefine(curfilename); oldtimestamp = set_timestamp_predefine(curfilename);
oldline = set_line_predefine(linecnt);
} }
oldline = set_line_predefine(linecnt, is_macro);
} }
#endif #endif
ps_addtoline(line,linedata,hist); ps_addtoline(line,linedata,hist);
linedata.add((void*)"",1);
int ret=doParse((char*)linedata.get());
#ifdef NSIS_SUPPORT_STANDARD_PREDEFINES #ifdef NSIS_SUPPORT_STANDARD_PREDEFINES
// Added by Sunil Kamath 11 June 2003 // Added by Sunil Kamath 11 June 2003
@ -495,9 +503,6 @@ int CEXEBuild::process_oneline(char *line, char *filename, int linenum)
} }
#endif #endif
linedata.add((void*)"",1);
int ret=doParse((char*)linedata.get());
linecnt=last_linecnt; linecnt=last_linecnt;
curfilename=last_filename; curfilename=last_filename;