Thu, 14 Apr 2011 18:55:31 +0100Merging changes.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 18:55:31 +0100] rev 288
Merging changes.

Thu, 14 Apr 2011 18:12:59 +0100Added tracking of order by which tokens are processed by lexical analyser.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 18:12:59 +0100] rev 287
Added tracking of order by which tokens are processed by lexical analyser.
This helps in correctly formating error messages when constructs begin in one file, and end in another.

Thu, 14 Apr 2011 17:35:25 +0100Adding tracking of filename in which token is located.
Mario de Sousa <msousa@fe.up.pt> [Thu, 14 Apr 2011 17:35:25 +0100] rev 286
Adding tracking of filename in which token is located.