MSys debug

Author: sadko4u

include/lsp-plug.in/fmt/obj/PullParser.h

@@ -49,7 +49,6 @@ namespace lsp
                 lsp_wchar_t        *pBuffer;        // Buffer for character data
                 size_t              nBufOff;        // Buffer offset
                 size_t              nBufLen;        // Buffer length
-                bool                bSkipLF;        // Skip line-feed character
                 size_t              nLines;         // Number of lines read
 
                 event_t             sEvent;

src/main/fmt/obj/PullParser.cpp

@@ -41,7 +41,6 @@ namespace lsp
             nBufOff         = 0;
             nBufLen         = 0;
             nLines          = 0;
-            bSkipLF         = false;
             nVx             = 0;
             nParVx          = 0;
             nTexVx          = 0;
@@ -210,7 +209,6 @@ namespace lsp
             pBuffer         = b;
             nBufOff         = 0;
             nBufLen         = 0;
-            bSkipLF         = false;
             nLines          = 0;
             nVx             = 0;
             nParVx          = 0;
@@ -234,7 +232,6 @@ namespace lsp
             nBufOff         = 0;
             nBufLen         = 0;
             nLines          = 0;
-            bSkipLF         = false;
 
             // Release input sequence
             if (pIn != NULL)
@@ -311,6 +308,8 @@ namespace lsp
             // Read lines
             while ((res = read_line()) == STATUS_OK)
             {
+                fprintf(stderr, "READ LINE: %s\n", sLine.get_utf8());
+
                 // Check that line is not empty
                 const char *l = skip_spaces(sLine.get_utf8());
                 if ((l == NULL) || (*l == '\0'))
@@ -351,27 +350,13 @@ namespace lsp
                     nBufOff     = 0;
                 }
 
-                // Scan for line ending
-                if (bSkipLF)
-                {
-                    bSkipLF = false;
-                    if (pBuffer[nBufOff] == '\r')
-                    {
-                        if ((++nBufOff) >= nBufLen)
-                            continue;
-                    }
-                }
-
                 // Scan for line ending character
                 size_t tail = nBufOff;
                 while (tail < nBufLen)
                 {
                     lsp_wchar_t ch = pBuffer[tail++];
                     if (ch == '\n') // Found!
-                    {
-                        bSkipLF = true;
                         break;
-                    }
                 }
 
                 // Append data to string and update buffer state
@@ -383,6 +368,8 @@ namespace lsp
                 if (sLine.last() != '\n') // Not end of line?
                     continue;
                 sLine.set_length(--len);
+                if (sLine.last() == '\r') // Remove carriage-return symbol if it is present
+                    sLine.set_length(--len);
 
                 // Compute number of terminating '\\' characters
                 ssize_t slashes = 0, xoff = len-1;
@@ -530,10 +517,13 @@ namespace lsp
             return true;
         }
 
-        status_t PullParser::parse_line(const char *s)
+        status_t PullParser::parse_line(const char *line)
         {
             status_t result = ((nLines++) > 0) ? STATUS_CORRUPTED_FILE : STATUS_BAD_FORMAT;
 
+            fprintf(stderr, "PARSE LINE: %s\n", line);
+
+            const char *s = line;
             switch (*(s++))
             {
                 case 'b': // bmat, bevel
@@ -775,10 +765,16 @@ namespace lsp
                     {
                         s   = skip_spaces(s+1);
                         if (!parse_float(&sEvent.vertex.x, &s))
+                        {
+                            fprintf(stderr, "Failed parse_float: %s\n", s);
                             return result;
+                        }
                         s   = skip_spaces(s);
                         if (!parse_float(&sEvent.vertex.y, &s))
+                        {
+                            fprintf(stderr, "Failed parse_float: %s\n", s);
                             return result;
+                        }
                         s   = skip_spaces(s);
                         if (!parse_float(&sEvent.vertex.z, &s))
                             sEvent.vertex.z     = 0.0f; // Extension, strictly required in obj format, for our case facilitated
@@ -787,7 +783,11 @@ namespace lsp
                             sEvent.vertex.w     = 1.0f;
 
                         if (!end_of_line(s))
+                        {
+                            fprintf(stderr, "Failed end_of_line: \"%s\"\n", s);
+                            lsp::debug::dumpb("String dump", s, strlen(s));
                             return result;
+                        }
 
                         ++nVx;
                         sEvent.type     = EV_VERTEX;
@@ -858,6 +858,9 @@ namespace lsp
                     break;
             }
 
+            if (result != STATUS_OK)
+                lsp::debug::dumpb("Could not parse line", line, strlen(line));
+
             return result;
         }