Merge remote-tracking branch 'upstream/master' into pcenginetarget

2015-09-04 13:40:52 +02:00
parent 9fe0c34fe6 8d5f6b89ae
commit d0a1dc73b8
18 changed files with 218 additions and 104 deletions
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -1418,11 +1418,14 @@ CharAgain:
            /* Line continuation? */
            if (LineCont) {
                NextChar ();
+                /* Next char should be a LF, if not, will result in an error later */
                if (C == '\n') {
-                    /* Handle as white space */
+                    /* Ignore the '\n' */
                    NextChar ();
-                    C = ' ';
                    goto Again;
+                } else {
+                    /* Make it clear what the problem is: */
+                    Error ("EOL expected.");
                }
            }
            break;