diff options
| -rw-r--r-- | todo.txt | 1 | ||||
| -rw-r--r-- | tools/website.tmpl | 34 | ||||
| -rw-r--r-- | web/assets/images/favicon.ico | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | web/assets/style.css | 20 | ||||
| -rw-r--r-- | web/community.txt | 2 | ||||
| -rw-r--r-- | web/index.txt | 2 | ||||
| -rw-r--r-- | web/news.txt | 3 | ||||
| -rw-r--r-- | web/question.txt | 1 |
8 files changed, 44 insertions, 19 deletions
diff --git a/todo.txt b/todo.txt index 302178b96..5e2f91b01 100644 --- a/todo.txt +++ b/todo.txt @@ -1,7 +1,6 @@ version 0.10 ============ -- document 'converter' - document the tables module better - The bitwise 'not' operator will be renamed to 'bnot' to diff --git a/tools/website.tmpl b/tools/website.tmpl index 9f655a04c..b16373c4f 100644 --- a/tools/website.tmpl +++ b/tools/website.tmpl @@ -8,7 +8,7 @@ <title>$c.projectTitle</title> <link rel="stylesheet" type="text/css" href="assets/style.css" /> - <link rel="shortcut icon" href="http://reign-studios.net/philipwitte/nim/favicon.ico"> + <link rel="shortcut icon" href="assets/images/favicon.ico"> #if len(rss) > 0: <link href="$rss" title="Recent changes" type="application/atom+xml" rel="alternate"> #end if @@ -17,7 +17,7 @@ <header id="head"> <div class="page-layout tall"> <div id="head-logo"></div> - <a id="head-logo-link" href="http://reign-studios.net/philipwitte/nim/home.htm"></a> + <a id="head-logo-link" href="http://nim-lang.org/index.html"></a> <nav id="head-links"> #for i in 0.. c.tabs.len-1: # var name = c.tabs[i].key @@ -73,7 +73,7 @@ echo(<span class="val">"Average line length: "</span>, <span class="tab"> </span>name: <span class="typ">string</span> <span class="tab end"> </span>age: <span class="typ">int</span> -<span class="kwd">proc</span> <span class="def">greet</span>(p:<span class="typ">Person</span>) = +<span class="kwd">proc</span> <span class="def">greet</span>(p: <span class="typ">Person</span>) = <span class="tab"> </span>echo <span class="val">"Hi, I'm "</span>, p.name, <span class="val">"."</span> <span class="tab end"> </span>echo <span class="val">"I am "</span>, p.age, <span class="val">" years old."</span> @@ -83,16 +83,24 @@ p.greet() <span class="cmt"># or greet(p)</span> </div> </div> <!-- slide0 --> <div id="slide1" class="active"> - #let quoteIdx = if c.quotations.hasKey(currentTab): currentTab else: "index" - <div class="quote-image"></div> - <p class="quote"> - ${c.quotations[quoteIdx].quote} - <br> - <b style="float: right">-- ${c.quotations[quoteIdx].author}</b> - </p> - <br/> - </div> - </div> + <h2><a name="why-should-i-be-excited">Why should I be excited?</a></h2> + <span class="desc"> + Nim the only language that leverages automated proof technology + to perform a <i>disjoint check</i> for your parallel + code. Working on disjoint data means no locking is + required and yet data races are impossible:</span> + <pre> +<span class="kwd">parallel</span>: +<span class="tab"> </span><span class="kwd">var</span> i = 0 +<span class="tab"> </span><span class="kwd">while</span> i <= a.high: +<span class="tab"> </span>spawn f(a[i]) +<span class="tab"> </span>spawn f(a[i+<span class="val">1</span>]) +<span class="tab"> </span><span class="cmt"># ERROR: cannot prove a[i] is disjoint from a[i+1]</span> +<span class="tab"> </span><span class="cmt"># BUT: replace 'i += 1' with 'i += 2' and the code compiles!</span> +<span class="tab end"> </span>i += <span class="val">1</span> + </pre> + </div> + </div> <div id="slideshow-nav"> <div id="slideControl0" onclick="slideshow_click(0)"></div> <div id="slideControl1" onclick="slideshow_click(1)" class="active"></div> diff --git a/web/assets/images/favicon.ico b/web/assets/images/favicon.ico new file mode 100644 index 000000000..aed71adb4 --- /dev/null +++ b/web/assets/images/favicon.ico Binary files differdiff --git a/web/assets/style.css b/web/assets/style.css index 60768f9e2..3e2d18045 100644 --- a/web/assets/style.css +++ b/web/assets/style.css @@ -111,7 +111,7 @@ pre .end { background:url("images/tabEnd.png") no-repeat left bottom; } #slide0 { margin:30px 0 0 10px; } #slide0 > div { float:left; width:320px; font:10pt monospace; } #slide0 > div:first-child { margin:0 40px 0 0; } - #slide0 > div > h2 { margin:0 0 5px 0; color:rgba(162,198,223,.78); } + #slide0 h2 { margin:0 0 5px 0; color:rgba(162,198,223,.78); } #slide0 > div > pre { margin:0; padding:15px 10px; @@ -119,7 +119,21 @@ pre .end { background:url("images/tabEnd.png") no-repeat left bottom; } background:rgba(0,0,0,.4); border-left:8px solid rgba(0,0,0,.3); box-shadow:1px 2px 16px rgba(28,180,236,.4); } - + + #slide1 { margin:30px 0 0 10px; } + #slide1 { float:left; width:680px; font:10pt monospace; } + #slide1 > div:first-child { margin:0 40px 0 0; } + #slide1 h2 { margin:0 0 5px 0; color:rgba(162,198,223,.78); } + #slide1 .desc { margin:0 0 5px 0; color:rgba(162,198,223,.78); + font:13pt "arial"; } + #slide1 pre { + padding:7px 10px; + line-height:14pt; + background:rgba(0,0,0,.4); + border-left:8px solid rgba(0,0,0,.3); + box-shadow:1px 2px 16px rgba(28,180,236,.4); } + + /* back when slide1 was the quote: #slide1 { margin-top:50px; } #slide1 > p { padding:40px 20px 0 20px; @@ -134,7 +148,7 @@ pre .end { background:url("images/tabEnd.png") no-repeat left bottom; } font-style:italic; font-weight:bold; color:rgba(93,155,199,.44); } - + */ #sidebar { z-index:2; position:absolute; diff --git a/web/community.txt b/web/community.txt index c5b025067..aad281a44 100644 --- a/web/community.txt +++ b/web/community.txt @@ -18,7 +18,7 @@ Nim's Community ---- Many Nim developers are a part of the - `#nim IRC channel <http://webchat.freenode.net/?channels=nim>`_ on + `#nim IRC channel <http://webchat.freenode.net/?channels=nimrod>`_ on Freenode. That is the place where the rest of the discussion relating to Nim occurs. Be sure to join us there if you wish to discuss Nim in real-time. IRC is the perfect place for people just starting to learn Nim and we diff --git a/web/index.txt b/web/index.txt index 3317ba940..1d76c1cda 100644 --- a/web/index.txt +++ b/web/index.txt @@ -85,5 +85,5 @@ Roadmap to 1.0 ============== Please have a look at -this `wiki page <https://github.com/Araq/Nim/wiki/Roadmap>`_ for +this `wiki page <https://github.com/Araq/Nimrod/wiki/Roadmap>`_ for an up-to-date overview. diff --git a/web/news.txt b/web/news.txt index 9971ed724..361acfab5 100644 --- a/web/news.txt +++ b/web/news.txt @@ -86,6 +86,9 @@ News - Added module ``fenv`` to control the handling of floating-point rounding and exceptions (overflow, division by zero, etc.). + - ``system.setupForeignThreadGc`` can be used for better interaction with + foreign libraries that create threads and run a Nim callback from these + foreign threads. 2014-12-09 New website design! diff --git a/web/question.txt b/web/question.txt index 8f48c1640..d3a2dd5c0 100644 --- a/web/question.txt +++ b/web/question.txt @@ -6,6 +6,7 @@ General ======= + .. container:: standout What is Nim? |