Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This patch introduces infrastructure for the rule tree, and constructs it. We don't use it yet, nor have good heuristics for GC'ing it, but this should not happen anymore once we store the rule node reference in the node. I haven't messed up with memory orders because I want to do a try run with it, then mess with them. Take down the ApplicableDeclarationsCache, use the rule tree for doing the cascade.
- Loading branch information
1 parent
f7875da
commit de4fe6e
Showing
22 changed files
with
1,068 additions
and
553 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* This Source Code Form is subject to the terms of the Mozilla Public | ||
| * License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| //! A set of simple iterators to be reused for doing the cascade. | ||
|
|
||
| use properties::{Importance, PropertyDeclaration}; | ||
|
|
||
|
|
||
| /// An iterator that applies the declarations in a list that matches the given | ||
| /// importance. | ||
| #[derive(Clone)] | ||
| pub struct SimpleDeclarationsIterator<'a> { | ||
| declarations: &'a [(PropertyDeclaration, Importance)], | ||
| importance: Importance, | ||
| index: usize, | ||
| } | ||
|
|
||
| impl<'a> SimpleDeclarationsIterator<'a> { | ||
| pub fn new(declarations: &'a [(PropertyDeclaration, Importance)], | ||
| importance: Importance) -> Self { | ||
| SimpleDeclarationsIterator { | ||
| declarations: declarations, | ||
| importance: importance, | ||
| index: 0, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Iterator for SimpleDeclarationsIterator<'a> { | ||
| type Item = &'a PropertyDeclaration; | ||
|
|
||
| fn next(&mut self) -> Option<Self::Item> { | ||
| loop { | ||
| if self.index == self.declarations.len() { | ||
| return None; | ||
| } | ||
|
|
||
| let (ref decl, importance) = | ||
| self.declarations[self.declarations.len() - self.index - 1]; | ||
|
|
||
| self.index += 1; | ||
|
|
||
| if importance == self.importance { | ||
| return Some(decl) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// An iterator that applies the declarations in a list without checking any | ||
| /// order. | ||
| #[derive(Clone)] | ||
| pub struct RawDeclarationsIterator<'a> { | ||
| declarations: &'a [(PropertyDeclaration, Importance)], | ||
| index: usize, | ||
| } | ||
|
|
||
| impl<'a> RawDeclarationsIterator<'a> { | ||
| pub fn new(declarations: &'a [(PropertyDeclaration, Importance)]) -> Self { | ||
| RawDeclarationsIterator { | ||
| declarations: declarations, | ||
| index: 0, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Iterator for RawDeclarationsIterator<'a> { | ||
| type Item = &'a PropertyDeclaration; | ||
|
|
||
| fn next(&mut self) -> Option<Self::Item> { | ||
| if self.index == self.declarations.len() { | ||
| return None; | ||
| } | ||
|
|
||
| let (ref decl, _) = | ||
| self.declarations[self.declarations.len() - self.index - 1]; | ||
|
|
||
| self.index += 1; | ||
|
|
||
| return Some(decl) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.