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

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

 /*
  * NASM-compatible re2c lexer
  *
  *  Copyright (C) 2001-2007  Peter Johnson
  *
  *  Portions based on re2c's example code.
  *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND OTHER CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * 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: nasm-token.re 2139 2008-10-08 05:19:47Z peter $");
+RCSID("$Id: nasm-token.re 2277 2010-01-19 07:03:15Z peter $");
 
 #include <libyasm.h>
 
 #include "modules/parsers/nasm/nasm-parser.h"
 #include "modules/preprocs/nasm/nasm.h"
 
 
 #define YYCURSOR        cursor
 #define YYLIMIT         (s->lim)
 #define YYMARKER        (s->ptr)
@@ skipping 36 matching lines @@
 {
     /* check for special non-local labels like ..start */
     if (tok[zeropos+1] == '.') {
         lvalp->str_val = yasm__xstrndup(tok+zeropos+(parser_nasm->tasm?2:0),
             toklen-zeropos-(parser_nasm->tasm?2:0));
         /* check for special non-local ..@label */
         if (lvalp->str_val[zeropos+2] == '@')
             return NONLOCAL_ID;
         return SPECIAL_ID;
     }
+    if (parser_nasm->masm && tok[zeropos] == '.') {
+        lvalp->str_val = yasm__xstrndup(tok + zeropos, toklen - zeropos);
+        return SPECIAL_ID;
+    }
     if (parser_nasm->tasm && (!tasm_locals || 
                 (tok[zeropos] == '.' &&
                  tok[zeropos+1] != '@' && tok[zeropos+2] != '@'))) {
         /* no locals on Tasm without the 'locals' directive */
         /* .foo is never local either, but .@@foo may be (local structure
          * members) */
         lvalp->str_val = yasm__xstrndup(tok + zeropos, toklen - zeropos);
         return SPECIAL_ID;
     }
     if (!parser_nasm->locallabel_base) {
@@ skipping 312 matching lines @@
                     (p_object->arch, TOK, TOKLEN, &lvalp->arch_data)) {
                 case YASM_ARCH_REG:
                     s->tok[TOKLEN] = savech;
                     RETURN(REG);
                 case YASM_ARCH_SEGREG:
                     s->tok[TOKLEN] = savech;
                     RETURN(SEGREG);
                 case YASM_ARCH_TARGETMOD:
                     s->tok[TOKLEN] = savech;
                     RETURN(TARGETMOD);
+                case YASM_ARCH_REGGROUP:
+                    if (parser_nasm->masm) {
+                        s->tok[TOKLEN] = savech;
+                        RETURN(REGGROUP);
+                    }
                 default:
                     break;
             }
-            if (parser_nasm->tasm) {
+            if (parser_nasm->masm) {
+               if (!yasm__strcasecmp(TOK, "offset")) {
+                    s->tok[TOKLEN] = savech;
+                    RETURN(OFFSET);
+                }
+            } else if (parser_nasm->tasm) {
                 if (!yasm__strcasecmp(TOK, "shl")) {
                     s->tok[TOKLEN] = savech;
                     RETURN(LEFT_OP);
                 }
                 if (!yasm__strcasecmp(TOK, "shr")) {
                     s->tok[TOKLEN] = savech;
                     RETURN(RIGHT_OP);
                 }
                 if (!yasm__strcasecmp(TOK, "and")) {
                     s->tok[TOKLEN] = savech;
                     RETURN('&');
                 }
                 if (!yasm__strcasecmp(TOK, "or")) {
                     s->tok[TOKLEN] = savech;
                     RETURN('|');
                 }
+                if (!yasm__strcasecmp(TOK, "not")) {
+                    s->tok[TOKLEN] = savech;
+                    RETURN('~');
+                }
                 if (!yasm__strcasecmp(TOK, "low")) {
                     s->tok[TOKLEN] = savech;
                     RETURN(LOW);
                 }
                 if (!yasm__strcasecmp(TOK, "high")) {
                     s->tok[TOKLEN] = savech;
                     RETURN(HIGH);
                 }
                 if (!yasm__strcasecmp(TOK, "offset")) {
                     s->tok[TOKLEN] = savech;
@@ skipping 320 matching lines @@
 stringconst_end:
     strbuf[count] = '\0';
     lvalp->str.contents = (char *)strbuf;
     lvalp->str.len = count;
     RETURN(STRING);
 
 endofinput:
     parser_nasm->state = INITIAL;
     RETURN(s->tok[0]);
 }