continued work on html/xmlparser

747 files changed, 439 insertions, 191 deletions

diff --git a/.bzrignore b/.bzrignore
index a638ed4bd..a638ed4bd 100755..100644
--- a/.bzrignore
+++ b/.bzrignore
diff --git a/config/nimdoc.cfg b/config/nimdoc.cfg
index 300b5e509..300b5e509 100755..100644
--- a/config/nimdoc.cfg
+++ b/config/nimdoc.cfg
diff --git a/config/nimdoc.tex.cfg b/config/nimdoc.tex.cfg
index 54a57e0fb..54a57e0fb 100755..100644
--- a/config/nimdoc.tex.cfg
+++ b/config/nimdoc.tex.cfg
diff --git a/config/nimrod.cfg b/config/nimrod.cfg
index 5f4c12786..5f4c12786 100755..100644
--- a/config/nimrod.cfg
+++ b/config/nimrod.cfg
diff --git a/contributors.txt b/contributors.txt
index 803b4f9dc..803b4f9dc 100755..100644
--- a/contributors.txt
+++ b/contributors.txt
diff --git a/copying.txt b/copying.txt
index 992a5f9b9..992a5f9b9 100755..100644
--- a/copying.txt
+++ b/copying.txt
diff --git a/data/advopt.txt b/data/advopt.txt
index a4895efe7..a4895efe7 100755..100644
--- a/data/advopt.txt
+++ b/data/advopt.txt
diff --git a/data/ast.yml b/data/ast.yml
index f27b09a18..f27b09a18 100755..100644
--- a/data/ast.yml
+++ b/data/ast.yml
diff --git a/data/basicopt.txt b/data/basicopt.txt
index 0201b84d7..0201b84d7 100755..100644
--- a/data/basicopt.txt
+++ b/data/basicopt.txt
diff --git a/data/keywords.txt b/data/keywords.txt
index 3cf9790ef..3cf9790ef 100755..100644
--- a/data/keywords.txt
+++ b/data/keywords.txt
diff --git a/data/magic.yml b/data/magic.yml
index 857a24088..857a24088 100755..100644
--- a/data/magic.yml
+++ b/data/magic.yml
diff --git a/data/messages.yml b/data/messages.yml
index 51ec2b088..51ec2b088 100755..100644
--- a/data/messages.yml
+++ b/data/messages.yml
diff --git a/data/pas_keyw.yml b/data/pas_keyw.yml
index 7f2d26960..7f2d26960 100755..100644
--- a/data/pas_keyw.yml
+++ b/data/pas_keyw.yml
diff --git a/data/readme.txt b/data/readme.txt
index ee9630eac..ee9630eac 100755..100644
--- a/data/readme.txt
+++ b/data/readme.txt
diff --git a/diff/empty.txt b/diff/empty.txt
index 20f9a91e3..20f9a91e3 100755..100644
--- a/diff/empty.txt
+++ b/diff/empty.txt
diff --git a/doc/abstypes.txt b/doc/abstypes.txt
index 44c3bb0c9..44c3bb0c9 100755..100644
--- a/doc/abstypes.txt
+++ b/doc/abstypes.txt
diff --git a/doc/apis.txt b/doc/apis.txt
index 93484b8b7..93484b8b7 100755..100644
--- a/doc/apis.txt
+++ b/doc/apis.txt
diff --git a/doc/astspec.txt b/doc/astspec.txt
index 01c1adba3..01c1adba3 100755..100644
--- a/doc/astspec.txt
+++ b/doc/astspec.txt
diff --git a/doc/docs.txt b/doc/docs.txt
index a731b1504..a731b1504 100755..100644
--- a/doc/docs.txt
+++ b/doc/docs.txt
diff --git a/doc/effects.txt b/doc/effects.txt
index 85de1ffdf..85de1ffdf 100755..100644
--- a/doc/effects.txt
+++ b/doc/effects.txt
diff --git a/doc/endb.txt b/doc/endb.txt
index e2be59c50..e2be59c50 100755..100644
--- a/doc/endb.txt
+++ b/doc/endb.txt
diff --git a/doc/filelist.txt b/doc/filelist.txt
index 7bcd424db..7bcd424db 100755..100644
--- a/doc/filelist.txt
+++ b/doc/filelist.txt
diff --git a/doc/filters.txt b/doc/filters.txt
index 0cbb3319d..0cbb3319d 100755..100644
--- a/doc/filters.txt
+++ b/doc/filters.txt
diff --git a/doc/gramcurl.txt b/doc/gramcurl.txt
index 3ac9294c8..3ac9294c8 100755..100644
--- a/doc/gramcurl.txt
+++ b/doc/gramcurl.txt
diff --git a/doc/grammar.txt b/doc/grammar.txt
index a648913a0..a648913a0 100755..100644
--- a/doc/grammar.txt
+++ b/doc/grammar.txt
diff --git a/doc/intern.txt b/doc/intern.txt
index 37c376568..37c376568 100755..100644
--- a/doc/intern.txt
+++ b/doc/intern.txt
diff --git a/doc/lib.txt b/doc/lib.txt
index 609889607..609889607 100755..100644
--- a/doc/lib.txt
+++ b/doc/lib.txt
diff --git a/doc/manual.txt b/doc/manual.txt
index d2bfde138..d2bfde138 100755..100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
diff --git a/doc/mytest.cfg b/doc/mytest.cfg
index be1118c46..be1118c46 100755..100644
--- a/doc/mytest.cfg
+++ b/doc/mytest.cfg
diff --git a/doc/nimdoc.css b/doc/nimdoc.css
index 6154f0b2e..6154f0b2e 100755..100644
--- a/doc/nimdoc.css
+++ b/doc/nimdoc.css
diff --git a/doc/nimrodc.txt b/doc/nimrodc.txt
index 79ce06ad1..79ce06ad1 100755..100644
--- a/doc/nimrodc.txt
+++ b/doc/nimrodc.txt
diff --git a/doc/overview.txt b/doc/overview.txt
index 242039086..242039086 100755..100644
--- a/doc/overview.txt
+++ b/doc/overview.txt
diff --git a/doc/pegdocs.txt b/doc/pegdocs.txt
index 8e21b12cd..8e21b12cd 100755..100644
--- a/doc/pegdocs.txt
+++ b/doc/pegdocs.txt
diff --git a/doc/readme.txt b/doc/readme.txt
index 7f509bd39..7f509bd39 100755..100644
--- a/doc/readme.txt
+++ b/doc/readme.txt
diff --git a/doc/regexprs.txt b/doc/regexprs.txt
index 930352948..930352948 100755..100644
--- a/doc/regexprs.txt
+++ b/doc/regexprs.txt
diff --git a/doc/rst.txt b/doc/rst.txt
index 79d0eb9c4..79d0eb9c4 100755..100644
--- a/doc/rst.txt
+++ b/doc/rst.txt
diff --git a/doc/theindex.txt b/doc/theindex.txt
index 06cec5d19..06cec5d19 100755..100644
--- a/doc/theindex.txt
+++ b/doc/theindex.txt
diff --git a/doc/tut1.txt b/doc/tut1.txt
index bb37bd84d..bb37bd84d 100755..100644
--- a/doc/tut1.txt
+++ b/doc/tut1.txt
diff --git a/doc/tut2.txt b/doc/tut2.txt
index a139fb5de..a139fb5de 100755..100644
--- a/doc/tut2.txt
+++ b/doc/tut2.txt
diff --git a/examples/allany.nim b/examples/allany.nim
index 4747ce0d6..4747ce0d6 100755..100644
--- a/examples/allany.nim
+++ b/examples/allany.nim
diff --git a/examples/filterex.nim b/examples/filterex.nim
index 3713f4b64..3713f4b64 100755..100644
--- a/examples/filterex.nim
+++ b/examples/filterex.nim
diff --git a/examples/hallo.nim b/examples/hallo.nim
index 20aa4695c..20aa4695c 100755..100644
--- a/examples/hallo.nim
+++ b/examples/hallo.nim
diff --git a/examples/htmlrefs.nim b/examples/htmlrefs.nim
index b1695ee7a..b1695ee7a 100755..100644
--- a/examples/htmlrefs.nim
+++ b/examples/htmlrefs.nim
diff --git a/examples/htmltitle.nim b/examples/htmltitle.nim
index ae023e379..ae023e379 100755..100644
--- a/examples/htmltitle.nim
+++ b/examples/htmltitle.nim
diff --git a/examples/iupex1.nim b/examples/iupex1.nim
index 89e85e776..89e85e776 100755..100644
--- a/examples/iupex1.nim
+++ b/examples/iupex1.nim
diff --git a/examples/keyval.nim b/examples/keyval.nim
index 99a410e8c..99a410e8c 100755..100644
--- a/examples/keyval.nim
+++ b/examples/keyval.nim
diff --git a/examples/keyval2.nim b/examples/keyval2.nim
index 5e7d0ea4a..5e7d0ea4a 100755..100644
--- a/examples/keyval2.nim
+++ b/examples/keyval2.nim
diff --git a/examples/luaex.nim b/examples/luaex.nim
index a71f0fb05..a71f0fb05 100755..100644
--- a/examples/luaex.nim
+++ b/examples/luaex.nim
diff --git a/examples/maximum.nim b/examples/maximum.nim
index 1e26ee1a7..1e26ee1a7 100755..100644
--- a/examples/maximum.nim
+++ b/examples/maximum.nim
diff --git a/examples/myfile.txt b/examples/myfile.txt
index 1df0d56f8..1df0d56f8 100755..100644
--- a/examples/myfile.txt
+++ b/examples/myfile.txt
diff --git a/examples/pythonex.nim b/examples/pythonex.nim
index e2664f350..e2664f350 100755..100644
--- a/examples/pythonex.nim
+++ b/examples/pythonex.nim
diff --git a/examples/readme.txt b/examples/readme.txt
index e6e47c1d1..e6e47c1d1 100755..100644
--- a/examples/readme.txt
+++ b/examples/readme.txt
diff --git a/examples/statcsv.nim b/examples/statcsv.nim
index e2f272a21..e2f272a21 100755..100644
--- a/examples/statcsv.nim
+++ b/examples/statcsv.nim
diff --git a/examples/tclex.nim b/examples/tclex.nim
index 6d6d45b8f..6d6d45b8f 100755..100644
--- a/examples/tclex.nim
+++ b/examples/tclex.nim
diff --git a/examples/transff.nim b/examples/transff.nim
index 32d17e52c..32d17e52c 100755..100644
--- a/examples/transff.nim
+++ b/examples/transff.nim
diff --git a/gpl.html b/gpl.html
index 0aec9fff0..0aec9fff0 100755..100644
--- a/gpl.html
+++ b/gpl.html
diff --git a/ide/config.nim b/ide/config.nim
index 448a67bda..448a67bda 100755..100644
--- a/ide/config.nim
+++ b/ide/config.nim
diff --git a/ide/main.nim b/ide/main.nim
index a7e9bb642..a7e9bb642 100755..100644
--- a/ide/main.nim
+++ b/ide/main.nim
diff --git a/ide/nimide.glade b/ide/nimide.glade
index ce24683b2..ce24683b2 100755..100644
--- a/ide/nimide.glade
+++ b/ide/nimide.glade
diff --git a/ide/nimide.gladep b/ide/nimide.gladep
index e429f891d..e429f891d 100755..100644
--- a/ide/nimide.gladep
+++ b/ide/nimide.gladep
diff --git a/ide/nimide.nim b/ide/nimide.nim
index 741f71afb..741f71afb 100755..100644
--- a/ide/nimide.nim
+++ b/ide/nimide.nim
diff --git a/install.txt b/install.txt
index 048cf8f98..048cf8f98 100755..100644
--- a/install.txt
+++ b/install.txt
diff --git a/koch.nim b/koch.nim
index e5d963b1e..e5d963b1e 100755..100644
--- a/koch.nim
+++ b/koch.nim
diff --git a/lib/copying.txt b/lib/copying.txt
index 6fcdca1df..6fcdca1df 100755..100644
--- a/lib/copying.txt
+++ b/lib/copying.txt
diff --git a/lib/cycle.h b/lib/cycle.h
index 4d714ba3f..4d714ba3f 100755..100644
--- a/lib/cycle.h
+++ b/lib/cycle.h
diff --git a/lib/ecmas/dom.nim b/lib/ecmas/dom.nim
index 6d9224c26..6d9224c26 100755..100644
--- a/lib/ecmas/dom.nim
+++ b/lib/ecmas/dom.nim
diff --git a/lib/impure/db_mysql.nim b/lib/impure/db_mysql.nim
index 9c427ae3b..9c427ae3b 100755..100644
--- a/lib/impure/db_mysql.nim
+++ b/lib/impure/db_mysql.nim
diff --git a/lib/impure/db_postgres.nim b/lib/impure/db_postgres.nim
index 3296e688a..3296e688a 100755..100644
--- a/lib/impure/db_postgres.nim
+++ b/lib/impure/db_postgres.nim
diff --git a/lib/impure/dialogs.nim b/lib/impure/dialogs.nim
index 31c8ca0ff..31c8ca0ff 100755..100644
--- a/lib/impure/dialogs.nim
+++ b/lib/impure/dialogs.nim
diff --git a/lib/impure/web.nim b/lib/impure/web.nim
index ba74c285a..ba74c285a 100755..100644
--- a/lib/impure/web.nim
+++ b/lib/impure/web.nim
diff --git a/lib/impure/zipfiles.nim b/lib/impure/zipfiles.nim
index 09bf8f7cc..09bf8f7cc 100755..100644
--- a/lib/impure/zipfiles.nim
+++ b/lib/impure/zipfiles.nim
diff --git a/lib/lgpl.txt b/lib/lgpl.txt
index f6fa6c9e5..f6fa6c9e5 100755..100644
--- a/lib/lgpl.txt
+++ b/lib/lgpl.txt
diff --git a/lib/newwrap/cairo/cairo.nim b/lib/newwrap/cairo/cairo.nim
index 77b2efa7b..77b2efa7b 100755..100644
--- a/lib/newwrap/cairo/cairo.nim
+++ b/lib/newwrap/cairo/cairo.nim
diff --git a/lib/newwrap/cairo/cairoft.nim b/lib/newwrap/cairo/cairoft.nim
index 16a80e7f7..16a80e7f7 100755..100644
--- a/lib/newwrap/cairo/cairoft.nim
+++ b/lib/newwrap/cairo/cairoft.nim
diff --git a/lib/newwrap/cairo/cairowin32.nim b/lib/newwrap/cairo/cairowin32.nim
index cec3a5bc5..cec3a5bc5 100755..100644
--- a/lib/newwrap/cairo/cairowin32.nim
+++ b/lib/newwrap/cairo/cairowin32.nim
diff --git a/lib/newwrap/cairo/cairoxlib.nim b/lib/newwrap/cairo/cairoxlib.nim
index 861c55527..861c55527 100755..100644
--- a/lib/newwrap/cairo/cairoxlib.nim
+++ b/lib/newwrap/cairo/cairoxlib.nim
diff --git a/lib/newwrap/gtk/atk.nim b/lib/newwrap/gtk/atk.nim
index 0178ade6f..0178ade6f 100755..100644
--- a/lib/newwrap/gtk/atk.nim
+++ b/lib/newwrap/gtk/atk.nim
diff --git a/lib/newwrap/gtk/gdk2.nim b/lib/newwrap/gtk/gdk2.nim
index f2e12ab24..f2e12ab24 100755..100644
--- a/lib/newwrap/gtk/gdk2.nim
+++ b/lib/newwrap/gtk/gdk2.nim
diff --git a/lib/newwrap/gtk/gdk2pixbuf.nim b/lib/newwrap/gtk/gdk2pixbuf.nim
index f22ab345b..f22ab345b 100755..100644
--- a/lib/newwrap/gtk/gdk2pixbuf.nim
+++ b/lib/newwrap/gtk/gdk2pixbuf.nim
diff --git a/lib/newwrap/gtk/gdkglext.nim b/lib/newwrap/gtk/gdkglext.nim
index 4fa20b969..4fa20b969 100755..100644
--- a/lib/newwrap/gtk/gdkglext.nim
+++ b/lib/newwrap/gtk/gdkglext.nim
diff --git a/lib/newwrap/gtk/glib2.nim b/lib/newwrap/gtk/glib2.nim
index 7ace55f7c..7ace55f7c 100755..100644
--- a/lib/newwrap/gtk/glib2.nim
+++ b/lib/newwrap/gtk/glib2.nim
diff --git a/lib/newwrap/gtk/gtk2.nim b/lib/newwrap/gtk/gtk2.nim
index 3abe363e3..3abe363e3 100755..100644
--- a/lib/newwrap/gtk/gtk2.nim
+++ b/lib/newwrap/gtk/gtk2.nim
diff --git a/lib/newwrap/gtk/gtkglext.nim b/lib/newwrap/gtk/gtkglext.nim
index 265730b83..265730b83 100755..100644
--- a/lib/newwrap/gtk/gtkglext.nim
+++ b/lib/newwrap/gtk/gtkglext.nim
diff --git a/lib/newwrap/gtk/gtkhtml.nim b/lib/newwrap/gtk/gtkhtml.nim
index 59568d6d0..59568d6d0 100755..100644
--- a/lib/newwrap/gtk/gtkhtml.nim
+++ b/lib/newwrap/gtk/gtkhtml.nim
diff --git a/lib/newwrap/gtk/libglade2.nim b/lib/newwrap/gtk/libglade2.nim
index 47e78e05e..47e78e05e 100755..100644
--- a/lib/newwrap/gtk/libglade2.nim
+++ b/lib/newwrap/gtk/libglade2.nim
diff --git a/lib/newwrap/gtk/pango.nim b/lib/newwrap/gtk/pango.nim
index 1443aba1d..1443aba1d 100755..100644
--- a/lib/newwrap/gtk/pango.nim
+++ b/lib/newwrap/gtk/pango.nim
diff --git a/lib/newwrap/gtk/pangoutils.nim b/lib/newwrap/gtk/pangoutils.nim
index 552362b9a..552362b9a 100755..100644
--- a/lib/newwrap/gtk/pangoutils.nim
+++ b/lib/newwrap/gtk/pangoutils.nim
diff --git a/lib/newwrap/libcurl.nim b/lib/newwrap/libcurl.nim
index 875f1cbc8..875f1cbc8 100755..100644
--- a/lib/newwrap/libcurl.nim
+++ b/lib/newwrap/libcurl.nim
diff --git a/lib/newwrap/lua/lauxlib.nim b/lib/newwrap/lua/lauxlib.nim
index bcb806f74..bcb806f74 100755..100644
--- a/lib/newwrap/lua/lauxlib.nim
+++ b/lib/newwrap/lua/lauxlib.nim
diff --git a/lib/newwrap/lua/lua.nim b/lib/newwrap/lua/lua.nim
index 000e09993..000e09993 100755..100644
--- a/lib/newwrap/lua/lua.nim
+++ b/lib/newwrap/lua/lua.nim
diff --git a/lib/newwrap/lua/lualib.nim b/lib/newwrap/lua/lualib.nim
index 94f08a1f1..94f08a1f1 100755..100644
--- a/lib/newwrap/lua/lualib.nim
+++ b/lib/newwrap/lua/lualib.nim
diff --git a/lib/newwrap/mysql.nim b/lib/newwrap/mysql.nim
index 2a7a10c58..2a7a10c58 100755..100644
--- a/lib/newwrap/mysql.nim
+++ b/lib/newwrap/mysql.nim
diff --git a/lib/newwrap/opengl/gl.nim b/lib/newwrap/opengl/gl.nim
index 9387b5bc9..9387b5bc9 100755..100644
--- a/lib/newwrap/opengl/gl.nim
+++ b/lib/newwrap/opengl/gl.nim
diff --git a/lib/newwrap/opengl/glext.nim b/lib/newwrap/opengl/glext.nim
index 32871df0e..32871df0e 100755..100644
--- a/lib/newwrap/opengl/glext.nim
+++ b/lib/newwrap/opengl/glext.nim
diff --git a/lib/newwrap/opengl/glu.nim b/lib/newwrap/opengl/glu.nim
index 29edb0df2..29edb0df2 100755..100644
--- a/lib/newwrap/opengl/glu.nim
+++ b/lib/newwrap/opengl/glu.nim
diff --git a/lib/newwrap/opengl/glut.nim b/lib/newwrap/opengl/glut.nim
index 43bee3382..43bee3382 100755..100644
--- a/lib/newwrap/opengl/glut.nim
+++ b/lib/newwrap/opengl/glut.nim
diff --git a/lib/newwrap/opengl/glx.nim b/lib/newwrap/opengl/glx.nim
index 76c052d70..76c052d70 100755..100644
--- a/lib/newwrap/opengl/glx.nim
+++ b/lib/newwrap/opengl/glx.nim
diff --git a/lib/newwrap/opengl/wingl.nim b/lib/newwrap/opengl/wingl.nim
index 7ed78f970..7ed78f970 100755..100644
--- a/lib/newwrap/opengl/wingl.nim
+++ b/lib/newwrap/opengl/wingl.nim
diff --git a/lib/newwrap/pcre/pcre.nim b/lib/newwrap/pcre/pcre.nim
index c2220b4e5..c2220b4e5 100755..100644
--- a/lib/newwrap/pcre/pcre.nim
+++ b/lib/newwrap/pcre/pcre.nim
diff --git a/lib/newwrap/postgres.nim b/lib/newwrap/postgres.nim
index 84e7d5abc..84e7d5abc 100755..100644
--- a/lib/newwrap/postgres.nim
+++ b/lib/newwrap/postgres.nim
diff --git a/lib/newwrap/sdl/sdl.nim b/lib/newwrap/sdl/sdl.nim
index 48553f96d..48553f96d 100755..100644
--- a/lib/newwrap/sdl/sdl.nim
+++ b/lib/newwrap/sdl/sdl.nim
diff --git a/lib/newwrap/sdl/sdl_gfx.nim b/lib/newwrap/sdl/sdl_gfx.nim
index 4bce944ec..4bce944ec 100755..100644
--- a/lib/newwrap/sdl/sdl_gfx.nim
+++ b/lib/newwrap/sdl/sdl_gfx.nim
diff --git a/lib/newwrap/sdl/sdl_image.nim b/lib/newwrap/sdl/sdl_image.nim
index f1f0eb8cc..f1f0eb8cc 100755..100644
--- a/lib/newwrap/sdl/sdl_image.nim
+++ b/lib/newwrap/sdl/sdl_image.nim
diff --git a/lib/newwrap/sdl/sdl_mixer.nim b/lib/newwrap/sdl/sdl_mixer.nim
index fb9ae4871..fb9ae4871 100755..100644
--- a/lib/newwrap/sdl/sdl_mixer.nim
+++ b/lib/newwrap/sdl/sdl_mixer.nim
diff --git a/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim b/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim
index 321b0e519..321b0e519 100755..100644
--- a/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim
+++ b/lib/newwrap/sdl/sdl_mixer_nosmpeg.nim
diff --git a/lib/newwrap/sdl/sdl_net.nim b/lib/newwrap/sdl/sdl_net.nim
index 5a6445af9..5a6445af9 100755..100644
--- a/lib/newwrap/sdl/sdl_net.nim
+++ b/lib/newwrap/sdl/sdl_net.nim
diff --git a/lib/newwrap/sdl/sdl_ttf.nim b/lib/newwrap/sdl/sdl_ttf.nim
index bab48ec53..bab48ec53 100755..100644
--- a/lib/newwrap/sdl/sdl_ttf.nim
+++ b/lib/newwrap/sdl/sdl_ttf.nim
diff --git a/lib/newwrap/sdl/smpeg.nim b/lib/newwrap/sdl/smpeg.nim
index 09ca5a018..09ca5a018 100755..100644
--- a/lib/newwrap/sdl/smpeg.nim
+++ b/lib/newwrap/sdl/smpeg.nim
diff --git a/lib/newwrap/sqlite3.nim b/lib/newwrap/sqlite3.nim
index f2912f05f..f2912f05f 100755..100644
--- a/lib/newwrap/sqlite3.nim
+++ b/lib/newwrap/sqlite3.nim
diff --git a/lib/newwrap/tcl.nim b/lib/newwrap/tcl.nim
index f2ecf558d..f2ecf558d 100755..100644
--- a/lib/newwrap/tcl.nim
+++ b/lib/newwrap/tcl.nim
diff --git a/lib/nimbase.h b/lib/nimbase.h
index dc0ac6e0f..dc0ac6e0f 100755..100644
--- a/lib/nimbase.h
+++ b/lib/nimbase.h
diff --git a/lib/posix/posix.nim b/lib/posix/posix.nim
index 6bda372bb..6bda372bb 100755..100644
--- a/lib/posix/posix.nim
+++ b/lib/posix/posix.nim
diff --git a/lib/pure/browsers.nim b/lib/pure/browsers.nim
index 243c07dad..243c07dad 100755..100644
--- a/lib/pure/browsers.nim
+++ b/lib/pure/browsers.nim
diff --git a/lib/pure/cgi.nim b/lib/pure/cgi.nim
index 490ae926d..490ae926d 100755..100644
--- a/lib/pure/cgi.nim
+++ b/lib/pure/cgi.nim
diff --git a/lib/pure/complex.nim b/lib/pure/complex.nim
index f50ff4bd0..f50ff4bd0 100755..100644
--- a/lib/pure/complex.nim
+++ b/lib/pure/complex.nim
diff --git a/lib/pure/dynlib.nim b/lib/pure/dynlib.nim
index 592073e3d..592073e3d 100755..100644
--- a/lib/pure/dynlib.nim
+++ b/lib/pure/dynlib.nim
diff --git a/lib/pure/hashes.nim b/lib/pure/hashes.nim
index 1593119bd..1593119bd 100755..100644
--- a/lib/pure/hashes.nim
+++ b/lib/pure/hashes.nim
diff --git a/lib/pure/hashtabs.nim b/lib/pure/hashtabs.nim
index 68d19d63b..68d19d63b 100755..100644
--- a/lib/pure/hashtabs.nim
+++ b/lib/pure/hashtabs.nim
diff --git a/lib/pure/htmlparser.nim b/lib/pure/htmlparser.nim
index df840e15c..5c88f211d 100755..100644
--- a/lib/pure/htmlparser.nim
+++ b/lib/pure/htmlparser.nim
@@ -11,7 +11,7 @@
 ## It is supposed to handle the *wild* HTML the real world uses.
 ## 
 ## It can be used to parse a wild HTML document and output it as valid XHTML
