aboutsummaryrefslogtreecommitdiff
path: root/src/tree
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-01-28 08:07:56 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-01-28 08:07:56 +0000
commitaff82e5ee1d587b858e7237511e611bb8cc61cf3 (patch)
tree83d1a4bbaa4be96f76c2d48c00ad479173f61274 /src/tree
parentefadcf715862a2d96af0f57d2b53bfa325390779 (diff)
parent4244948c6b1a62bd0e1ef276d1f0cc22c36f6f66 (diff)
Merge #16
16: Proof-of-concept SyntaxKind as enum r=matklad a=CAD97 This was the one bit about the original RFC I was most confused about. Why isn't `SyntaxKind` a normal `enum`? If it's to signify that it's non-exhaustive [`#[non_exhaustive]`](https://github.com/rust-lang/rust/issues/44109) should be used. (Or `#[doc(hidden)] __Nonexhaustive` on stable.) If it's so that more variants can be added externally, why? There's no need for that, that I can foresee. If it's to expose the `SyntaxKind` type but not any of its instances, why? This is the only actual benefit I can see of this pseudo-enum style. This diff is meant to be as non-invasive as possible, and as such reexports all symbols as they existed prior to this. It's diffed on top of the assumed-good-to-merge #15 to avoid the conflict between them. Diff without #15: <https://github.com/matklad/libsyntax2/pull/16/commits/4244948c6b1a62bd0e1ef276d1f0cc22c36f6f66> Just `src/syntax_kinds.rs`: <https://github.com/matklad/libsyntax2/pull/16/commits/4244948c6b1a62bd0e1ef276d1f0cc22c36f6f66#diff-8f0d69eb4fe0148851505f787b6fd3bb>
Diffstat (limited to 'src/tree')
-rw-r--r--src/tree/mod.rs21
1 files changed, 1 insertions, 20 deletions
diff --git a/src/tree/mod.rs b/src/tree/mod.rs
index aaf048c73..43bda480d 100644
--- a/src/tree/mod.rs
+++ b/src/tree/mod.rs
@@ -1,5 +1,4 @@
1use text::{TextRange, TextUnit}; 1use text::{TextRange, TextUnit};
2use syntax_kinds::syntax_info;
3 2
4use std::fmt; 3use std::fmt;
5use std::cmp; 4use std::cmp;
@@ -7,25 +6,7 @@ use std::cmp;
7mod file_builder; 6mod file_builder;
8pub use self::file_builder::{FileBuilder, Sink}; 7pub use self::file_builder::{FileBuilder, Sink};
9 8
10/// The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT_DEF`. 9pub use syntax_kinds::SyntaxKind;
11#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
12pub struct SyntaxKind(pub(crate) u32);
13
14pub(crate) const EOF: SyntaxKind = SyntaxKind(!0);
15pub(crate) const EOF_INFO: SyntaxInfo = SyntaxInfo { name: "EOF" };
16
17pub(crate) const TOMBSTONE: SyntaxKind = SyntaxKind(!0 - 1);
18pub(crate) const TOMBSTONE_INFO: SyntaxInfo = SyntaxInfo { name: "TOMBSTONE" };
19
20impl SyntaxKind {
21 fn info(self) -> &'static SyntaxInfo {
22 match self {
23 EOF => &EOF_INFO,
24 TOMBSTONE => &TOMBSTONE_INFO,
25 _ => syntax_info(self),
26 }
27 }
28}
29 10
30impl fmt::Debug for SyntaxKind { 11impl fmt::Debug for SyntaxKind {
31 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { 12 fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {