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

third_party/yasm/patched-yasm/modules/parsers/gas/gas-parser.c

 /*
  * GAS-compatible parser
  *
  *  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>
-/*@unused@*/ RCSID("$Id: gas-parser.c 2167 2009-01-02 08:36:09Z peter $");
+/*@unused@*/ RCSID("$Id: gas-parser.c 2279 2010-01-19 07:57:43Z peter $");
 
 #include <libyasm.h>
 
 #include "gas-parser.h"
 
 
 static void
 gas_parser_do_parse(yasm_object *object, yasm_preproc *pp,
                     int save_input, yasm_linemap *linemap,
                     yasm_errwarns *errwarns)
@@ skipping 22 matching lines @@
 
     parser_gas.peek_token = NONE;
 
     parser_gas.line = NULL;
 
     /* initialize scanner structure */
     yasm_scanner_initialize(&parser_gas.s);
 
     parser_gas.state = INITIAL;
 
-    parser_gas.rept = NULL;
-
     for (i=0; i<10; i++)
         parser_gas.local[i] = 0;
 
+    parser_gas.intel_syntax = 0;
+
     parser_gas.is_cpp_preproc =
         yasm__strcasecmp(((yasm_preproc_base*)pp)->module->keyword, "cpp") == 0;
     parser_gas.is_nasm_preproc =
         yasm__strcasecmp(((yasm_preproc_base*)pp)->module->keyword, "nasm") == 0;
 
     gas_parser_parse(&parser_gas);
 
-    /* Check for ending inside a rept */
-    if (parser_gas.rept) {
-        yasm_error_set(YASM_ERROR_SYNTAX, N_("rept without matching endr"));
-        yasm_errwarn_propagate(errwarns, parser_gas.rept->startline);
-    }
-
     /* Check for ending inside a comment */
     if (parser_gas.state == COMMENT) {
         yasm_warn_set(YASM_WARN_GENERAL, N_("end of file in comment"));
         /* XXX: Minus two to compensate for already having moved past the EOF
          * in the linemap.
          */
         yasm_errwarn_propagate(errwarns,
                                yasm_linemap_get_current(parser_gas.linemap)-2);
     }
 
     yasm_scanner_delete(&parser_gas.s);
 
     /* Free locallabel base if necessary */
     if (parser_gas.locallabel_base)
         yasm_xfree(parser_gas.locallabel_base);
 
     if (parser_gas.dir_file)
         yasm_xfree(parser_gas.dir_file);
 
     /* Convert all undefined symbols into extern symbols */
     yasm_symtab_parser_finalize(object->symtab, 1, errwarns);
 }
 
 /* Define valid preprocessors to use with this parser */
 static const char *gas_parser_preproc_keywords[] = {
+    "gas",
     "raw",
     "cpp",
     "nasm",
     NULL
 };
 
 /* Define parser structure -- see parser.h for details */
 yasm_parser_module yasm_gas_LTX_parser = {
     "GNU AS (GAS)-compatible parser",
     "gas",
     gas_parser_preproc_keywords,
-    "raw",
+    "gas",
     NULL,   /* No standard macros */
     gas_parser_do_parse
 };
 yasm_parser_module yasm_gnu_LTX_parser = {
     "GNU AS (GAS)-compatible parser",
     "gnu",
     gas_parser_preproc_keywords,
-    "raw",
+    "gas",
     NULL,   /* No standard macros */
     gas_parser_do_parse
 };