-## document (if you are lucky):
+## document (well, if you are lucky):
 ##
 ## .. code-block:: nimrod
 ##
@@ -23,24 +23,29 @@
 ## **Note:** The resulting ``PXmlNode``s already use the ``clientData`` field, 
 ## so it cannot be used by clients of this library.
 
-import streams, parsexml, xmltree
+import strutils, streams, parsexml, xmltree, unicode, strtabs
 
 type
   THtmlTag* = enum ## list of all supported HTML tags; order will always be
                    ## alphabetically
     tagUnknown,    ## unknown HTML element
     tagA,          ## the HTML ``a`` element
+    tagAbbr,       ## the deprecated HTML ``abbr`` element
     tagAcronym,    ## the HTML ``acronym`` element
     tagAddress,    ## the HTML ``address`` element
+    tagApplet,     ## the deprecated HTML ``applet`` element
     tagArea,       ## the HTML ``area`` element
     tagB,          ## the HTML ``b`` element
     tagBase,       ## the HTML ``base`` element
+    tagBdo,        ## the deprecated HTML ``dbo`` element
+    tagBasefont,   ## the deprecated HTML ``basefont`` element
     tagBig,        ## the HTML ``big`` element
     tagBlockquote, ## the HTML ``blockquote`` element
     tagBody,       ## the HTML ``body`` element
     tagBr,         ## the HTML ``br`` element
     tagButton,     ## the HTML ``button`` element
     tagCaption,    ## the HTML ``caption`` element
+    tagCenter,     ## the deprecated HTML ``center`` element
     tagCite,       ## the HTML ``cite`` element
     tagCode,       ## the HTML ``code`` element
     tagCol,        ## the HTML ``col`` element
@@ -49,11 +54,15 @@ type
     tagDel,        ## the HTML ``del`` element
     tagDfn,        ## the HTML ``dfn`` element
     tagDiv,        ## the HTML ``div`` element
+    tagDir,        ## the deprecated HTLM ``dir`` element
     tagDl,         ## the HTML ``dl`` element
     tagDt,         ## the HTML ``dt`` element
     tagEm,         ## the HTML ``em`` element
     tagFieldset,   ## the HTML ``fieldset`` element
+    tagFont,       ## the deprecated HTML ``font`` element
     tagForm,       ## the HTML ``form`` element
+    tagFrame,      ## the HTML ``frame`` element
+    tagFrameset,   ## the deprecated HTML ``frameset`` element
     tagH1,         ## the HTML ``h1`` element
     tagH2,         ## the HTML ``h2`` element
     tagH3,         ## the HTML ``h3`` element
@@ -64,16 +73,21 @@ type
     tagHtml,       ## the HTML ``html`` element
     tagHr,         ## the HTML ``hr`` element
     tagI,          ## the HTML ``i`` element
+    tagIframe,     ## the deprecated HTML ``iframe`` element
     tagImg,        ## the HTML ``img`` element
     tagInput,      ## the HTML ``input`` element
     tagIns,        ## the HTML ``ins`` element
+    tagIsindex,    ## the deprecated HTML ``isindex`` element
     tagKbd,        ## the HTML ``kbd`` element
     tagLabel,      ## the HTML ``label`` element
     tagLegend,     ## the HTML ``legend`` element
     tagLi,         ## the HTML ``li`` element
     tagLink,       ## the HTML ``link`` element
     tagMap,        ## the HTML ``map`` element
+    tagMenu,       ## the deprecated HTML ``menu`` element
     tagMeta,       ## the HTML ``meta`` element
+    tagNobr,       ## the deprecated HTML ``nobr`` element
+    tagNoframes,   ## the deprecated HTML ``noframes`` element
     tagNoscript,   ## the HTML ``noscript`` element
     tagObject,     ## the HTML ``object`` element
     tagOl,         ## the HTML ``ol`` element
@@ -83,11 +97,13 @@ type
     tagParam,      ## the HTML ``param`` element
     tagPre,        ## the HTML ``pre`` element
     tagQ,          ## the HTML ``q`` element
+    tagS,          ## the deprecated HTML ``s`` element
     tagSamp,       ## the HTML ``samp`` element
     tagScript,     ## the HTML ``script`` element
     tagSelect,     ## the HTML ``select`` element
     tagSmall,      ## the HTML ``small`` element
     tagSpan,       ## the HTML ``span`` element
+    tagStrike,     ## the deprecated HTML ``strike`` element
     tagStrong,     ## the HTML ``strong`` element
     tagStyle,      ## the HTML ``style`` element
     tagSub,        ## the HTML ``sub`` element
@@ -102,21 +118,116 @@ type
     tagTitle,      ## the HTML ``title`` element
     tagTr,         ## the HTML ``tr`` element
     tagTt,         ## the HTML ``tt`` element
+    tagU,          ## the deprecated HTML ``u`` element
     tagUl,         ## the HTML ``ul`` element
     tagVar         ## the HTML ``var`` element
 
-const 
+const
   tagStrs = [
-    "a", "acronym", "address", "area", "b", "base", "big", "blockquote", 
-    "body", "br", "button", "caption", "cite", "code", "col", "colgroup", 
-    "dd", "del", "dfn", "div", "dl", "dt", "em", "fieldset", 
-    "form", "h1", "h2", "h3", "h4", "h5", "h6", "head", "html", "hr", 
-    "i", "img", "input", "ins", "kbd", "label", "legend", "li", "link", 
-    "map", "meta", "noscript", "object", "ol", "optgroup", "option", 
-    "p", "param", "pre", "q", "samp", "script", "select", "small", 
-    "span", "strong", "style", "sub", "sup", "table", "tbody", "td", 
-    "textarea", "tfoot", "th", "thead", "title", "tr", "tt", "ul", "var"
+    "a", "abbr", "acronym", "address", "applet", "area", 
+    "b", "base", "basefont", "bdo", "big", "blockquote", "body", 
+    "br", "button", "caption", "center", "cite", "code", 
+    "col", "colgroup", "dd", "del", "dfn", "div", 
+    "dir", "dl", "dt", "em", "fieldset", "font", 
+    "form", "frame", "frameset", "h1", "h2", "h3", 
+    "h4", "h5", "h6", "head", "html", "hr", 
+    "i", "iframe", "img", "input", "ins", "isindex", 
+    "kbd", "label", "legend", "li", "link", "map", 
+    "menu", "meta", "nobr", "noframes", "noscript", "object", "ol", 
+    "optgroup", "option", "p", "param", "pre", "q", 
+    "s", "samp", "script", "select", "small", "span", 
+    "strike", "strong", "style", "sub", "sup", "table", 
+    "tbody", "td", "textarea", "tfoot", "th", "thead", 
+    "title", "tr", "tt", "u", "ul", "var"
   ]
+  InlineTags* = {tagA, tagAbbr, tagAcronym, tagApplet, tagB, tagBasefont,
+    tagBdo, tagBig, tagBr, tagButton, tagCite, tagCode, tagDel, tagDfn,
+    tagEm, tagFont, tagI, tagImg, tagIns, tagInput, tagIframe, tagKbd,
+    tagLabel, tagMap, tagObject, tagQ, tagSamp, tagScript, tagSelect,
+    tagSmall, tagSpan, tagStrong, tagSub, tagSup, tagTextarea, tagTt,
+    tagVar, tagApplet, tagBasefont, tagFont, tagIframe, tagU, tagS, 
+    tagStrike}
+  BlockTags* = {tagAddress, tagBlockquote, tagCenter, tagDel, tagDir, tagDiv, 
+    tagDl, tagFieldset, tagForm, tagH1, tagH2, tagH3, tagH4, 
+    tagH5, tagH6, tagHr, tagIns, tagIsindex, tagMenu, tagNoframes, tagNoscript, 
+    tagOl, tagP, tagPre, tagTable, tagUl, tagCenter, tagDir, tagIsindex, 
+    tagMenu, tagNoframes}
+  SingleTags* = {tagArea, tagBase, tagBasefont, 
+    tagBr, tagCol, tagFrame, tagHr, tagImg, tagInput, tagIsindex,
+    tagLink, tagMeta, tagParam} # `tagP` can be both!
+  
+  Entities = [
+    ("nbsp", 0x00A0), ("iexcl", 0x00A1), ("cent", 0x00A2), ("pound", 0x00A3),
+    ("curren", 0x00A4), ("yen", 0x00A5), ("brvbar", 0x00A6), ("sect", 0x00A7),
+    ("uml", 0x00A8), ("copy", 0x00A9), ("ordf", 0x00AA), ("laquo", 0x00AB),
+    ("not", 0x00AC), ("shy", 0x00AD), ("reg", 0x00AE), ("macr", 0x00AF),
+    ("deg", 0x00B0), ("plusmn", 0x00B1), ("sup2", 0x00B2), ("sup3", 0x00B3),
+    ("acute", 0x00B4), ("micro", 0x00B5), ("para", 0x00B6), ("middot", 0x00B7),
+    ("cedil", 0x00B8), ("sup1", 0x00B9), ("ordm", 0x00BA), ("raquo", 0x00BB),
+    ("frac14", 0x00BC), ("frac12", 0x00BD), ("frac34", 0x00BE), 
+    ("iquest", 0x00BF), ("Agrave", 0x00C0), ("Aacute", 0x00C1),
+    ("Acirc", 0x00C2), ("Atilde", 0x00C3), ("Auml", 0x00C4), ("Aring", 0x00C5),
+    ("AElig", 0x00C6), ("Ccedil", 0x00C7), ("Egrave", 0x00C8),
+    ("Eacute", 0x00C9), ("Ecirc", 0x00CA), ("Euml", 0x00CB), ("Igrave", 0x00CC),
+    ("Iacute", 0x00CD), ("Icirc", 0x00CE), ("Iuml", 0x00CF), ("ETH", 0x00D0),
+    ("Ntilde", 0x00D1), ("Ograve", 0x00D2), ("Oacute", 0x00D3), 
+    ("Ocirc", 0x00D4), ("Otilde", 0x00D5), ("Ouml", 0x00D6), ("times", 0x00D7),
+    ("Oslash", 0x00D8), ("Ugrave", 0x00D9), ("Uacute", 0x00DA),
+    ("Ucirc", 0x00DB), ("Uuml", 0x00DC), ("Yacute", 0x00DD), ("THORN", 0x00DE),
+    ("szlig", 0x00DF), ("agrave", 0x00E0), ("aacute", 0x00E1),
+    ("acirc", 0x00E2), ("atilde", 0x00E3), ("auml", 0x00E4), ("aring", 0x00E5),
+    ("aelig", 0x00E6), ("ccedil", 0x00E7), ("egrave", 0x00E8),
+    ("eacute", 0x00E9), ("ecirc", 0x00EA), ("euml", 0x00EB), ("igrave", 0x00EC),
+    ("iacute", 0x00ED), ("icirc", 0x00EE), ("iuml", 0x00EF), ("eth", 0x00F0),
+    ("ntilde", 0x00F1), ("ograve", 0x00F2), ("oacute", 0x00F3),
+    ("ocirc", 0x00F4), ("otilde", 0x00F5), ("ouml", 0x00F6), ("divide", 0x00F7),
+    ("oslash", 0x00F8), ("ugrave", 0x00F9), ("uacute", 0x00FA),
+    ("ucirc", 0x00FB), ("uuml", 0x00FC), ("yacute", 0x00FD), ("thorn", 0x00FE),
+    ("yuml", 0x00FF), ("OElig", 0x0152), ("oelig", 0x0153), ("Scaron", 0x0160),
+    ("scaron", 0x0161), ("Yuml", 0x0178), ("fnof", 0x0192), ("circ", 0x02C6),
+    ("tilde", 0x02DC), ("Alpha", 0x0391), ("Beta", 0x0392), ("Gamma", 0x0393),
+    ("Delta", 0x0394), ("Epsilon", 0x0395), ("Zeta", 0x0396), ("Eta", 0x0397),
+    ("Theta", 0x0398), ("Iota", 0x0399), ("Kappa", 0x039A), ("Lambda", 0x039B),
+    ("Mu", 0x039C), ("Nu", 0x039D), ("Xi", 0x039E), ("Omicron", 0x039F),
+    ("Pi", 0x03A0), ("Rho", 0x03A1), ("Sigma", 0x03A3), ("Tau", 0x03A4),
+    ("Upsilon", 0x03A5), ("Phi", 0x03A6), ("Chi", 0x03A7), ("Psi", 0x03A8),
+    ("Omega", 0x03A9), ("alpha", 0x03B1), ("beta", 0x03B2), ("gamma", 0x03B3),
+    ("delta", 0x03B4), ("epsilon", 0x03B5), ("zeta", 0x03B6), ("eta", 0x03B7),
+    ("theta", 0x03B8), ("iota", 0x03B9), ("kappa", 0x03BA), ("lambda", 0x03BB),
+    ("mu", 0x03BC), ("nu", 0x03BD), ("xi", 0x03BE), ("omicron", 0x03BF),
+    ("pi", 0x03C0), ("rho", 0x03C1), ("sigmaf", 0x03C2), ("sigma", 0x03C3),
+    ("tau", 0x03C4), ("upsilon", 0x03C5), ("phi", 0x03C6), ("chi", 0x03C7),
+    ("psi", 0x03C8), ("omega", 0x03C9), ("thetasym", 0x03D1), ("upsih", 0x03D2),
+    ("piv", 0x03D6), ("ensp", 0x2002), ("emsp", 0x2003), ("thinsp", 0x2009),
+    ("zwnj", 0x200C), ("zwj", 0x200D), ("lrm", 0x200E), ("rlm", 0x200F),
+    ("ndash", 0x2013), ("mdash", 0x2014), ("lsquo", 0x2018), ("rsquo", 0x2019),
+    ("sbquo", 0x201A), ("ldquo", 0x201C), ("rdquo", 0x201D), ("bdquo", 0x201E),
+    ("dagger", 0x2020), ("Dagger", 0x2021), ("bull", 0x2022), 
+    ("hellip", 0x2026), ("permil", 0x2030), ("prime", 0x2032),
+    ("Prime", 0x2033), ("lsaquo", 0x2039), ("rsaquo", 0x203A),
+    ("oline", 0x203E), ("frasl", 0x2044), ("euro", 0x20AC),
+    ("image", 0x2111), ("weierp", 0x2118), ("real", 0x211C),
+    ("trade", 0x2122), ("alefsym", 0x2135), ("larr", 0x2190),
+    ("uarr", 0x2191), ("rarr", 0x2192), ("darr", 0x2193),
+    ("harr", 0x2194), ("crarr", 0x21B5), ("lArr", 0x21D0),
+    ("uArr", 0x21D1), ("rArr", 0x21D2), ("dArr", 0x21D3),
+    ("hArr", 0x21D4), ("forall", 0x2200), ("part", 0x2202),
+    ("exist", 0x2203), ("empty", 0x2205), ("nabla", 0x2207),
+    ("isin", 0x2208), ("notin", 0x2209), ("ni", 0x220B),
+    ("prod", 0x220F), ("sum", 0x2211), ("minus", 0x2212),
+    ("lowast", 0x2217), ("radic", 0x221A), ("prop", 0x221D),
+    ("infin", 0x221E), ("ang", 0x2220), ("and", 0x2227),
+    ("or", 0x2228), ("cap", 0x2229), ("cup", 0x222A),
+    ("int", 0x222B), ("there4", 0x2234), ("sim", 0x223C),
+    ("cong", 0x2245), ("asymp", 0x2248), ("ne", 0x2260),
+    ("equiv", 0x2261), ("le", 0x2264), ("ge", 0x2265),
+    ("sub", 0x2282), ("sup", 0x2283), ("nsub", 0x2284),
+    ("sube", 0x2286), ("supe", 0x2287), ("oplus", 0x2295),
+    ("otimes", 0x2297), ("perp", 0x22A5), ("sdot", 0x22C5),
+    ("lceil", 0x2308), ("rceil", 0x2309), ("lfloor", 0x230A),
+    ("rfloor", 0x230B), ("lang", 0x2329), ("rang", 0x232A),
+    ("loz", 0x25CA), ("spades", 0x2660), ("clubs", 0x2663),
+    ("hearts", 0x2665), ("diams", 0x2666)]
 
 proc binaryStrSearch(x: openarray[string], y: string): int = 
   ## XXX put this into the library somewhere!
@@ -125,110 +236,121 @@ proc binaryStrSearch(x: openarray[string], y: string): int =
   while a <= b: 
     var mid = (a + b) div 2
     var c = cmp(x[mid], y)
-    if c < 0: 
-      a = mid + 1
-    elif c > 0: 
-      b = mid - 1
-    else: 
-      return mid
+    if c < 0: a = mid + 1
+    elif c > 0: b = mid - 1
+    else: return mid
   result = - 1
 
 proc htmlTag*(n: PXmlNode): THtmlTag = 
-  ## gets `n`'s tag as a ``THtmlTag``. Even though results are cached, this is
-  ## can be more expensive than comparing ``tag`` directly to a string.
+  ## gets `n`'s tag as a ``THtmlTag``.
   if n.clientData == 0:
     n.clientData = binaryStrSearch(tagStrs, n.tag)+1
   result = THtmlTag(n.clientData)
 
-proc parseElement(x: var TXmlParser, doc: var PDocument): PElement =
-  var n = doc.createElement("")
+proc entityToUtf8*(entity: string): string = 
+  ## converts an HTML entity name like ``&Uuml;`` to its UTF-8 equivalent.
+  ## "" is returned if the entity name is unknown. The HTML parser
+  ## already converts entities to UTF-8.
+  for name, val in items(entities):
+    if name == entity:
+      return toUTF8(TRune(val))
+  result = ""
+
+proc addNode(father, son: PXmlNode) = 
+  if son != nil: add(father, son)
+
+proc parse(x: var TXmlParser, errors: var seq[string]): PXmlNode
 
-  while True:
-    case x.kind()
+proc untilElementEnd(x: var TXmlParser, result: PXmlNode, 
+                     errors: var seq[string]) =
+  if result.htmlTag in singleTags:
+    if x.kind != xmlElementEnd or cmpIgnoreCase(x.elementName, result.tag) != 0:
+      return
+  while true:
+    case x.kind
+    of xmlElementEnd: 
+      if cmpIgnoreCase(x.elementName, result.tag) == 0: 
+        next(x)
+      else:
+        errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
+        # do not skip it here!
+      break
     of xmlEof:
+      errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
       break
-    of xmlElementStart:
-      if n.tagName() != "":
-        n.appendChild(parseElement(x, doc))
-      else:
-        n = doc.createElement(x.elementName)
-    of xmlElementOpen:
-      if n.tagName() != "":
-        n.appendChild(parseElement(x, doc))
-      else:
-        if x.elementName.contains(':'):
-          #TODO: NamespaceURI
-          n = doc.createElementNS("nil", x.elementName)
-        else:  
-          n = doc.createElement(x.elementName)
-        
-    of xmlElementEnd:
-      if x.elementName == n.nodeName:
-        # n.normalize() # Remove any whitespace etc.
-        return n
-      else: #The wrong element is ended
-        raise newException(EMismatchedTag, "Mismatched tag at line " & 
-          $x.getLine() & " column " & $x.getColumn)
-      
-    of xmlCharData:
-      n.appendChild(parseText(x, doc))
-    of xmlAttribute:
-      if x.attrKey.contains(':'):
-        #TODO: NamespaceURI
-        n.setAttributeNS("nil", x.attrKey, x.attrValue)
-      else:
-        n.setAttribute(x.attrKey, x.attrValue)
-    of xmlCData:
-      n.appendChild(doc.createCDATASection(x.charData()))
-    of xmlComment:
-      n.appendChild(doc.createComment(x.charData()))
-    of xmlPI:
-      n.appendChild(doc.createProcessingInstruction(x.PIName(), x.PIRest()))
-      
-    of xmlWhitespace, xmlElementClose, xmlEntity, xmlSpecial:
-      # Unused 'events'
-
     else:
-      raise newException(EParserError, "Unexpected XML Parser event")
-    x.next()
+      result.addNode(parse(x, errors))
 
-  raise newException(EMismatchedTag, 
-    "Mismatched tag at line " & $x.getLine() & " column " & $x.getColumn)
-
-
-proc parse*(x: var TXmlParser, father: PXmlNode) =
-  
+proc parse(x: var TXmlParser, errors: var seq[string]): PXmlNode =
+  case x.kind
+  of xmlComment: 
+    result = newComment(x.charData)
+    next(x)
+  of xmlCharData, xmlWhitespace:
+    result = newText(x.charData)
+    next(x)
+  of xmlPI, xmlSpecial:
+    # we just ignore processing instructions for now
+    next(x)
+  of xmlError:
+    errors.add(errorMsg(x))
+    next(x)
+  of xmlElementStart:
+    result = newElement(x.elementName)
+    next(x)
+    untilElementEnd(x, result, errors)
+  of xmlElementEnd:
+    errors.add(errorMsg(x, "unexpected ending tag: " & x.elementName))
+  of xmlElementOpen: 
+    result = newElement(x.elementName)
+    next(x)
+    result.attr = newStringTable()
+    while true: 
+      case x.kind
+      of xmlAttribute:
+        result.attr[x.attrKey] = x.attrValue
+        next(x)
+      of xmlElementClose:
+        next(x)
+        break
+      of xmlError:
+        errors.add(errorMsg(x))
+        next(x)
+        break
+      else:
+        errors.add(errorMsg(x, "'>' expected"))
+        next(x)
+        break
+    untilElementEnd(x, result, errors)
+  of xmlAttribute, xmlElementClose:
+    errors.add(errorMsg(x, "<some_tag> expected"))
+    next(x)
+  of xmlCData: 
+    result = newCData(x.charData)
+    next(x)
+  of xmlEntity:
+    var u = entityToUtf8(x.entityName)
+    if u.len != 0: result = newText(u)
+    next(x)
+  of xmlEof: nil
 
 proc parseHtml*(s: PStream, filename: string, 
                 errors: var seq[string]): PXmlNode = 
-  ## parses the HTML from stream `s` and returns a ``PXmlNode``. Every
+  ## parses the XML from stream `s` and returns a ``PXmlNode``. Every
   ## occured parsing error is added to the `errors` sequence.
   var x: TXmlParser
   open(x, s, filename, {reportComments})
-  
-  result = newElement("html")
-  while true:
-    x.next()
-    case x.kind
-    of xmlWhitespace: nil # just skip it
-    of xmlComment: 
-      result.add(newComment(x.text))
-  
-  while True:
-    x.next()
-    case x.kind
-    of xmlEof: break
-    of xmlElementStart, xmlElementOpen:
-      var el: PElement = parseElement(x, XmlDoc)
-      XmlDoc = dom.createDocument(el)
-    of xmlWhitespace, xmlElementClose, xmlEntity, xmlSpecial:
-      # Unused 'events'
-    else:
-      raise newException(EParserError, "Unexpected XML Parser event")
+  next(x)
+  # skip the DOCTYPE:
+  if x.kind == xmlSpecial: next(x)
+  result = parse(x, errors)
+  while x.kind != xmlEof:
+    errors.add(errorMsg(x, "EOF expected"))
+    result.addNode(parse(x, errors))
   close(x)
 
 proc parseHtml*(s: PStream): PXmlNode = 
-  ## parses the HTML from stream `s` and returns a ``PXmlNode``. All parsing
+  ## parses the XTML from stream `s` and returns a ``PXmlNode``. All parsing
   ## errors are ignored.
   var errors: seq[string] = @[]
   result = parseHtml(s, "unknown_html_doc", errors)
@@ -236,7 +358,7 @@ proc parseHtml*(s: PStream): PXmlNode =
 proc loadHtml*(path: string, reportErrors = false): PXmlNode = 
   ## Loads and parses HTML from file specified by ``path``, and returns 
   ## a ``PXmlNode``. If `reportErrors` is true, the parsing errors are
-  ## ``echo``ed.
+  ## ``echo``ed, otherwise they are ignored.
   var s = newFileStream(path, fmRead)
   if s == nil: raise newException(EIO, "Unable to read file: " & path)
   
@@ -245,3 +367,16 @@ proc loadHtml*(path: string, reportErrors = false): PXmlNode =
   if reportErrors: 
     for msg in items(errors): echo(msg)
 
