From: =?utf-8?b?0L3QsNCx?= Date: Thu, 14 Nov 2024 00:58:31 +0100 Subject: Remove needless allocations. Read input with std::getline() instead of fgets(1024). Calculate path to ~/.concalcvariables once. Allow all input files to be non-seekable --- src/concalc.cpp | 332 +++++++++++++++++--------------------------------------- src/global.h | 24 ++-- 2 files changed, 114 insertions(+), 242 deletions(-) diff --git a/src/concalc.cpp b/src/concalc.cpp index 3805eb4..be8f9b8 100644 --- a/src/concalc.cpp +++ b/src/concalc.cpp @@ -17,6 +17,10 @@ any later version. #include "global.h" #include #include +#include +#include +#include +#include #include #include "concalc.h" @@ -49,25 +53,23 @@ any later version. int main(int argc,char**argv) { - Variable *vars=new Variable[VARNUM]; + Variable vars[VARNUM]{}; Number value; - for(int c=0; cangle=RAD; pref->calcType=SCIENTIFIC; pref->base=DEC; pref->complex=false; bool ask=true; - char*input=NULL; + std::string input; bool script=false; - Script*s; ThreadSync scriptData; scriptData.vars=new Number*[VARNUM]; for(int c=0; coutputLength=pref->precision=LDBL_DIG; int maxLength=LDBL_DIG; -#else +#else pref->outputLength=pref->precision=DBL_DIG; int maxLength=DBL_DIG; #endif - char*homedir=getenv("HOME"); - char*path=new char[strlen(homedir)+20]; - memcpy(path,homedir,strlen(homedir)); - memcpy(&path[strlen(homedir)],"/.concalcvariables",19); + std::string variablesPath=getenv("HOME"); + variablesPath += "/.concalcvariables"; struct timeval rndTime; gettimeofday(&rndTime,NULL); srand(rndTime.tv_usec*rndTime.tv_sec); - + int fileLength; struct stat fileStat; char*variablesString; - char*var; - - if(lstat(path,&fileStat) == 0) - { - FILE*variablesFile=fopen(path,"r"); + FILE*variablesFile=fopen(variablesPath.c_str(),"r"); if(variablesFile!=NULL) { fileLength=fileStat.st_size; - variablesString=new char[fileLength+1]; - fread(variablesString,fileLength,1,variablesFile); - + char *var{}; + size_t varLineCap{}; + ssize_t varLineLen{}; + int varStart=0; int varEnd=0; int varCount=0; bool real=true; - - - for(int c=0; cangle=GRA; else { printf("Invalid argument for -a!\n\nPossible Arguments:\n-a deg\n-a rad\n-a gra\n\nPlease use man concalc for further information\n"); - delete pref; - delete[] vars; return 0; } c++; } else { printf("Invalid argument for -a!\n\nPossible Arguments:\n-a deg\n-a rad\n-a gra\n\nPlease use man calc for further information\n"); - delete pref; - delete[] vars; return 0; } } @@ -194,16 +179,12 @@ int main(int argc,char**argv) } else { printf("Invalid argument for -m!\n\nPossible Arguments:\n-m base\n-m std\n\nPlease use man concalc for further information\n"); - delete pref; - delete[] vars; return 0; } c++; } else { printf("Invalid argument for -m!\n\nPossible Arguments:\n-m base\n-m std\n\nPlease use man concalc for further information\n"); - delete pref; - delete[] vars; return 0; } } @@ -221,16 +202,12 @@ int main(int argc,char**argv) pref->base=DEC; else { printf("Invalid argument for -m!\n\nPossible Arguments:\n-m base\n-m std\n\nPlease use man concalc for further information\n"); - delete pref; - delete[] vars; return 0; } c++; } else { printf("Invalid argument for -b!\n\nPossible Arguments:\n-b dec\n-b hex\n-b bin\n-b oct\n\nPlease use man concalc for further information\n"); - delete pref; - delete[] vars; return 0; } } @@ -242,18 +219,14 @@ int main(int argc,char**argv) if(outLen<2 || outLen>pref->precision) { printf("Invalid argument for -o!\n\nThe argument must be a number between 2 and %i.\nFor example: -o 8\n\nPlease use man concalc for further information\n",pref->precision); - delete pref; - delete[] vars; return 0; } pref->outputLength=outLen; - + c++; } else { printf("Invalid argument for -o!\n\nThe argument must be a number between 2 and %i.\nFor example: -o 8\n\nPlease use man concalc for further information\n",pref->precision); - delete pref; - delete[] vars; return 0; } } @@ -264,83 +237,48 @@ int main(int argc,char**argv) else if(strcmp(argv[c],"-h")==0 || strcmp(argv[c],"--help")==0) { printf("Usage:\nconcalc \"input\"\nFor example: calc \"2*(3+7/2)\"\n\nOptions:\n-a, --angle (deg, rad, gra)\n-m, --mode (base, std, script)\n-c, --complex\n-b, --base (dec, hex, bin, oct) only in base mode\n-o, --output (2-18)\n-h, --help\n-v, --version\n\nPlease use man concalc for further information\n"); - delete pref; - delete[] vars; - return 0; + return 0; } else if(strcmp(argv[c],"-v")==0 || strcmp(argv[c],"--version")==0) { printf("\n%s\n\n%s",VERSIONSTRING,AUTHORSTRING); - delete pref; - delete[] vars; - return 0; + return 0; } else { ask=false; - if(input==NULL) - { - input=(char*)malloc(strlen(argv[c])+1); - memcpy(input,argv[c],strlen(argv[c])+1); - } - else { - char*temp=input; - input=(char*)malloc(strlen(argv[c])+strlen(temp)+1); - memcpy(input,temp,strlen(temp)); - memcpy(&input[strlen(temp)],argv[c],strlen(argv[c])+1); - } + input += argv[c]; } } if(pref->calcType == SCIENTIFIC && pref->base!=DEC) { printf("Invalid option -b!\nOption -b can only be used when -m is set!\n\nPlease use man concalc for further information\n"); - delete pref; - delete[] vars; return 0; } if(ask) { - input=(char*)malloc(1026); - scanf("%1024s",input); + std::getline(std::cin, input); } if(script) { - char*path=input; - struct stat fileinfo; - FILE*scriptFile; - if(lstat(path,&fileinfo)!=0) + std::string path = std::move(input); + std::ifstream ifs{path}; + if(!ifs) { - printf("Opening script file %s failed!\n",path); - delete[]path; + printf("Opening script file %s failed!\n",path.c_str()); return 0; } - if(fileinfo.st_size<=0) + input={std::istreambuf_iterator{ifs}, {}}; + if(input.empty()) { - printf("Invalid file %s !\n",path); - delete[]path; + printf("File %s empty !\n",path.c_str()); return 0; } - scriptFile=fopen(path,"r"); - if(scriptFile==NULL) - { - printf("Opening script file %s failed!\n",path); - delete[]path; - return 0; - } - input =(char*)malloc(fileinfo.st_size+2); - if(fread(input,fileinfo.st_size,1,scriptFile)<=0) - { - printf("Can't read file %s !\n",path); - delete[]path; - return 0; - } - input[fileinfo.st_size]=(char)0; } - char*printString=new char[50]; char*res=NULL; - + scriptData.error=false; - + struct termios terminfo,oldTerminfo; tcgetattr(fileno(stdout),&terminfo); @@ -354,62 +292,52 @@ int main(int argc,char**argv) scriptData.usleep=false; scriptData.bbreak=false; scriptData.bcontinue=false; - + scriptData.exit=false; - + if(script) { - - + + scriptData.countDifference=0; - initDebugging(input,&scriptData); - res=preprocessor(input,pref,true); - - + initDebugging(input.data(),&scriptData); + res=preprocessor(input.data(),pref,true); + + if(res==NULL) { fprintf(stderr,"Preprocessor Error\n"); - free(input); - delete[]printString; - delete[]vars; - delete pref; tcsetattr(fileno(stdout),TCSANOW,&oldTerminfo); return 0; } searchScripts(res,pref,vars,&scriptData); - + scriptData.calcMode=false; fprintf(stderr,"\nProcessing main file ...\n"); - s=new Script((Script*)NULL,res,pref,vars,&scriptData); - loadSubScripts(&scriptData,pref,vars,s); + Script s((Script*)NULL,res,pref,vars,&scriptData); + loadSubScripts(&scriptData,pref,vars,&s); if(scriptData.error) { fprintf(stderr,"Script processing failed\n"); - free(input); - delete[]printString; - delete[]vars; - delete pref; - delete s; tcsetattr(fileno(stdout),TCSANOW,&oldTerminfo); return 0; } - value=s->exec(); + value=s.exec(); } - else + else { - res=preprocessor(input,pref,false); + res=preprocessor(input.data(),pref,false); scriptData.calcMode=true; - s=new Script((Script*)NULL,res,pref,vars,&scriptData); - value=s->exec(); - delete s; + Script s((Script*)NULL,res,pref,vars,&scriptData); + value=s.exec(); } - - + + if(pref->calcType==SCIENTIFIC) - { + { switch(value.type) { case NFLOAT: @@ -423,7 +351,7 @@ int main(int argc,char**argv) printf("%.*Lg+%.*Lgi",pref->outputLength,real(value.fval),pref->outputLength,imag(value.fval)); else printf("%.*Lg%.*Lgi",pref->outputLength,real(value.fval),pref->outputLength,imag(value.fval)); } - + break; } case NINT: @@ -450,7 +378,7 @@ int main(int argc,char**argv) } else { long long ival; - + switch(value.type) { case NFLOAT: @@ -465,8 +393,8 @@ int main(int argc,char**argv) default: ival=0; } - - + + switch(pref->base) { case DEC: @@ -475,7 +403,7 @@ int main(int argc,char**argv) case BIN: { long long result=ival; - char*cRes=new char[65]; + char cRes[65]; cRes[64]=(char)0; for(long long c=0; c<64;c++) { @@ -498,16 +426,13 @@ int main(int argc,char**argv) case OCT: printf("%llo\n",ival); break; - } + } } - char*newVarString=""; - - char*varString=new char[maxLength+20]; - scriptData.vars[26][0]=value; + variablesFile=fopen(variablesPath.c_str(),"w"); for(int c=0; c<27; c++) { if(scriptData.vars[c][0].type==NINT) @@ -516,38 +441,14 @@ int main(int argc,char**argv) scriptData.vars[c][0].fval=Complex((long double)scriptData.vars[c][0].bval,0.0); else if(scriptData.vars[c][0].type!=NFLOAT) scriptData.vars[c][0].fval=Complex(NAN,0.0); - - sprintf(varString,"%.*Lg",maxLength,scriptData.vars[c][0].fval.real()); - newVarString=strins(newVarString,varString,strlen(newVarString)); - newVarString=strins(newVarString,"\n",strlen(newVarString)); - - sprintf(varString,"%.*Lg",maxLength,scriptData.vars[c][0].fval.imag()); - newVarString=strins(newVarString,varString,strlen(newVarString)); - newVarString=strins(newVarString,"\n",strlen(newVarString)); - } - chdir(getenv("HOME")); - FILE*variablesFile=fopen(".concalcvariables","w"); - if(variablesFile!=NULL) - { - fwrite(newVarString,strlen(newVarString),1,variablesFile); - fclose(variablesFile); - } - delete[] newVarString; - tcsetattr(fileno(stdout),TCSANOW,&oldTerminfo); - - free(res); - for(int c=0; c=len) run=false; lineCount++; - line=new char[pos2-pos1+1]; - memcpy(line,&code[pos1],pos2-pos1); - line[pos2-pos1]=(char)0; - lineLen=strlen(line); - for(int c=0; csubprogramPath.GetLen(); c++) - if(strcmp(scriptData->subprogramPath[c],scriptName)==0) + if(scriptData->subprogramPath[c]==scriptName) { newScript=false; break; } if(newScript) { - struct stat fileStat; - char*subFileContent; - - if(lstat(scriptName,&fileStat)!=0) - ; - else { - subFile=fopen(scriptName,"r"); - if(subFile==NULL || fileStat.st_size<=0) - ; - else - { - subFileContent=new char[fileStat.st_size+1]; - subFileContent[fileStat.st_size]=(char)0; - fread(subFileContent,fileStat.st_size,1,subFile); - fclose(subFile); - scriptData->subprogramPath.NewItem(scriptName); - searchScripts(subFileContent,pref,vars,scriptData); - delete[]subFileContent; - } + std::ifstream subFile{scriptName}; + if(subFile) + { + std::string subFileContent{std::istreambuf_iterator{subFile}, {}}; + searchScripts(subFileContent.data(),pref,vars,scriptData); } } pos=pos2+1; @@ -660,21 +541,14 @@ void loadSubScripts(ThreadSync*scriptData,Preferences*pref,Variable*vars,Script* for(int c=0; csubprogramPath.GetLen(); c++) { filePath=scriptData->subprogramPath[c]; - if(lstat(filePath,&fileStat)!=0) + std::ifstream subFile{filePath}; + if(!subFile) scriptData->subprograms.NewItem((Math*)NULL); else { - subFile=fopen(filePath,"r"); - if(subFile==NULL || fileStat.st_size<=0) - scriptData->subprograms.NewItem((Math*)NULL); - else - { - subFileContent=new char[fileStat.st_size+1]; - subFileContent[fileStat.st_size]=(char)0; - fread(subFileContent,fileStat.st_size,1,subFile); - fclose(subFile); + std::string subFileContent{std::istreambuf_iterator{subFile}, {}}; scriptData->countDifference+=scriptData->semicolonLines.GetLen(); - initDebugging(subFileContent,scriptData); - cleanSubFileContent=preprocessor(subFileContent,pref,true); + initDebugging(subFileContent.data(),scriptData); + cleanSubFileContent=preprocessor(subFileContent.data(),pref,true); fprintf(stderr,"\nProcessing file "); fprintf(stderr,"%s", scriptData->subprogramPath[c]); fprintf(stderr,"\n"); @@ -683,14 +557,12 @@ void loadSubScripts(ThreadSync*scriptData,Preferences*pref,Variable*vars,Script* fprintf(stderr,"Preprocessor Error\n"); subScript=NULL; } - else + else { subScript=new Script(parent,NULL,pref,vars,scriptData); subScript->split(cleanSubFileContent,0,strlen(cleanSubFileContent)); } - free(subFileContent); scriptData->subprograms.NewItem(subScript); - } } } @@ -702,8 +574,8 @@ int preferencesPreprocessor(char *code,Preferences*pref) int pos=0,startPos=0,endPos=0,len; bool comment=false,quote=false; char*configString=NULL; - - + + while(pos<=(len=strlen(code))) { if(quote) @@ -725,20 +597,20 @@ int preferencesPreprocessor(char *code,Preferences*pref) startPos=pos; int configStartPos=startPos; endPos=pos; - + if(strncmp(&code[startPos],"#config",7)==0) configStartPos+=7; else return PPINVALIDCOMMAND; - + while(code[endPos]!='\n' && endPos<=len) endPos++; - - + + while((code[configStartPos]==' ' || code[configStartPos]=='\t') && configStartPos<=len) configStartPos++; - + configString=(char*)realloc(configString,endPos-configStartPos+1); strcopy(configString,&code[configStartPos],endPos-configStartPos); - + if(strncmp(configString,"complexon",9)==0) pref->complex=true; @@ -763,19 +635,19 @@ int preferencesPreprocessor(char *code,Preferences*pref) else return PPINVALIDARGUMENT; } else return PPINVALIDPREF; - + memmove(&code[startPos],&code[endPos],len-endPos+1); - + if(endPos==len) break; pos=startPos; } pos++; } - + if(strlen(code)<=0) return PPEMPTY; - + return 0; } */ diff --git a/src/global.h b/src/global.h index d2ee9ea..169218f 100644 --- a/src/global.h +++ b/src/global.h @@ -179,7 +179,7 @@ using namespace std; #endif #ifdef M_El #define EULER M_El -#else +#else #define EULER 2.718281828459045235360287471352662497757 #endif #define SPI "3.141592653589793238462643383279502884197" @@ -307,8 +307,8 @@ class Math double number; int var; - - + + public: int operation; Math(Math*par,Preferences*pr,Variable*va) @@ -330,33 +330,33 @@ class Math horzObj=NULL; } } - + int getOperation() { return operation; } - + virtual double calc() {return 0.0;} virtual double calcVertObj() {return 0.0;} virtual double calcHorzObj() {return 0.0;} - + virtual Number exec() {Number r;r.type=NNONE;return r;} virtual Number execVertObj() {Number r;r.type=NNONE;return r;} virtual Number execHorzObj() {Number r;r.type=NNONE;return r;} virtual int split(char*,int,int){return 0;} virtual int parse(char*,int,int){return 0;} - + }; class Calculate :public Math { - + virtual int split(char* line,int,int); public: - + Calculate(Math *par,char* line,int start, int end,Preferences*pr,Variable*va) :Math((Math*)par,pr,va) { horzObj=vertObj=NULL; @@ -398,9 +398,9 @@ class Script :public Math Number value; Math *vertObj2,*vertObj3,*vertObj4; ThreadSync*eventReciver; - + private: - + inline bool resizeVar(int var,int newlen); public: @@ -428,7 +428,7 @@ class Script :public Math } } } - + Script(Script*par,char*line,int start,int end,Preferences*pr,Variable*va,ThreadSync*evrec) :Math((Math*)par,pr,va) { horzObj=vertObj=vertObj2=vertObj3=vertObj4=NULL;