diff options
| -rwxr-xr-x | compiler/c2nim/cparse.nim | 2 | ||||
| -rwxr-xr-x | compiler/nimrod.ini | 1 | ||||
| -rwxr-xr-x | doc/theindex.txt | 38 | ||||
| -rwxr-xr-x | install.sh | 15 | ||||
| -rwxr-xr-x | install.txt | 22 | ||||
| -rwxr-xr-x | web/index.txt | 3 | ||||
| -rwxr-xr-x | web/news.txt | 21 |
7 files changed, 75 insertions, 27 deletions
diff --git a/compiler/c2nim/cparse.nim b/compiler/c2nim/cparse.nim index 64dd340cf..438d3755f 100755 --- a/compiler/c2nim/cparse.nim +++ b/compiler/c2nim/cparse.nim @@ -275,7 +275,7 @@ proc mangleRules(s: string, p: TParser): string = block prefixes: for prefix in items(p.options.prefixes): if s.startsWith(prefix): - result = s.copy(prefix.len) + result = s.substr(prefix.len) break prefixes result = s block suffixes: diff --git a/compiler/nimrod.ini b/compiler/nimrod.ini index 3cca80b51..471790111 100755 --- a/compiler/nimrod.ini +++ b/compiler/nimrod.ini @@ -61,6 +61,7 @@ Files: "lib/*.cfg" Files: "lib/system/*.nim" Files: "lib/core/*.nim" Files: "lib/pure/*.nim" +Files: "lib/pure/collections/*.nim" Files: "lib/impure/*.nim" Files: "lib/wrappers/*.nim" diff --git a/doc/theindex.txt b/doc/theindex.txt index 85c5da5cf..9a5dde744 100755 --- a/doc/theindex.txt +++ b/doc/theindex.txt @@ -309,9 +309,7 @@ Index `pegs.html#114 <pegs.html#114>`_ `[]`:idx: - * `typeinfo.html#111 <typeinfo.html#111>`_ - * `typeinfo.html#119 <typeinfo.html#119>`_ - * `typeinfo.html#120 <typeinfo.html#120>`_ + `ropes.html#115 <ropes.html#115>`_ `[]`:idx: * `tables.html#106 <tables.html#106>`_ @@ -319,7 +317,7 @@ Index * `tables.html#131 <tables.html#131>`_ `[]`:idx: - `macros.html#112 <macros.html#112>`_ + `xmltree.html#114 <xmltree.html#114>`_ `[]`:idx: * `graphics.html#116 <graphics.html#116>`_ @@ -333,31 +331,36 @@ Index * `json.html#131 <json.html#131>`_ `[]`:idx: + `macros.html#112 <macros.html#112>`_ + + `[]`:idx: * `system.html#579 <system.html#579>`_ * `system.html#581 <system.html#581>`_ * `system.html#583 <system.html#583>`_ * `system.html#585 <system.html#585>`_ `[]`:idx: - `xmltree.html#114 <xmltree.html#114>`_ - - `[]`:idx: - `ropes.html#115 <ropes.html#115>`_ + * `typeinfo.html#111 <typeinfo.html#111>`_ + * `typeinfo.html#119 <typeinfo.html#119>`_ + * `typeinfo.html#120 <typeinfo.html#120>`_ `[]=`:idx: `json.html#135 <json.html#135>`_ `[]=`:idx: - `strtabs.html#109 <strtabs.html#109>`_ + * `typeinfo.html#112 <typeinfo.html#112>`_ + * `typeinfo.html#118 <typeinfo.html#118>`_ + * `typeinfo.html#121 <typeinfo.html#121>`_ `[]=`:idx: * `graphics.html#118 <graphics.html#118>`_ * `graphics.html#119 <graphics.html#119>`_ `[]=`:idx: - * `typeinfo.html#112 <typeinfo.html#112>`_ - * `typeinfo.html#118 <typeinfo.html#118>`_ - * `typeinfo.html#121 <typeinfo.html#121>`_ + * `system.html#580 <system.html#580>`_ + * `system.html#582 <system.html#582>`_ + * `system.html#584 <system.html#584>`_ + * `system.html#586 <system.html#586>`_ `[]=`:idx: * `tables.html#108 <tables.html#108>`_ @@ -368,10 +371,7 @@ Index `macros.html#113 <macros.html#113>`_ `[]=`:idx: - * `system.html#580 <system.html#580>`_ - * `system.html#582 <system.html#582>`_ - * `system.html#584 <system.html#584>`_ - * `system.html#586 <system.html#586>`_ + `strtabs.html#109 <strtabs.html#109>`_ `[ESC]`:idx: `manual.html#134 <manual.html#134>`_ @@ -1428,12 +1428,12 @@ Index * `system.html#396 <system.html#396>`_ * `system.html#397 <system.html#397>`_ - `CompileTime`:idx: - `system.html#387 <system.html#387>`_ - `compileTime`:idx: `manual.html#244 <manual.html#244>`_ + `CompileTime`:idx: + `system.html#387 <system.html#387>`_ + `complex statements`:idx: `manual.html#191 <manual.html#191>`_ diff --git a/install.sh b/install.sh index 6cf55dc08..1fa9a1697 100755 --- a/install.sh +++ b/install.sh @@ -54,6 +54,7 @@ if [ $# -eq 1 ] ; then mkdir -p $libdir/system || exit 1 mkdir -p $libdir/core || exit 1 mkdir -p $libdir/pure || exit 1 + mkdir -p $libdir/pure/collections || exit 1 mkdir -p $libdir/impure || exit 1 mkdir -p $libdir/wrappers || exit 1 mkdir -p $libdir/wrappers/cairo || exit 1 @@ -157,6 +158,8 @@ if [ $# -eq 1 ] ; then chmod 644 $docdir/encodings.html cp doc/endb.html $docdir/endb.html || exit 1 chmod 644 $docdir/endb.html + cp doc/filters.html $docdir/filters.html || exit 1 + chmod 644 $docdir/filters.html cp doc/graphics.html $docdir/graphics.html || exit 1 chmod 644 $docdir/graphics.html cp doc/hashes.html $docdir/hashes.html || exit 1 @@ -217,6 +220,8 @@ if [ $# -eq 1 ] ; then chmod 644 $docdir/queues.html cp doc/rdstdin.html $docdir/rdstdin.html || exit 1 chmod 644 $docdir/rdstdin.html + cp doc/re.html $docdir/re.html || exit 1 + chmod 644 $docdir/re.html cp doc/redis.html $docdir/redis.html || exit 1 chmod 644 $docdir/redis.html cp doc/ropes.html $docdir/ropes.html || exit 1 @@ -451,6 +456,16 @@ if [ $# -eq 1 ] ; then chmod 644 $libdir/pure/xmlparser.nim cp lib/pure/xmltree.nim $libdir/pure/xmltree.nim || exit 1 chmod 644 $libdir/pure/xmltree.nim + cp lib/pure/collections/intsets.nim $libdir/pure/collections/intsets.nim || exit 1 + chmod 644 $libdir/pure/collections/intsets.nim + cp lib/pure/collections/lists.nim $libdir/pure/collections/lists.nim || exit 1 + chmod 644 $libdir/pure/collections/lists.nim + cp lib/pure/collections/queues.nim $libdir/pure/collections/queues.nim || exit 1 + chmod 644 $libdir/pure/collections/queues.nim + cp lib/pure/collections/sets.nim $libdir/pure/collections/sets.nim || exit 1 + chmod 644 $libdir/pure/collections/sets.nim + cp lib/pure/collections/tables.nim $libdir/pure/collections/tables.nim || exit 1 + chmod 644 $libdir/pure/collections/tables.nim cp lib/impure/db_mysql.nim $libdir/impure/db_mysql.nim || exit 1 chmod 644 $libdir/impure/db_mysql.nim cp lib/impure/db_postgres.nim $libdir/impure/db_postgres.nim || exit 1 diff --git a/install.txt b/install.txt index 345a6846c..09dd5ae78 100755 --- a/install.txt +++ b/install.txt @@ -13,12 +13,28 @@ To get the source code you need either of these: * git: ``git clone git://github.com/Araq/Nimrod.git`` After downloading the source (and extracting it), you need to -extract ``build/csources.zip`` and then you can bootstrap with: +extract ``build/csources.zip``: -* ``./build.sh`` or ``build.bat`` (Windows) -* ``nimrod c koch`` +* ``cd build`` +* ``unzip csources.zip`` +* ``cd ..`` + +and then you can bootstrap with: + +On Windows +~~~~~~~~~~ + +* ``build.bat`` +* ``bin\nimrod c koch`` * ``koch boot -d:release`` +On UNIX +~~~~~~~ + +* ``./build.sh`` +* ``bin/nimrod c koch`` +* ``./koch boot -d:release`` + Installation on Linux/UNIX -------------------------- diff --git a/web/index.txt b/web/index.txt index 8f1209f52..9e39f5dd3 100755 --- a/web/index.txt +++ b/web/index.txt @@ -102,9 +102,6 @@ Nimrod plays nice with others Roadmap to 1.0 ============== -Version 0.8.x - * threading - Version 0.9.0 * closures and anonymous procs * recursive iterators/coroutines diff --git a/web/news.txt b/web/news.txt index 95a209151..062b171a1 100755 --- a/web/news.txt +++ b/web/news.txt @@ -2,11 +2,30 @@ News ==== +2011-XX-XX Version 0.X.XX released +================================== + +Version 0.X.XX has been released! Get it `here <download.html>`_. + +Bugfixes +-------- + +Changes affecting backwards compatibility +----------------------------------------- + +Language Additions +------------------ + +Compiler Additions +------------------ + +Library Additions +----------------- + 2011-07-10 Version 0.8.12 released ================================== -Version 0.8.12 has been released! Get it `here <download.html>`_. Bugfixes -------- |