+when true:
+  nil
+else:
+  proc checkHtmlAux(n: PXmlNode, errors: var seq[string]) =
+    nil
+  
+  proc checkHtmlStructure*(n: PXmlNode, errors: var seq[string]) =
+    ## checks the HTML structure after parsing for other errors like 
+    ## a ``<h1>`` element within a ``<p>`` element.
+    if n == nil or n.htmlTag != tagHtml: 
+      errors.add("<html> tag expected")
+    checkHtmlAux(n, errors)
+  
\ No newline at end of file
diff --git a/lib/pure/httpclient.nim b/lib/pure/httpclient.nim
index 43eab0404..0f9054873 100755..100644
--- a/lib/pure/httpclient.nim
+++ b/lib/pure/httpclient.nim
@@ -60,14 +60,6 @@ type
                                      ## and ``postContent`` proc,
                                      ## when the server returns an error
 
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 proc httpError(msg: string) =
   var e: ref EInvalidProtocol
   new(e)
diff --git a/lib/pure/httpserver.nim b/lib/pure/httpserver.nim
index 2c85d8137..2c85d8137 100755..100644
--- a/lib/pure/httpserver.nim
+++ b/lib/pure/httpserver.nim
diff --git a/lib/pure/lexbase.nim b/lib/pure/lexbase.nim
index bb207e92a..bb207e92a 100755..100644
--- a/lib/pure/lexbase.nim
+++ b/lib/pure/lexbase.nim
diff --git a/lib/pure/logging.nim b/lib/pure/logging.nim
index 6df39f50b..6df39f50b 100755..100644
--- a/lib/pure/logging.nim
+++ b/lib/pure/logging.nim
diff --git a/lib/pure/macros.nim b/lib/pure/macros.nim
index 677469ed2..677469ed2 100755..100644
--- a/lib/pure/macros.nim
+++ b/lib/pure/macros.nim
diff --git a/lib/pure/math.nim b/lib/pure/math.nim
index cf4b6d95c..cf4b6d95c 100755..100644
--- a/lib/pure/math.nim
+++ b/lib/pure/math.nim
diff --git a/lib/pure/md5.nim b/lib/pure/md5.nim
index e75f80b4c..e75f80b4c 100755..100644
--- a/lib/pure/md5.nim
+++ b/lib/pure/md5.nim
diff --git a/lib/pure/os.nim b/lib/pure/os.nim
index 1879fb5db..ef526993a 100755..100644
--- a/lib/pure/os.nim
+++ b/lib/pure/os.nim
@@ -26,15 +26,6 @@ else:
 
 include "system/ansi_c"
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   doslike = defined(windows) or defined(OS2) or defined(DOS)
     # DOS-like filesystem
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
index bbdea1eee..bbdea1eee 100755..100644
--- a/lib/pure/osproc.nim
+++ b/lib/pure/osproc.nim
diff --git a/lib/pure/parsecfg.nim b/lib/pure/parsecfg.nim
index c26dab099..c26dab099 100755..100644
--- a/lib/pure/parsecfg.nim
+++ b/lib/pure/parsecfg.nim
diff --git a/lib/pure/parsecsv.nim b/lib/pure/parsecsv.nim
index 5970f2090..5970f2090 100755..100644
--- a/lib/pure/parsecsv.nim
+++ b/lib/pure/parsecsv.nim
diff --git a/lib/pure/parseopt.nim b/lib/pure/parseopt.nim
index 8f4be98f4..8f4be98f4 100755..100644
--- a/lib/pure/parseopt.nim
+++ b/lib/pure/parseopt.nim
diff --git a/lib/pure/parsesql.nim b/lib/pure/parsesql.nim
index 2109c273a..2109c273a 100755..100644
--- a/lib/pure/parsesql.nim
+++ b/lib/pure/parsesql.nim
diff --git a/lib/pure/parseurl.nim b/lib/pure/parseurl.nim
index cd3bc621a..cd3bc621a 100755..100644
--- a/lib/pure/parseurl.nim
+++ b/lib/pure/parseurl.nim
diff --git a/lib/pure/parseutils.nim b/lib/pure/parseutils.nim
index 04d2a7973..0f107793c 100755..100644
--- a/lib/pure/parseutils.nim
+++ b/lib/pure/parseutils.nim
@@ -14,15 +14,6 @@
 {.push debugger:off .} # the user does not want to trace a part
                        # of the standard library!
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   Whitespace = {' ', '\t', '\v', '\r', '\l', '\f'}
   IdentChars = {'a'..'z', 'A'..'Z', '0'..'9', '_'}
diff --git a/lib/pure/parsexml.nim b/lib/pure/parsexml.nim
index 598ae6c68..598ae6c68 100755..100644
--- a/lib/pure/parsexml.nim
+++ b/lib/pure/parsexml.nim
diff --git a/lib/pure/pegs.nim b/lib/pure/pegs.nim
index 5ba0351ad..5ba0351ad 100755..100644
--- a/lib/pure/pegs.nim
+++ b/lib/pure/pegs.nim
diff --git a/lib/pure/re.nim b/lib/pure/re.nim
index 953f9c744..953f9c744 100755..100644
--- a/lib/pure/re.nim
+++ b/lib/pure/re.nim
diff --git a/lib/pure/regexprs.nim b/lib/pure/regexprs.nim
index 43c7f05be..43c7f05be 100755..100644
--- a/lib/pure/regexprs.nim
+++ b/lib/pure/regexprs.nim
diff --git a/lib/pure/ropes.nim b/lib/pure/ropes.nim
index aa793b4f3..df85baf92 100755..100644
--- a/lib/pure/ropes.nim
+++ b/lib/pure/ropes.nim
@@ -21,15 +21,6 @@
 {.push debugger:off .} # the user does not want to trace a part
                        # of the standard library!
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   countCacheMisses = false
 
diff --git a/lib/pure/sockets.nim b/lib/pure/sockets.nim
index 85628db78..85628db78 100755..100644
--- a/lib/pure/sockets.nim
+++ b/lib/pure/sockets.nim
diff --git a/lib/pure/streams.nim b/lib/pure/streams.nim
index f4d2911fc..f4d2911fc 100755..100644
--- a/lib/pure/streams.nim
+++ b/lib/pure/streams.nim
diff --git a/lib/pure/strtabs.nim b/lib/pure/strtabs.nim
index 8ea59637a..8ea59637a 100755..100644
--- a/lib/pure/strtabs.nim
+++ b/lib/pure/strtabs.nim
diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim
index fe70130e5..2fd2aaeef 100755..100644
--- a/lib/pure/strutils.nim
+++ b/lib/pure/strutils.nim
@@ -17,16 +17,6 @@ import parseutils
 {.push debugger:off .} # the user does not want to trace a part
                        # of the standard library!
 
-# copied from excpt.nim, because I don't want to make this template public
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
-
 type
   TCharSet* = set[char] # for compatibility with Nim
 
diff --git a/lib/pure/terminal.nim b/lib/pure/terminal.nim
index 42bd80cb4..42bd80cb4 100755..100644
--- a/lib/pure/terminal.nim
+++ b/lib/pure/terminal.nim
diff --git a/lib/pure/times.nim b/lib/pure/times.nim
index a54af3254..a54af3254 100755..100644
--- a/lib/pure/times.nim
+++ b/lib/pure/times.nim
diff --git a/lib/pure/unicode.nim b/lib/pure/unicode.nim
index bebbe56c5..bebbe56c5 100755..100644
--- a/lib/pure/unicode.nim
+++ b/lib/pure/unicode.nim
diff --git a/lib/pure/unidecode/gen.py b/lib/pure/unidecode/gen.py
index 8da0136ff..8da0136ff 100755..100644
--- a/lib/pure/unidecode/gen.py
+++ b/lib/pure/unidecode/gen.py
diff --git a/lib/pure/unidecode/unidecode.dat b/lib/pure/unidecode/unidecode.dat
index 9dff0a4a9..9dff0a4a9 100755..100644
--- a/lib/pure/unidecode/unidecode.dat
+++ b/lib/pure/unidecode/unidecode.dat
diff --git a/lib/pure/unidecode/unidecode.nim b/lib/pure/unidecode/unidecode.nim
index a665dd73e..a665dd73e 100755..100644
--- a/lib/pure/unidecode/unidecode.nim
+++ b/lib/pure/unidecode/unidecode.nim
diff --git a/lib/pure/variants.nim b/lib/pure/variants.nim
index f661f81a6..f661f81a6 100755..100644
--- a/lib/pure/variants.nim
+++ b/lib/pure/variants.nim
diff --git a/lib/pure/xmldom.nim b/lib/pure/xmldom.nim
index 4e9d721d7..76c666de0 100755..100644
--- a/lib/pure/xmldom.nim
+++ b/lib/pure/xmldom.nim
@@ -34,14 +34,6 @@ type
   ESyntaxErr* = object of EDOMException ## If an invalid or illegal string is specified.
   EWrongDocumentErr* = object of EDOMException ## If a node is used in a different document than the one that created it (that doesn't support it)
 
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
-
 const
   ElementNode* = 1
   AttributeNode* = 2
diff --git a/lib/pure/xmldomparser.nim b/lib/pure/xmldomparser.nim
index 9df60cab8..b73baf1ff 100755..100644
--- a/lib/pure/xmldomparser.nim
+++ b/lib/pure/xmldomparser.nim
@@ -17,14 +17,6 @@ type
   #Parsing errors
   EMismatchedTag* = object of E_Base ## Raised when a tag is not properly closed
   EParserError* = object of E_Base ## Raised when an unexpected XML Parser event occurs
-
-template newException(exceptn, message: expr): expr =
-  block: # open a new scope
-    var
-      e: ref exceptn
-    new(e)
-    e.msg = message
-    e
     
 proc parseText(x: var TXmlParser, doc: var PDocument): PText =
   result = doc.createTextNode(x.charData())
diff --git a/lib/pure/xmlgen.nim b/lib/pure/xmlgen.nim
index 29f2700f2..29f2700f2 100755..100644
--- a/lib/pure/xmlgen.nim
+++ b/lib/pure/xmlgen.nim
diff --git a/lib/pure/xmltree.nim b/lib/pure/xmltree.nim
index 005969fc4..2b0977874 100755..100644
--- a/lib/pure/xmltree.nim
+++ b/lib/pure/xmltree.nim
@@ -63,7 +63,7 @@ proc newCData*(cdata: string): PXmlNode =
 proc newEntity*(entity: string): PXmlNode = 
   ## creates a new ``PXmlNode`` of kind ``xnEntity`` with the text `entity`.
   result = newXmlNode(xnCData)
-  result.fText = cdata
+  result.fText = entity
 
 proc text*(n: PXmlNode): string {.inline.} = 
   ## gets the associated text with the node `n`. `n` can be a CDATA, Text,
diff --git a/lib/pure/xmltreeparser.nim b/lib/pure/xmltreeparser.nim
index b7a9ba54a..bf2c05570 100755..100644
--- a/lib/pure/xmltreeparser.nim
+++ b/lib/pure/xmltreeparser.nim
@@ -9,7 +9,7 @@
 
 ## This module parses an XML document and creates its XML tree representation.
 
-import streams, parsexml, strtabs, xmltree, hxmlcommon
+import streams, parsexml, strtabs, xmltree
 
 type
   EInvalidXml* = object of E_Base ## exception that is raised for invalid XML
@@ -25,13 +25,30 @@ proc raiseInvalidXml(errors: seq[string]) =
 proc addNode(father, son: PXmlNode) = 
   if son != nil: add(father, son)
 
-proc parse*(x: var TXmlParser, errors: var seq[string]): PXmlNode =
+proc untilElementEnd(x: var TXmlParser, result: PXmlNode, 
+                     errors: var seq[string]) =
+  while true:
+    case x.kind
+    of xmlElementEnd: 
+      if x.elementName == result.tag: 
+        next(x)
+      else:
+        errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
+        # do not skip it here!
+      break
+    of xmlEof:
+      errors.add(errorMsg(x, "</" & result.tag & "$1> expected"))
+      break
+    else:
+      result.addNode(parse(x, errors))
+
+proc parse(x: var TXmlParser, errors: var seq[string]): PXmlNode =
   case x.kind
   of xmlComment: 
-    result = newComment(x.text)
+    result = newComment(x.charData)
     next(x)
   of xmlCharData, xmlWhitespace:
-    result = newText(x.text)
+    result = newText(x.charData)
     next(x)
   of xmlPI, xmlSpecial:
     # we just ignore processing instructions for now
@@ -42,23 +59,10 @@ proc parse*(x: var TXmlParser, errors: var seq[string]): PXmlNode =
   of xmlElementStart:    ## ``<elem>``
     result = newElement(x.elementName)
     next(x)
-    while true:
-      case x.kind
-      of xmlElementEnd: 
-        if x.elementName == result.tag: 
-          next(x)
-        else:
-          errors.add(errorMsg(x, "</$1> expected" % result.tag))
-          # do not skip it here!
-        break
-      of xmlEof:
-        errors.add(errorMsg(x, "</$1> expected" % result.tag))
-        break
-      else:
-        result.addNode(parse(x, errors))
-  of xmlElementEnd:       ## ``</elem>``
+    untilElementEnd(x, result, errors)
+  of xmlElementEnd:
     errors.add(errorMsg(x, "unexpected ending tag: " & x.elementName))
-  of xmlElementOpen:     ## ``<elem 
+  of xmlElementOpen: 
     result = newElement(x.elementName)
     next(x)
     result.attr = newStringTable()
@@ -75,12 +79,12 @@ proc parse*(x: var TXmlParser, errors: var seq[string]): PXmlNode =
         next(x)
         break
       else:
-        errors.add(errorMsg(x, "'>' expected" % result.tag))
+        errors.add(errorMsg(x, "'>' expected"))
         next(x)
         break
-  
+    untilElementEnd(x, result, errors)
   of xmlAttribute, xmlElementClose:
