Changeset 523 for cpp/frams

Timestamp:

07/03/16 17:36:35 (9 years ago)

Author:

Maciej Komosinski

Message:

No more overloading of fopen/fclose/... functions for the VirtFILE class. #define VIRTFILE_OVERLOADING to enable overloading only when necessary.

Location:

cpp/frams

Files:

• param/multiparamload.cpp (modified) (3 diffs)
• param/param.cpp (modified) (7 diffs)
• util/sstringutils.cpp (modified) (3 diffs)
• vm/framscript.y (modified) (1 diff)

cpp/frams/param/multiparamload.cpp

@@ -66 +66 @@
 if (file && ownfile)
         {
-        fclose(file);
+        delete file;
         file=0;
         }
@@ -258 +258 @@
 {
 VirtFILE *f;
-while(f=popstack()) fclose(f);
+while(f=popstack()) delete f;
 }
 
@@ -264 +264 @@
 {
 if (!filestack.size()) return false;
-if (file) fclose(file);
+if (file) delete file;
 file=popstack();
 return true;

cpp/frams/param/param.cpp

@@ -25 +25 @@
         int z;
         char last_char = 0;
-        while ((z = fgetc(f)) != EOF)
+        while ((z = f->Vgetc()) != EOF)
         {
                 if (z == '~')
@@ -267 +267 @@
         if ((altname == NULL) || (altname[0] != 0))
         {
-                err |= (fputs(altname ? altname : getName(), f) == EOF);
-                err |= (fputs(":\n", f) == EOF);
+                err |= (f->Vputs(altname ? altname : getName()) == EOF);
+                err |= (f->Vputs(":\n") == EOF);
                 withname = true;
         }
@@ -274 +274 @@
                 err |= saveprop(f, i, p, force);
         if (withname)
-                err |= (fputs("\n", f) == EOF);
+                err |= (f->Vputs("\n") == EOF);
         return err;
 }
@@ -290 +290 @@
         int err = 0, cr;
 
-        err |= (fputs(p, f) == EOF); fputc(':', f);
+        err |= (f->Vputs(p) == EOF); f->Vputc(':');
         cr = 0;
         if ((*typ == 'x') || (*typ == 'o'))
@@ -304 +304 @@
         if (ws.len() > 50) cr = 1;
         else for (t = w; *t; t++) if ((*t == 10) || (*t == 13)) { cr = 1; break; }
-        if (cr) fputs("~\n", f);
-        err |= (fputs(w, f) == EOF);
-        err |= (fputs(cr ? "~\n" : "\n", f) == EOF);
+        if (cr) f->Vputs("~\n");
+        err |= (f->Vputs(w) == EOF);
+        err |= (f->Vputs(cr ? "~\n" : "\n") == EOF);
         return err;
 }
@@ -464 +464 @@
                                                 }
                                         removeCR(s);
-                                        int ch; while ((ch = fgetc(f)) != EOF) if (ch == '\n') break;
+                                        int ch; while ((ch = f->Vgetc()) != EOF) if (ch == '\n') break;
                                         unquoteTilde(s);
                                         if (linenum && (flags(i)&PARAM_LINECOMMENT))
@@ -501 +501 @@
                                 (*linenum) += lfcount;
                         }
-                        int ch; while ((ch = fgetc(f)) != EOF) if (ch == '\n') break;
+                        int ch; while ((ch = f->Vgetc()) != EOF) if (ch == '\n') break;
                 }
         }

cpp/frams/util/sstringutils.cpp

@@ -16 +16 @@
                 loadSString(f, s);
                 ret = 1;
-                fclose(f);
+                delete f;
         }
         else if (framsgmodule)
@@ -29 +29 @@
         while (!f->Veof())
         {
-                len = fread(buf, 1, sizeof(buf), f);
+                len = f->Vread(buf, 1, sizeof(buf));
                 s.append(buf, len);
         }
@@ -44 +44 @@
         while (!eolfound)
         {
-                char *r = fgets(buf, sizeof(buf), f);
+                char *r = f->Vgets(buf, sizeof(buf));
                 if (r == NULL) break;
                 ret = true;

cpp/frams/vm/framscript.y

@@ -149 +149 @@
 
 asmlines: /* empty */
-        | ASMLINE            {fputs(str($1),trctx.out);fputc('\n',trctx.out);}
-        | asmlines ASMLINE   {fputs(str($2),trctx.out);fputc('\n',trctx.out);}
+        | ASMLINE            {trctx.out->Vputs(str($1));trctx.out->Vputc('\n');}
+        | asmlines ASMLINE   {trctx.out->Vputs(str($2));trctx.out->Vputc('\n');}
 ;