Index: third_party/yasm/patched-yasm/modules/parsers/gas/gas-parser.c |
=================================================================== |
--- third_party/yasm/patched-yasm/modules/parsers/gas/gas-parser.c (revision 71129) |
+++ third_party/yasm/patched-yasm/modules/parsers/gas/gas-parser.c (working copy) |
@@ -28,7 +28,7 @@ |
* 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> |
@@ -71,11 +71,11 @@ |
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 = |
@@ -83,12 +83,6 @@ |
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")); |
@@ -114,6 +108,7 @@ |
/* Define valid preprocessors to use with this parser */ |
static const char *gas_parser_preproc_keywords[] = { |
+ "gas", |
"raw", |
"cpp", |
"nasm", |
@@ -125,7 +120,7 @@ |
"GNU AS (GAS)-compatible parser", |
"gas", |
gas_parser_preproc_keywords, |
- "raw", |
+ "gas", |
NULL, /* No standard macros */ |
gas_parser_do_parse |
}; |
@@ -133,7 +128,7 @@ |
"GNU AS (GAS)-compatible parser", |
"gnu", |
gas_parser_preproc_keywords, |
- "raw", |
+ "gas", |
NULL, /* No standard macros */ |
gas_parser_do_parse |
}; |