-    errors.add(errorMsg(x, "<some_tag> expected")
+    errors.add(errorMsg(x, "<some_tag> expected"))
     next(x)
   of xmlCData: 
     result = newCData(x.charData)
@@ -107,7 +111,7 @@ proc parseXml*(s: PStream, filename: string,
     of xmlError:
       errors.add(errorMsg(x))
     else:
-      errors.add(errorMsg(x, "<some_tag> expected")
+      errors.add(errorMsg(x, "<some_tag> expected"))
       break
   close(x)
 
diff --git a/lib/system.nim b/lib/system.nim
index ae9d6b432..ae9d6b432 100755..100644
--- a/lib/system.nim
+++ b/lib/system.nim
diff --git a/lib/system/alloc.nim b/lib/system/alloc.nim
index 95feff854..95feff854 100755..100644
--- a/lib/system/alloc.nim
+++ b/lib/system/alloc.nim
diff --git a/lib/system/ansi_c.nim b/lib/system/ansi_c.nim
index e9300949b..e9300949b 100755..100644
--- a/lib/system/ansi_c.nim
+++ b/lib/system/ansi_c.nim
diff --git a/lib/system/arithm.nim b/lib/system/arithm.nim
index b93bb9844..b93bb9844 100755..100644
--- a/lib/system/arithm.nim
+++ b/lib/system/arithm.nim
diff --git a/lib/system/assign.nim b/lib/system/assign.nim
index 44d2e5c64..44d2e5c64 100755..100644
--- a/lib/system/assign.nim
+++ b/lib/system/assign.nim
diff --git a/lib/system/cellsets.nim b/lib/system/cellsets.nim
index 0ce83864c..0ce83864c 100755..100644
--- a/lib/system/cellsets.nim
+++ b/lib/system/cellsets.nim
diff --git a/lib/system/cntbits.nim b/lib/system/cntbits.nim
index 281b96dd0..281b96dd0 100755..100644
--- a/lib/system/cntbits.nim
+++ b/lib/system/cntbits.nim
diff --git a/lib/system/debugger.nim b/lib/system/debugger.nim
index 01d8bd8a2..01d8bd8a2 100755..100644
--- a/lib/system/debugger.nim
+++ b/lib/system/debugger.nim
diff --git a/lib/system/dyncalls.nim b/lib/system/dyncalls.nim
index 0946ee355..0946ee355 100755..100644
--- a/lib/system/dyncalls.nim
+++ b/lib/system/dyncalls.nim
diff --git a/lib/system/ecmasys.nim b/lib/system/ecmasys.nim
index c0d0a5fd6..c0d0a5fd6 100755..100644
--- a/lib/system/ecmasys.nim
+++ b/lib/system/ecmasys.nim
diff --git a/lib/system/excpt.nim b/lib/system/excpt.nim
index 4d7b41da2..4d7b41da2 100755..100644
--- a/lib/system/excpt.nim
+++ b/lib/system/excpt.nim
diff --git a/lib/system/gc.nim b/lib/system/gc.nim
index da8f75768..da8f75768 100755..100644
--- a/lib/system/gc.nim
+++ b/lib/system/gc.nim
diff --git a/lib/system/hti.nim b/lib/system/hti.nim
index 3343000ae..3343000ae 100755..100644
--- a/lib/system/hti.nim
+++ b/lib/system/hti.nim
diff --git a/lib/system/mm.nim b/lib/system/mm.nim
index 76b5d83bd..76b5d83bd 100755..100644
--- a/lib/system/mm.nim
+++ b/lib/system/mm.nim
diff --git a/lib/system/profiler.nim b/lib/system/profiler.nim
index b87b30d4a..b87b30d4a 100755..100644
--- a/lib/system/profiler.nim
+++ b/lib/system/profiler.nim
diff --git a/lib/system/repr.nim b/lib/system/repr.nim
index e340f1d7c..e340f1d7c 100755..100644
--- a/lib/system/repr.nim
+++ b/lib/system/repr.nim
diff --git a/lib/system/sets.nim b/lib/system/sets.nim
index f9f3eb32b..f9f3eb32b 100755..100644
--- a/lib/system/sets.nim
+++ b/lib/system/sets.nim
diff --git a/lib/system/sysio.nim b/lib/system/sysio.nim
index 3c99a5eed..3c99a5eed 100755..100644
--- a/lib/system/sysio.nim
+++ b/lib/system/sysio.nim
diff --git a/lib/system/sysstr.nim b/lib/system/sysstr.nim
index 808941c06..808941c06 100755..100644
--- a/lib/system/sysstr.nim
+++ b/lib/system/sysstr.nim
diff --git a/lib/ucmaps/8859-1.txt b/lib/ucmaps/8859-1.txt
index 473ecabc1..473ecabc1 100755..100644
--- a/lib/ucmaps/8859-1.txt
+++ b/lib/ucmaps/8859-1.txt
diff --git a/lib/ucmaps/8859-10.txt b/lib/ucmaps/8859-10.txt
index 374a42b1a..374a42b1a 100755..100644
--- a/lib/ucmaps/8859-10.txt
+++ b/lib/ucmaps/8859-10.txt
diff --git a/lib/ucmaps/8859-13.txt b/lib/ucmaps/8859-13.txt
index cd11b53fd..cd11b53fd 100755..100644
--- a/lib/ucmaps/8859-13.txt
+++ b/lib/ucmaps/8859-13.txt
diff --git a/lib/ucmaps/8859-14.txt b/lib/ucmaps/8859-14.txt
index 36038f413..36038f413 100755..100644
--- a/lib/ucmaps/8859-14.txt
+++ b/lib/ucmaps/8859-14.txt
diff --git a/lib/ucmaps/8859-15.txt b/lib/ucmaps/8859-15.txt
index 1e319707d..1e319707d 100755..100644
--- a/lib/ucmaps/8859-15.txt
+++ b/lib/ucmaps/8859-15.txt
diff --git a/lib/ucmaps/8859-2.txt b/lib/ucmaps/8859-2.txt
index e45df25eb..e45df25eb 100755..100644
--- a/lib/ucmaps/8859-2.txt
+++ b/lib/ucmaps/8859-2.txt
diff --git a/lib/ucmaps/8859-3.txt b/lib/ucmaps/8859-3.txt
index 9b6ac69dd..9b6ac69dd 100755..100644
--- a/lib/ucmaps/8859-3.txt
+++ b/lib/ucmaps/8859-3.txt
diff --git a/lib/ucmaps/8859-4.txt b/lib/ucmaps/8859-4.txt
index 662e698ab..662e698ab 100755..100644
--- a/lib/ucmaps/8859-4.txt
+++ b/lib/ucmaps/8859-4.txt
diff --git a/lib/ucmaps/8859-5.txt b/lib/ucmaps/8859-5.txt
index a7ed1ce2a..a7ed1ce2a 100755..100644
--- a/lib/ucmaps/8859-5.txt
+++ b/lib/ucmaps/8859-5.txt
diff --git a/lib/ucmaps/8859-6.txt b/lib/ucmaps/8859-6.txt
index 69ac7f589..69ac7f589 100755..100644
--- a/lib/ucmaps/8859-6.txt
+++ b/lib/ucmaps/8859-6.txt
diff --git a/lib/ucmaps/8859-7.txt b/lib/ucmaps/8859-7.txt
index 52c42d08a..52c42d08a 100755..100644
--- a/lib/ucmaps/8859-7.txt
+++ b/lib/ucmaps/8859-7.txt
diff --git a/lib/ucmaps/8859-8.txt b/lib/ucmaps/8859-8.txt
index bc8da4c7f..bc8da4c7f 100755..100644
--- a/lib/ucmaps/8859-8.txt
+++ b/lib/ucmaps/8859-8.txt
diff --git a/lib/ucmaps/8859-9.txt b/lib/ucmaps/8859-9.txt
index 22901f107..22901f107 100755..100644
--- a/lib/ucmaps/8859-9.txt
+++ b/lib/ucmaps/8859-9.txt
diff --git a/lib/ucmaps/cp1250.txt b/lib/ucmaps/cp1250.txt
index 081d7763b..081d7763b 100755..100644
--- a/lib/ucmaps/cp1250.txt
+++ b/lib/ucmaps/cp1250.txt
diff --git a/lib/ucmaps/cp1251.txt b/lib/ucmaps/cp1251.txt
index 37eadbdbc..37eadbdbc 100755..100644
--- a/lib/ucmaps/cp1251.txt
+++ b/lib/ucmaps/cp1251.txt
diff --git a/lib/ucmaps/cp1252.txt b/lib/ucmaps/cp1252.txt
index 2ca4486eb..2ca4486eb 100755..100644
--- a/lib/ucmaps/cp1252.txt
+++ b/lib/ucmaps/cp1252.txt
diff --git a/lib/ucmaps/cp1253.txt b/lib/ucmaps/cp1253.txt
index 2ba51a0c8..2ba51a0c8 100755..100644
--- a/lib/ucmaps/cp1253.txt
+++ b/lib/ucmaps/cp1253.txt
diff --git a/lib/ucmaps/cp1254.txt b/lib/ucmaps/cp1254.txt
index ca1a1ebdb..ca1a1ebdb 100755..100644
--- a/lib/ucmaps/cp1254.txt
+++ b/lib/ucmaps/cp1254.txt
diff --git a/lib/ucmaps/cp1255.txt b/lib/ucmaps/cp1255.txt
index 341517f11..341517f11 100755..100644
--- a/lib/ucmaps/cp1255.txt
+++ b/lib/ucmaps/cp1255.txt
diff --git a/lib/ucmaps/cp1256.txt b/lib/ucmaps/cp1256.txt
index 0edd081b9..0edd081b9 100755..100644
--- a/lib/ucmaps/cp1256.txt
+++ b/lib/ucmaps/cp1256.txt
diff --git a/lib/ucmaps/cp1257.txt b/lib/ucmaps/cp1257.txt
index 97979d931..97979d931 100755..100644
--- a/lib/ucmaps/cp1257.txt
+++ b/lib/ucmaps/cp1257.txt
diff --git a/lib/ucmaps/cp1258.txt b/lib/ucmaps/cp1258.txt
index 392310a8c..392310a8c 100755..100644
--- a/lib/ucmaps/cp1258.txt
+++ b/lib/ucmaps/cp1258.txt
diff --git a/lib/ucmaps/cp437.txt b/lib/ucmaps/cp437.txt
index ae38e17ab..ae38e17ab 100755..100644
--- a/lib/ucmaps/cp437.txt
+++ b/lib/ucmaps/cp437.txt
diff --git a/lib/ucmaps/cp737.txt b/lib/ucmaps/cp737.txt
index 0fc572fc3..0fc572fc3 100755..100644
--- a/lib/ucmaps/cp737.txt
+++ b/lib/ucmaps/cp737.txt
diff --git a/lib/ucmaps/cp775.txt b/lib/ucmaps/cp775.txt
index 1ad4e4e58..1ad4e4e58 100755..100644
--- a/lib/ucmaps/cp775.txt
+++ b/lib/ucmaps/cp775.txt
diff --git a/lib/ucmaps/cp850.txt b/lib/ucmaps/cp850.txt
index 590b1afe5..590b1afe5 100755..100644
--- a/lib/ucmaps/cp850.txt
+++ b/lib/ucmaps/cp850.txt
diff --git a/lib/ucmaps/cp852.txt b/lib/ucmaps/cp852.txt
index 2f2dabaeb..2f2dabaeb 100755..100644
--- a/lib/ucmaps/cp852.txt
+++ b/lib/ucmaps/cp852.txt
diff --git a/lib/ucmaps/cp855.txt b/lib/ucmaps/cp855.txt
index d43daf039..d43daf039 100755..100644
--- a/lib/ucmaps/cp855.txt
+++ b/lib/ucmaps/cp855.txt
diff --git a/lib/ucmaps/cp856.txt b/lib/ucmaps/cp856.txt
index 3a6000bcb..3a6000bcb 100755..100644
--- a/lib/ucmaps/cp856.txt
+++ b/lib/ucmaps/cp856.txt
diff --git a/lib/ucmaps/cp857.txt b/lib/ucmaps/cp857.txt
index 305938396..305938396 100755..100644
--- a/lib/ucmaps/cp857.txt
+++ b/lib/ucmaps/cp857.txt
diff --git a/lib/ucmaps/cp860.txt b/lib/ucmaps/cp860.txt
index d7f2cb737..d7f2cb737 100755..100644
--- a/lib/ucmaps/cp860.txt
+++ b/lib/ucmaps/cp860.txt
diff --git a/lib/ucmaps/cp861.txt b/lib/ucmaps/cp861.txt
index fe0f02bb5..fe0f02bb5 100755..100644
--- a/lib/ucmaps/cp861.txt
+++ b/lib/ucmaps/cp861.txt
diff --git a/lib/ucmaps/cp862.txt b/lib/ucmaps/cp862.txt
index 963110518..963110518 100755..100644
--- a/lib/ucmaps/cp862.txt
+++ b/lib/ucmaps/cp862.txt
diff --git a/lib/ucmaps/cp863.txt b/lib/ucmaps/cp863.txt
index cc4eae186..cc4eae186 100755..100644
--- a/lib/ucmaps/cp863.txt
+++ b/lib/ucmaps/cp863.txt
diff --git a/lib/ucmaps/cp864.txt b/lib/ucmaps/cp864.txt
index 7aa055fba..7aa055fba 100755..100644
--- a/lib/ucmaps/cp864.txt
+++ b/lib/ucmaps/cp864.txt
diff --git a/lib/ucmaps/cp865.txt b/lib/ucmaps/cp865.txt
index 67705f46a..67705f46a 100755..100644
--- a/lib/ucmaps/cp865.txt
+++ b/lib/ucmaps/cp865.txt
diff --git a/lib/ucmaps/cp866.txt b/lib/ucmaps/cp866.txt
index 880fb70e3..880fb70e3 100755..100644
--- a/lib/ucmaps/cp866.txt
+++ b/lib/ucmaps/cp866.txt
diff --git a/lib/ucmaps/cp869.txt b/lib/ucmaps/cp869.txt
index 4c77ffd6c..4c77ffd6c 100755..100644
--- a/lib/ucmaps/cp869.txt
+++ b/lib/ucmaps/cp869.txt
diff --git a/lib/ucmaps/cp874.txt b/lib/ucmaps/cp874.txt
index 1eb71dfe1..1eb71dfe1 100755..100644
--- a/lib/ucmaps/cp874.txt
+++ b/lib/ucmaps/cp874.txt
diff --git a/lib/ucmaps/cp932.txt b/lib/ucmaps/cp932.txt
index 36bfdbfab..36bfdbfab 100755..100644
--- a/lib/ucmaps/cp932.txt
+++ b/lib/ucmaps/cp932.txt
diff --git a/lib/windows/mmsystem.nim b/lib/windows/mmsystem.nim
index 07d0cb538..c7dd5b1be 100755..100644
--- a/lib/windows/mmsystem.nim
+++ b/lib/windows/mmsystem.nim
@@ -21,6 +21,8 @@
 #   LCC-win32 (c) Jacob Navia
 #*******************************
 
+{.deadCodeElim: on.}
+
 import
   windows
 
diff --git a/lib/windows/nb30.nim b/lib/windows/nb30.nim
index 615488ac1..527e3a9e2 100755..100644
--- a/lib/windows/nb30.nim
+++ b/lib/windows/nb30.nim
@@ -10,6 +10,8 @@
 
 # This module contains the definitions for portable NetBIOS 3.0 support. 
 
+{.deadCodeElim: on.}
+
 import                        # Data structure templates 
   Windows
 
diff --git a/lib/windows/ole2.nim b/lib/windows/ole2.nim
index ec0ab8f5d..ec0ab8f5d 100755..100644
--- a/lib/windows/ole2.nim
+++ b/lib/windows/ole2.nim
diff --git a/lib/windows/shellapi.nim b/lib/windows/shellapi.nim
index a4a976c60..c6d2d69a1 100755..100644
--- a/lib/windows/shellapi.nim
+++ b/lib/windows/shellapi.nim
@@ -7,6 +7,8 @@
 #    distribution, for details about the copyright.
 #
 
+{.deadCodeElim: on.}
+
 # leave out unused functions so the unit can be used on win2000 as well
 
 #+-------------------------------------------------------------------------
diff --git a/lib/windows/shfolder.nim b/lib/windows/shfolder.nim
index 210f6441f..253b1c77a 100755..100644
--- a/lib/windows/shfolder.nim
+++ b/lib/windows/shfolder.nim
@@ -21,6 +21,8 @@
 #  systems.
 #  ---------------------------------------------------------------------
 
+{.deadCodeElim: on.}
+
 import 
   windows
 
diff --git a/lib/windows/windows.nim b/lib/windows/windows.nim
index 20f9a9d7d..20f9a9d7d 100755..100644
--- a/lib/windows/windows.nim
+++ b/lib/windows/windows.nim
diff --git a/lib/windows/winlean.nim b/lib/windows/winlean.nim
index 9a74a242a..9a74a242a 100755..100644
--- a/lib/windows/winlean.nim
+++ b/lib/windows/winlean.nim
diff --git a/lib/wrappers/cairo/cairo.nim b/lib/wrappers/cairo/cairo.nim
index 6da8183f3..6da8183f3 100755..100644
--- a/lib/wrappers/cairo/cairo.nim
+++ b/lib/wrappers/cairo/cairo.nim
diff --git a/lib/wrappers/cairo/cairoft.nim b/lib/wrappers/cairo/cairoft.nim
index 2418aa922..2418aa922 100755..100644
--- a/lib/wrappers/cairo/cairoft.nim
+++ b/lib/wrappers/cairo/cairoft.nim
diff --git a/lib/wrappers/cairo/cairowin32.nim b/lib/wrappers/cairo/cairowin32.nim
index 5d07c2611..5d07c2611 100755..100644
--- a/lib/wrappers/cairo/cairowin32.nim
+++ b/lib/wrappers/cairo/cairowin32.nim
diff --git a/lib/wrappers/cairo/cairoxlib.nim b/lib/wrappers/cairo/cairoxlib.nim
index dfe44eb87..dfe44eb87 100755..100644
--- a/lib/wrappers/cairo/cairoxlib.nim
+++ b/lib/wrappers/cairo/cairoxlib.nim
diff --git a/lib/wrappers/gtk/atk.nim b/lib/wrappers/gtk/atk.nim
index ae7a34c4b..ae7a34c4b 100755..100644
--- a/lib/wrappers/gtk/atk.nim
+++ b/lib/wrappers/gtk/atk.nim
diff --git a/lib/wrappers/gtk/gdk2.nim b/lib/wrappers/gtk/gdk2.nim
index 0ca5056b5..0ca5056b5 100755..100644
--- a/lib/wrappers/gtk/gdk2.nim
+++ b/lib/wrappers/gtk/gdk2.nim
diff --git a/lib/wrappers/gtk/gdk2pixbuf.nim b/lib/wrappers/gtk/gdk2pixbuf.nim
index daaa1479b..daaa1479b 100755..100644
--- a/lib/wrappers/gtk/gdk2pixbuf.nim
+++ b/lib/wrappers/gtk/gdk2pixbuf.nim
diff --git a/lib/wrappers/gtk/gdkglext.nim b/lib/wrappers/gtk/gdkglext.nim
index 524b5f730..524b5f730 100755..100644
--- a/lib/wrappers/gtk/gdkglext.nim
+++ b/lib/wrappers/gtk/gdkglext.nim
diff --git a/lib/wrappers/gtk/glib2.nim b/lib/wrappers/gtk/glib2.nim
index 3f33501e8..3f33501e8 100755..100644
--- a/lib/wrappers/gtk/glib2.nim
+++ b/lib/wrappers/gtk/glib2.nim
diff --git a/lib/wrappers/gtk/gtk2.nim b/lib/wrappers/gtk/gtk2.nim
index e7c5be7be..e7c5be7be 100755..100644
--- a/lib/wrappers/gtk/gtk2.nim
+++ b/lib/wrappers/gtk/gtk2.nim
diff --git a/lib/wrappers/gtk/gtkglext.nim b/lib/wrappers/gtk/gtkglext.nim
index 38da5d25e..38da5d25e 100755..100644
--- a/lib/wrappers/gtk/gtkglext.nim
+++ b/lib/wrappers/gtk/gtkglext.nim
diff --git a/lib/wrappers/gtk/gtkhtml.nim b/lib/wrappers/gtk/gtkhtml.nim
index c9ccc3595..c9ccc3595 100755..100644
--- a/lib/wrappers/gtk/gtkhtml.nim
+++ b/lib/wrappers/gtk/gtkhtml.nim
diff --git a/lib/wrappers/gtk/libglade2.nim b/lib/wrappers/gtk/libglade2.nim
index 5e323680e..5e323680e 100755..100644
--- a/lib/wrappers/gtk/libglade2.nim
+++ b/lib/wrappers/gtk/libglade2.nim
diff --git a/lib/wrappers/gtk/pango.nim b/lib/wrappers/gtk/pango.nim
index ade2da989..ade2da989 100755..100644
--- a/lib/wrappers/gtk/pango.nim
+++ b/lib/wrappers/gtk/pango.nim
diff --git a/lib/wrappers/gtk/pangoutils.nim b/lib/wrappers/gtk/pangoutils.nim
index e6f3ab94c..e6f3ab94c 100755..100644
--- a/lib/wrappers/gtk/pangoutils.nim
+++ b/lib/wrappers/gtk/pangoutils.nim
diff --git a/lib/wrappers/iup.nim b/lib/wrappers/iup.nim
index c37d31047..c37d31047 100755..100644
--- a/lib/wrappers/iup.nim
+++ b/lib/wrappers/iup.nim
diff --git a/lib/wrappers/libcurl.nim b/lib/wrappers/libcurl.nim
index 9cb352fb7..9cb352fb7 100755..100644
--- a/lib/wrappers/libcurl.nim
+++ b/lib/wrappers/libcurl.nim
diff --git a/lib/wrappers/lua/lauxlib.nim b/lib/wrappers/lua/lauxlib.nim
index 477dd5874..477dd5874 100755..100644
--- a/lib/wrappers/lua/lauxlib.nim
+++ b/lib/wrappers/lua/lauxlib.nim
diff --git a/lib/wrappers/lua/lua.nim b/lib/wrappers/lua/lua.nim
index 54f8d46bb..54f8d46bb 100755..100644
--- a/lib/wrappers/lua/lua.nim
+++ b/lib/wrappers/lua/lua.nim
diff --git a/lib/wrappers/lua/lualib.nim b/lib/wrappers/lua/lualib.nim
index df5d53101..df5d53101 100755..100644
--- a/lib/wrappers/lua/lualib.nim
+++ b/lib/wrappers/lua/lualib.nim
diff --git a/lib/wrappers/mysql.nim b/lib/wrappers/mysql.nim
index e94afb1a2..e94afb1a2 100755..100644
--- a/lib/wrappers/mysql.nim
+++ b/lib/wrappers/mysql.nim
diff --git a/lib/wrappers/odbcsql.nim b/lib/wrappers/odbcsql.nim
index 77719e85f..77719e85f 100755..100644
--- a/lib/wrappers/odbcsql.nim
+++ b/lib/wrappers/odbcsql.nim
diff --git a/lib/wrappers/opengl/gl.nim b/lib/wrappers/opengl/gl.nim
index 79f09b544..79f09b544 100755..100644
--- a/lib/wrappers/opengl/gl.nim
+++ b/lib/wrappers/opengl/gl.nim
diff --git a/lib/wrappers/opengl/glext.nim b/lib/wrappers/opengl/glext.nim
index 0a2138584..0a2138584 100755..100644
--- a/lib/wrappers/opengl/glext.nim
+++ b/lib/wrappers/opengl/glext.nim
diff --git a/lib/wrappers/opengl/glu.nim b/lib/wrappers/opengl/glu.nim
index 297f4d354..297f4d354 100755..100644
--- a/lib/wrappers/opengl/glu.nim
+++ b/lib/wrappers/opengl/glu.nim
diff --git a/lib/wrappers/opengl/glut.nim b/lib/wrappers/opengl/glut.nim
index 55ee18bda..55ee18bda 100755..100644
--- a/lib/wrappers/opengl/glut.nim
+++ b/lib/wrappers/opengl/glut.nim
diff --git a/lib/wrappers/opengl/glx.nim b/lib/wrappers/opengl/glx.nim
index a967acfc6..a967acfc6 100755..100644
--- a/lib/wrappers/opengl/glx.nim
+++ b/lib/wrappers/opengl/glx.nim
diff --git a/lib/wrappers/opengl/wingl.nim b/lib/wrappers/opengl/wingl.nim
index 2cebf8622..2cebf8622 100755..100644
--- a/lib/wrappers/opengl/wingl.nim
+++ b/lib/wrappers/opengl/wingl.nim
diff --git a/lib/wrappers/pcre/pcre.nim b/lib/wrappers/pcre/pcre.nim
index 05f937579..05f937579 100755..100644
--- a/lib/wrappers/pcre/pcre.nim
+++ b/lib/wrappers/pcre/pcre.nim
diff --git a/lib/wrappers/pcre/pcre_all.c b/lib/wrappers/pcre/pcre_all.c
index bcda06e50..bcda06e50 100755..100644
--- a/lib/wrappers/pcre/pcre_all.c
+++ b/lib/wrappers/pcre/pcre_all.c
diff --git a/lib/wrappers/postgres.nim b/lib/wrappers/postgres.nim
index 4b43333d7..4b43333d7 100755..100644
--- a/lib/wrappers/postgres.nim
+++ b/lib/wrappers/postgres.nim
diff --git a/lib/wrappers/python.nim b/lib/wrappers/python.nim
index ea9ef1fd5..ea9ef1fd5 100755..100644
--- a/lib/wrappers/python.nim
+++ b/lib/wrappers/python.nim
diff --git a/lib/wrappers/sdl/sdl.nim b/lib/wrappers/sdl/sdl.nim
index 7d2b6ba26..7d2b6ba26 100755..100644
--- a/lib/wrappers/sdl/sdl.nim
+++ b/lib/wrappers/sdl/sdl.nim
diff --git a/lib/wrappers/sdl/sdl_gfx.nim b/lib/wrappers/sdl/sdl_gfx.nim
index 8ae8eca0b..8ae8eca0b 100755..100644
--- a/lib/wrappers/sdl/sdl_gfx.nim
+++ b/lib/wrappers/sdl/sdl_gfx.nim
diff --git a/lib/wrappers/sdl/sdl_image.nim b/lib/wrappers/sdl/sdl_image.nim
index a15afd575..a15afd575 100755..100644
--- a/lib/wrappers/sdl/sdl_image.nim
+++ b/lib/wrappers/sdl/sdl_image.nim
diff --git a/lib/wrappers/sdl/sdl_mixer.nim b/lib/wrappers/sdl/sdl_mixer.nim
index a17ef09d4..a17ef09d4 100755..100644
--- a/lib/wrappers/sdl/sdl_mixer.nim
+++ b/lib/wrappers/sdl/sdl_mixer.nim
diff --git a/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim b/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim
index 879867607..879867607 100755..100644
--- a/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim
+++ b/lib/wrappers/sdl/sdl_mixer_nosmpeg.nim
diff --git a/lib/wrappers/sdl/sdl_net.nim b/lib/wrappers/sdl/sdl_net.nim
index f27a674ae..f27a674ae 100755..100644
--- a/lib/wrappers/sdl/sdl_net.nim
+++ b/lib/wrappers/sdl/sdl_net.nim
diff --git a/lib/wrappers/sdl/sdl_ttf.nim b/lib/wrappers/sdl/sdl_ttf.nim
index 724c2f634..724c2f634 100755..100644
--- a/lib/wrappers/sdl/sdl_ttf.nim
+++ b/lib/wrappers/sdl/sdl_ttf.nim
diff --git a/lib/wrappers/sdl/sdlutils.pas b/lib/wrappers/sdl/sdlutils.pas
index e4206e935..e4206e935 100755..100644
--- a/lib/wrappers/sdl/sdlutils.pas
+++ b/lib/wrappers/sdl/sdlutils.pas
diff --git a/lib/wrappers/sdl/smpeg.nim b/lib/wrappers/sdl/smpeg.nim
index 733a3fcf9..733a3fcf9 100755..100644
--- a/lib/wrappers/sdl/smpeg.nim
+++ b/lib/wrappers/sdl/smpeg.nim
diff --git a/lib/wrappers/sqlite3.nim b/lib/wrappers/sqlite3.nim
index 9a97330ec..9a97330ec 100755..100644
--- a/lib/wrappers/sqlite3.nim
+++ b/lib/wrappers/sqlite3.nim
diff --git a/lib/wrappers/tcl.nim b/lib/wrappers/tcl.nim
index 813714ecd..813714ecd 100755..100644
--- a/lib/wrappers/tcl.nim
+++ b/lib/wrappers/tcl.nim
diff --git a/lib/wrappers/tre/config.h b/lib/wrappers/tre/config.h
index 1a3a0bc3a..1a3a0bc3a 100755..100644
--- a/lib/wrappers/tre/config.h
+++ b/lib/wrappers/tre/config.h
diff --git a/lib/wrappers/tre/tre_all.c b/lib/wrappers/tre/tre_all.c
index 8272657a3..8272657a3 100755..100644
--- a/lib/wrappers/tre/tre_all.c
+++ b/lib/wrappers/tre/tre_all.c
diff --git a/lib/wrappers/tre/version.txt b/lib/wrappers/tre/version.txt
index 4d01880a7..4d01880a7 100755..100644
--- a/lib/wrappers/tre/version.txt
+++ b/lib/wrappers/tre/version.txt
diff --git a/lib/wrappers/x11/cursorfont.nim b/lib/wrappers/x11/cursorfont.nim
index b262ad7c1..b262ad7c1 100755..100644
--- a/lib/wrappers/x11/cursorfont.nim
+++ b/lib/wrappers/x11/cursorfont.nim
diff --git a/lib/wrappers/x11/keysym.nim b/lib/wrappers/x11/keysym.nim
index b1fe13b80..b1fe13b80 100755..100644
--- a/lib/wrappers/x11/keysym.nim
+++ b/lib/wrappers/x11/keysym.nim
diff --git a/lib/wrappers/x11/x.nim b/lib/wrappers/x11/x.nim
index aa6e7f821..aa6e7f821 100755..100644
--- a/lib/wrappers/x11/x.nim
+++ b/lib/wrappers/x11/x.nim
diff --git a/lib/wrappers/x11/xatom.nim b/lib/wrappers/x11/xatom.nim
index b2e1dca91..b2e1dca91 100755..100644
--- a/lib/wrappers/x11/xatom.nim
+++ b/lib/wrappers/x11/xatom.nim
diff --git a/lib/wrappers/x11/xcms.nim b/lib/wrappers/x11/xcms.nim
index 57aad6ae0..57aad6ae0 100755..100644
--- a/lib/wrappers/x11/xcms.nim
+++ b/lib/wrappers/x11/xcms.nim
diff --git a/lib/wrappers/x11/xf86dga.nim b/lib/wrappers/x11/xf86dga.nim
index 376f11861..376f11861 100755..100644
--- a/lib/wrappers/x11/xf86dga.nim
+++ b/lib/wrappers/x11/xf86dga.nim
diff --git a/lib/wrappers/x11/xf86vmode.nim b/lib/wrappers/x11/xf86vmode.nim
index 18a922cab..18a922cab 100755..100644
--- a/lib/wrappers/x11/xf86vmode.nim
+++ b/lib/wrappers/x11/xf86vmode.nim
diff --git a/lib/wrappers/x11/xi.nim b/lib/wrappers/x11/xi.nim
index d1b9f7846..d1b9f7846 100755..100644
--- a/lib/wrappers/x11/xi.nim
+++ b/lib/wrappers/x11/xi.nim
diff --git a/lib/wrappers/x11/xinerama.nim b/lib/wrappers/x11/xinerama.nim
index 96f5d7da3..96f5d7da3 100755..100644
--- a/lib/wrappers/x11/xinerama.nim
+++ b/lib/wrappers/x11/xinerama.nim
diff --git a/lib/wrappers/x11/xkb.nim b/lib/wrappers/x11/xkb.nim
index f1b0448a8..f1b0448a8 100755..100644
--- a/lib/wrappers/x11/xkb.nim
+++ b/lib/wrappers/x11/xkb.nim
diff --git a/lib/wrappers/x11/xkblib.nim b/lib/wrappers/x11/xkblib.nim
index 92d438a60..92d438a60 100755..100644
--- a/lib/wrappers/x11/xkblib.nim
+++ b/lib/wrappers/x11/xkblib.nim
diff --git a/lib/wrappers/x11/xlib.nim b/lib/wrappers/x11/xlib.nim
index 19ebda9e0..19ebda9e0 100755..100644
--- a/lib/wrappers/x11/xlib.nim
+++ b/lib/wrappers/x11/xlib.nim
diff --git a/lib/wrappers/x11/xrandr.nim b/lib/wrappers/x11/xrandr.nim
index ee6f1705b..ee6f1705b 100755..100644
--- a/lib/wrappers/x11/xrandr.nim
+++ b/lib/wrappers/x11/xrandr.nim
diff --git a/lib/wrappers/x11/xrender.nim b/lib/wrappers/x11/xrender.nim
index 7b85fc9a7..7b85fc9a7 100755..100644
--- a/lib/wrappers/x11/xrender.nim
+++ b/lib/wrappers/x11/xrender.nim
diff --git a/lib/wrappers/x11/xresource.nim b/lib/wrappers/x11/xresource.nim
index ddb2a89c2..ddb2a89c2 100755..100644
--- a/lib/wrappers/x11/xresource.nim
+++ b/lib/wrappers/x11/xresource.nim
diff --git a/lib/wrappers/x11/xshm.nim b/lib/wrappers/x11/xshm.nim
index e56bd87b1..e56bd87b1 100755..100644
--- a/lib/wrappers/x11/xshm.nim
+++ b/lib/wrappers/x11/xshm.nim
diff --git a/lib/wrappers/x11/xutil.nim b/lib/wrappers/x11/xutil.nim
index 563702123..563702123 100755..100644
--- a/lib/wrappers/x11/xutil.nim
+++ b/lib/wrappers/x11/xutil.nim
diff --git a/lib/wrappers/x11/xv.nim b/lib/wrappers/x11/xv.nim
index 45ab61418..45ab61418 100755..100644
--- a/lib/wrappers/x11/xv.nim
+++ b/lib/wrappers/x11/xv.nim
diff --git a/lib/wrappers/x11/xvlib.nim b/lib/wrappers/x11/xvlib.nim
index 19fd0d000..19fd0d000 100755..100644
--- a/lib/wrappers/x11/xvlib.nim
+++ b/lib/wrappers/x11/xvlib.nim
diff --git a/lib/wrappers/zip/libzip.nim b/lib/wrappers/zip/libzip.nim
index 2f8abc46c..2f8abc46c 100755..100644
--- a/lib/wrappers/zip/libzip.nim
+++ b/lib/wrappers/zip/libzip.nim
diff --git a/lib/wrappers/zip/libzip_all.c b/lib/wrappers/zip/libzip_all.c
index 797374b29..797374b29 100755..100644
--- a/lib/wrappers/zip/libzip_all.c
+++ b/lib/wrappers/zip/libzip_all.c
diff --git a/lib/wrappers/zip/zlib.nim b/lib/wrappers/zip/zlib.nim
index 9b49b9663..9b49b9663 100755..100644
--- a/lib/wrappers/zip/zlib.nim
+++ b/lib/wrappers/zip/zlib.nim
diff --git a/lib/wrappers/zip/zzip.nim b/lib/wrappers/zip/zzip.nim
index a656322ee..a656322ee 100755..100644
--- a/lib/wrappers/zip/zzip.nim
+++ b/lib/wrappers/zip/zzip.nim
diff --git a/llvm/llvm.h b/llvm/llvm.h
index a873b44eb..a873b44eb 100755..100644
--- a/llvm/llvm.h
+++ b/llvm/llvm.h
diff --git a/llvm/llvm.nim b/llvm/llvm.nim
index d010457f8..d010457f8 100755..100644
--- a/llvm/llvm.nim
+++ b/llvm/llvm.nim
diff --git a/llvm/llvm.pas b/llvm/llvm.pas
index ad1398b83..ad1398b83 100755..100644
--- a/llvm/llvm.pas
+++ b/llvm/llvm.pas
diff --git a/llvm/llvm_orig.nim b/llvm/llvm_orig.nim
index 8e09f9c68..8e09f9c68 100755..100644
--- a/llvm/llvm_orig.nim
+++ b/llvm/llvm_orig.nim
diff --git a/nim/ast.pas b/nim/ast.pas
index 277d7d061..0079d755c 100755..100644
--- a/nim/ast.pas
+++ b/nim/ast.pas
@@ -475,7 +475,8 @@ type
   end;
 
 const
-  OverloadableSyms = {@set}[skProc, skMethod, skIterator, skConverter];
+  OverloadableSyms = {@set}[skProc, skMethod, skIterator, skConverter,
+                            skModule];
 
 const // "MagicToStr" array:
   MagicToStr: array [TMagic] of string = (
diff --git a/nim/astalgo.pas b/nim/astalgo.pas
index 7c1f3ec0b..7c1f3ec0b 100755..100644
--- a/nim/astalgo.pas
+++ b/nim/astalgo.pas
diff --git a/nim/bitsets.pas b/nim/bitsets.pas
index 78c6d1f36..78c6d1f36 100755..100644
--- a/nim/bitsets.pas
+++ b/nim/bitsets.pas
diff --git a/nim/ccgexprs.pas b/nim/ccgexprs.pas
index a5789487a..a5789487a 100755..100644
--- a/nim/ccgexprs.pas
+++ b/nim/ccgexprs.pas
diff --git a/nim/ccgstmts.pas b/nim/ccgstmts.pas
index d31f0e5bd..d31f0e5bd 100755..100644
--- a/nim/ccgstmts.pas
+++ b/nim/ccgstmts.pas
diff --git a/nim/ccgtypes.pas b/nim/ccgtypes.pas
index 1c07fe5c7..1c07fe5c7 100755..100644
--- a/nim/ccgtypes.pas
+++ b/nim/ccgtypes.pas
diff --git a/nim/ccgutils.pas b/nim/ccgutils.pas
index da6b8774f..da6b8774f 100755..100644
--- a/nim/ccgutils.pas
+++ b/nim/ccgutils.pas
diff --git a/nim/cgen.pas b/nim/cgen.pas
index 83c34241a..83c34241a 100755..100644
--- a/nim/cgen.pas
+++ b/nim/cgen.pas
diff --git a/nim/cgmeth.pas b/nim/cgmeth.pas
index 6b9335c4c..6b9335c4c 100755..100644
--- a/nim/cgmeth.pas
+++ b/nim/cgmeth.pas
diff --git a/nim/charsets.pas b/nim/charsets.pas
index a5f14450f..a5f14450f 100755..100644
--- a/nim/charsets.pas
+++ b/nim/charsets.pas
diff --git a/nim/commands.pas b/nim/commands.pas
index 19f79fb4a..19f79fb4a 100755..100644
--- a/nim/commands.pas
+++ b/nim/commands.pas
diff --git a/nim/condsyms.pas b/nim/condsyms.pas
index d22bc0e18..d22bc0e18 100755..100644
--- a/nim/condsyms.pas
+++ b/nim/condsyms.pas
diff --git a/nim/config.inc b/nim/config.inc
index f73444a71..f73444a71 100755..100644
--- a/nim/config.inc
+++ b/nim/config.inc
diff --git a/nim/crc.pas b/nim/crc.pas
index e14716605..e14716605 100755..100644
--- a/nim/crc.pas
+++ b/nim/crc.pas
diff --git a/nim/depends.pas b/nim/depends.pas
index 6711875fe..6711875fe 100755..100644
--- a/nim/depends.pas
+++ b/nim/depends.pas
diff --git a/nim/docgen.pas b/nim/docgen.pas
index 468dd1bc9..468dd1bc9 100755..100644
--- a/nim/docgen.pas
+++ b/nim/docgen.pas
diff --git a/nim/ecmasgen.pas b/nim/ecmasgen.pas
index 59cb3c330..59cb3c330 100755..100644
--- a/nim/ecmasgen.pas
+++ b/nim/ecmasgen.pas
diff --git a/nim/evals.pas b/nim/evals.pas
index b7edc43ed..b7edc43ed 100755..100644
--- a/nim/evals.pas
+++ b/nim/evals.pas
diff --git a/nim/extccomp.pas b/nim/extccomp.pas
index 7df3e8748..7df3e8748 100755..100644
--- a/nim/extccomp.pas
+++ b/nim/extccomp.pas
diff --git a/nim/filters.pas b/nim/filters.pas
index 95f628fe2..95f628fe2 100755..100644
--- a/nim/filters.pas
+++ b/nim/filters.pas
diff --git a/nim/hashtest.pas b/nim/hashtest.pas
index 7e93ca5bf..7e93ca5bf 100755..100644
--- a/nim/hashtest.pas
+++ b/nim/hashtest.pas
diff --git a/nim/highlite.pas b/nim/highlite.pas
index fa760d2a2..fa760d2a2 100755..100644
--- a/nim/highlite.pas
+++ b/nim/highlite.pas
diff --git a/nim/idents.pas b/nim/idents.pas
index c1c1755e9..c1c1755e9 100755..100644
--- a/nim/idents.pas
+++ b/nim/idents.pas
diff --git a/nim/importer.pas b/nim/importer.pas
index a1ed57978..a1ed57978 100755..100644
--- a/nim/importer.pas
+++ b/nim/importer.pas
diff --git a/nim/interact.pas b/nim/interact.pas
index aab3c7fc2..aab3c7fc2 100755..100644
--- a/nim/interact.pas
+++ b/nim/interact.pas
diff --git a/nim/lexbase.pas b/nim/lexbase.pas
index 2b056c04f..2b056c04f 100755..100644
--- a/nim/lexbase.pas
+++ b/nim/lexbase.pas
diff --git a/nim/lists.pas b/nim/lists.pas
index e3442eb29..e3442eb29 100755..100644
--- a/nim/lists.pas
+++ b/nim/lists.pas
diff --git a/nim/llstream.pas b/nim/llstream.pas
index 30d9c0287..30d9c0287 100755..100644
--- a/nim/llstream.pas
+++ b/nim/llstream.pas
diff --git a/nim/llvmdata.pas b/nim/llvmdata.pas
index a8ae0f311..a8ae0f311 100755..100644
--- a/nim/llvmdata.pas
+++ b/nim/llvmdata.pas
diff --git a/nim/llvmdyn.pas b/nim/llvmdyn.pas
index e039939e5..e039939e5 100755..100644
--- a/nim/llvmdyn.pas
+++ b/nim/llvmdyn.pas
diff --git a/nim/llvmstat.pas b/nim/llvmstat.pas
index e7d06a284..e7d06a284 100755..100644
--- a/nim/llvmstat.pas
+++ b/nim/llvmstat.pas
diff --git a/nim/lookups.pas b/nim/lookups.pas
index e4c07224f..e4c07224f 100755..100644
--- a/nim/lookups.pas
+++ b/nim/lookups.pas
diff --git a/nim/magicsys.pas b/nim/magicsys.pas
index f4e4beafe..f4e4beafe 100755..100644
--- a/nim/magicsys.pas
+++ b/nim/magicsys.pas
diff --git a/nim/main.pas b/nim/main.pas
index 4b35513c5..4b35513c5 100755..100644
--- a/nim/main.pas
+++ b/nim/main.pas
diff --git a/nim/msgs.pas b/nim/msgs.pas
index 55ccdda5e..55ccdda5e 100755..100644
--- a/nim/msgs.pas
+++ b/nim/msgs.pas
diff --git a/nim/nhashes.pas b/nim/nhashes.pas
index 95bfd62f5..95bfd62f5 100755..100644
--- a/nim/nhashes.pas
+++ b/nim/nhashes.pas
diff --git a/nim/nimconf.pas b/nim/nimconf.pas
index 69c6f7618..69c6f7618 100755..100644
--- a/nim/nimconf.pas
+++ b/nim/nimconf.pas
diff --git a/nim/nimrod.pas b/nim/nimrod.pas
index 8d7db04b2..8d7db04b2 100755..100644
--- a/nim/nimrod.pas
+++ b/nim/nimrod.pas
diff --git a/nim/nimsets.pas b/nim/nimsets.pas
index 9795817b8..9795817b8 100755..100644
--- a/nim/nimsets.pas
+++ b/nim/nimsets.pas
diff --git a/nim/nmath.pas b/nim/nmath.pas
index 8b638eb42..8b638eb42 100755..100644
--- a/nim/nmath.pas
+++ b/nim/nmath.pas
diff --git a/nim/nos.pas b/nim/nos.pas
index 7c74ba1bc..7c74ba1bc 100755..100644
--- a/nim/nos.pas
+++ b/nim/nos.pas
diff --git a/nim/nstrtabs.pas b/nim/nstrtabs.pas
index bcb10f2ed..bcb10f2ed 100755..100644
--- a/nim/nstrtabs.pas
+++ b/nim/nstrtabs.pas
diff --git a/nim/nsystem.pas b/nim/nsystem.pas
index 4cdfade93..4cdfade93 100755..100644
--- a/nim/nsystem.pas
+++ b/nim/nsystem.pas
diff --git a/nim/ntime.pas b/nim/ntime.pas
index 9135c26c3..9135c26c3 100755..100644
--- a/nim/ntime.pas
+++ b/nim/ntime.pas
diff --git a/nim/nversion.pas b/nim/nversion.pas
index c9bdd24fb..c9bdd24fb 100755..100644
--- a/nim/nversion.pas
+++ b/nim/nversion.pas
diff --git a/nim/options.pas b/nim/options.pas
index 3a7d4a669..3a7d4a669 100755..100644
--- a/nim/options.pas
+++ b/nim/options.pas
diff --git a/nim/osproc.pas b/nim/osproc.pas
index 485daaf67..485daaf67 100755..100644
--- a/nim/osproc.pas
+++ b/nim/osproc.pas
diff --git a/nim/parsecfg.pas b/nim/parsecfg.pas
index ba6a98679..ba6a98679 100755..100644
--- a/nim/parsecfg.pas
+++ b/nim/parsecfg.pas
diff --git a/nim/parseopt.pas b/nim/parseopt.pas
index 0ca87bd37..0ca87bd37 100755..100644
--- a/nim/parseopt.pas
+++ b/nim/parseopt.pas
diff --git a/nim/paslex.pas b/nim/paslex.pas
index f3d8daaeb..f3d8daaeb 100755..100644
--- a/nim/paslex.pas
+++ b/nim/paslex.pas
diff --git a/nim/pasparse.pas b/nim/pasparse.pas
index dbfbf0437..dbfbf0437 100755..100644
--- a/nim/pasparse.pas
+++ b/nim/pasparse.pas
diff --git a/nim/passaux.pas b/nim/passaux.pas
index 7898d8278..7898d8278 100755..100644
--- a/nim/passaux.pas
+++ b/nim/passaux.pas
diff --git a/nim/passes.pas b/nim/passes.pas
index c280a75b1..c280a75b1 100755..100644
--- a/nim/passes.pas
+++ b/nim/passes.pas
diff --git a/nim/pbraces.pas b/nim/pbraces.pas
index d1cb84096..d1cb84096 100755..100644
--- a/nim/pbraces.pas
+++ b/nim/pbraces.pas
diff --git a/nim/pendx.pas b/nim/pendx.pas
index e23229e28..e23229e28 100755..100644
--- a/nim/pendx.pas
+++ b/nim/pendx.pas
diff --git a/nim/platform.pas b/nim/platform.pas
index c2fa711b9..c2fa711b9 100755..100644
--- a/nim/platform.pas
+++ b/nim/platform.pas
diff --git a/nim/pnimsyn.pas b/nim/pnimsyn.pas
index 260d1e5a5..260d1e5a5 100755..100644
--- a/nim/pnimsyn.pas
+++ b/nim/pnimsyn.pas
diff --git a/nim/pragmas.pas b/nim/pragmas.pas
index 7a0fd2468..7a0fd2468 100755..100644
--- a/nim/pragmas.pas
+++ b/nim/pragmas.pas
diff --git a/nim/procfind.pas b/nim/procfind.pas
index e93820ab3..e93820ab3 100755..100644
--- a/nim/procfind.pas
+++ b/nim/procfind.pas
diff --git a/nim/ptmplsyn.pas b/nim/ptmplsyn.pas
index 717da6ee0..717da6ee0 100755..100644
--- a/nim/ptmplsyn.pas
+++ b/nim/ptmplsyn.pas
diff --git a/nim/readme.txt b/nim/readme.txt
index 258192543..258192543 100755..100644
--- a/nim/readme.txt
+++ b/nim/readme.txt
diff --git a/nim/rnimsyn.pas b/nim/rnimsyn.pas
index ec1e9571e..ec1e9571e 100755..100644
--- a/nim/rnimsyn.pas
+++ b/nim/rnimsyn.pas
diff --git a/nim/rodread.pas b/nim/rodread.pas
index 457ad6cc2..457ad6cc2 100755..100644
--- a/nim/rodread.pas
+++ b/nim/rodread.pas
diff --git a/nim/rodwrite.pas b/nim/rodwrite.pas
index c71eda7e3..c71eda7e3 100755..100644
--- a/nim/rodwrite.pas
+++ b/nim/rodwrite.pas
diff --git a/nim/ropes.pas b/nim/ropes.pas
index 286f1b9e6..286f1b9e6 100755..100644
--- a/nim/ropes.pas
+++ b/nim/ropes.pas
diff --git a/nim/rst.pas b/nim/rst.pas
index 89ef2c501..89ef2c501 100755..100644
--- a/nim/rst.pas
+++ b/nim/rst.pas
diff --git a/nim/scanner.pas b/nim/scanner.pas
index c03ae9224..c03ae9224 100755..100644
--- a/nim/scanner.pas
+++ b/nim/scanner.pas
diff --git a/nim/sem.pas b/nim/sem.pas
index a5d28d734..a5d28d734 100755..100644
--- a/nim/sem.pas
+++ b/nim/sem.pas
diff --git a/nim/semdata.pas b/nim/semdata.pas
index 37934f3d6..37934f3d6 100755..100644
--- a/nim/semdata.pas
+++ b/nim/semdata.pas
diff --git a/nim/semexprs.pas b/nim/semexprs.pas
index 2d1d0a957..2d1d0a957 100755..100644
--- a/nim/semexprs.pas
+++ b/nim/semexprs.pas
diff --git a/nim/semfold.pas b/nim/semfold.pas
index 791f39149..791f39149 100755..100644
--- a/nim/semfold.pas
+++ b/nim/semfold.pas
diff --git a/nim/semgnrc.pas b/nim/semgnrc.pas
index ee905d444..ee905d444 100755..100644
--- a/nim/semgnrc.pas
+++ b/nim/semgnrc.pas
diff --git a/nim/seminst.pas b/nim/seminst.pas
index ea8889007..ea8889007 100755..100644
--- a/nim/seminst.pas
+++ b/nim/seminst.pas
diff --git a/nim/semstmts.pas b/nim/semstmts.pas
index 1ece72023..1ece72023 100755..100644
--- a/nim/semstmts.pas
+++ b/nim/semstmts.pas
diff --git a/nim/semtempl.pas b/nim/semtempl.pas
index fc7e12a73..fc7e12a73 100755..100644
--- a/nim/semtempl.pas
+++ b/nim/semtempl.pas
diff --git a/nim/semtypes.pas b/nim/semtypes.pas
index e2a0d2185..e2a0d2185 100755..100644
--- a/nim/semtypes.pas
+++ b/nim/semtypes.pas
diff --git a/nim/sigmatch.pas b/nim/sigmatch.pas
index 45a29fc29..45a29fc29 100755..100644
--- a/nim/sigmatch.pas
+++ b/nim/sigmatch.pas
diff --git a/nim/strutils.pas b/nim/strutils.pas
index 96c07d365..96c07d365 100755..100644
--- a/nim/strutils.pas
+++ b/nim/strutils.pas
diff --git a/nim/syntaxes.pas b/nim/syntaxes.pas
index 158ab8ea2..158ab8ea2 100755..100644
--- a/nim/syntaxes.pas
+++ b/nim/syntaxes.pas
diff --git a/nim/tigen.pas b/nim/tigen.pas
index 687b70920..687b70920 100755..100644
--- a/nim/tigen.pas
+++ b/nim/tigen.pas
diff --git a/nim/transf.pas b/nim/transf.pas
index a0f07d51d..a0f07d51d 100755..100644
--- a/nim/transf.pas
+++ b/nim/transf.pas
diff --git a/nim/transtmp.pas b/nim/transtmp.pas
index 15a07f5a2..15a07f5a2 100755..100644
--- a/nim/transtmp.pas
+++ b/nim/transtmp.pas
diff --git a/nim/trees.pas b/nim/trees.pas
index 0e0c04a22..0e0c04a22 100755..100644
--- a/nim/trees.pas
+++ b/nim/trees.pas
diff --git a/nim/treetab.pas b/nim/treetab.pas
index 31d7aa0cf..31d7aa0cf 100755..100644
--- a/nim/treetab.pas
+++ b/nim/treetab.pas
diff --git a/nim/types.pas b/nim/types.pas
index a881b2f11..a881b2f11 100755..100644
--- a/nim/types.pas
+++ b/nim/types.pas
diff --git a/nim/wordrecg.pas b/nim/wordrecg.pas
index c18969877..c18969877 100755..100644
--- a/nim/wordrecg.pas
+++ b/nim/wordrecg.pas
diff --git a/nimlib/copying.txt b/nimlib/copying.txt
index be182d65c..be182d65c 100755..100644
--- a/nimlib/copying.txt
+++ b/nimlib/copying.txt
diff --git a/nimlib/lgpl.txt b/nimlib/lgpl.txt
index f6fa6c9e5..f6fa6c9e5 100755..100644
--- a/nimlib/lgpl.txt
+++ b/nimlib/lgpl.txt
diff --git a/nimlib/nimbase.h b/nimlib/nimbase.h
index a0f08f4f3..a0f08f4f3 100755..100644
--- a/nimlib/nimbase.h
+++ b/nimlib/nimbase.h
diff --git a/nimlib/posix/posix.nim b/nimlib/posix/posix.nim
index ddeaec664..ddeaec664 100755..100644
--- a/nimlib/posix/posix.nim
+++ b/nimlib/posix/posix.nim
diff --git a/nimlib/pure/cgi.nim b/nimlib/pure/cgi.nim
index baae244e7..baae244e7 100755..100644
--- a/nimlib/pure/cgi.nim
+++ b/nimlib/pure/cgi.nim
diff --git a/nimlib/pure/complex.nim b/nimlib/pure/complex.nim
index f50ff4bd0..f50ff4bd0 100755..100644
--- a/nimlib/pure/complex.nim
+++ b/nimlib/pure/complex.nim
diff --git a/nimlib/pure/dynlib.nim b/nimlib/pure/dynlib.nim
index 592073e3d..592073e3d 100755..100644
--- a/nimlib/pure/dynlib.nim
+++ b/nimlib/pure/dynlib.nim
diff --git a/nimlib/pure/hashes.nim b/nimlib/pure/hashes.nim
index 1593119bd..1593119bd 100755..100644
--- a/nimlib/pure/hashes.nim
+++ b/nimlib/pure/hashes.nim
diff --git a/nimlib/pure/hashtabs.nim b/nimlib/pure/hashtabs.nim
index 68d19d63b..68d19d63b 100755..100644
--- a/nimlib/pure/hashtabs.nim
+++ b/nimlib/pure/hashtabs.nim
diff --git a/nimlib/pure/lexbase.nim b/nimlib/pure/lexbase.nim
index bb207e92a..bb207e92a 100755..100644
--- a/nimlib/pure/lexbase.nim
+++ b/nimlib/pure/lexbase.nim
diff --git a/nimlib/pure/logging.nim b/nimlib/pure/logging.nim
index 6df39f50b..6df39f50b 100755..100644
--- a/nimlib/pure/logging.nim
+++ b/nimlib/pure/logging.nim
diff --git a/nimlib/pure/macros.nim b/nimlib/pure/macros.nim
index 677469ed2..677469ed2 100755..100644
--- a/nimlib/pure/macros.nim
+++ b/nimlib/pure/macros.nim
diff --git a/nimlib/pure/math.nim b/nimlib/pure/math.nim
index bca45894c..bca45894c 100755..100644
--- a/nimlib/pure/math.nim
+++ b/nimlib/pure/math.nim
diff --git a/nimlib/pure/md5.nim b/nimlib/pure/md5.nim
index d9bb92949..d9bb92949 100755..100644
--- a/nimlib/pure/md5.nim
+++ b/nimlib/pure/md5.nim
diff --git a/nimlib/pure/os.nim b/nimlib/pure/os.nim
index afa145e9f..afa145e9f 100755..100644
--- a/nimlib/pure/os.nim
+++ b/nimlib/pure/os.nim
diff --git a/nimlib/pure/osproc.nim b/nimlib/pure/osproc.nim
index d76825531..d76825531 100755..100644
--- a/nimlib/pure/osproc.nim
+++ b/nimlib/pure/osproc.nim
diff --git a/nimlib/pure/parsecfg.nim b/nimlib/pure/parsecfg.nim
index c26dab099..c26dab099 100755..100644
--- a/nimlib/pure/parsecfg.nim
+++ b/nimlib/pure/parsecfg.nim
diff --git a/nimlib/pure/parsecsv.nim b/nimlib/pure/parsecsv.nim
index 5970f2090..5970f2090 100755..100644
--- a/nimlib/pure/parsecsv.nim
+++ b/nimlib/pure/parsecsv.nim
diff --git a/nimlib/pure/parseopt.nim b/nimlib/pure/parseopt.nim
index 8f4be98f4..8f4be98f4 100755..100644
--- a/nimlib/pure/parseopt.nim
+++ b/nimlib/pure/parseopt.nim
diff --git a/nimlib/pure/parsesql.nim b/nimlib/pure/parsesql.nim
index 2109c273a..2109c273a 100755..100644
--- a/nimlib/pure/parsesql.nim
+++ b/nimlib/pure/parsesql.nim
diff --git a/nimlib/pure/parsexml.nim b/nimlib/pure/parsexml.nim
index 54f62a9a4..54f62a9a4 100755..100644
--- a/nimlib/pure/parsexml.nim
+++ b/nimlib/pure/parsexml.nim
diff --git a/nimlib/pure/pegs.nim b/nimlib/pure/pegs.nim
index 488e42c7d..488e42c7d 100755..100644
--- a/nimlib/pure/pegs.nim
+++ b/nimlib/pure/pegs.nim
diff --git a/nimlib/pure/re.nim b/nimlib/pure/re.nim
index 1328f5f1f..1328f5f1f 100755..100644
--- a/nimlib/pure/re.nim
+++ b/nimlib/pure/re.nim
diff --git a/nimlib/pure/regexprs.nim b/nimlib/pure/regexprs.nim
index cff3152cf..cff3152cf 100755..100644
--- a/nimlib/pure/regexprs.nim
+++ b/nimlib/pure/regexprs.nim
diff --git a/nimlib/pure/streams.nim b/nimlib/pure/streams.nim
index f4d2911fc..f4d2911fc 100755..100644
--- a/nimlib/pure/streams.nim
+++ b/nimlib/pure/streams.nim
diff --git a/nimlib/pure/strtabs.nim b/nimlib/pure/strtabs.nim
index 10cd0b933..10cd0b933 100755..100644
--- a/nimlib/pure/strtabs.nim
+++ b/nimlib/pure/strtabs.nim
diff --git a/nimlib/pure/strutils.nim b/nimlib/pure/strutils.nim
index d7fd69f61..d7fd69f61 100755..100644
--- a/nimlib/pure/strutils.nim
+++ b/nimlib/pure/strutils.nim
diff --git a/nimlib/pure/terminal.nim b/nimlib/pure/terminal.nim
index 42bd80cb4..42bd80cb4 100755..100644
--- a/nimlib/pure/terminal.nim
+++ b/nimlib/pure/terminal.nim
diff --git a/nimlib/pure/times.nim b/nimlib/pure/times.nim
index 8c21b6027..8c21b6027 100755..100644
--- a/nimlib/pure/times.nim
+++ b/nimlib/pure/times.nim
diff --git a/nimlib/pure/unicode.nim b/nimlib/pure/unicode.nim
index 2a53d7660..2a53d7660 100755..100644
--- a/nimlib/pure/unicode.nim
+++ b/nimlib/pure/unicode.nim
diff --git a/nimlib/pure/variants.nim b/nimlib/pure/variants.nim
index f661f81a6..f661f81a6 100755..100644
--- a/nimlib/pure/variants.nim
+++ b/nimlib/pure/variants.nim
diff --git a/nimlib/pure/xmlgen.nim b/nimlib/pure/xmlgen.nim
index 79a782252..79a782252 100755..100644
--- a/nimlib/pure/xmlgen.nim
+++ b/nimlib/pure/xmlgen.nim
diff --git a/nimlib/readme.txt b/nimlib/readme.txt
index 2b2c4a03c..2b2c4a03c 100755..100644
--- a/nimlib/readme.txt
+++ b/nimlib/readme.txt
diff --git a/nimlib/system.nim b/nimlib/system.nim
index 174d739cd..174d739cd 100755..100644
--- a/nimlib/system.nim
+++ b/nimlib/system.nim
diff --git a/nimlib/system/alloc.nim b/nimlib/system/alloc.nim
index 95feff854..95feff854 100755..100644
--- a/nimlib/system/alloc.nim
+++ b/nimlib/system/alloc.nim
diff --git a/nimlib/system/ansi_c.nim b/nimlib/system/ansi_c.nim
index e9300949b..e9300949b 100755..100644
--- a/nimlib/system/ansi_c.nim
+++ b/nimlib/system/ansi_c.nim
diff --git a/nimlib/system/arithm.nim b/nimlib/system/arithm.nim
index f097ee794..f097ee794 100755..100644
--- a/nimlib/system/arithm.nim
+++ b/nimlib/system/arithm.nim
diff --git a/nimlib/system/assign.nim b/nimlib/system/assign.nim
index 44d2e5c64..44d2e5c64 100755..100644
--- a/nimlib/system/assign.nim
+++ b/nimlib/system/assign.nim
diff --git a/nimlib/system/cellsets.nim b/nimlib/system/cellsets.nim
index 0ce83864c..0ce83864c 100755..100644
--- a/nimlib/system/cellsets.nim
+++ b/nimlib/system/cellsets.nim
diff --git a/nimlib/system/cntbits.nim b/nimlib/system/cntbits.nim
index 281b96dd0..281b96dd0 100755..100644
--- a/nimlib/system/cntbits.nim
+++ b/nimlib/system/cntbits.nim
diff --git a/nimlib/system/debugger.nim b/nimlib/system/debugger.nim
index 01d8bd8a2..01d8bd8a2 100755..100644
--- a/nimlib/system/debugger.nim
+++ b/nimlib/system/debugger.nim
diff --git a/nimlib/system/dyncalls.nim b/nimlib/system/dyncalls.nim
index 0946ee355..0946ee355 100755..100644
--- a/nimlib/system/dyncalls.nim
+++ b/nimlib/system/dyncalls.nim
diff --git a/nimlib/system/ecmasys.nim b/nimlib/system/ecmasys.nim
index c0d0a5fd6..c0d0a5fd6 100755..100644
--- a/nimlib/system/ecmasys.nim
+++ b/nimlib/system/ecmasys.nim
diff --git a/nimlib/system/excpt.nim b/nimlib/system/excpt.nim
index 293491fe9..293491fe9 100755..100644
--- a/nimlib/system/excpt.nim
+++ b/nimlib/system/excpt.nim
diff --git a/nimlib/system/gc.nim b/nimlib/system/gc.nim
index da8f75768..da8f75768 100755..100644
--- a/nimlib/system/gc.nim
+++ b/nimlib/system/gc.nim
diff --git a/nimlib/system/hti.nim b/nimlib/system/hti.nim
index 3343000ae..3343000ae 100755..100644
--- a/nimlib/system/hti.nim
+++ b/nimlib/system/hti.nim
diff --git a/nimlib/system/mm.nim b/nimlib/system/mm.nim
index 76b5d83bd..76b5d83bd 100755..100644
--- a/nimlib/system/mm.nim
+++ b/nimlib/system/mm.nim
diff --git a/nimlib/system/profiler.nim b/nimlib/system/profiler.nim
index b87b30d4a..b87b30d4a 100755..100644
--- a/nimlib/system/profiler.nim
+++ b/nimlib/system/profiler.nim
diff --git a/nimlib/system/repr.nim b/nimlib/system/repr.nim
index e340f1d7c..e340f1d7c 100755..100644
--- a/nimlib/system/repr.nim
+++ b/nimlib/system/repr.nim
diff --git a/nimlib/system/sets.nim b/nimlib/system/sets.nim
index f9f3eb32b..f9f3eb32b 100755..100644
--- a/nimlib/system/sets.nim
+++ b/nimlib/system/sets.nim
diff --git a/nimlib/system/sysio.nim b/nimlib/system/sysio.nim
index 8b6d0e285..8b6d0e285 100755..100644
--- a/nimlib/system/sysio.nim
+++ b/nimlib/system/sysio.nim
diff --git a/nimlib/system/sysstr.nim b/nimlib/system/sysstr.nim
index 808941c06..808941c06 100755..100644
--- a/nimlib/system/sysstr.nim
+++ b/nimlib/system/sysstr.nim
diff --git a/nimlib/windows/winlean.nim b/nimlib/windows/winlean.nim
index 40e6e7b11..40e6e7b11 100755..100644
--- a/nimlib/windows/winlean.nim
+++ b/nimlib/windows/winlean.nim
diff --git a/noprefix.nim b/noprefix.nim
index e7ec26c56..e7ec26c56 100755..100644
--- a/noprefix.nim
+++ b/noprefix.nim
diff --git a/obj/empty.txt b/obj/empty.txt
index 20f9a91e3..20f9a91e3 100755..100644
--- a/obj/empty.txt
+++ b/obj/empty.txt
diff --git a/readme.txt b/readme.txt
index 56821bece..56821bece 100755..100644
--- a/readme.txt
+++ b/readme.txt
diff --git a/rod/ast.nim b/rod/ast.nim
index 0be562980..fde238eaa 100755..100644
--- a/rod/ast.nim
+++ b/rod/ast.nim
@@ -502,9 +502,12 @@ type
     counter*: int
     data*: TObjectSeq
 
+# BUGFIX: a module is overloadable so that a proc can have the
+# same name as an imported module. This is necessary because of
+# the poor naming choices in the standard library.
 
 const 
-  OverloadableSyms* = {skProc, skMethod, skIterator, skConverter}
+  OverloadableSyms* = {skProc, skMethod, skIterator, skConverter, skModule}
 
   GenericTypes*: TTypeKinds = {tyGenericInvokation, tyGenericBody, 
     tyGenericParam}
diff --git a/rod/astalgo.nim b/rod/astalgo.nim
index 1b4572b2b..1b4572b2b 100755..100644
--- a/rod/astalgo.nim
+++ b/rod/astalgo.nim
diff --git a/rod/bitsets.nim b/rod/bitsets.nim
index 937e8237c..937e8237c 100755..100644
--- a/rod/bitsets.nim
+++ b/rod/bitsets.nim
diff --git a/rod/ccgexprs.nim b/rod/ccgexprs.nim
index ecff707ae..ecff707ae 100755..100644
--- a/rod/ccgexprs.nim
+++ b/rod/ccgexprs.nim
diff --git a/rod/ccgstmts.nim b/rod/ccgstmts.nim
index 3cf2123c9..3cf2123c9 100755..100644
--- a/rod/ccgstmts.nim
+++ b/rod/ccgstmts.nim
diff --git a/rod/ccgtypes.nim b/rod/ccgtypes.nim
index 5034bf67b..5034bf67b 100755..100644
--- a/rod/ccgtypes.nim
+++ b/rod/ccgtypes.nim
diff --git a/rod/ccgutils.nim b/rod/ccgutils.nim
index c7733c5ff..c7733c5ff 100755..100644
--- a/rod/ccgutils.nim
+++ b/rod/ccgutils.nim
diff --git a/rod/cgen.nim b/rod/cgen.nim
index 989778a02..989778a02 100755..100644
--- a/rod/cgen.nim
+++ b/rod/cgen.nim
diff --git a/rod/cgmeth.nim b/rod/cgmeth.nim
index 05118f78a..05118f78a 100755..100644
--- a/rod/cgmeth.nim
+++ b/rod/cgmeth.nim
diff --git a/rod/charsets.nim b/rod/charsets.nim
index c952a73bd..c952a73bd 100755..100644
--- a/rod/charsets.nim
+++ b/rod/charsets.nim
diff --git a/rod/commands.nim b/rod/commands.nim
index 17c946292..17c946292 100755..100644
--- a/rod/commands.nim
+++ b/rod/commands.nim
diff --git a/rod/condsyms.nim b/rod/condsyms.nim
index 0325a2b77..0325a2b77 100755..100644
--- a/rod/condsyms.nim
+++ b/rod/condsyms.nim
diff --git a/rod/crc.nim b/rod/crc.nim
index e66ce30fb..e66ce30fb 100755..100644
--- a/rod/crc.nim
+++ b/rod/crc.nim
diff --git a/rod/depends.nim b/rod/depends.nim
index 4c464f5ec..4c464f5ec 100755..100644
--- a/rod/depends.nim
+++ b/rod/depends.nim
diff --git a/rod/docgen.nim b/rod/docgen.nim
index 10516bf73..10516bf73 100755..100644
--- a/rod/docgen.nim
+++ b/rod/docgen.nim
diff --git a/rod/ecmasgen.nim b/rod/ecmasgen.nim
index 91acb98b2..91acb98b2 100755..100644
--- a/rod/ecmasgen.nim
+++ b/rod/ecmasgen.nim
diff --git a/rod/evals.nim b/rod/evals.nim
index bfc46aa5c..bfc46aa5c 100755..100644
--- a/rod/evals.nim
+++ b/rod/evals.nim
diff --git a/rod/expandimportc.nim b/rod/expandimportc.nim
index d4b2fee18..d4b2fee18 100755..100644
--- a/rod/expandimportc.nim
+++ b/rod/expandimportc.nim
diff --git a/rod/extccomp.nim b/rod/extccomp.nim
index 990466e1b..990466e1b 100755..100644
--- a/rod/extccomp.nim
+++ b/rod/extccomp.nim
diff --git a/rod/filters.nim b/rod/filters.nim
index 20db697bf..20db697bf 100755..100644
--- a/rod/filters.nim
+++ b/rod/filters.nim
diff --git a/rod/hashtest.nim b/rod/hashtest.nim
index c1b3ea0f4..c1b3ea0f4 100755..100644
--- a/rod/hashtest.nim
+++ b/rod/hashtest.nim
diff --git a/rod/highlite.nim b/rod/highlite.nim
index c2fc95da8..c2fc95da8 100755..100644
--- a/rod/highlite.nim
+++ b/rod/highlite.nim
diff --git a/rod/idents.nim b/rod/idents.nim
index 03d155169..03d155169 100755..100644
--- a/rod/idents.nim
+++ b/rod/idents.nim
diff --git a/rod/importer.nim b/rod/importer.nim
index 608bad066..608bad066 100755..100644
--- a/rod/importer.nim
+++ b/rod/importer.nim
diff --git a/rod/interact.nim b/rod/interact.nim
index 36fee8413..36fee8413 100755..100644
--- a/rod/interact.nim
+++ b/rod/interact.nim
diff --git a/rod/lexbase.nim b/rod/lexbase.nim
index 4f946b35f..4f946b35f 100755..100644
--- a/rod/lexbase.nim
+++ b/rod/lexbase.nim
diff --git a/rod/lists.nim b/rod/lists.nim
index b4610ab2f..b4610ab2f 100755..100644
--- a/rod/lists.nim
+++ b/rod/lists.nim
diff --git a/rod/llstream.nim b/rod/llstream.nim
index 6fcd278a0..6fcd278a0 100755..100644
--- a/rod/llstream.nim
+++ b/rod/llstream.nim
diff --git a/rod/llvmgen.nim b/rod/llvmgen.nim
index f8acb624a..f8acb624a 100755..100644
--- a/rod/llvmgen.nim
+++ b/rod/llvmgen.nim
diff --git a/rod/llvmtype.nim b/rod/llvmtype.nim
index 7790855ac..7790855ac 100755..100644
--- a/rod/llvmtype.nim
+++ b/rod/llvmtype.nim
diff --git a/rod/lookups.nim b/rod/lookups.nim
index be4172c86..e545ad3e6 100755..100644
--- a/rod/lookups.nim
+++ b/rod/lookups.nim
@@ -71,10 +71,9 @@ proc addDeclAt(c: PContext, sym: PSym, at: Natural) =
     liMessage(sym.info, errAttemptToRedefine, sym.Name.s)
   
 proc addOverloadableSymAt(c: PContext, fn: PSym, at: Natural) = 
-  var check: PSym
   if not (fn.kind in OverloadableSyms): 
     InternalError(fn.info, "addOverloadableSymAt")
-  check = StrTableGet(c.tab.stack[at], fn.name)
+  var check = StrTableGet(c.tab.stack[at], fn.name)
   if (check != nil) and not (check.Kind in OverloadableSyms): 
     liMessage(fn.info, errAttemptToRedefine, fn.Name.s)
   SymTabAddAt(c.tab, fn, at)
diff --git a/rod/magicsys.nim b/rod/magicsys.nim
index 58de1d795..58de1d795 100755..100644
--- a/rod/magicsys.nim
+++ b/rod/magicsys.nim
diff --git a/rod/main.nim b/rod/main.nim
index 3221f531e..3221f531e 100755..100644
--- a/rod/main.nim
+++ b/rod/main.nim
diff --git a/rod/msgs.nim b/rod/msgs.nim
index ca3a5c1e5..ca3a5c1e5 100755..100644
--- a/rod/msgs.nim
+++ b/rod/msgs.nim
diff --git a/rod/nhashes.nim b/rod/nhashes.nim
index b9dd3670a..b9dd3670a 100755..100644
--- a/rod/nhashes.nim
+++ b/rod/nhashes.nim
diff --git a/rod/nimconf.nim b/rod/nimconf.nim
index 836be5097..836be5097 100755..100644
--- a/rod/nimconf.nim
+++ b/rod/nimconf.nim
diff --git a/rod/nimrod.cfg b/rod/nimrod.cfg
index 5168a3bb9..5168a3bb9 100755..100644
--- a/rod/nimrod.cfg
+++ b/rod/nimrod.cfg
diff --git a/rod/nimrod.dot b/rod/nimrod.dot
index 36429844f..36429844f 100755..100644
--- a/rod/nimrod.dot
+++ b/rod/nimrod.dot
diff --git a/rod/nimrod.ini b/rod/nimrod.ini
index 7c0e8c565..7c0e8c565 100755..100644
--- a/rod/nimrod.ini
+++ b/rod/nimrod.ini
diff --git a/rod/nimrod.nim b/rod/nimrod.nim
index 8f83aa5cd..8f83aa5cd 100755..100644
--- a/rod/nimrod.nim
+++ b/rod/nimrod.nim
diff --git a/rod/nimsets.nim b/rod/nimsets.nim
index 337aedda9..337aedda9 100755..100644
--- a/rod/nimsets.nim
+++ b/rod/nimsets.nim
diff --git a/rod/nstrtabs.nim b/rod/nstrtabs.nim
index 811e461cc..811e461cc 100755..100644
--- a/rod/nstrtabs.nim
+++ b/rod/nstrtabs.nim
diff --git a/rod/nversion.nim b/rod/nversion.nim
index 2aa7babf7..2aa7babf7 100755..100644
--- a/rod/nversion.nim
+++ b/rod/nversion.nim
diff --git a/rod/options.nim b/rod/options.nim
index 514c3db3b..514c3db3b 100755..100644
--- a/rod/options.nim
+++ b/rod/options.nim
diff --git a/rod/parsecfg.nim b/rod/parsecfg.nim
index 0b9574a41..0b9574a41 100755..100644
--- a/rod/parsecfg.nim
+++ b/rod/parsecfg.nim
diff --git a/rod/pas2nim/pas2nim.cfg b/rod/pas2nim/pas2nim.cfg
index 789e6ec7f..789e6ec7f 100755..100644
--- a/rod/pas2nim/pas2nim.cfg
+++ b/rod/pas2nim/pas2nim.cfg
diff --git a/rod/pas2nim/pas2nim.nim b/rod/pas2nim/pas2nim.nim
index 5c7b68857..5c7b68857 100755..100644
--- a/rod/pas2nim/pas2nim.nim
+++ b/rod/pas2nim/pas2nim.nim
diff --git a/rod/pas2nim/paslex.nim b/rod/pas2nim/paslex.nim
index 193a45001..193a45001 100755..100644
--- a/rod/pas2nim/paslex.nim
+++ b/rod/pas2nim/paslex.nim
diff --git a/rod/pas2nim/pasparse.nim b/rod/pas2nim/pasparse.nim
index 427cdc5ef..427cdc5ef 100755..100644
--- a/rod/pas2nim/pasparse.nim
+++ b/rod/pas2nim/pasparse.nim
diff --git a/rod/passaux.nim b/rod/passaux.nim
index 0fc5226d1..0fc5226d1 100755..100644
--- a/rod/passaux.nim
+++ b/rod/passaux.nim
diff --git a/rod/passes.nim b/rod/passes.nim
index 7ae642ed4..7ae642ed4 100755..100644
--- a/rod/passes.nim
+++ b/rod/passes.nim
diff --git a/rod/pbraces.nim b/rod/pbraces.nim
index 4a5f85b85..4a5f85b85 100755..100644
--- a/rod/pbraces.nim
+++ b/rod/pbraces.nim
diff --git a/rod/pendx.nim b/rod/pendx.nim
index debe0d852..debe0d852 100755..100644
--- a/rod/pendx.nim
+++ b/rod/pendx.nim
diff --git a/rod/platform.nim b/rod/platform.nim
index 4e2240a90..4e2240a90 100755..100644
--- a/rod/platform.nim
+++ b/rod/platform.nim
diff --git a/rod/pnimsyn.nim b/rod/pnimsyn.nim
index 766e01671..766e01671 100755..100644
--- a/rod/pnimsyn.nim
+++ b/rod/pnimsyn.nim
diff --git a/rod/pragmas.nim b/rod/pragmas.nim
index 02411ee52..02411ee52 100755..100644
--- a/rod/pragmas.nim
+++ b/rod/pragmas.nim
diff --git a/rod/procfind.nim b/rod/procfind.nim
index bd5b3841f..bd5b3841f 100755..100644
--- a/rod/procfind.nim
+++ b/rod/procfind.nim
diff --git a/rod/ptmplsyn.nim b/rod/ptmplsyn.nim
index ad3a73b70..ad3a73b70 100755..100644
--- a/rod/ptmplsyn.nim
+++ b/rod/ptmplsyn.nim
diff --git a/rod/readme.txt b/rod/readme.txt
index 40b4ea057..40b4ea057 100755..100644
--- a/rod/readme.txt
+++ b/rod/readme.txt
diff --git a/rod/rnimsyn.nim b/rod/rnimsyn.nim
index 60cfd38b1..60cfd38b1 100755..100644
--- a/rod/rnimsyn.nim
+++ b/rod/rnimsyn.nim
diff --git a/rod/rodread.nim b/rod/rodread.nim
index ee295d122..ee295d122 100755..100644
--- a/rod/rodread.nim
+++ b/rod/rodread.nim
diff --git a/rod/rodwrite.nim b/rod/rodwrite.nim
index 370ebc314..370ebc314 100755..100644
--- a/rod/rodwrite.nim
+++ b/rod/rodwrite.nim
diff --git a/rod/ropes.nim b/rod/ropes.nim
index 1fe5ed55e..1fe5ed55e 100755..100644
--- a/rod/ropes.nim
+++ b/rod/ropes.nim
diff --git a/rod/rst.nim b/rod/rst.nim
index 5c675f563..5c675f563 100755..100644
--- a/rod/rst.nim
+++ b/rod/rst.nim
diff --git a/rod/scanner.nim b/rod/scanner.nim
index 9367208da..9367208da 100755..100644
--- a/rod/scanner.nim
+++ b/rod/scanner.nim
diff --git a/rod/sem.nim b/rod/sem.nim
index 90dfd96ff..7ea6338a2 100755..100644
--- a/rod/sem.nim
+++ b/rod/sem.nim
@@ -1,7 +1,7 @@
 #
 #
 #           The Nimrod Compiler
-#        (c) Copyright 2009 Andreas Rumpf
+#        (c) Copyright 2010 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
diff --git a/rod/semdata.nim b/rod/semdata.nim
index 5020f103d..5020f103d 100755..100644
--- a/rod/semdata.nim
+++ b/rod/semdata.nim
diff --git a/rod/semexprs.nim b/rod/semexprs.nim
index 0a3c6e2ee..0a3c6e2ee 100755..100644
--- a/rod/semexprs.nim
+++ b/rod/semexprs.nim
diff --git a/rod/semfold.nim b/rod/semfold.nim
index a7515f3bb..a7515f3bb 100755..100644
--- a/rod/semfold.nim
+++ b/rod/semfold.nim
diff --git a/rod/semgnrc.nim b/rod/semgnrc.nim
index fbc9f18bd..fbc9f18bd 100755..100644
--- a/rod/semgnrc.nim
+++ b/rod/semgnrc.nim
diff --git a/rod/seminst.nim b/rod/seminst.nim
index ba1f05cb2..ba1f05cb2 100755..100644
--- a/rod/seminst.nim
+++ b/rod/seminst.nim
diff --git a/rod/semstmts.nim b/rod/semstmts.nim
index d2df06f3d..d2df06f3d 100755..100644
--- a/rod/semstmts.nim
+++ b/rod/semstmts.nim
diff --git a/rod/semtempl.nim b/rod/semtempl.nim
index f866f77d2..f866f77d2 100755..100644
--- a/rod/semtempl.nim
+++ b/rod/semtempl.nim
diff --git a/rod/semtypes.nim b/rod/semtypes.nim
index 71fa178cb..cf88b0b4b 100755..100644
--- a/rod/semtypes.nim
+++ b/rod/semtypes.nim
@@ -1,7 +1,7 @@
 #
 #
 #           The Nimrod Compiler
-#        (c) Copyright 2009 Andreas Rumpf
+#        (c) Copyright 2010 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
 #    distribution, for details about the copyright.
@@ -229,12 +229,10 @@ proc semGeneric(c: PContext, n: PNode, s: PSym, prev: PType): PType =
 
 proc semIdentVis(c: PContext, kind: TSymKind, n: PNode, allowed: TSymFlags): PSym = 
   # identifier with visibility
-  var v: PIdent
-  result = nil
   if n.kind == nkPostfix: 
     if (sonsLen(n) == 2) and (n.sons[0].kind == nkIdent): 
       result = newSymS(kind, n.sons[1], c)
-      v = n.sons[0].ident
+      var v = n.sons[0].ident
       if (sfStar in allowed) and (v.id == ord(wStar)): 
         incl(result.flags, sfStar)
       elif (sfMinus in allowed) and (v.id == ord(wMinus)): 
diff --git a/rod/sigmatch.nim b/rod/sigmatch.nim
index 1bb68ef1a..1bb68ef1a 100755..100644
--- a/rod/sigmatch.nim
+++ b/rod/sigmatch.nim
diff --git a/rod/syntaxes.nim b/rod/syntaxes.nim
index b8e4c1837..b8e4c1837 100755..100644
--- a/rod/syntaxes.nim
+++ b/rod/syntaxes.nim
diff --git a/rod/tigen.nim b/rod/tigen.nim
index ef13fe42b..ef13fe42b 100755..100644
--- a/rod/tigen.nim
+++ b/rod/tigen.nim
diff --git a/rod/transf.nim b/rod/transf.nim
index 6bb825e13..6bb825e13 100755..100644
--- a/rod/transf.nim
+++ b/rod/transf.nim
diff --git a/rod/transtmp.nim b/rod/transtmp.nim
index 44a462fea..44a462fea 100755..100644
--- a/rod/transtmp.nim
+++ b/rod/transtmp.nim
diff --git a/rod/trees.nim b/rod/trees.nim
index 69b77b8ab..69b77b8ab 100755..100644
--- a/rod/trees.nim
+++ b/rod/trees.nim
diff --git a/rod/treetab.nim b/rod/treetab.nim
index 797ef5029..797ef5029 100755..100644
--- a/rod/treetab.nim
+++ b/rod/treetab.nim
diff --git a/rod/types.nim b/rod/types.nim
index 64564233e..64564233e 100755..100644
--- a/rod/types.nim
+++ b/rod/types.nim
diff --git a/rod/webrepl.nim b/rod/webrepl.nim
index bf59bbfec..bf59bbfec 100755..100644
--- a/rod/webrepl.nim
+++ b/rod/webrepl.nim
diff --git a/rod/wordrecg.nim b/rod/wordrecg.nim
index 1d078dfcc..1d078dfcc 100755..100644
--- a/rod/wordrecg.nim
+++ b/rod/wordrecg.nim
diff --git a/start.bat b/start.bat
index 694a79520..694a79520 100755..100644
--- a/start.bat
+++ b/start.bat
diff --git a/tests/99bottles.nim b/tests/99bottles.nim
index 14904ac0f..14904ac0f 100755..100644
--- a/tests/99bottles.nim
+++ b/tests/99bottles.nim
diff --git a/tests/cairotest.nim b/tests/cairotest.nim
index 2c28e1abf..2c28e1abf 100755..100644
--- a/tests/cairotest.nim
+++ b/tests/cairotest.nim
diff --git a/tests/cgitest.nim b/tests/cgitest.nim
index ef115c80b..ef115c80b 100755..100644
--- a/tests/cgitest.nim
+++ b/tests/cgitest.nim
diff --git a/tests/csvtest.csv b/tests/csvtest.csv
index 6e7e14103..6e7e14103 100755..100644
--- a/tests/csvtest.csv
+++ b/tests/csvtest.csv
diff --git a/tests/curltest.nim b/tests/curltest.nim
index 7b040c20a..7b040c20a 100755..100644
--- a/tests/curltest.nim
+++ b/tests/curltest.nim
diff --git a/tests/data.csv b/tests/data.csv
index ea73f7387..ea73f7387 100755..100644
--- a/tests/data.csv
+++ b/tests/data.csv
diff --git a/tests/ecmas.html b/tests/ecmas.html
index 1cb56e72a..1cb56e72a 100755..100644
--- a/tests/ecmas.html
+++ b/tests/ecmas.html
diff --git a/tests/ecmas.nim b/tests/ecmas.nim
index 59e7ae1e8..59e7ae1e8 100755..100644
--- a/tests/ecmas.nim
+++ b/tests/ecmas.nim
diff --git a/tests/gcbench.nim b/tests/gcbench.nim
index 72daad210..72daad210 100755..100644
--- a/tests/gcbench.nim
+++ b/tests/gcbench.nim
diff --git a/tests/gctest.nim b/tests/gctest.nim
index f58dc3217..f58dc3217 100755..100644
--- a/tests/gctest.nim
+++ b/tests/gctest.nim
diff --git a/tests/gtk/ex1.nim b/tests/gtk/ex1.nim
index aa3ed2f66..aa3ed2f66 100755..100644
--- a/tests/gtk/ex1.nim
+++ b/tests/gtk/ex1.nim
diff --git a/tests/gtk/ex2.nim b/tests/gtk/ex2.nim
index 80ff6f104..80ff6f104 100755..100644
--- a/tests/gtk/ex2.nim
+++ b/tests/gtk/ex2.nim
diff --git a/tests/gtk/ex3.nim b/tests/gtk/ex3.nim
index 460b1e4dc..460b1e4dc 100755..100644
--- a/tests/gtk/ex3.nim
+++ b/tests/gtk/ex3.nim
diff --git a/tests/gtk/ex4.nim b/tests/gtk/ex4.nim
index a387da972..a387da972 100755..100644
--- a/tests/gtk/ex4.nim
+++ b/tests/gtk/ex4.nim
diff --git a/tests/gtk/ex5.nim b/tests/gtk/ex5.nim
index 3a5b076c6..3a5b076c6 100755..100644
--- a/tests/gtk/ex5.nim
+++ b/tests/gtk/ex5.nim
diff --git a/tests/gtk/ex6.nim b/tests/gtk/ex6.nim
index 5f18786fe..5f18786fe 100755..100644
--- a/tests/gtk/ex6.nim
+++ b/tests/gtk/ex6.nim
diff --git a/tests/gtk/ex7.nim b/tests/gtk/ex7.nim
index 53890d1e1..53890d1e1 100755..100644
--- a/tests/gtk/ex7.nim
+++ b/tests/gtk/ex7.nim
diff --git a/tests/gtk/ex8.nim b/tests/gtk/ex8.nim
index acbba2258..acbba2258 100755..100644
--- a/tests/gtk/ex8.nim
+++ b/tests/gtk/ex8.nim
diff --git a/tests/gtk/ex9.nim b/tests/gtk/ex9.nim
index ce2f73862..ce2f73862 100755..100644
--- a/tests/gtk/ex9.nim
+++ b/tests/gtk/ex9.nim
diff --git a/tests/hallo.nim b/tests/hallo.nim
index 070633793..070633793 100755..100644
--- a/tests/hallo.nim
+++ b/tests/hallo.nim
diff --git a/tests/jsontest.json b/tests/jsontest.json
index 27b5ba1d1..27b5ba1d1 100755..100644
--- a/tests/jsontest.json
+++ b/tests/jsontest.json
diff --git a/tests/mambsym1.nim b/tests/mambsym1.nim
index cf8ac5242..cf8ac5242 100755..100644
--- a/tests/mambsym1.nim
+++ b/tests/mambsym1.nim
diff --git a/tests/mambsym2.nim b/tests/mambsym2.nim
index eac8de6ba..eac8de6ba 100755..100644
--- a/tests/mambsym2.nim
+++ b/tests/mambsym2.nim
diff --git a/tests/mambsys1.nim b/tests/mambsys1.nim
index 5472b5ae4..5472b5ae4 100755..100644
--- a/tests/mambsys1.nim
+++ b/tests/mambsys1.nim
diff --git a/tests/mambsys2.nim b/tests/mambsys2.nim
index 395425b86..395425b86 100755..100644
--- a/tests/mambsys2.nim
+++ b/tests/mambsys2.nim
diff --git a/tests/mbind3.nim b/tests/mbind3.nim
index 586222eb8..586222eb8 100755..100644
--- a/tests/mbind3.nim
+++ b/tests/mbind3.nim
diff --git a/tests/mbind4.nim b/tests/mbind4.nim
index 53b8331cd..53b8331cd 100755..100644
--- a/tests/mbind4.nim
+++ b/tests/mbind4.nim
diff --git a/tests/minit.nim b/tests/minit.nim
index d3b4b0be1..d3b4b0be1 100755..100644
--- a/tests/minit.nim
+++ b/tests/minit.nim
diff --git a/tests/mnamspc1.nim b/tests/mnamspc1.nim
index da13c5f24..da13c5f24 100755..100644
--- a/tests/mnamspc1.nim
+++ b/tests/mnamspc1.nim
diff --git a/tests/mnamspc2.nim b/tests/mnamspc2.nim
index 84ef8533e..84ef8533e 100755..100644
--- a/tests/mnamspc2.nim
+++ b/tests/mnamspc2.nim
diff --git a/tests/mopaque.nim b/tests/mopaque.nim
index b7c5180fd..b7c5180fd 100755..100644
--- a/tests/mopaque.nim
+++ b/tests/mopaque.nim
diff --git a/tests/mrecmod.nim b/tests/mrecmod.nim
index fab9654d5..fab9654d5 100755..100644
--- a/tests/mrecmod.nim
+++ b/tests/mrecmod.nim
diff --git a/tests/mrecmod2.nim b/tests/mrecmod2.nim
index 9557ce729..9557ce729 100755..100644
--- a/tests/mrecmod2.nim
+++ b/tests/mrecmod2.nim
diff --git a/tests/mvarious.nim b/tests/mvarious.nim
index 333b34d33..333b34d33 100755..100644
--- a/tests/mvarious.nim
+++ b/tests/mvarious.nim
diff --git a/tests/readme.txt b/tests/readme.txt
index c21b04acd..c21b04acd 100755..100644
--- a/tests/readme.txt
+++ b/tests/readme.txt
diff --git a/tests/rectest.nim b/tests/rectest.nim
index f08306cfd..f08306cfd 100755..100644
--- a/tests/rectest.nim
+++ b/tests/rectest.nim
diff --git a/tests/scantest.nim b/tests/scantest.nim
index c9779c762..c9779c762 100755..100644
--- a/tests/scantest.nim
+++ b/tests/scantest.nim
diff --git a/tests/sdltest.nim b/tests/sdltest.nim
index ae7f1b41e..ae7f1b41e 100755..100644
--- a/tests/sdltest.nim
+++ b/tests/sdltest.nim
diff --git a/tests/stckovfl.nim b/tests/stckovfl.nim
index 799fe0001..799fe0001 100755..100644
--- a/tests/stckovfl.nim
+++ b/tests/stckovfl.nim
diff --git a/tests/sunset.tmpl b/tests/sunset.tmpl
index 6475bac4e..6475bac4e 100755..100644
--- a/tests/sunset.tmpl
+++ b/tests/sunset.tmpl
diff --git a/tests/t99bott.nim b/tests/t99bott.nim
index 4dfb11701..4dfb11701 100755..100644
--- a/tests/t99bott.nim
+++ b/tests/t99bott.nim
diff --git a/tests/tack.nim b/tests/tack.nim
index 59535e547..59535e547 100755..100644
--- a/tests/tack.nim
+++ b/tests/tack.nim
diff --git a/tests/tadrdisc.nim b/tests/tadrdisc.nim
index a7118455f..a7118455f 100755..100644
--- a/tests/tadrdisc.nim
+++ b/tests/tadrdisc.nim
diff --git a/tests/tambsym.nim b/tests/tambsym.nim
index b8eae3ba3..b8eae3ba3 100755..100644
--- a/tests/tambsym.nim
+++ b/tests/tambsym.nim
diff --git a/tests/tambsym2.nim b/tests/tambsym2.nim
index 9178182aa..9178182aa 100755..100644
--- a/tests/tambsym2.nim
+++ b/tests/tambsym2.nim
diff --git a/tests/tambsym3.nim b/tests/tambsym3.nim
index 96a5098c9..96a5098c9 100755..100644
--- a/tests/tambsym3.nim
+++ b/tests/tambsym3.nim
diff --git a/tests/tambsys.nim b/tests/tambsys.nim
index bb2622824..bb2622824 100755..100644
--- a/tests/tambsys.nim
+++ b/tests/tambsys.nim
diff --git a/tests/tarray.nim b/tests/tarray.nim
index 252cbd991..252cbd991 100755..100644
--- a/tests/tarray.nim
+++ b/tests/tarray.nim
diff --git a/tests/tarray2.nim b/tests/tarray2.nim
index eb0b75692..eb0b75692 100755..100644
--- a/tests/tarray2.nim
+++ b/tests/tarray2.nim
diff --git a/tests/tarrindx.nim b/tests/tarrindx.nim
index 13919cc2c..13919cc2c 100755..100644
--- a/tests/tarrindx.nim
+++ b/tests/tarrindx.nim
diff --git a/tests/tassert.nim b/tests/tassert.nim
index 9fd18e9bd..9fd18e9bd 100755..100644
--- a/tests/tassert.nim
+++ b/tests/tassert.nim
diff --git a/tests/tassign.nim b/tests/tassign.nim
index f51c20783..f51c20783 100755..100644
--- a/tests/tassign.nim
+++ b/tests/tassign.nim
diff --git a/tests/tbind1.nim b/tests/tbind1.nim
index e7eed3e4f..e7eed3e4f 100755..100644
--- a/tests/tbind1.nim
+++ b/tests/tbind1.nim
diff --git a/tests/tbind2.nim b/tests/tbind2.nim
index 41711083f..41711083f 100755..100644
--- a/tests/tbind2.nim
+++ b/tests/tbind2.nim
diff --git a/tests/tbind3.nim b/tests/tbind3.nim
index f7fb4865b..f7fb4865b 100755..100644
--- a/tests/tbind3.nim
+++ b/tests/tbind3.nim
diff --git a/tests/tbind4.nim b/tests/tbind4.nim
index d0b5fc062..d0b5fc062 100755..100644
--- a/tests/tbind4.nim
+++ b/tests/tbind4.nim
diff --git a/tests/tbintre2.nim b/tests/tbintre2.nim
index dedc87705..dedc87705 100755..100644
--- a/tests/tbintre2.nim
+++ b/tests/tbintre2.nim
diff --git a/tests/tbintree.nim b/tests/tbintree.nim
index 89126eaa5..89126eaa5 100755..100644
--- a/tests/tbintree.nim
+++ b/tests/tbintree.nim
diff --git a/tests/tblock1.nim b/tests/tblock1.nim
index 0bea7ae7f..0bea7ae7f 100755..100644
--- a/tests/tblock1.nim
+++ b/tests/tblock1.nim
diff --git a/tests/tcasestm.nim b/tests/tcasestm.nim
index 277b0bab1..277b0bab1 100755..100644
--- a/tests/tcasestm.nim
+++ b/tests/tcasestm.nim
diff --git a/tests/tclosure.nim b/tests/tclosure.nim
index 761e9a8f3..761e9a8f3 100755..100644
--- a/tests/tclosure.nim
+++ b/tests/tclosure.nim
diff --git a/tests/tcmdline.nim b/tests/tcmdline.nim
index f43aecafa..f43aecafa 100755..100644
--- a/tests/tcmdline.nim
+++ b/tests/tcmdline.nim
diff --git a/tests/tcnstseq.nim b/tests/tcnstseq.nim
index 4f389bb3b..4f389bb3b 100755..100644
--- a/tests/tcnstseq.nim
+++ b/tests/tcnstseq.nim
diff --git a/tests/tcolors.nim b/tests/tcolors.nim
index 9d1034405..9d1034405 100755..100644
--- a/tests/tcolors.nim
+++ b/tests/tcolors.nim
diff --git a/tests/tconsteval.nim b/tests/tconsteval.nim
index ce90d7c27..ce90d7c27 100755..100644
--- a/tests/tconsteval.nim
+++ b/tests/tconsteval.nim
diff --git a/tests/tconstr1.nim b/tests/tconstr1.nim
index 488170350..488170350 100755..100644
--- a/tests/tconstr1.nim
+++ b/tests/tconstr1.nim
diff --git a/tests/tconstr2.nim b/tests/tconstr2.nim
index 7687a416c..7687a416c 100755..100644
--- a/tests/tconstr2.nim
+++ b/tests/tconstr2.nim
diff --git a/tests/tconvert.nim b/tests/tconvert.nim
index b23afde74..b23afde74 100755..100644
--- a/tests/tconvert.nim
+++ b/tests/tconvert.nim
diff --git a/tests/tcopy.nim b/tests/tcopy.nim
index 6cb2ec14c..6cb2ec14c 100755..100644
--- a/tests/tcopy.nim
+++ b/tests/tcopy.nim
diff --git a/tests/tcurrncy.nim b/tests/tcurrncy.nim
index fa08d620b..fa08d620b 100755..100644
--- a/tests/tcurrncy.nim
+++ b/tests/tcurrncy.nim
diff --git a/tests/tdeprecated.nim b/tests/tdeprecated.nim
index e287da3f9..e287da3f9 100755..100644
--- a/tests/tdeprecated.nim
+++ b/tests/tdeprecated.nim
diff --git a/tests/tdialogs.nim b/tests/tdialogs.nim
index 90f241cdf..90f241cdf 100755..100644
--- a/tests/tdialogs.nim
+++ b/tests/tdialogs.nim
diff --git a/tests/tdllvar.nim b/tests/tdllvar.nim
index ab767770c..ab767770c 100755..100644
--- a/tests/tdllvar.nim
+++ b/tests/tdllvar.nim
diff --git a/tests/tdumpast.nim b/tests/tdumpast.nim
index fb31af0ec..fb31af0ec 100755..100644
--- a/tests/tdumpast.nim
+++ b/tests/tdumpast.nim
diff --git a/tests/techo.nim b/tests/techo.nim
index beb21fa16..beb21fa16 100755..100644
--- a/tests/techo.nim
+++ b/tests/techo.nim
diff --git a/tests/tendian.nim b/tests/tendian.nim
index 256e2653c..256e2653c 100755..100644
--- a/tests/tendian.nim
+++ b/tests/tendian.nim
diff --git a/tests/tenum.nim b/tests/tenum.nim
index 6e53b9c08..6e53b9c08 100755..100644
--- a/tests/tenum.nim
+++ b/tests/tenum.nim
diff --git a/tests/tester.nim b/tests/tester.nim
index 25a6dd428..25a6dd428 100755..100644
--- a/tests/tester.nim
+++ b/tests/tester.nim
diff --git a/tests/tfinally.nim b/tests/tfinally.nim
index df6397125..df6397125 100755..100644
--- a/tests/tfinally.nim
+++ b/tests/tfinally.nim
diff --git a/tests/tfloat1.nim b/tests/tfloat1.nim
index 89911dd61..89911dd61 100755..100644
--- a/tests/tfloat1.nim
+++ b/tests/tfloat1.nim
diff --git a/tests/tfloat2.nim b/tests/tfloat2.nim
index 92421d446..92421d446 100755..100644
--- a/tests/tfloat2.nim
+++ b/tests/tfloat2.nim
diff --git a/tests/tformat.nim b/tests/tformat.nim
index aba35504b..aba35504b 100755..100644
--- a/tests/tformat.nim
+++ b/tests/tformat.nim
diff --git a/tests/tforwty.nim b/tests/tforwty.nim
index 0f1d3697f..0f1d3697f 100755..100644
--- a/tests/tforwty.nim
+++ b/tests/tforwty.nim
diff --git a/tests/tforwty2.nim b/tests/tforwty2.nim
index 5d15e112a..5d15e112a 100755..100644
--- a/tests/tforwty2.nim
+++ b/tests/tforwty2.nim
diff --git a/tests/tgtk.nim b/tests/tgtk.nim
index cd9254e4f..cd9254e4f 100755..100644
--- a/tests/tgtk.nim
+++ b/tests/tgtk.nim
diff --git a/tests/thallo.nim b/tests/thallo.nim
index f1cae5897..f1cae5897 100755..100644
--- a/tests/thallo.nim
+++ b/tests/thallo.nim
diff --git a/tests/thintoff.nim b/tests/thintoff.nim
index 7aff283d6..7aff283d6 100755..100644
--- a/tests/thintoff.nim
+++ b/tests/thintoff.nim
diff --git a/tests/tident.nim b/tests/tident.nim
index 1ed9894c6..1ed9894c6 100755..100644
--- a/tests/tident.nim
+++ b/tests/tident.nim
diff --git a/tests/tillrec.nim b/tests/tillrec.nim
index 21ce19889..21ce19889 100755..100644
--- a/tests/tillrec.nim
+++ b/tests/tillrec.nim
diff --git a/tests/tindent1.nim b/tests/tindent1.nim
index 0527b6e57..0527b6e57 100755..100644
--- a/tests/tindent1.nim
+++ b/tests/tindent1.nim
diff --git a/tests/tinit.nim b/tests/tinit.nim
index 85475ce94..85475ce94 100755..100644
--- a/tests/tinit.nim
+++ b/tests/tinit.nim
diff --git a/tests/tinout.nim b/tests/tinout.nim
index b4fe2fb10..b4fe2fb10 100755..100644
--- a/tests/tinout.nim
+++ b/tests/tinout.nim
diff --git a/tests/tints.nim b/tests/tints.nim
index f2b52c134..f2b52c134 100755..100644
--- a/tests/tints.nim
+++ b/tests/tints.nim
diff --git a/tests/tinvalidnewseq.nim b/tests/tinvalidnewseq.nim
index e2a3736c3..e2a3736c3 100755..100644
--- a/tests/tinvalidnewseq.nim
+++ b/tests/tinvalidnewseq.nim
diff --git a/tests/tinvwhen.nim b/tests/tinvwhen.nim
index 8dc8cbf50..8dc8cbf50 100755..100644
--- a/tests/tinvwhen.nim
+++ b/tests/tinvwhen.nim
diff --git a/tests/tio.nim b/tests/tio.nim
index 014c32d9f..014c32d9f 100755..100644
--- a/tests/tio.nim
+++ b/tests/tio.nim
diff --git a/tests/tisopr.nim b/tests/tisopr.nim
index d52859b09..d52859b09 100755..100644
--- a/tests/tisopr.nim
+++ b/tests/tisopr.nim
diff --git a/tests/titer.nim b/tests/titer.nim
index 19a11dc4e..19a11dc4e 100755..100644
--- a/tests/titer.nim
+++ b/tests/titer.nim
diff --git a/tests/titer2.nim b/tests/titer2.nim
index b9cdb53fe..b9cdb53fe 100755..100644
--- a/tests/titer2.nim
+++ b/tests/titer2.nim
diff --git a/tests/titer3.nim b/tests/titer3.nim
index d0e121445..d0e121445 100755..100644
--- a/tests/titer3.nim
+++ b/tests/titer3.nim
diff --git a/tests/titer4.nim b/tests/titer4.nim
index 376522482..376522482 100755..100644
--- a/tests/titer4.nim
+++ b/tests/titer4.nim
diff --git a/tests/titer5.nim b/tests/titer5.nim
index 1ac37ba66..1ac37ba66 100755..100644
--- a/tests/titer5.nim
+++ b/tests/titer5.nim
diff --git a/tests/tlastmod.nim b/tests/tlastmod.nim
index 75b047fc8..75b047fc8 100755..100644
--- a/tests/tlastmod.nim
+++ b/tests/tlastmod.nim
diff --git a/tests/tlibs.nim b/tests/tlibs.nim
index e3b6bd4c3..e3b6bd4c3 100755..100644
--- a/tests/tlibs.nim
+++ b/tests/tlibs.nim
diff --git a/tests/tloops.nim b/tests/tloops.nim
index 3d03256ad..3d03256ad 100755..100644
--- a/tests/tloops.nim
+++ b/tests/tloops.nim
diff --git a/tests/tlowhigh.nim b/tests/tlowhigh.nim
index 79f5c5b95..79f5c5b95 100755..100644
--- a/tests/tlowhigh.nim
+++ b/tests/tlowhigh.nim
diff --git a/tests/tmath.nim b/tests/tmath.nim
index 6a1dae54d..6a1dae54d 100755..100644
--- a/tests/tmath.nim
+++ b/tests/tmath.nim
diff --git a/tests/tmatrix.nim b/tests/tmatrix.nim
index a162d0f10..a162d0f10 100755..100644
--- a/tests/tmatrix.nim
+++ b/tests/tmatrix.nim
diff --git a/tests/tmultim1.nim b/tests/tmultim1.nim
index 5d807e4c9..5d807e4c9 100755..100644
--- a/tests/tmultim1.nim
+++ b/tests/tmultim1.nim
diff --git a/tests/tmultim2.nim b/tests/tmultim2.nim
index bf3b5fd6e..bf3b5fd6e 100755..100644
--- a/tests/tmultim2.nim
+++ b/tests/tmultim2.nim
diff --git a/tests/tnamspc.nim b/tests/tnamspc.nim
index eddaacfd8..eddaacfd8 100755..100644
--- a/tests/tnamspc.nim
+++ b/tests/tnamspc.nim
diff --git a/tests/tnestif.nim b/tests/tnestif.nim
index 558fe8d07..558fe8d07 100755..100644
--- a/tests/tnestif.nim
+++ b/tests/tnestif.nim
diff --git a/tests/tnestprc.nim b/tests/tnestprc.nim
index b7326e032..b7326e032 100755..100644
--- a/tests/tnestprc.nim
+++ b/tests/tnestprc.nim
diff --git a/tests/tnew.nim b/tests/tnew.nim
index 6527541a2..6527541a2 100755..100644
--- a/tests/tnew.nim
+++ b/tests/tnew.nim
diff --git a/tests/tnewlibs.cfg b/tests/tnewlibs.cfg
index 852209a36..852209a36 100755..100644
--- a/tests/tnewlibs.cfg
+++ b/tests/tnewlibs.cfg
diff --git a/tests/tnewlibs.nim b/tests/tnewlibs.nim
index aca2e3c30..aca2e3c30 100755..100644
--- a/tests/tnewlibs.nim
+++ b/tests/tnewlibs.nim
diff --git a/tests/tnewsets.nim b/tests/tnewsets.nim
index 415fe8f7e..415fe8f7e 100755..100644
--- a/tests/tnewsets.nim
+++ b/tests/tnewsets.nim
diff --git a/tests/tnewuns.nim b/tests/tnewuns.nim
index 5181e467c..5181e467c 100755..100644
--- a/tests/tnewuns.nim
+++ b/tests/tnewuns.nim
diff --git a/tests/tnoop.nim b/tests/tnoop.nim
index d097553e8..d097553e8 100755..100644
--- a/tests/tnoop.nim
+++ b/tests/tnoop.nim
diff --git a/tests/tnot.nim b/tests/tnot.nim
index cda551654..cda551654 100755..100644
--- a/tests/tnot.nim
+++ b/tests/tnot.nim
diff --git a/tests/tobjcov.nim b/tests/tobjcov.nim
index da34fcb60..da34fcb60 100755..100644
--- a/tests/tobjcov.nim
+++ b/tests/tobjcov.nim
diff --git a/tests/tobject2.nim b/tests/tobject2.nim
index 8f69a6bac..8f69a6bac 100755..100644
--- a/tests/tobject2.nim
+++ b/tests/tobject2.nim
diff --git a/tests/tobjects.nim b/tests/tobjects.nim
index 8305e2838..8305e2838 100755..100644
--- a/tests/tobjects.nim
+++ b/tests/tobjects.nim
diff --git a/tests/toop1.nim b/tests/toop1.nim
index 8bae002e7..8bae002e7 100755..100644
--- a/tests/toop1.nim
+++ b/tests/toop1.nim
diff --git a/tests/topaque.nim b/tests/topaque.nim
index 7553a749e..7553a749e 100755..100644
--- a/tests/topaque.nim
+++ b/tests/topaque.nim
diff --git a/tests/topena1.nim b/tests/topena1.nim
index 7351edf55..7351edf55 100755..100644
--- a/tests/topena1.nim
+++ b/tests/topena1.nim
diff --git a/tests/topenarrayrepr.nim b/tests/topenarrayrepr.nim
index 7e976540f..7e976540f 100755..100644
--- a/tests/topenarrayrepr.nim
+++ b/tests/topenarrayrepr.nim
diff --git a/tests/topenlen.nim b/tests/topenlen.nim
index b9d7fbc2d..b9d7fbc2d 100755..100644
--- a/tests/topenlen.nim
+++ b/tests/topenlen.nim
diff --git a/tests/toptions.nim b/tests/toptions.nim
index 95bb5cfbc..95bb5cfbc 100755..100644
--- a/tests/toptions.nim
+++ b/tests/toptions.nim
diff --git a/tests/tos.nim b/tests/tos.nim
index 9ab4295f8..9ab4295f8 100755..100644
--- a/tests/tos.nim
+++ b/tests/tos.nim
diff --git a/tests/toverflw.nim b/tests/toverflw.nim
index c8f194e68..c8f194e68 100755..100644
--- a/tests/toverflw.nim
+++ b/tests/toverflw.nim
diff --git a/tests/toverl.nim b/tests/toverl.nim
index 94f251cac..94f251cac 100755..100644
--- a/tests/toverl.nim
+++ b/tests/toverl.nim
diff --git a/tests/toverl2.nim b/tests/toverl2.nim
index 2d1225c6f..2d1225c6f 100755..100644
--- a/tests/toverl2.nim
+++ b/tests/toverl2.nim
diff --git a/tests/toverlop.nim b/tests/toverlop.nim
index f11275644..f11275644 100755..100644
--- a/tests/toverlop.nim
+++ b/tests/toverlop.nim
diff --git a/tests/toverprc.nim b/tests/toverprc.nim
index f35528ace..f35528ace 100755..100644
--- a/tests/toverprc.nim
+++ b/tests/toverprc.nim
diff --git a/tests/toverwr.nim b/tests/toverwr.nim
index f2b42df15..f2b42df15 100755..100644
--- a/tests/toverwr.nim
+++ b/tests/toverwr.nim
diff --git a/tests/tovfint.nim b/tests/tovfint.nim
index 91eda8d0b..91eda8d0b 100755..100644
--- a/tests/tovfint.nim
+++ b/tests/tovfint.nim
diff --git a/tests/tparedef.nim b/tests/tparedef.nim
index dedebf6b7..dedebf6b7 100755..100644
--- a/tests/tparedef.nim
+++ b/tests/tparedef.nim
diff --git a/tests/tparscfg.nim b/tests/tparscfg.nim
index 618ecadd6..618ecadd6 100755..100644
--- a/tests/tparscfg.nim
+++ b/tests/tparscfg.nim
diff --git a/tests/tparsefloat.nim b/tests/tparsefloat.nim
index 38ed2db6d..38ed2db6d 100755..100644
--- a/tests/tparsefloat.nim
+++ b/tests/tparsefloat.nim
diff --git a/tests/tparsopt.nim b/tests/tparsopt.nim
index 2b2da7e51..2b2da7e51 100755..100644
--- a/tests/tparsopt.nim
+++ b/tests/tparsopt.nim
diff --git a/tests/tpos.nim b/tests/tpos.nim
index 114d39c05..114d39c05 100755..100644
--- a/tests/tpos.nim
+++ b/tests/tpos.nim
diff --git a/tests/tposix.nim b/tests/tposix.nim
index bf0b49586..bf0b49586 100755..100644
--- a/tests/tposix.nim
+++ b/tests/tposix.nim
diff --git a/tests/tprep.nim b/tests/tprep.nim
index 999b2f57f..999b2f57f 100755..100644
--- a/tests/tprep.nim
+++ b/tests/tprep.nim
diff --git a/tests/tprintf.nim b/tests/tprintf.nim
index 14687a937..14687a937 100755..100644
--- a/tests/tprintf.nim
+++ b/tests/tprintf.nim
diff --git a/tests/tprocvar.nim b/tests/tprocvar.nim
index f51543dfa..f51543dfa 100755..100644
--- a/tests/tprocvar.nim
+++ b/tests/tprocvar.nim
diff --git a/tests/tpush.nim b/tests/tpush.nim
index 5fb411a79..5fb411a79 100755..100644
--- a/tests/tpush.nim
+++ b/tests/tpush.nim
diff --git a/tests/tquicksort.nim b/tests/tquicksort.nim
index 421564ecd..421564ecd 100755..100644
--- a/tests/tquicksort.nim
+++ b/tests/tquicksort.nim
diff --git a/tests/tquit.nim b/tests/tquit.nim
index d4dc1522d..d4dc1522d 100755..100644
--- a/tests/tquit.nim
+++ b/tests/tquit.nim
diff --git a/tests/tquotewords.nim b/tests/tquotewords.nim
index 462293b40..462293b40 100755..100644
--- a/tests/tquotewords.nim
+++ b/tests/tquotewords.nim
diff --git a/tests/tradix.nim b/tests/tradix.nim
index e7ca210e4..e7ca210e4 100755..100644
--- a/tests/tradix.nim
+++ b/tests/tradix.nim
diff --git a/tests/trawstr.nim b/tests/trawstr.nim
index 7b2db0335..7b2db0335 100755..100644
--- a/tests/trawstr.nim
+++ b/tests/trawstr.nim
diff --git a/tests/treadln.nim b/tests/treadln.nim
index 7703d5a56..7703d5a56 100755..100644
--- a/tests/treadln.nim
+++ b/tests/treadln.nim
diff --git a/tests/treadx.nim b/tests/treadx.nim
index 13acb0514..13acb0514 100755..100644
--- a/tests/treadx.nim
+++ b/tests/treadx.nim
diff --git a/tests/trecinca.nim b/tests/trecinca.nim
index d78fee233..d78fee233 100755..100644
--- a/tests/trecinca.nim
+++ b/tests/trecinca.nim
diff --git a/tests/trecincb.nim b/tests/trecincb.nim
index 6191671a1..6191671a1 100755..100644
--- a/tests/trecincb.nim
+++ b/tests/trecincb.nim
diff --git a/tests/treciter.nim b/tests/treciter.nim
index 662239285..662239285 100755..100644
--- a/tests/treciter.nim
+++ b/tests/treciter.nim
diff --git a/tests/trecmod.nim b/tests/trecmod.nim
index 9d39d3ff7..9d39d3ff7 100755..100644
--- a/tests/trecmod.nim
+++ b/tests/trecmod.nim
diff --git a/tests/trecmod2.nim b/tests/trecmod2.nim
index 85fe2215f..85fe2215f 100755..100644
--- a/tests/trecmod2.nim
+++ b/tests/trecmod2.nim
diff --git a/tests/trectype.nim b/tests/trectype.nim
index a7a6f56e0..a7a6f56e0 100755..100644
--- a/tests/trectype.nim
+++ b/tests/trectype.nim
diff --git a/tests/trefs.nim b/tests/trefs.nim
index ab3934088..ab3934088 100755..100644
--- a/tests/trefs.nim
+++ b/tests/trefs.nim
diff --git a/tests/tregex.nim b/tests/tregex.nim
index d9d22d603..d9d22d603 100755..100644
--- a/tests/tregex.nim
+++ b/tests/tregex.nim
diff --git a/tests/treguse.nim b/tests/treguse.nim
index dc805fc70..dc805fc70 100755..100644
--- a/tests/treguse.nim
+++ b/tests/treguse.nim
diff --git a/tests/trepr.nim b/tests/trepr.nim
index 4a56842f6..4a56842f6 100755..100644
--- a/tests/trepr.nim
+++ b/tests/trepr.nim
diff --git a/tests/tromans.nim b/tests/tromans.nim
index 12deca1ea..12deca1ea 100755..100644
--- a/tests/tromans.nim
+++ b/tests/tromans.nim
diff --git a/tests/tseq2.nim b/tests/tseq2.nim
index 03bdb3fab..03bdb3fab 100755..100644
--- a/tests/tseq2.nim
+++ b/tests/tseq2.nim
diff --git a/tests/tseqcon.nim b/tests/tseqcon.nim
index 935da86b5..935da86b5 100755..100644
--- a/tests/tseqcon.nim
+++ b/tests/tseqcon.nim
diff --git a/tests/tseqcon2.nim b/tests/tseqcon2.nim
index 6225c3bb1..6225c3bb1 100755..100644
--- a/tests/tseqcon2.nim
+++ b/tests/tseqcon2.nim
diff --git a/tests/tsets.nim b/tests/tsets.nim
index 08ab3e54b..08ab3e54b 100755..100644
--- a/tests/tsets.nim
+++ b/tests/tsets.nim
diff --git a/tests/tsidee1.nim b/tests/tsidee1.nim
index 3bd520680..3bd520680 100755..100644
--- a/tests/tsidee1.nim
+++ b/tests/tsidee1.nim
diff --git a/tests/tsidee2.nim b/tests/tsidee2.nim
index 2eaec01d7..2eaec01d7 100755..100644
--- a/tests/tsidee2.nim
+++ b/tests/tsidee2.nim
diff --git a/tests/tsidee3.nim b/tests/tsidee3.nim
index be94192e7..be94192e7 100755..100644
--- a/tests/tsidee3.nim
+++ b/tests/tsidee3.nim
diff --git a/tests/tsidee4.nim b/tests/tsidee4.nim
index 55c474d10..55c474d10 100755..100644
--- a/tests/tsidee4.nim
+++ b/tests/tsidee4.nim
diff --git a/tests/tsimmeth.nim b/tests/tsimmeth.nim
index 3f5f810e6..3f5f810e6 100755..100644
--- a/tests/tsimmeth.nim
+++ b/tests/tsimmeth.nim
diff --git a/tests/tsimtych.nim b/tests/tsimtych.nim
index b100c62e3..b100c62e3 100755..100644
--- a/tests/tsimtych.nim
+++ b/tests/tsimtych.nim
diff --git a/tests/tsizeof.nim b/tests/tsizeof.nim
index f7b70dd4d..f7b70dd4d 100755..100644
--- a/tests/tsizeof.nim
+++ b/tests/tsizeof.nim
diff --git a/tests/tsockets.nim b/tests/tsockets.nim
index cc7d18b87..cc7d18b87 100755..100644
--- a/tests/tsockets.nim
+++ b/tests/tsockets.nim
diff --git a/tests/tsplit.nim b/tests/tsplit.nim
index 711696b9e..711696b9e 100755..100644
--- a/tests/tsplit.nim
+++ b/tests/tsplit.nim
diff --git a/tests/tstatret.nim b/tests/tstatret.nim
index ac93ac532..ac93ac532 100755..100644
--- a/tests/tstatret.nim
+++ b/tests/tstatret.nim
diff --git a/tests/tstmtexp.nim b/tests/tstmtexp.nim
index f4d83e83f..f4d83e83f 100755..100644
--- a/tests/tstmtexp.nim
+++ b/tests/tstmtexp.nim
diff --git a/tests/tstrace.nim b/tests/tstrace.nim
index 56f20a0dd..56f20a0dd 100755..100644
--- a/tests/tstrace.nim
+++ b/tests/tstrace.nim
diff --git a/tests/tstrange.nim b/tests/tstrange.nim
index 13aab2302..13aab2302 100755..100644
--- a/tests/tstrange.nim
+++ b/tests/tstrange.nim
diff --git a/tests/tstrdesc.nim b/tests/tstrdesc.nim
index 1c2e85b4b..1c2e85b4b 100755..100644
--- a/tests/tstrdesc.nim
+++ b/tests/tstrdesc.nim
diff --git a/tests/tstrdist.nim b/tests/tstrdist.nim
index 3e1939e73..3e1939e73 100755..100644
--- a/tests/tstrdist.nim
+++ b/tests/tstrdist.nim
diff --git a/tests/tstreams.nim b/tests/tstreams.nim
index 68ca8eeeb..68ca8eeeb 100755..100644
--- a/tests/tstreams.nim
+++ b/tests/tstreams.nim
diff --git a/tests/tstrlits.nim b/tests/tstrlits.nim
index 48ae08212..48ae08212 100755..100644
--- a/tests/tstrlits.nim
+++ b/tests/tstrlits.nim
diff --git a/tests/tstrset.nim b/tests/tstrset.nim
index e19ccee4d..e19ccee4d 100755..100644
--- a/tests/tstrset.nim
+++ b/tests/tstrset.nim
diff --git a/tests/tstrtabs.nim b/tests/tstrtabs.nim
index 299db609d..299db609d 100755..100644
--- a/tests/tstrtabs.nim
+++ b/tests/tstrtabs.nim
diff --git a/tests/tstrutil.nim b/tests/tstrutil.nim
index 0468dfa0c..0468dfa0c 100755..100644
--- a/tests/tstrutil.nim
+++ b/tests/tstrutil.nim
diff --git a/tests/ttempl.nim b/tests/ttempl.nim
index dcf096671..dcf096671 100755..100644
--- a/tests/ttempl.nim
+++ b/tests/ttempl.nim
diff --git a/tests/ttempl2.nim b/tests/ttempl2.nim
index fba6bd0cb..fba6bd0cb 100755..100644
--- a/tests/ttempl2.nim
+++ b/tests/ttempl2.nim
diff --git a/tests/ttempl3.nim b/tests/ttempl3.nim
index 0c8fa9a94..0c8fa9a94 100755..100644
--- a/tests/ttempl3.nim
+++ b/tests/ttempl3.nim
diff --git a/tests/ttime.nim b/tests/ttime.nim
index bad818816..bad818816 100755..100644
--- a/tests/ttime.nim
+++ b/tests/ttime.nim
diff --git a/tests/ttuple1.nim b/tests/ttuple1.nim
index 5787cc309..5787cc309 100755..100644
--- a/tests/ttuple1.nim
+++ b/tests/ttuple1.nim
diff --git a/tests/tunderscores.nim b/tests/tunderscores.nim
index 459cfda30..459cfda30 100755..100644
--- a/tests/tunderscores.nim
+++ b/tests/tunderscores.nim
diff --git a/tests/tvardecl.nim b/tests/tvardecl.nim
index 496601e3a..496601e3a 100755..100644
--- a/tests/tvardecl.nim
+++ b/tests/tvardecl.nim
diff --git a/tests/tvarious.nim b/tests/tvarious.nim
index 52dd46184..52dd46184 100755..100644
--- a/tests/tvarious.nim
+++ b/tests/tvarious.nim
diff --git a/tests/tvarnums.nim b/tests/tvarnums.nim
index 1b683ad94..1b683ad94 100755..100644
--- a/tests/tvarnums.nim
+++ b/tests/tvarnums.nim
diff --git a/tests/tvartup.nim b/tests/tvartup.nim
index 05b00b207..05b00b207 100755..100644
--- a/tests/tvartup.nim
+++ b/tests/tvartup.nim
diff --git a/tests/twalker.nim b/tests/twalker.nim
index ba89ee7c6..ba89ee7c6 100755..100644
--- a/tests/twalker.nim
+++ b/tests/twalker.nim
diff --git a/tests/typalias.nim b/tests/typalias.nim
index ba9f38ed9..ba9f38ed9 100755..100644
--- a/tests/typalias.nim
+++ b/tests/typalias.nim
diff --git a/tests/typredef.nim b/tests/typredef.nim
index a77d91f40..a77d91f40 100755..100644
--- a/tests/typredef.nim
+++ b/tests/typredef.nim
diff --git a/tests/wingui.nim b/tests/wingui.nim
index f4941bcc7..f4941bcc7 100755..100644
--- a/tests/wingui.nim
+++ b/tests/wingui.nim
diff --git a/tests/x11test.nim b/tests/x11test.nim
index 2769b6c74..2769b6c74 100755..100644
--- a/tests/x11test.nim
+++ b/tests/x11test.nim
diff --git a/tests/xmltest.html b/tests/xmltest.html
index ca4abc4eb..ca4abc4eb 100755..100644
--- a/tests/xmltest.html
+++ b/tests/xmltest.html
diff --git a/tools/build.tmpl b/tools/build.tmpl
index a18831f95..a18831f95 100755..100644
--- a/tools/build.tmpl
+++ b/tools/build.tmpl
diff --git a/tools/cmerge.nim b/tools/cmerge.nim
index 729a8f218..729a8f218 100755..100644
--- a/tools/cmerge.nim
+++ b/tools/cmerge.nim
diff --git a/tools/deinstall.tmpl b/tools/deinstall.tmpl
index 19b31e5b4..19b31e5b4 100755..100644
--- a/tools/deinstall.tmpl
+++ b/tools/deinstall.tmpl
diff --git a/tools/inno.tmpl b/tools/inno.tmpl
index cc8583779..cc8583779 100755..100644
--- a/tools/inno.tmpl
+++ b/tools/inno.tmpl
diff --git a/tools/install.tmpl b/tools/install.tmpl
index bf3bfabc4..bf3bfabc4 100755..100644
--- a/tools/install.tmpl
+++ b/tools/install.tmpl
diff --git a/tools/niminst.nim b/tools/niminst.nim
index 078aba6df..078aba6df 100755..100644
--- a/tools/niminst.nim
+++ b/tools/niminst.nim
diff --git a/tools/nimrepl.nim b/tools/nimrepl.nim
new file mode 100644
index 000000000..6e4e3faaa
--- /dev/null
+++ b/tools/nimrepl.nim
@@ -0,0 +1,160 @@
+import glib2, gtk2, gdk2, osproc, dialogs
+
+type
+  output = tuple[compiler, app: string]
+
+proc execCode(code: string): output =
+
+  var f: TFile
+  if open(f, "temp.nim", fmWrite):
+    f.write(code)
+    f.close()
+  else:
+    raise newException(EIO, "Unable to open file")
+    
+  var compilerOutput = osproc.execProcess("nimrod c temp.nim")
+  var appOutput = osproc.execProcess("temp.exe")
+  return (compilerOutput, appOutput)
+
+var shiftPressed = False
+var w: PGtkWindow
+var InputTextBuffer: PGtkTextBuffer
+var OutputTextBuffer: PGtkTextBuffer
+
+proc destroy(widget: PGtkWidget, data: pgpointer){.cdecl.} = 
+  gtk_main_quit()
+
+proc FileOpenClicked(menuitem: PGtkMenuItem, userdata: pgpointer) =
+  var path = ChooseFileToOpen(w)
+  
+  if path != "":
+
+    var file: string = readFile(path)
+    if file != nil:
+      gtk_text_buffer_set_text(InputTextBuffer, file, len(file))
+      
+    else:
+      error(w, "Unable to read from file")
+
+proc FileSaveClicked(menuitem: PGtkMenuItem, userdata: pgpointer) =
+  var path = ChooseFileToSave(w)
+  
+  if path != "":
+    var startIter: TGtkTextIter
+    var endIter: TGtkTextIter
+    gtk_text_buffer_get_start_iter(InputTextBuffer, addr(startIter))
+    gtk_text_buffer_get_end_iter(InputTextBuffer, addr(endIter))
+    var InputText = gtk_text_buffer_get_text(InputTextBuffer, addr(startIter), addr(endIter), False)
+
+    var f: TFile
+    if open(f, path, fmWrite):
+      f.write(InputText)
+      f.close()
+    else:
+      error(w, "Unable to write to file")
+
+
+proc inputKeyPressed(widget: PGtkWidget, event: PGdkEventKey, userdata: pgpointer): bool =
+  if event.keyval == 65505:
+    # SHIFT is pressed
+    shiftPressed = True
+  
+  return False
+proc inputKeyReleased(widget: PGtkWidget, event: PGdkEventKey, userdata: pgpointer): bool =
+  if event.keyval == 65505:
+    # SHIFT is released
+    shiftPressed = False
+    
+  if event.keyval == 65293:
+    # Enter pressed
+    if shiftPressed == False:
+      var startIter: TGtkTextIter
+      var endIter: TGtkTextIter
+      gtk_text_buffer_get_start_iter(InputTextBuffer, addr(startIter))
+      gtk_text_buffer_get_end_iter(InputTextBuffer, addr(endIter))
+      var InputText = gtk_text_buffer_get_text(InputTextBuffer, addr(startIter), addr(endIter), False)
+
+      try:
+        var r: output = execCode($InputText)
+        gtk_text_buffer_set_text(OutputTextBuffer, r[0] & r[1], len(r[0] & r[1]))
+      except:
+        gtk_text_buffer_set_text(OutputTextBuffer, "Error: Could not open file temp.nim", len("Error: Could not open file temp.nim"))
+
+  return False
+
+proc initControls() =
+  w = gtk_window_new(GTK_WINDOW_TOPLEVEL)
+  gtk_window_set_default_size(w, 500, 600)
+  gtk_window_set_title(w, "Nimrod REPL")
+  discard gtk_signal_connect(GTKOBJECT(w), "destroy", 
+                          GTK_SIGNAL_FUNC(destroy), nil)
+  
+  # MainBox (vbox)
+  var MainBox: PGtkWidget = gtk_vbox_new(False, 0)
+  gtk_container_add(GTK_Container(w), MainBox)
+  
+  # TopMenu (MenuBar)
+  var TopMenu: PGtkWidget = gtk_menu_bar_new()
+  gtk_widget_show(TopMenu)
+  
+  var FileMenu = gtk_menu_new()
+  var OpenMenuItem = gtk_menu_item_new_with_label("Open")
+  gtk_menu_append(FileMenu, OpenMenuItem)
+  gtk_widget_show(OpenMenuItem)
+  discard gtk_signal_connect(GTKOBJECT(OpenMenuItem), "activate", 
+                          GTK_SIGNAL_FUNC(FileOpenClicked), nil)
+  var SaveMenuItem = gtk_menu_item_new_with_label("Save...")
+  gtk_menu_append(FileMenu, SaveMenuItem)
+  gtk_widget_show(SaveMenuItem)
+  discard gtk_signal_connect(GTKOBJECT(SaveMenuItem), "activate", 
+                          GTK_SIGNAL_FUNC(FileSaveClicked), nil)
+  var FileMenuItem = gtk_menu_item_new_with_label("File")
+
+  
+  gtk_menu_item_set_submenu(FileMenuItem, FileMenu)
+  gtk_widget_show(FileMenuItem)
+  gtk_menu_bar_append(TopMenu, FileMenuItem)
+  
+  gtk_box_pack_start(GTK_Box(MainBox), TopMenu, False, False, 0)
+
+  # VPaned - Seperates the InputTextView and the OutputTextView
+  var paned = gtk_vpaned_new()
+  gtk_paned_set_position(paned, 450)
+  gtk_box_pack_start(GTK_Box(MainBox), paned, True, True, 0)
+  gtk_widget_show(paned)
+
+  # Init the TextBuffers
+  InputTextBuffer = gtk_text_buffer_new(nil)
+  OutputTextBuffer = gtk_text_buffer_new(nil)
+
+  # InputTextView (TextView)
+  var InputScrolledWindow = gtk_scrolled_window_new(nil, nil)
+  gtk_scrolled_window_set_policy(InputScrolledWindow,
+                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC)
+  var InputTextView = gtk_text_view_new_with_buffer(InputTextBuffer)
+  gtk_scrolled_window_add_with_viewport(InputScrolledWindow, InputTextView)
+  gtk_paned_add1(paned, InputScrolledWindow)
+  gtk_widget_show(InputScrolledWindow)
+  gtk_widget_show(InputTextView)
+  
+  discard gtk_signal_connect(GTKOBJECT(InputTextView), "key-release-event", 
+                          GTK_SIGNAL_FUNC(inputKeyReleased), nil)
+  discard gtk_signal_connect(GTKOBJECT(InputTextView), "key-press-event", 
+                          GTK_SIGNAL_FUNC(inputKeyPressed), nil)
+  
+  # OutputTextView (TextView)
+  var OutputScrolledWindow = gtk_scrolled_window_new(nil, nil)
+  gtk_scrolled_window_set_policy(OutputScrolledWindow,
+                GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC)
+  var OutputTextView = gtk_text_view_new_with_buffer(OutputTextBuffer)
+  gtk_scrolled_window_add_with_viewport(OutputScrolledWindow, OutputTextView)
+  gtk_paned_add2(paned, OutputScrolledWindow)
+  gtk_widget_show(OutputScrolledWindow)
+  gtk_widget_show(OutputTextView)
+  
+  gtk_widget_show(w)
+  gtk_widget_show(MainBox)
+  
+gtk_nimrod_init()
+initControls()
+gtk_main()
\ No newline at end of file
diff --git a/tools/nimweb.nim b/tools/nimweb.nim
index bebde6cc5..bebde6cc5 100755..100644
--- a/tools/nimweb.nim
+++ b/tools/nimweb.nim
diff --git a/tools/noprefix.nim b/tools/noprefix.nim
index e7ec26c56..e7ec26c56 100755..100644
--- a/tools/noprefix.nim
+++ b/tools/noprefix.nim
diff --git a/tools/sunset.tmpl b/tools/sunset.tmpl
index 18f8b74d5..18f8b74d5 100755..100644
--- a/tools/sunset.tmpl
+++ b/tools/sunset.tmpl
diff --git a/tools/trimcc.nim b/tools/trimcc.nim
index 966f406d4..966f406d4 100755..100644
--- a/tools/trimcc.nim
+++ b/tools/trimcc.nim
diff --git a/web/community.txt b/web/community.txt
index 1a8b1c38b..1a8b1c38b 100755..100644
--- a/web/community.txt
+++ b/web/community.txt
diff --git a/web/documentation.txt b/web/documentation.txt
index da0313c32..da0313c32 100755..100644
--- a/web/documentation.txt
+++ b/web/documentation.txt
diff --git a/web/download.txt b/web/download.txt
index 21ca1f57d..21ca1f57d 100755..100644
--- a/web/download.txt
+++ b/web/download.txt
diff --git a/web/index.txt b/web/index.txt
index fd6a04242..fd6a04242 100755..100644
--- a/web/index.txt
+++ b/web/index.txt
diff --git a/web/links.txt b/web/links.txt
index e69de29bb..e69de29bb 100755..100644
--- a/web/links.txt
+++ b/web/links.txt
diff --git a/web/news.txt b/web/news.txt
index b4f3551d1..84daa490e 100755..100644
--- a/web/news.txt
+++ b/web/news.txt
@@ -19,6 +19,7 @@ Bugfixes
 - ``system.write(f: TFile, s: string)`` now works even if ``s`` contains binary
   zeros.
 - Fixed a bug in ``os.setFilePermissions`` for Windows.
+- An overloadable symbol can now have the same name as an imported module.
 
 
 Additions
diff --git a/web/nimrod.ini b/web/nimrod.ini
index 1cb494f9c..1cb494f9c 100755..100644
--- a/web/nimrod.ini
+++ b/web/nimrod.ini
diff --git a/web/question.txt b/web/question.txt
index 2012d182f..2012d182f 100755..100644
--- a/web/question.txt
+++ b/web/question.txt
diff --git a/web/snippets/snippet1.nim b/web/snippets/snippet1.nim
index 05359a0e0..05359a0e0 100755..100644
--- a/web/snippets/snippet1.nim
+++ b/web/snippets/snippet1.nim
diff --git a/web/ticker.txt b/web/ticker.txt
index 1ac6c9ecf..1ac6c9ecf 100755..100644
--- a/web/ticker.txt
+++ b/web/ticker.txt