lexer: rename StartHeredoc and EndHeredoc to *DocString

Author: ryangjchandler

src/lexer/mod.rs

@@ -557,7 +557,7 @@ impl Lexer {
  state.next();
  state.set(StackFrame::DocString(doc_string_kind, label.clone()))?;
 
- TokenKind::StartHeredoc(label, doc_string_kind)
+ TokenKind::StartDocString(label, doc_string_kind)
  }
  [b'<', b'<', b'=', ..] => {
  state.skip(3);
@@ -772,7 +772,7 @@ impl Lexer {
  if state.try_read(&label) {
  state.skip(label.len());
  state.set(StackFrame::Scripting)?;
- break TokenKind::EndHeredoc(label, None, 0);
+ break TokenKind::EndDocString(label, None, 0);
  }
 
  // We know the label isn't at the start of the line, so we can 
@@ -861,7 +861,7 @@ impl Lexer {
  // to normalize.
  state.skip(label.len());
  state.set(StackFrame::Scripting)?;
- break TokenKind::EndHeredoc(label, indentation_type, current_indentation_amount);
+ break TokenKind::EndDocString(label, indentation_type, current_indentation_amount);
  } else {
  buffer.extend(whitespace_buffer);
  continue;

src/lexer/token.rs

@@ -38,8 +38,8 @@ impl Into<u8> for DocStringIndentationType {
 
 #[derive(Debug, PartialEq, PartialOrd, Clone)]
 pub enum TokenKind {
- StartHeredoc(ByteString, DocStringKind),
- EndHeredoc(ByteString, Option<DocStringIndentationType>, usize),
+ StartDocString(ByteString, DocStringKind),
+ EndDocString(ByteString, Option<DocStringIndentationType>, usize),
  From,
  Print,
  Dollar,
@@ -239,12 +239,12 @@ impl Default for Token {
 impl Display for TokenKind {
  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
  let s = match self {
- Self::StartHeredoc(label, kind) => if kind == &DocStringKind::Nowdoc {
+ Self::StartDocString(label, kind) => if kind == &DocStringKind::Nowdoc {
  return write!(f, "<<<'{}'", label)
  } else {
  return write!(f, "<<<{}", label)
  },
- Self::EndHeredoc(label, ..) => return write!(f, "{}", label),
+ Self::EndDocString(label, ..) => return write!(f, "{}", label),
  Self::BangEquals => "!=",
  Self::From => "from",
  Self::Print => "print",

src/parser/mod.rs

@@ -1053,7 +1053,7 @@ impl Parser {
  e
  }
  TokenKind::StringPart(_) => self.interpolated_string(state)?,
- TokenKind::StartHeredoc(label, kind) => {
+ TokenKind::StartDocString(label, kind) => {
  let kind = kind.clone();
  let label = label.clone();
 
@@ -1578,14 +1578,14 @@ impl Parser {
  DocStringKind::Heredoc => {
  let mut parts = Vec::new();
 
- while !matches!(state.current.kind, TokenKind::EndHeredoc(_, _, _)) {
+ while !matches!(state.current.kind, TokenKind::EndDocString(_, _, _)) {
  if let Some(part) = self.interpolated_string_part(state)? {
  parts.push(part);
  }
  }
 
  let (indentation_type, indentation_amount) = match state.current.kind {
- TokenKind::EndHeredoc(_, indentation_type, indentation_amount) => (indentation_type, indentation_amount),
+ TokenKind::EndDocString(_, indentation_type, indentation_amount) => (indentation_type, indentation_amount),
  _ => unreachable!(),
  };
 
@@ -1617,7 +1617,7 @@ impl Parser {
  // but since I already had the logic in place for parsing heredocs, this was
  // the fastest way to get nowdocs working too.
  let s = expect_token!([TokenKind::StringPart(s) => s], state, "constant string");
- expect_token!([TokenKind::EndHeredoc(..)], state, "label");
+ expect_token!([TokenKind::EndDocString(..)], state, "label");
 
  Expression::Nowdoc { value: s }
  },

tests/0224/tokens.txt

@@ -9,7 +9,7 @@
  ),
  },
  Token {
- kind: StartHeredoc(
+ kind: StartDocString(
  "EOF",
  Heredoc,
  ),
@@ -28,7 +28,7 @@
  ),
  },
  Token {
- kind: EndHeredoc(
+ kind: EndDocString(
  "EOF",
  None,
  0,

tests/0225/tokens.txt

@@ -9,7 +9,7 @@
  ),
  },
  Token {
- kind: StartHeredoc(
+ kind: StartDocString(
  "TXT",
  Heredoc,
  ),
@@ -28,7 +28,7 @@
  ),
  },
  Token {
- kind: EndHeredoc(
+ kind: EndDocString(
  "TXT",
  None,
  0,

tests/0228/tokens.txt

@@ -9,7 +9,7 @@
  ),
  },
  Token {
- kind: StartHeredoc(
+ kind: StartDocString(
  "EOF",
  Heredoc,
  ),
@@ -28,7 +28,7 @@
  ),
  },
  Token {
- kind: EndHeredoc(
+ kind: EndDocString(
  "EOF",
  None,
  0,

tests/0229/tokens.txt

@@ -9,7 +9,7 @@
  ),
  },
  Token {
- kind: StartHeredoc(
+ kind: StartDocString(
  "EOF",
  Heredoc,
  ),
@@ -28,7 +28,7 @@
  ),
  },
  Token {
- kind: EndHeredoc(
+ kind: EndDocString(
  "EOF",
  Some(
  Space,

tests/0230/tokens.txt

@@ -9,7 +9,7 @@
  ),
  },
  Token {
- kind: StartHeredoc(
+ kind: StartDocString(
  "EOF",
  Heredoc,
  ),
@@ -28,7 +28,7 @@
  ),
  },
  Token {
- kind: EndHeredoc(
+ kind: EndDocString(
  "EOF",
  Some(
  Space,