Css3 parser tryout #286
Css3 parser tryout #286
Conversation
src/css3.rs
Outdated
| if let ComponentValue::PreservedToken(_) = v { | ||
| true | ||
| } else { | ||
| false | ||
| } |
There was a problem hiding this comment.
| if let ComponentValue::PreservedToken(_) = v { | |
| true | |
| } else { | |
| false | |
| } | |
| matches!(v, ComponentValue::PreservedToken(_)) |
src/css3.rs
Outdated
| } else { | ||
| panic!("we should not be here"); | ||
| } | ||
| }).collect::<Vec<Token>>().into(); |
There was a problem hiding this comment.
I think, you can remove the into here
| }).collect::<Vec<Token>>().into(); | |
| }).collect::<Vec<Token>>(); |
src/css3.rs
Outdated
| if self.index >= self.tokens.len() { | ||
| return Token::Eof; | ||
| } | ||
|
|
||
| self.tokens[self.index].clone() |
There was a problem hiding this comment.
You can probably change this to
| if self.index >= self.tokens.len() { | |
| return Token::Eof; | |
| } | |
| self.tokens[self.index].clone() | |
| self.tokens.get(self.index).unwrap_or(&Token::Eof).clone() |
or if you don't want to clone the Token::Eof you can use
| if self.index >= self.tokens.len() { | |
| return Token::Eof; | |
| } | |
| self.tokens[self.index].clone() | |
| if let Some(token) = self.tokens.get(self.index) { | |
| token.clone() | |
| } else { | |
| Token::Eof | |
| } |
src/css3.rs
Outdated
| // ================================================================================================= | ||
|
|
||
| pub struct CSS3ParserTng<'a> { | ||
| token_stream: &'a mut dyn TokenStreamer, |
There was a problem hiding this comment.
When i think about this, it's probably better to use Nico's suggestion. (with the lifetime in the Box) because then you can store the TokenStreamer actually in the struct. If it doesn't matters, you can leave it as it is.
src/css3.rs
Outdated
| tmp_input.push(token); | ||
| } | ||
| ComponentValue::Function(_function) => { | ||
| panic!("we should not have a function here"); |
There was a problem hiding this comment.
I assume, you'll change this to a be a parser error in the future?
src/css3.rs
Outdated
| pub fn display_tree(&self) { | ||
| self.display_tree_node(&self.tree, 0); | ||
| } | ||
|
|
||
| fn display_tree_node(&self, node: &Node, level: usize) { | ||
| println!("{}{}: {:?}", " ".repeat(level), node.name, node.attributes); | ||
| for child in &node.children { | ||
| self.display_tree_node(&child, level + 1); | ||
| } | ||
| } |
There was a problem hiding this comment.
| pub fn display_tree(&self) { | |
| self.display_tree_node(&self.tree, 0); | |
| } | |
| fn display_tree_node(&self, node: &Node, level: usize) { | |
| println!("{}{}: {:?}", " ".repeat(level), node.name, node.attributes); | |
| for child in &node.children { | |
| self.display_tree_node(&child, level + 1); | |
| } | |
| } | |
| pub fn display_tree(&self) { | |
| Self::display_tree_node(&self.tree, 0); | |
| } | |
| fn display_tree_node(node: &Node, level: usize) { | |
| println!("{}{}: {:?}", " ".repeat(level), node.name, node.attributes); | |
| for child in &node.children { | |
| Self::display_tree_node(&child, level + 1); | |
| } | |
| } |
src/css3.rs
Outdated
| loop { | ||
| let t = input[idx].clone(); | ||
| idx += 1; |
There was a problem hiding this comment.
Are you somewhere exiting this loop? Because else it can (and probably will) panic because of an overflow. Maybe I miss something. (and please add the semicolons after the push and maybe change the double quotes to single ones in line 880)
src/css3/ast.rs
Outdated
|
|
||
| impl InputTake for Span<'_> { | ||
| fn take(&self, count: usize) -> Self { | ||
| let tokens = &self.0[0..count]; |
There was a problem hiding this comment.
When you give it a too high count here, it will panic
src/css3/new_tokenizer.rs
Outdated
|
|
||
| impl TokenStreamer for Tokenizer<'_> { | ||
| fn current(&self) -> Token { | ||
| if self.position == 0 || self.position > self.tokens.len() { |
There was a problem hiding this comment.
| if self.position == 0 || self.position > self.tokens.len() { | |
| if self.position == 0 || self.position >= self.tokens.len() { |
panic-alert
src/css3/nom_selector.rs
Outdated
| let node = match combinator { | ||
| Some(combinator) => { | ||
| let mut node = Node::new("Combinator"); | ||
| node.children.push(combinator); | ||
| node.children.push(selector); | ||
| node | ||
| } | ||
| None => { | ||
| selector | ||
| } |
| fn slice_index(&self, _count: usize) -> Result<usize, nom::Needed> { | ||
| todo!() | ||
| } | ||
| } |
There was a problem hiding this comment.
You probably want a simple unit test to work against, e.g., here. I would not attempt this purely from first principles, myself.
There was a problem hiding this comment.
Nevermind. I see you have a unit test down below.
jaytaph
force-pushed
the
css-tmp-parser
branch
from
a9f0cda
to
7c3e97d
Compare
Instead of filtering out componentvalues that are not tokens, we use all component values. This means that the Span does not contain just tokens, but componentvalues. This allows us to detect functions etc.
|
Old tryout. Closing in favor of a new setup |
This PR is a css3 parser created as much as possible according the specs to gain more knowledge about the css specification. Main goal would be fill in the blanks in the current css3 parser that we current have (new_parser). This PR tries to follow the specifications as close as possible.
Main entrypoints are the parse_* functions. There are multiple depending on what you like to parse (i'm not 100% sure how this actually works).
The consume_* functions are the parts that will consume tokens and return css structures like Rules, QualifiedValues etc.