Changes to catch macros that are missing arguments - not perfect, but it will work...

Added cleaner ABORT handling in some situations
If \\end{document} is not found, then program auto-aborts after first pass to avoid hanging in some endless loop until all system resources are exhausted and the program crashes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 3a596413a86cd2d8fa6b9f4bcfca34da06891161..49c710c82ac5f340f1d4dfe0986ef9e10ba0faa5 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -5090,6 +5090,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
 
 bool RTFGo(void)
 {
 
 bool RTFGo(void)
 {

+  if (stopRunning)
+      return FALSE;
+

   // Reset variables
   indentLevel = 0;
   forbidParindent = 0;
   // Reset variables
   indentLevel = 0;
   forbidParindent = 0;


@@ -5164,6 +5167,9 @@ bool RTFGo(void)
 
     SetCurrentOutput(Chapters);
 
 
     SetCurrentOutput(Chapters);
 

+    if (stopRunning)
+        return FALSE;
+

     OnInform("Converting...");
 
     TraverseDocument();
     OnInform("Converting...");
 
     TraverseDocument();

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index bc2e66c153b695bfb59d67c1ac27efa228154e94..7e8062f12a94b9ba0944ba473f0fa8bbc86b58e6 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -274,19 +274,19 @@ void TexOutput(char *s, bool ordinaryText)
 
 void ForbidWarning(TexMacroDef *def)
 {
 
 void ForbidWarning(TexMacroDef *def)
 {

-  char buf[100];
+  wxString informBuf;

   switch (def->forbidden)
   {
     case FORBID_WARN:
     {
   switch (def->forbidden)
   {
     case FORBID_WARN:
     {

-      sprintf(buf, "Warning: it is recommended that command %s is not used.", def->name);
-      OnInform(buf);
+      informBuf.Printf("Warning: it is recommended that command %s is not used.", def->name);
+      OnInform((char *)informBuf.c_str());

       break;
     }
     case FORBID_ABSOLUTELY:
     {
       break;
     }
     case FORBID_ABSOLUTELY:
     {

-      sprintf(buf, "Error: command %s cannot be used and will lead to errors.", def->name);
-      OnInform(buf);
+      informBuf.Printf("Error: command %s cannot be used and will lead to errors.", def->name);
+      OnInform((char *)informBuf.c_str());

       break;
     }
     default:
       break;
     }
     default:


@@ -938,6 +938,14 @@ void MacroError(char *buffer)
   errBuf.Printf("Could not find macro: %s at line %d, file %s",
              macroBuf, (int)(LineNumbers[CurrentInputIndex]-1), FileNames[CurrentInputIndex]);
   OnError((char *)errBuf.c_str());
   errBuf.Printf("Could not find macro: %s at line %d, file %s",
              macroBuf, (int)(LineNumbers[CurrentInputIndex]-1), FileNames[CurrentInputIndex]);
   OnError((char *)errBuf.c_str());

+
+  if (wxStrcmp(macroBuf,"\\end{document}") == 0)
+  {
+      wxString buf;
+      buf = "Halted build due to unrecoverable error.";
+      OnInform((char *)buf.c_str());
+      stopRunning = TRUE;
+  }

 }
 
 /*
 }
 
 /*


@@ -1248,6 +1256,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
           CustomMacro *customMacro = FindCustomMacro(def->name);
 
           TexChunk *chunk = new TexChunk(CHUNK_TYPE_MACRO, def);
           CustomMacro *customMacro = FindCustomMacro(def->name);
 
           TexChunk *chunk = new TexChunk(CHUNK_TYPE_MACRO, def);

+

           chunk->no_args = def->no_args;
 //          chunk->name = copystring(def->name);
           chunk->macroId = def->macroId;
           chunk->no_args = def->no_args;
 //          chunk->name = copystring(def->name);
           chunk->macroId = def->macroId;


@@ -1604,6 +1613,19 @@ int ParseMacroBody(char *macro_name, TexChunk *parent,
         isOptional = TRUE;
         pos += 2;
       }
         isOptional = TRUE;
         pos += 2;
       }

+      else if (i > 0)
+      {
+        wxString errBuf;
+        wxString tmpBuffer(buffer);
+        if (tmpBuffer.length() > 4)
+        {
+            if (tmpBuffer.Right(4) == "\\par")
+                tmpBuffer = tmpBuffer.Mid(0,tmpBuffer.length()-4);
+        }
+        errBuf.Printf("Missing macro argument in the line:\n\t%s\n",tmpBuffer.c_str());
+        OnError((char *)errBuf.c_str());
+      }
+

     }
     arg->optional = isOptional;
 
     }
     arg->optional = isOptional;
 


@@ -1853,14 +1875,16 @@ void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode, bool childrenOnly)
         OnMacro(chunk->macroId, chunk->no_args, TRUE);
 
       wxNode *node = chunk->children.First();
         OnMacro(chunk->macroId, chunk->no_args, TRUE);
 
       wxNode *node = chunk->children.First();

+      TexChunk *child_chunk = NULL;

       while (node)
       {
       while (node)
       {

-        TexChunk *child_chunk = (TexChunk *)node->Data();
+        child_chunk = (TexChunk *)node->Data();

         TraverseFromChunk(child_chunk, node);
         node = node->Next();
       }
 
         TraverseFromChunk(child_chunk, node);
         node = node->Next();
       }
 

-      if (thisNode && thisNode->Next()) nextChunk = (TexChunk *)thisNode->Next()->Data();
+      if (thisNode && thisNode->Next())
+          nextChunk = (TexChunk *)thisNode->Next()->Data();

 
       if (!childrenOnly)
         OnMacro(chunk->macroId, chunk->no_args, FALSE);
 
       if (!childrenOnly)
         OnMacro(chunk->macroId, chunk->no_args, FALSE);


@@ -1888,7 +1912,8 @@ void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode, bool childrenOnly)
 
       currentArgument = chunk;
 
 
       currentArgument = chunk;
 

-      if (thisNode && thisNode->Next()) nextChunk = (TexChunk *)thisNode->Next()->Data();
+      if (thisNode && thisNode->Next())
+          nextChunk = (TexChunk *)thisNode->Next()->Data();

 
       isArgOptional = chunk->optional;
       noArgs = chunk->no_args;
 
       isArgOptional = chunk->optional;
       noArgs = chunk->no_args;


@@ -1906,7 +1931,9 @@ void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode, bool childrenOnly)
         // If non-whitespace text, we no longer have a new paragraph.
         if (issuedNewParagraph && !((chunk->value[0] == 10 || chunk->value[0] == 13 || chunk->value[0] == 32)
                                     && chunk->value[1] == 0))
         // If non-whitespace text, we no longer have a new paragraph.
         if (issuedNewParagraph && !((chunk->value[0] == 10 || chunk->value[0] == 13 || chunk->value[0] == 32)
                                     && chunk->value[1] == 0))

+        {

           issuedNewParagraph = FALSE;
           issuedNewParagraph = FALSE;

+        }

         TexOutput(chunk->value, TRUE);
       }
       break;
         TexOutput(chunk->value, TRUE);
       }
       break;


@@ -3136,10 +3163,9 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
         }
         else
         {
         }
         else
         {

-          char buf[300];
-          TexOutput("??", TRUE);
-          sprintf(buf, "Warning: unresolved reference '%s'", refName); 
-          OnInform(buf);
+           wxString informBuf;
+           informBuf.Printf("Warning: unresolved reference '%s'", refName); 
+           OnInform((char *)informBuf.c_str());

         }
       }
       else TexOutput("??", TRUE);
         }
       }
       else TexOutput("??", TRUE);


@@ -3298,9 +3324,9 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
           TexOutput(ref->sectionNumber, TRUE);
           if (strcmp(ref->sectionNumber, "??") == 0)
           {
           TexOutput(ref->sectionNumber, TRUE);
           if (strcmp(ref->sectionNumber, "??") == 0)
           {

-            char buf[300];
-            sprintf(buf, "Warning: unresolved citation %s.", citeKey);
-            OnInform(buf);
+            wxString informBuf;
+            informBuf.Printf("Warning: unresolved citation %s.", citeKey);
+            OnInform((char *)informBuf.c_str());

           }
         }
         citeKey = ParseMultifieldString(citeKeys, &pos);
           }
         }
         citeKey = ParseMultifieldString(citeKeys, &pos);

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index cc8f64acae7d2f886c9bd8e12e59466bf5a9c178..40537bea252c755479feca2f72e1515e728259d9 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -665,7 +665,16 @@ void MyFrame::OnGo(wxCommandEvent& event)
       Tex2RTFYield(TRUE);
       Go();
 
       Tex2RTFYield(TRUE);
       Go();
 

-      if (runTwice)
+      if (stopRunning)
+      {
+        SetStatusText("Build aborted!");
+        wxString errBuf;
+        errBuf.Printf("\nErrors encountered during this pass: %lu\n", errorCount);
+        OnInform((char *)errBuf.c_str());
+      }
+
+
+      if (runTwice && !stopRunning)

       {
         Tex2RTFYield(TRUE);
         Go();
       {
         Tex2RTFYield(TRUE);
         Go();


@@ -907,7 +916,7 @@ bool Go(void)
   ChooseOutputFile();
 #endif
 
   ChooseOutputFile();
 #endif
 

-  if (!InputFile || !OutputFile)
+  if (!InputFile || !OutputFile || stopRunning)

     return FALSE;
 
 #ifndef NO_GUI
     return FALSE;
 
 #ifndef NO_GUI


@@ -981,6 +990,9 @@ bool Go(void)
     OnInform("Reading LaTeX file...");
     TexLoadFile(InputFile);
 
     OnInform("Reading LaTeX file...");
     TexLoadFile(InputFile);
 

+    if (stopRunning)
+        return FALSE;
+

     switch (convertMode)
     {
       case TEX_RTF:
     switch (convertMode)
     {
       case TEX_RTF: