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.

Sign up for GitHub

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

Jump to bottom

feat(css): add expected parser struct output #227

Merged
merged 1 commit into from
Nov 4, 2023
Merged

feat(css): add expected parser struct output #227

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 35 additions & 12 deletions src/css3/new_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{bytes::CharIterator, css3::new_tokenizer::Tokenizer};

struct Function {
name: String,
value: Vec<Token>,
value: Vec<ComponentValue>,
}

enum SimpleBlockTokenKind {
Expand All @@ -14,9 +14,36 @@ enum SimpleBlockTokenKind {

struct SimpleBlock {
kind: SimpleBlockTokenKind,
value: Vec<Token>,
value: Vec<ComponentValue>,
}

struct AtRule {
name: String,
prelude: Vec<ComponentValue>,
block: Option<SimpleBlock>,
}

struct QualifiedRule {
prelude: Vec<ComponentValue>,
block: SimpleBlock,
}

struct Declaration {
name: String,
value: Vec<ComponentValue>,
important: bool,
}

enum ComponentValue {
/// Any token expect for `<function-token>`, `<{-token>`, `<(-token>`, and `<[-token>` (which are consumed in other higher-level objects)
///
/// Note: `<}-token>`, `<)-token>`, `<]-token>`, `<bad-string-token>`, and `<bad-url-token>` are always parse errors.
Token(Token),
Function(Function),
SimpleBlock(SimpleBlock),
}

// Parser output: at-rules, qualified rules, and/or declarations
pub struct CSS3Parser<'stream> {
tokenizer: Tokenizer<'stream>,
}
Expand All @@ -26,8 +53,8 @@ impl<'stream> CSS3Parser<'stream> {
CSS3Parser { tokenizer }
}

pub fn from_input_stream(is: &mut CharIterator) -> CSS3Parser {
CSS3Parser::new(Tokenizer::new(is))
pub fn from_input_stream(ci: &mut CharIterator) -> CSS3Parser {
CSS3Parser::new(Tokenizer::new(ci))
}

/// [5.3.1. Parse something according to a CSS grammar](https://www.w3.org/TR/css-syntax-3/#parse-grammar)
Expand All @@ -41,8 +68,8 @@ impl<'stream> CSS3Parser<'stream> {
}

/// [5.4.9. Consume a function](https://www.w3.org/TR/css-syntax-3/#consume-function)
fn consume_function(&mut self) -> Function {
let name = self.consume_token(TokenKind::Function).value();
fn consume_function(&mut self) {
let _name = self.consume_token(TokenKind::Function).value();
let mut value = Vec::new();

loop {
Expand All @@ -54,15 +81,13 @@ impl<'stream> CSS3Parser<'stream> {

value.push(token);
}

Function { name, value }
}

/// [5.4.7. Consume a component value](https://www.w3.org/TR/css-syntax-3/#consume-a-component-value)
fn consume_component_value(&mut self) {}

/// [5.4.8. Consume a simple block](https://www.w3.org/TR/css-syntax-3/#consume-a-simple-block)
fn consume_simple_block(&mut self) -> SimpleBlock {
fn consume_simple_block(&mut self) {
let start = self.current_token().kind();
// consume block start <{-token>, <[-token>, or <(-token>.
self.consume_token(start);
Expand All @@ -80,14 +105,12 @@ impl<'stream> CSS3Parser<'stream> {
value.push(self.consume_token(TokenKind::Any))
}

let kind = match start {
let _kind = match start {
TokenKind::LParen => SimpleBlockTokenKind::Paren,
TokenKind::LCurly => SimpleBlockTokenKind::Curly,
TokenKind::LBracket => SimpleBlockTokenKind::Bracket,
_ => todo!(),
};

SimpleBlock { kind, value }
}

fn current_token(&self) -> Token {
Expand Down