---

yaml
---
r: 142516
b: refs/heads/try2
c: 52949fb
h: refs/heads/master
v: v3

Author: glinscott

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 37494d39d38be33a589a1f46dae38fe2ceb9d94f
+refs/heads/try2: 52949fbf1876ecd03303006c534a74c5e29bc90d
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/json.rs

@@ -481,30 +481,22 @@ pub fn to_pretty_str(json: &Json) -> ~str {
     io::with_str_writer(|wr| to_pretty_writer(wr, json))
 }
 
-static BUF_SIZE : uint = 64000;
-
 #[allow(missing_doc)]
 pub struct Parser {
     priv rdr: @io::Reader,
-    priv buf: ~[char],
-    priv buf_idx: uint,
     priv ch: char,
     priv line: uint,
     priv col: uint,
 }
 
 /// Decode a json value from an io::reader
 pub fn Parser(rdr: @io::Reader) -> Parser {
-    let mut p = Parser {
+    Parser {
         rdr: rdr,
-        buf: rdr.read_chars(BUF_SIZE),
-        buf_idx: 0,
-        ch: 0 as char,
+        ch: rdr.read_char(),
         line: 1,
-        col: 0,
-    };
-    p.bump();
-    p
+        col: 1,
+    }
 }
 
 impl Parser {
@@ -529,26 +521,13 @@ impl Parser {
     fn eof(&self) -> bool { self.ch == -1 as char }
 
     fn bump(&mut self) {
-        if self.eof() {
-            return;
-        }
-
-        self.col += 1u;
-
-        if self.buf_idx >= self.buf.len() {
-            self.buf = self.rdr.read_chars(BUF_SIZE);
-            if self.buf.len() == 0 {
-                self.ch = -1 as char;
-                return;
-            }
-            self.buf_idx = 0;
-        }
-        self.ch = self.buf[self.buf_idx];
-        self.buf_idx += 1;
+        self.ch = self.rdr.read_char();
 
         if self.ch == '\n' {
             self.line += 1u;
             self.col = 1u;
+        } else {
+            self.col += 1u;
         }
     }
 

branches/try2/src/libstd/char.rs

@@ -82,7 +82,8 @@ pub fn is_uppercase(c: char) -> bool { general_category::Lu(c) }
 ///
 #[inline]
 pub fn is_whitespace(c: char) -> bool {
-    ('\x09' <= c && c <= '\x0d')
+    c == ' '
+        || ('\x09' <= c && c <= '\x0d')
         || general_category::Zs(c)
         || general_category::Zl(c)
         || general_category::Zp(c)