Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add minimal docs to most public symbols #15

Merged
merged 1 commit into from
Jan 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/lexer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use self::strings::{is_string_literal_start, scan_byte_char_or_string, scan_char
mod comments;
use self::comments::{scan_comment, scan_shebang};

/// Break a string up into its component tokens
pub fn tokenize(text: &str) -> Vec<Token> {
let mut text = text;
let mut acc = Vec::new();
Expand All @@ -28,6 +29,7 @@ pub fn tokenize(text: &str) -> Vec<Token> {
}
acc
}
/// Get the next token from a string
pub fn next_token(text: &str) -> Token {
assert!(!text.is_empty());
let mut ptr = Ptr::new(text);
Expand Down
20 changes: 20 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
//! An experimental implementation of [Rust RFC#2256 libsyntax2.0][rfc#2256].
//!
//! The intent is to be an IDE-ready parser, i.e. one that offers
//!
//! - easy and fast incremental re-parsing,
//! - graceful handling of errors, and
//! - maintains all information in the source file.
//!
//! For more information, see [the RFC][rfc#2265], or [the working draft][RFC.md].
//!
//! [rfc#2256]: <https://github.com/rust-lang/rfcs/pull/2256>
//! [RFC.md]: <https://github.com/matklad/libsyntax2/blob/master/docs/RFC.md>

#![forbid(missing_debug_implementations, unconditional_recursion, future_incompatible)]
#![deny(bad_style, unsafe_code, missing_docs)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, I feel slightly uneasy about missing_docs: this is very experimental and will change a lot, so all docs potentially will have to be rewritten many times.

On the other hand, I hope that the public API surface will be small, and documenting it would help with design...

This also exposed one interesting problem: FileBuilder is not a public API and should be pub(crate).

//#![warn(unreachable_pub)] // rust-lang/rust#47816

extern crate unicode_xid;

mod text;
Expand All @@ -6,17 +23,20 @@ mod lexer;
mod parser;

#[cfg_attr(rustfmt, rustfmt_skip)]
#[allow(missing_docs)]
pub mod syntax_kinds;
pub use text::{TextRange, TextUnit};
pub use tree::{File, FileBuilder, Node, Sink, SyntaxKind, Token};
pub use lexer::{next_token, tokenize};
pub use parser::parse;

/// Utilities for simple uses of the parser.
pub mod utils {
use std::fmt::Write;

use {File, Node};

/// Parse a file and create a string representation of the resulting parse tree.
pub fn dump_tree(file: &File) -> String {
let mut result = String::new();
go(file.root(), &mut result, 0);
Expand Down
1 change: 1 addition & 0 deletions src/parser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use tree::TOMBSTONE;
mod event_parser;
use self::event_parser::Event;

/// Parse a sequence of tokens into the representative node tree
pub fn parse(text: String, tokens: &[Token]) -> File {
let events = event_parser::parse(&text, tokens);
from_events_to_file(text, tokens, events)
Expand Down
11 changes: 11 additions & 0 deletions src/text.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
use std::fmt;
use std::ops;

/// An text position in a source file
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct TextUnit(u32);

impl TextUnit {
/// The positional offset required for one character
pub fn len_of_char(c: char) -> TextUnit {
TextUnit(c.len_utf8() as u32)
}

#[allow(missing_docs)]
pub fn new(val: u32) -> TextUnit {
TextUnit(val)
}
Expand Down Expand Up @@ -64,6 +67,7 @@ impl ops::SubAssign<TextUnit> for TextUnit {
}
}

/// A range of text in a source file
#[derive(Clone, Copy, PartialEq, Eq)]
pub struct TextRange {
start: TextUnit,
Expand All @@ -83,10 +87,12 @@ impl fmt::Display for TextRange {
}

impl TextRange {
/// An length-0 range of text
pub fn empty() -> TextRange {
TextRange::from_to(TextUnit::new(0), TextUnit::new(0))
}

/// The left-inclusive range (`[from..to)`) between to points in the text
pub fn from_to(from: TextUnit, to: TextUnit) -> TextRange {
assert!(from <= to, "Invalid text range [{}; {})", from, to);
TextRange {
Expand All @@ -95,22 +101,27 @@ impl TextRange {
}
}

/// The range from some point over some length
pub fn from_len(from: TextUnit, len: TextUnit) -> TextRange {
TextRange::from_to(from, from + len)
}

/// The starting position of this range
pub fn start(&self) -> TextUnit {
self.start
}

/// The end position of this range
pub fn end(&self) -> TextUnit {
self.end
}

/// The length of this range
pub fn len(&self) -> TextUnit {
self.end - self.start
}

/// Is this range empty of any content?
pub fn is_empty(&self) -> bool {
self.start() == self.end()
}
Expand Down
5 changes: 5 additions & 0 deletions src/tree/file_builder.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(CAD97): I don't understand this mod well enough to stub out docs for the public symbols yet
#![allow(missing_docs)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be covered by #17


use {SyntaxKind, TextRange, TextUnit};
use super::{File, NodeData, NodeIdx, SyntaxErrorData};

Expand All @@ -8,6 +11,7 @@ pub trait Sink {
fn error(&mut self) -> ErrorBuilder;
}

#[derive(Debug)]
pub struct FileBuilder {
text: String,
nodes: Vec<NodeData>,
Expand Down Expand Up @@ -139,6 +143,7 @@ fn grow(left: &mut TextRange, right: TextRange) {
*left = TextRange::from_to(left.start(), right.end())
}

#[derive(Debug)]
pub struct ErrorBuilder<'f> {
message: Option<String>,
builder: &'f mut FileBuilder,
Expand Down
24 changes: 21 additions & 3 deletions src/tree/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use std::cmp;
mod file_builder;
pub use self::file_builder::{FileBuilder, Sink};

/// The kind of syntax node, e.g. `IDENT`, `USE_KW`, or `STRUCT_DEF`.
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct SyntaxKind(pub(crate) u32);

Expand Down Expand Up @@ -37,19 +38,25 @@ pub(crate) struct SyntaxInfo {
pub name: &'static str,
}

/// A token of Rust source.
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub struct Token {
/// The kind of token.
pub kind: SyntaxKind,
/// The length of the token.
pub len: TextUnit,
}

/// The contents of a Rust source file.
#[derive(Debug)]
pub struct File {
text: String,
nodes: Vec<NodeData>,
errors: Vec<SyntaxErrorData>,
}

impl File {
/// The root node of this source file.
pub fn root<'f>(&'f self) -> Node<'f> {
assert!(!self.nodes.is_empty());
Node {
Expand All @@ -59,35 +66,42 @@ impl File {
}
}

/// A reference to a token in a Rust source file.
#[derive(Clone, Copy)]
pub struct Node<'f> {
file: &'f File,
idx: NodeIdx,
}

impl<'f> Node<'f> {
/// The kind of the token at this node.
pub fn kind(&self) -> SyntaxKind {
self.data().kind
}

/// The text range covered by the token at this node.
pub fn range(&self) -> TextRange {
self.data().range
}

/// The text at this node.
pub fn text(&self) -> &'f str {
&self.file.text.as_str()[self.range()]
}

/// The parent node to this node.
pub fn parent(&self) -> Option<Node<'f>> {
self.as_node(self.data().parent)
}

/// The children nodes of this node.
pub fn children(&self) -> Children<'f> {
Children {
next: self.as_node(self.data().first_child),
}
}

/// Any errors contained in this node.
pub fn errors(&self) -> SyntaxErrors<'f> {
let pos = self.file.errors.iter().position(|e| e.node == self.idx);
let next = pos.map(|i| ErrorIdx(i as u32)).map(|idx| SyntaxError {
Expand Down Expand Up @@ -123,7 +137,7 @@ impl<'f> cmp::PartialEq<Node<'f>> for Node<'f> {

impl<'f> cmp::Eq for Node<'f> {}

#[derive(Clone, Copy)]
#[derive(Clone, Copy, Debug)]
pub struct SyntaxError<'f> {
file: &'f File,
idx: ErrorIdx,
Expand Down Expand Up @@ -162,6 +176,7 @@ impl<'f> SyntaxError<'f> {
}
}

#[derive(Debug)]
pub struct Children<'f> {
next: Option<Node<'f>>,
}
Expand All @@ -176,6 +191,7 @@ impl<'f> Iterator for Children<'f> {
}
}

#[derive(Debug)]
pub struct SyntaxErrors<'f> {
next: Option<SyntaxError<'f>>,
}
Expand All @@ -190,9 +206,10 @@ impl<'f> Iterator for SyntaxErrors<'f> {
}
}

#[derive(Clone, Copy, PartialEq, Eq)]
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
struct NodeIdx(u32);

#[derive(Debug)]
struct NodeData {
kind: SyntaxKind,
range: TextRange,
Expand All @@ -215,9 +232,10 @@ impl ::std::ops::IndexMut<NodeIdx> for Vec<NodeData> {
}
}

#[derive(Clone, Copy)]
#[derive(Clone, Copy, Debug)]
struct ErrorIdx(u32);

#[derive(Debug)]
struct SyntaxErrorData {
node: NodeIdx,
message: String,
Expand Down