Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: 3ad9c76c0d553b20f417f166ee9e35cc1d7994ee
      https://github.com/D-Programming-Language/dmd/commit/3ad9c76c0d553b20f417f166ee9e35cc1d7994ee
  Author: k-hara <k.hara.pg@gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M src/attrib.c
    M src/expression.c
    M src/lexer.c
    M src/lexer.h
    M src/mars.c
    M src/module.c
    M src/parse.c
    M src/statement.c
    A test/fail_compilation/diag8825.d
    M test/fail_compilation/fail9773.d

  Log Message:
  -----------
  fix Issue 8825 - Wrong line number of error message

- Each tokens should have its own 'loc'.
- Rename `Lexer::loc` to `scanloc` to avoid misuse of lookahead-loc.


  Commit: 9b8667b5037867c3378b242b1855c12bbe7179fc
      https://github.com/D-Programming-Language/dmd/commit/9b8667b5037867c3378b242b1855c12bbe7179fc
  Author: k-hara <k.hara.pg@gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M src/parse.c
    M test/compilable/extra-files/json.out
    M test/fail_compilation/diag7050c.d

  Log Message:
  -----------
  Fix trivial wrong line number of aggregates


  Commit: 35dbd956db816a6795be41a21393592f33ed3bb4
      https://github.com/D-Programming-Language/dmd/commit/35dbd956db816a6795be41a21393592f33ed3bb4
  Author: k-hara <k.hara.pg@gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M src/iasm.c

  Log Message:
  -----------
  Fix iasm parser bug

`asm_chktok` will advance the token place. So reading `asmtok->uns64value` after the call would take a wrong value.


  Commit: baddfba005f913234d91148f1c41e7c87f74a139
      https://github.com/D-Programming-Language/dmd/commit/baddfba005f913234d91148f1c41e7c87f74a139
  Author: Martin Nowak <code@dawg.eu>
  Date:   2013-09-21 (Sat, 21 Sep 2013)

  Changed paths:
    M src/attrib.c
    M src/expression.c
    M src/iasm.c
    M src/lexer.c
    M src/lexer.h
    M src/mars.c
    M src/module.c
    M src/parse.c
    M src/statement.c
    M test/compilable/extra-files/json.out
    M test/fail_compilation/diag7050c.d
    A test/fail_compilation/diag8825.d
    M test/fail_compilation/fail9773.d

  Log Message:
  -----------
  Merge pull request #2492 from 9rnsr/fix8825

Fix lexer/parser bugs to fix Issue 8825


Compare: https://github.com/D-Programming-Language/dmd/compare/180b89d51e69...baddfba005f9