Added type info
More fixes to get Lisra compiled.
Added type info
Bruce force commented out outdated code
Added type info.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git