X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpreproc%2Fprep.cpp;fp=src%2Fpreproc%2Fprep.cpp;h=dda3901c4149ad32f404b8ce82848306d95db08e;hb=b2bcd7aad84b87e82c1029ba9741953f559e317d;hp=285b2c899d69502b0dea048527afa23de6a7a9d3;hpb=3490d8d1eee73348bc8ed4938d27d19d8f41660b;p=vlp.git diff --git a/src/preproc/prep.cpp b/src/preproc/prep.cpp index 285b2c8..dda3901 100644 --- a/src/preproc/prep.cpp +++ b/src/preproc/prep.cpp @@ -1,10 +1,10 @@ -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -21,13 +21,15 @@ public: }; }; -QList inc; +QList inc; IncFile *findTrueLine(int ln, int *trueline) { - IncFile *pom, *pom1; - QList pl; - int c1 = 0, c2 = 0; + IncFile *pom; + IncFile *pom1; + QList pl; + int c1 = 0; +// int c2 = 0; if (inc.isEmpty()) { *trueline = ln; @@ -46,7 +48,7 @@ IncFile *findTrueLine(int ln, int *trueline) return pom; } pl.append(pom); - pom=inc.next(); + pom=inc.takeFirst(); } if (pom != NULL) { @@ -54,7 +56,7 @@ IncFile *findTrueLine(int ln, int *trueline) c1=0; while (pom1 != NULL) { c1 += pom1->len; - pom1 = pl.next(); + pom1 = pl.takeFirst(); } *trueline = ln - c1; return NULL; @@ -63,7 +65,7 @@ IncFile *findTrueLine(int ln, int *trueline) c1 = 0; while (pom1 != NULL) { c1 += pom1->len; - pom1=inc.next(); + pom1=inc.takeFirst(); } *trueline = ln - c1; return NULL; @@ -89,7 +91,7 @@ int main(int argc,char **argv) //******* get home directory if (i != -1) { poms1 = poms.left(i + 1); - strcpy(homedir, poms1.data()); + strcpy(homedir, poms1.toStdString().c_str()); } else strcpy(homedir, ""); @@ -102,26 +104,25 @@ int main(int argc,char **argv) else poms1.sprintf("."); - strcpy(mydir,poms1.data()); + strcpy(mydir, poms1.toStdString().c_str()); poms.sprintf("%s", argv[1]); i = poms.findRev(".log", poms.length()-1, FALSE); poms1 = poms.left(i); - strcpy(fname, poms1.data()); + strcpy(fname, poms1.toStdString().c_str()); // ******************** poms.sprintf("%s/.cmp00", mydir); poms1.sprintf("%s/cmp01.log", mydir); - unlink(poms.data()); - unlink(poms1.data()); + unlink(poms.toStdString().c_str()); + unlink(poms1.toStdString().c_str()); - QFile compfile(poms1.data()); + QFile compfile(poms1); QFile srcfile(argv[1]); if (!compfile.open(IO_WriteOnly)) { - fprintf(stdout,"Cannot open temp file to write %s\n", - poms1.data()); + fprintf(stdout,"Cannot open temp file to write %s\n", poms1.toStdString().c_str()); exit(1); } @@ -133,7 +134,7 @@ int main(int argc,char **argv) QTextStream comps(&compfile); QTextStream src(&srcfile); - while (!src.eof()) { + while (!src.atEnd()) { poms = src.readLine(); i = poms.find("#include"); if (i != -1) { @@ -147,17 +148,17 @@ int main(int argc,char **argv) poms1 = poms.mid(i + 1, j - i - 1); p = new IncFile((char*)poms1.ascii(), currentline); - poms2.sprintf("%s%s", homedir, poms1.data()); - QFile pomf(poms2.data()); + poms2.sprintf("%s%s", homedir, poms1.toStdString().c_str()); + QFile pomf(poms2.toStdString().c_str()); if (!pomf.open(IO_ReadOnly)) { fprintf(stdout, "Cannot open include " - "file: %s\n", poms2.data()); + "file: %s\n", poms2.toStdString().c_str()); exit(1); } QTextStream pomstream(&pomf); - while (!pomstream.eof()) { + while (!pomstream.atEnd()) { poms1 = pomstream.readLine(); - comps << poms1.data(); + comps << poms1.toStdString().c_str(); comps << "\n"; p->len++; currentline++; @@ -166,7 +167,7 @@ int main(int argc,char **argv) inc.append(p); } } else { - comps << poms.data(); + comps << poms.toStdString().c_str(); comps << "\n"; } currentline++; @@ -176,7 +177,7 @@ int main(int argc,char **argv) compfile.close(); poms.sprintf("%s/cmp01.lcd", mydir); - unlink(poms.data()); + unlink(poms.toStdString().c_str()); sprintf(ss, "%s/loglan %s/cmp01 > %s/.cmp00", mydir, mydir, mydir); if (system(ss) == -1) { @@ -186,9 +187,9 @@ int main(int argc,char **argv) poms1.sprintf("%s.lcd", fname); - if (QFile::exists(poms.data())) { - rename(poms.data(), poms1.data()); - unlink(poms.data()); + if (QFile::exists(poms.toStdString().c_str())) { + rename(poms.toStdString().c_str(), poms1.toStdString().c_str()); + unlink(poms.toStdString().c_str()); fprintf(stdout, "Compile ok\n"); sprintf(ss,"%s/gen %s", mydir, fname); if (system(ss)==-1) { @@ -196,13 +197,13 @@ int main(int argc,char **argv) exit(1); } poms.sprintf("%s.ccd", fname); - if (QFile::exists(poms.data())) { - unlink(poms1.data()); + if (QFile::exists(poms.toStdString().c_str())) { + unlink(poms1.toStdString().c_str()); } } else { fprintf(stdout, "Errors\n"); poms.sprintf("%s/.cmp00", mydir); - QFile err(poms.data()); + QFile err(poms.toStdString().c_str()); if (!err.open(IO_ReadOnly)) { fprintf(stdout,"Cannot open error file\n"); @@ -213,12 +214,12 @@ int main(int argc,char **argv) poms = errstream.readLine(); i = poms.find("LOGLAN-82"); - while ((!errstream.eof()) && (i == -1)) { + while ((!errstream.atEnd()) && (i == -1)) { poms = errstream.readLine(); i = poms.find("LOGLAN-82"); } - while (!errstream.eof()) { + while (!errstream.atEnd()) { poms = errstream.readLine(); i = poms.find("ERROR"); if (i != -1) { @@ -231,16 +232,16 @@ int main(int argc,char **argv) if (fl != NULL) fprintf(stdout, "%s: ", fl->filename); fprintf(stdout, "%d %s\n", - tline, poms2.data()); + tline, poms2.toStdString().c_str()); } } err.close(); } /* errors */ poms.sprintf("%s/cmp01.log",mydir); - unlink(poms.data()); + unlink(poms.toStdString().c_str()); poms.sprintf("%s/.cmp00",mydir); - unlink(poms.data()); + unlink(poms.toStdString().c_str()); return 0; }