--- a/python/ppci/common.py	Sun May 26 23:58:59 2013 +0200
+++ b/python/ppci/common.py	Wed May 29 22:36:37 2013 +0200
@@ -1,7 +1,16 @@
 from collections import namedtuple
 
 # Token is used in the lexical analyzer:
-Token = namedtuple('Token', 'typ val loc')
+class Token:
+    def __init__(self, typ, val, loc=None):
+        self.typ = typ
+        self.val = val
+        if loc is None:
+            loc = SourceLocation(0, 0, 0)
+        assert type(loc) is SourceLocation
+        self.loc = loc
+    def __repr__(self):
+        return 'Token({0}, {1})'.format(self.typ, self.val)
 
 class SourceLocation:
    def __init__(self, row, col, ln):