Fixes Issue 6717 - Better diagnostic on wrong ASM end token.

dlang · Feb 9, 2013 · e8b789b · e8b789b
1 parent 86d758c
commit e8b789b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/src/iasm.c b/src/iasm.c
@@ -103,7 +103,7 @@ const char *asmerrmsgs[] =
     "align %d must be a power of 2",
     "opcode expected, not %s",
     "prefix",
-    "end of instruction",
+    "end of instruction expected, not '%s'",
     "bad operand",
     "bad integral operand",
     "identifier expected",
@@ -4843,7 +4843,18 @@ Statement *AsmStatement::semantic(Scope *sc)
     o1 = o2 = o3 = NULL;
 
     if (tok_value != TOKeof)
-        asmerr(EM_eol);                 // end of line expected
+    {
+        try
+        {
+            asmerr(EM_eol, asmtok->toChars());  // end of line expected
+        }
+        catch (ASM_STATE *a)
+        {
+            asmtok = NULL;
+            tok_value = TOKeof;
+            exit(EXIT_FAILURE);
+        }
+    }
     //return asmstate.bReturnax;
     return this;
 }

diff --git a/test/fail_compilation/diag6717.d b/test/fail_compilation/diag6717.d
@@ -0,0 +1,14 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/diag6717.d(12): Error: end of instruction expected, not 'h'
+---
+*/
+
+void main()
+{
+    asm
+    {
+        mov AX, 12h ;
+    }
+}