Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

third_party/yasm/patched-yasm/modules/parsers/gas/gas-token.re

 /*
  * GAS-compatible re2c lexer
  *
  *  Copyright (C) 2005-2007  Peter Johnson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 10 matching lines @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR OTHER CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <util.h>
-RCSID("$Id: gas-token.re 2166 2009-01-02 08:33:21Z peter $");
+RCSID("$Id: gas-token.re 2266 2010-01-03 22:02:30Z peter $");
 
 #include <libyasm.h>
 
 #include "modules/parsers/gas/gas-parser.h"
 
 
 #define BSIZE   8192
 
 #define YYCURSOR        cursor
 #define YYLIMIT         (s->lim)
 #define YYMARKER        (s->ptr)
 #define YYFILL(n)       {cursor = fill(parser_gas, cursor);}
 
 #define RETURN(i)       do {s->cur = cursor; parser_gas->tokch = s->tok[0]; \
                          return i;} while (0)
 
 #define SCANINIT()      {s->tok = cursor;}
 
 #define TOK             ((char *)s->tok)
 #define TOKLEN          (size_t)(cursor-s->tok)
 
-static size_t
-rept_input(yasm_parser_gas *parser_gas, /*@out@*/ YYCTYPE *buf,
-           size_t max_size)
-{
-    gas_rept *rept = parser_gas->rept;
-    size_t numleft = max_size;
-    YYCTYPE *bufp = buf;
-
-    /* If numrept is 0, copy out just the line end characters */
-    if (rept->numrept == 0) {
-        /* Skip first line, which contains .line */
-        rept->line = STAILQ_NEXT(rept->line, link);
-        if (!rept->line) {
-            rept->numrept = 1;
-            rept->numdone = 1;
-        }
-        while (rept->numrept == 0 && numleft > 0) {
-            *bufp++ = rept->line->data[rept->line->len-1];
-            rept->line = STAILQ_NEXT(rept->line, link);
-            if (!rept->line) {
-                rept->numrept = 1;
-                rept->numdone = 1;
-            }
-        }
-    }
-
-    /* Copy out the previous fill buffer until we're *really* done */
-    if (rept->numdone == rept->numrept) {
-        size_t numcopy = rept->oldbuflen - rept->oldbufpos;
-        if (numcopy > numleft)
-            numcopy = numleft;
-        memcpy(bufp, &rept->oldbuf[rept->oldbufpos], numcopy);
-        numleft -= numcopy;
-        bufp += numcopy;
-        rept->oldbufpos += numcopy;
-
-        if (rept->oldbufpos == rept->oldbuflen) {
-            /* Delete lines, then delete rept and clear rept state */
-            gas_rept_line *cur, *next;
-            cur = STAILQ_FIRST(&rept->lines);
-            while (cur) {
-                next = STAILQ_NEXT(cur, link);
-                yasm_xfree(cur->data);
-                yasm_xfree(cur);
-                cur = next;
-            }
-            yasm_xfree(rept->oldbuf);
-            yasm_xfree(rept);
-            parser_gas->rept = NULL;
-        }
-    }
-
-    while (numleft > 0 && rept->numdone < rept->numrept) {
-        /* Copy from line data to buf */
-        size_t numcopy = rept->line->len - rept->linepos;
-        if (numcopy > numleft)
-            numcopy = numleft;
-        memcpy(bufp, &rept->line->data[rept->linepos], numcopy);
-        numleft -= numcopy;
-        bufp += numcopy;
-        rept->linepos += numcopy;
-
-        /* Update locations if needed */
-        if (rept->linepos == rept->line->len) {
-            rept->line = STAILQ_NEXT(rept->line, link);
-            rept->linepos = 0;
-        }
-        if (rept->line == NULL) {
-            rept->numdone++;
-            rept->line = STAILQ_FIRST(&rept->lines);
-        }
-    }
-
-    return (max_size-numleft);
-}
-
 /* Bridge function to convert byte-oriented parser with line-oriented
  * preprocessor.
  */
 static size_t
 preproc_input(yasm_parser_gas *parser_gas, /*@out@*/ YYCTYPE *buf,
               size_t max_size)
 {
     size_t tot=0;
     while (max_size > 0) {
         size_t n;
@@ skipping 51 matching lines @@
             memcpy(buf, s->tok, (size_t)(s->lim - s->tok));
             s->tok = buf;
             s->ptr = &buf[s->ptr - s->bot];
             cursor = &buf[cursor - s->bot];
             s->lim = &buf[s->lim - s->bot];
             s->top = &s->lim[BSIZE];
             if (s->bot)
                 yasm_xfree(s->bot);
             s->bot = buf;
         }
-        if (parser_gas->rept && parser_gas->rept->ended) {
-            /* Pull from rept lines instead of preproc */
-            cnt = rept_input(parser_gas, s->lim, BSIZE);
-        } else if((cnt = preproc_input(parser_gas, s->lim, BSIZE)) == 0) {
+        if((cnt = preproc_input(parser_gas, s->lim, BSIZE)) == 0) {
             s->eof = &s->lim[cnt]; *s->eof++ = '\n';
         }
         s->lim += cnt;
         if (first && parser_gas->save_input) {
             int i;
             YYCTYPE *saveline;
             parser_gas->save_last ^= 1;
             saveline = parser_gas->save_line[parser_gas->save_last];
             /* save next line into cur_line */
             for (i=0; i<79 && &s->tok[i] < s->lim && s->tok[i] != '\n'; i++)
@@ skipping 50 matching lines @@
   octdigit = [0-7];
   hexdigit = [0-9a-fA-F];
   ws = [ \t\r];
   dquot = ["];
 */
 
 
 int
 gas_parser_lex(YYSTYPE *lvalp, yasm_parser_gas *parser_gas)
 {
-    /*@null@*/ gas_rept *rept = parser_gas->rept;
     yasm_scanner *s = &parser_gas->s;
     YYCTYPE *cursor = s->cur;
     size_t count;
     YYCTYPE savech;
-    int linestart;
-    gas_rept_line *new_line;
 
     /* Handle one token of lookahead */
     if (parser_gas->peek_token != NONE) {
         int tok = parser_gas->peek_token;
         *lvalp = parser_gas->peek_tokval;  /* structure copy */
         parser_gas->tokch = parser_gas->peek_tokch;
         parser_gas->peek_token = NONE;
         return tok;
     }
 
     /* Catch EOF */
     if (s->eof && cursor == s->eof)
         return 0;
 
-    /* Handle rept */
-    if (rept && !rept->ended)
-        goto rept_directive;
-
     /* Jump to proper "exclusive" states */
     switch (parser_gas->state) {
         case COMMENT:
             goto comment;
         case SECTION_DIRECTIVE:
             goto section_directive;
         case NASM_FILENAME:
             goto nasm_filename;
         default:
             break;
@@ skipping 164 matching lines @@
         }
 
         "/*"                    { parser_gas->state = COMMENT; goto comment; }
         "#"                     {
             if (parser_gas->is_cpp_preproc)
             {
                 RETURN(CPP_LINE_MARKER);
             } else
                 goto line_comment;
         }
+        "//"                    { goto line_comment; }
 
         ws+                     { goto scan; }
 
         "\n"                    {
             if (parser_gas->save_input)
                 cursor = save_line(parser_gas, cursor);
             parser_gas->state = INITIAL;
             RETURN(s->tok[0]);
         }
 
@@ skipping 141 matching lines @@
                 yasm_error_set(YASM_ERROR_SYNTAX,
                                N_("unexpected end of file in string"));
                 lvalp->str.contents = (char *)strbuf;
                 lvalp->str.len = count;
                 RETURN(STRING);
             }
             strbuf_append(count++, cursor, s, s->tok[0]);
             goto stringconst_scan;
         }
     */
-
-rept_directive:
-    strbuf = yasm_xmalloc(STRBUF_ALLOC_SIZE);
-    strbuf_size = STRBUF_ALLOC_SIZE;
-    count = 0;
-    linestart = 1;
-
-
-rept_scan:
-    SCANINIT();
-
-    /*!re2c
-        [\n;]   {
-            /* Line ending, save in lines */
-            new_line = yasm_xmalloc(sizeof(gas_rept_line));
-            if (cursor == s->eof) {
-                yasm_xfree(strbuf);
-                return 0;
-            }
-            strbuf_append(count++, cursor, s, s->tok[0]);
-            new_line->data = strbuf;
-            new_line->len = count;
-            STAILQ_INSERT_TAIL(&rept->lines, new_line, link);
-            /* Allocate new strbuf */
-            strbuf = yasm_xmalloc(STRBUF_ALLOC_SIZE);
-            strbuf_size = STRBUF_ALLOC_SIZE;
-            count = 0;
-            /* Mark start of line */
-            linestart = 1;
-            goto rept_scan;
-        }
-        '.rept' {
-            int i;
-            if (linestart) {
-                /* We don't support nested right now, error */
-                yasm_error_set(YASM_ERROR_GENERAL,
-                               N_("nested rept not supported"));
-                yasm_errwarn_propagate(parser_gas->errwarns, cur_line);
-            }
-            for (i=0; i<6; i++)
-                strbuf_append(count++, cursor, s, s->tok[i]);
-            goto rept_scan;
-        }
-        '.endr' {
-            if (linestart) {
-                /* We're done, kick off the main lexer */
-                rept->line = STAILQ_FIRST(&rept->lines);
-                if (!rept->line) {
-                    /* Didn't get any intervening data?  Empty repeat, so
-                     * don't even bother.
-                     */
-                    yasm_xfree(strbuf);
-                    yasm_xfree(rept);
-                    parser_gas->rept = NULL;
-                } else {
-                    rept->ended = 1;
-
-                    /* Add .line as first line to get line numbers correct */
-                    new_line = yasm_xmalloc(sizeof(gas_rept_line));
-                    new_line->data = yasm_xmalloc(40);
-                    sprintf((char *)new_line->data, ".line %lu;",
-                            rept->startline+1);
-                    new_line->len = strlen((char *)new_line->data);
-                    STAILQ_INSERT_HEAD(&rept->lines, new_line, link);
-
-                    /* Save previous fill buffer */
-                    rept->oldbuf = parser_gas->s.bot;
-                    rept->oldbuflen = s->lim - s->bot;
-                    rept->oldbufpos = cursor - s->bot;
-
-                    /* Reset fill */
-                    s->bot = NULL;
-                    s->tok = NULL;
-                    s->ptr = NULL;
-                    s->cur = NULL;
-                    s->lim = NULL;
-                    s->top = NULL;
-                    s->eof = NULL;
-                    cursor = NULL;
-                    YYFILL(1);
-                }
-
-                goto scan;
-            } else {
-                int i;
-                for (i=0; i<6; i++)
-                    strbuf_append(count++, cursor, s, s->tok[i]);
-                goto rept_scan;
-            }
-        }
-
-        any     {
-            if (cursor == s->eof) {
-                yasm_xfree(strbuf);
-                return 0;
-            }
-            strbuf_append(count++, cursor, s, s->tok[0]);
-            linestart = 0;
-            goto rept_scan;
-        }
-    */
-
 }