clear()->erase() ; lots of using directives for cxx

[features.git] / src / Literate.C

diff --git a/src/Literate.C b/src/Literate.C
index 28e2f886abf51bc0d84bd0e116498e1cf46b4227..7443d01cfd1ad6d78464dcc0ede39a3c7c32d462 100644 (file)
--- a/src/Literate.C
+++ b/src/Literate.C
@@ -1,51 +1,51 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1999 The LyX Team.
+ *           Copyright 1995-2000 The LyX Team.
  *
- * ======================================================
+ * ====================================================== 
  */
 
 #include <config.h>
 
-#include <cstdio>
-#include <cstdlib>
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
+#include <fstream>
 
 #include "support/filetools.h"
 #include "LaTeX.h"
 #include "Literate.h"
-#include "lyxlex.h"
 #include "support/FileInfo.h"
 #include "debug.h"
 #include "support/lyxlib.h"
 #include "support/syscall.h"
 #include "support/syscontr.h"
-#include "pathstack.h"
+#include "support/path.h"
 #include "bufferlist.h"
 #include "minibuffer.h"
 #include "gettext.h"
 
+using std::ifstream;
+using std::getline;
+using std::endl;
+
 extern BufferList bufferlist;
 
 Literate::Literate(string const & latex, string const & f, string const & p, 
                   string const & l, 
                   string const & literate, string const & literate_f, 
                   string const & build, string const & build_f)
-                   : LaTeX (latex, f, p),
+                   : LaTeX(latex, f, p),
                     litfile(l),
                     literate_cmd(literate), literate_filter(literate_f), 
                     build_cmd(build), build_filter(build_f)
-{
-}
+{}
 
 
-int Literate::weave(TeXErrors &terr, MiniBuffer *minib)
+int Literate::weave(TeXErrors & terr, MiniBuffer * minib)
 {
         int scanres = Literate::NO_ERRORS;
         string tmp1, tmp2;
@@ -63,24 +63,21 @@ int Literate::weave(TeXErrors &terr, MiniBuffer *minib)
         //
         tmp1 = literate_cmd + " < " + litfile + " > " + file + " 2> " + litfile + ".out";
         tmp2 = literate_filter + " < " + litfile + ".out" + " > " + litfile + ".log";
-        ret1 = one.Startscript(Systemcalls::System, tmp1);
-        ret2 = two.Startscript(Systemcalls::System, tmp2);
+        ret1 = one.startscript(Systemcalls::System, tmp1);
+        ret2 = two.startscript(Systemcalls::System, tmp2);
         lyxerr.debug() << "LITERATE {" << tmp1 << "} {" << tmp2 << "}" << endl;
-       scanres = scanLiterateLogFile(terr);
+       scanres = scanLiterateLogFile();
        if (scanres & Literate::ERRORS) return scanres; // return on literate error
-
        return run(terr, minib);
 }
 
 
-int Literate::build(TeXErrors &terr, MiniBuffer *minib)
+int Literate::build(TeXErrors & /*terr*/, MiniBuffer * minib)
         // We know that this function will only be run if the lyx buffer
         // has been changed. 
 {
         int scanres = Literate::NO_ERRORS;
         num_errors = 0; // just to make sure.
-        // DepTable head; // empty head // unused
-        // bool rerun = false; // rerun requested // unused
         string tmp1, tmp2;
         int ret1, ret2;
         Systemcalls one, two;
@@ -96,37 +93,24 @@ int Literate::build(TeXErrors &terr, MiniBuffer *minib)
         //
         tmp1 = build_cmd + ' ' + litfile + " > " + litfile + ".out 2>&1";
         tmp2 = build_filter + " < " + litfile + ".out" + " > " + litfile + ".log";
-        ret1 = one.Startscript(Systemcalls::System, tmp1);
-        ret2 = two.Startscript(Systemcalls::System, tmp2);
-        scanres = scanBuildLogFile(terr);
+        ret1 = one.startscript(Systemcalls::System, tmp1);
+        ret2 = two.startscript(Systemcalls::System, tmp2);
+        scanres = scanBuildLogFile();
         lyxerr[Debug::LATEX] << "Done." << endl;
 
         return scanres;
 }
 
 
-int Literate::scanLiterateLogFile(TeXErrors &terr)
+int Literate::scanLiterateLogFile()
 {
         string token;
         int retval = NO_ERRORS;
         
-        LyXLex lex(0, 0);
- 
         string tmp = litfile + ".log";
         
-        if (!lex.setFile(tmp)) {
-                // unable to open file
-                // return at once
-                retval |= NO_LOGFILE;
-                return retval;
-        }
-        
-        while (lex.IsOK()) {
-                if (lex.EatLine())
-                        token = lex.GetString();
-                else // blank line in the file being read
-                        continue;
- 
+        ifstream ifs(tmp.c_str());
+       while (getline(ifs, token)) {
                 lyxerr[Debug::LATEX] << token << endl;
                 
                 if (prefixIs(token, "Build Warning:")) {
@@ -140,36 +124,22 @@ int Literate::scanLiterateLogFile(TeXErrors &terr)
                         retval |= LATEX_ERROR;
                         lyxerr[Debug::LATEX] << "Build Error." << endl;
                         // this is not correct yet
-                        terr.scanError(lex);
-                        num_errors++;
+                        ++num_errors;
                 }
         }       
         return retval;
 }
 
 
-int Literate::scanBuildLogFile(TeXErrors &terr)
+int Literate::scanBuildLogFile()
 {
         string token;
         int retval = NO_ERRORS;
-        
-        LyXLex lex(0, 0);
  
         string tmp = litfile + ".log";
         
-        if (!lex.setFile(tmp)) {
-                // unable to open file
-                // return at once
-                retval |= NO_LOGFILE;
-                return retval;
-        }
-        
-        while (lex.IsOK()) {
-                if (lex.EatLine())
-                        token = lex.GetString();
-                else // blank line in the file being read
-                        continue;
- 
+        ifstream ifs(tmp.c_str());
+       while (getline(ifs, token)) {
                 lyxerr[Debug::LATEX] << token << endl;
                 
                 if (prefixIs(token, "Build Warning:")) {
@@ -183,11 +153,8 @@ int Literate::scanBuildLogFile(TeXErrors &terr)
                         retval |= LATEX_ERROR;
                         lyxerr[Debug::LATEX] << "Build Error." << endl;
                         // this is not correct yet
-                        terr.scanError(lex);
-                        num_errors++;
+                        ++num_errors;
                 }
         }       
         return retval;
 }
-
-