---

yaml
---
r: 15601
b: refs/heads/try
c: 92b2113
h: refs/heads/master
i:
  15599: e7664bb
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fa86b5d67f22796797aac1f2f6267e270b1ba5d4
+refs/heads/try: 92b21135831b5d8ee56f6590e0d2f43173873532
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/librustsyntax/parse/comments.rs

@@ -148,16 +148,6 @@ fn consume_comment(rdr: reader, code_to_the_left: bool, &comments: [cmnt]) {
     #debug("<<< consume comment");
 }
 
-fn is_lit(t: token::token) -> bool {
-    ret alt t {
-          token::LIT_INT(_, _) { true }
-          token::LIT_UINT(_, _) { true }
-          token::LIT_FLOAT(_, _) { true }
-          token::LIT_STR(_) { true }
-          _ { false }
-        }
-}
-
 type lit = {lit: str, pos: uint};
 
 fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
@@ -186,7 +176,7 @@ fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
             break;
         }
         let tok = next_token(rdr);
-        if is_lit(tok.tok) {
+        if token::is_lit(tok.tok) {
             let s = rdr.get_str_from(tok.bpos);
             literals += [{lit: s, pos: tok.chpos}];
             log(debug, "tok lit: " + s);

branches/try/src/librustsyntax/parse/token.rs

@@ -187,6 +187,16 @@ pure fn can_begin_expr(t: token) -> bool {
     }
 }
 
+fn is_lit(t: token::token) -> bool {
+    ret alt t {
+          token::LIT_INT(_, _) { true }
+          token::LIT_UINT(_, _) { true }
+          token::LIT_FLOAT(_, _) { true }
+          token::LIT_STR(_) { true }
+          _ { false }
+        }
+}
+
 fn is_ident(t: token::token) -> bool {
     alt t { token::IDENT(_, _) { ret true; } _ { } }
     ret false;