From a0cbf638eefe8fcc256df2d290a986bd545d0836 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 20 Mar 2012 16:01:32 -0700
Subject: [PATCH] doc: Switch the tutorial to pandoc's method of tagging code
 blocks

Instead of '## tag', it's '~~~ {.tag}'
---
 doc/prep.js              |  6 ++---
 doc/tutorial.md          | 48 ++++++++++++++--------------------------
 src/etc/extract-tests.py | 14 +++++-------
 3 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/doc/prep.js b/doc/prep.js
index f8876b55020..89dfd5ef085 100755
--- a/doc/prep.js
+++ b/doc/prep.js
@@ -39,10 +39,10 @@ var out = outfile ? fs.createWriteStream(outfile) : process.stdout;
 
 while ((line = lines[cur++]) != null) {
   if (/^~~~/.test(line)) {
-    var block = "", bline, isRust = true;
+    var block = "", bline;
+    var isRust = !/notrust/.test(line);
     while ((bline = lines[cur++]) != null) {
-      if (/^\s*## notrust/.test(bline)) isRust = false;
-      else if (/^~~~/.test(bline)) break;
+      if (/^~~~/.test(bline)) break;
       if (!/^\s*##? /.test(bline)) block += bline + "\n";
     }
     if (!highlight || !isRust)
diff --git a/doc/tutorial.md b/doc/tutorial.md
index d09789f272b..3f02d3cd116 100644
--- a/doc/tutorial.md
+++ b/doc/tutorial.md
@@ -96,8 +96,7 @@ prerequisites, something along these lines should work. Building from source on
 Windows requires some extra steps: please see the
 [getting started][wiki-get-started] page on the Rust wiki.
 
-~~~~
-## notrust
+~~~~ {.notrust}
 $ wget http://dl.rust-lang.org/dist/rust-0.1.tar.gz
 $ tar -xzf rust-0.1.tar.gz
 $ cd rust-0.1
@@ -144,8 +143,7 @@ If you modify the program to make it invalid (for example, change the
 function to an unknown name), and then compile it, you'll see an error
 message like this:
 
-~~~~
-## notrust
+~~~~ {.notrust}
 hello.rs:2:4: 2:16 error: unresolved name: io::print_it
 hello.rs:2     io::print_it("hello world from '" + args[0] + "'!");
                ^~~~~~~~~~~~
@@ -511,8 +509,7 @@ BSD-style license). Finally, you can have a name followed by a
 comma-separated list of nested attributes, as in the `cfg` example
 above, or in this [crate](#modules-and-crates) metadata declaration:
 
-~~~~
-## ignore
+~~~~ {.ignore}
 #[link(name = "std",
        vers = "0.1",
        url = "http://rust-lang.org/src/std")];
@@ -1595,8 +1592,7 @@ parameter `T`, can you copy values of that type? In Rust, you can't,
 unless you explicitly declare that type parameter to have copyable
 'kind'. A kind is a type of type.
 
-~~~~
-## ignore
+~~~~ {.ignore}
 // This does not compile
 fn head_bad<T>(v: [T]) -> T { v[0] }
 // This does
@@ -1687,8 +1683,7 @@ It is also possible to include multiple files in a crate. For this
 purpose, you create a `.rc` crate file, which references any number of
 `.rs` code files. A crate file could look like this:
 
-~~~~
-## ignore
+~~~~ {.ignore}
 #[link(name = "farm", vers = "2.5", author = "mjh")];
 mod cow;
 mod chicken;
@@ -1707,8 +1702,7 @@ later.
 To have a nested directory structure for your source files, you can
 nest mods in your `.rc` file:
 
-~~~~
-## ignore
+~~~~ {.ignore}
 mod poultry {
     mod chicken;
     mod turkey;
@@ -1736,8 +1730,7 @@ crate library with the right name.
 It is possible to provide more specific information when using an
 external crate.
 
-~~~~
-## ignore
+~~~~ {.ignore}
 use myfarm (name = "farm", vers = "2.7");
 ~~~~
 
@@ -1750,8 +1743,7 @@ local name `myfarm`.
 
 Our example crate declared this set of `link` attributes:
 
-~~~~
-## ignore
+~~~~ {.ignore}
 #[link(name = "farm", vers = "2.5", author = "mjh")];
 ~~~~
 
@@ -1780,8 +1772,7 @@ these two files:
 fn world() -> str { "world" }
 ~~~~
 
-~~~~
-## ignore
+~~~~ {.ignore}
 // main.rs
 use std;
 use mylib;
@@ -1790,8 +1781,7 @@ fn main() { io::println("hello " + mylib::world()); }
 
 Now compile and run like this (adjust to your platform if necessary):
 
-~~~~
-## notrust
+~~~~ {.notrust}
 > rustc --lib mylib.rs
 > rustc main.rs -L .
 > ./main
@@ -2133,8 +2123,7 @@ hash of its first command-line argument, which it then converts to a
 hexadecimal string and prints to standard output. If you have the
 OpenSSL libraries installed, it should 'just work'.
 
-~~~~
-## xfail-test
+~~~~ {.xfail-test}
 use std;
 
 native mod crypto {
@@ -2164,8 +2153,7 @@ fn main(args: [str]) {
 Before we can call `SHA1`, we have to declare it. That is what this
 part of the program is responsible for:
 
-~~~~
-## xfail-test
+~~~~ {.xfail-test}
 native mod crypto {
     fn SHA1(src: *u8, sz: uint, out: *u8) -> *u8;
 }
@@ -2180,8 +2168,7 @@ in a platform-specific way (`libcrypto.so` on Linux, for example), and
 link that in. If you want the module to have a different name from the
 actual library, you can use the `"link_name"` attribute, like:
 
-~~~~
-## xfail-test
+~~~~ {.xfail-test}
 #[link_name = "crypto"]
 native mod something {
     fn SHA1(src: *u8, sz: uint, out: *u8) -> *u8;
@@ -2213,8 +2200,7 @@ or `"stdcall"`. Other conventions may be defined in the future.
 The native `SHA1` function is declared to take three arguments, and
 return a pointer.
 
-~~~~
-## xfail-test
+~~~~ {.xfail-test}
 # native mod crypto {
 fn SHA1(src: *u8, sz: uint, out: *u8) -> *u8;
 # }
@@ -2547,8 +2533,7 @@ When you compile the program normally, the `test_twice` function will
 not be included. To compile and run such tests, compile with the
 `--test` flag, and then run the result:
 
-~~~~
-## notrust
+~~~~ {.notrust}
 > rustc --test twice.rs
 > ./twice
 running 1 tests
@@ -2559,8 +2544,7 @@ result: ok. 1 passed; 0 failed; 0 ignored
 Or, if we change the file to fail, for example by replacing `x + x`
 with `x + 1`:
 
-~~~~
-## notrust
+~~~~ {.notrust}
 running 1 tests
 test test_twice ... FAILED
 failures:
diff --git a/src/etc/extract-tests.py b/src/etc/extract-tests.py
index 32fc25a685a..e95c6680f99 100644
--- a/src/etc/extract-tests.py
+++ b/src/etc/extract-tests.py
@@ -29,17 +29,16 @@ while cur < len(lines):
         chapter = re.sub(r"\W", "_", chap.group(1)).lower()
         chapter_n = 1
     elif re.match("~~~", line):
+        # Parse the tags that open a code block in the pandoc format:
+        # ~~~ {.tag1 .tag2}
+        tags = re.findall("\.([\w-]*)", line)
         block = ""
-        ignore = False
-        xfail = False
+        ignore = "notrust" in tags or "ignore" in tags
+        xfail = "xfail-test" in tags
         while cur < len(lines):
             line = lines[cur]
             cur += 1
-            if re.match(r"\s*## (notrust|ignore)", line):
-                ignore = True
-            elif re.match(r"\s*## xfail-test", line):
-                xfail = True
-            elif re.match("~~~", line):
+            if re.match("~~~", line):
                 break
             else:
                 block += re.sub("^# ", "", line)
@@ -60,4 +59,3 @@ while cur < len(lines):
             f = open(filename, 'w')
             f.write(block)
             f.close()
-