---

yaml
---
r: 36251
b: refs/heads/try2
c: 18a825b
h: refs/heads/master
i:
  36249: f47258f
  36247: 7bbe71d
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 5b248a6ca8962249d5882375610764a6dd9561c3
+refs/heads/try2: 18a825bda0a6098d3d8982784f3dffb908df5e40
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libsyntax/codemap.rs

@@ -39,8 +39,40 @@ export loc;
 export get_filemap;
 export new_codemap;
 
+struct span {lo: uint, hi: uint, expn_info: expn_info}
+
+impl span : cmp::Eq {
+    pure fn eq(other: &span) -> bool {
+        return self.lo == (*other).lo && self.hi == (*other).hi;
+    }
+    pure fn ne(other: &span) -> bool { !self.eq(other) }
+}
+
+impl<S: Serializer> span: Serializable<S> {
+    /* Note #1972 -- spans are serialized but not deserialized */
+    fn serialize(&self, _s: &S) { }
+}
+
+impl<D: Deserializer> span: Deserializable<D> {
+    static fn deserialize(_d: &D) -> span {
+        ast_util::dummy_sp()
+    }
+}
+
+enum expn_info_ {
+    expanded_from({call_site: span,
+                   callie: {name: ~str, span: Option<span>}})
+}
+type expn_info = Option<@expn_info_>;
+
 type filename = ~str;
 
+type lookup_fn = pure fn(file_pos) -> uint;
+
+struct loc {
+    file: @filemap, line: uint, col: uint
+}
+
 struct file_pos {
     ch: uint, byte: uint
 }
@@ -90,10 +122,6 @@ struct CodeMap {
     files: DVec<@filemap>
 }
 
-struct loc {
-    file: @filemap, line: uint, col: uint
-}
-
 fn new_codemap() -> CodeMap {
     CodeMap {
         files: DVec()
@@ -110,8 +138,6 @@ fn next_line(file: @filemap, chpos: uint, byte_pos: uint) {
     file.lines.push(file_pos {ch: chpos, byte: byte_pos + file.start_pos.byte});
 }
 
-type lookup_fn = pure fn(file_pos) -> uint;
-
 fn lookup_line(map: @CodeMap, pos: uint, lookup: lookup_fn)
     -> {fm: @filemap, line: uint}
 {
@@ -186,32 +212,6 @@ fn adjust_span(map: @CodeMap, sp: span) -> span {
     }
 }
 
-enum expn_info_ {
-    expanded_from({call_site: span,
-                   callie: {name: ~str, span: Option<span>}})
-}
-type expn_info = Option<@expn_info_>;
-
-struct span {lo: uint, hi: uint, expn_info: expn_info}
-
-impl span : cmp::Eq {
-    pure fn eq(other: &span) -> bool {
-        return self.lo == (*other).lo && self.hi == (*other).hi;
-    }
-    pure fn ne(other: &span) -> bool { !self.eq(other) }
-}
-
-impl<S: Serializer> span: Serializable<S> {
-    /* Note #1972 -- spans are serialized but not deserialized */
-    fn serialize(&self, _s: &S) { }
-}
-
-impl<D: Deserializer> span: Deserializable<D> {
-    static fn deserialize(_d: &D) -> span {
-        ast_util::dummy_sp()
-    }
-}
-
 fn span_to_str_no_adj(sp: span, cm: @CodeMap) -> ~str {
     let lo = lookup_char_pos(cm, sp.lo);
     let hi = lookup_char_pos(cm, sp.hi);