crates/sel4: Merge bitfield-parser into sys

Signed-off-by: Nick Spinale <[email protected]>

Author: nspin

Diff for: Cargo.lock

@@ -148,8 +148,6 @@ members = [
     "crates/sel4-synthetic-elf",
     "crates/sel4-test-harness",
     "crates/sel4/bitfield-ops",
-    "crates/sel4/bitfield-parser",
-    "crates/sel4/bitfield-parser/test",
     "crates/sel4/build-env",
     "crates/sel4/config",
     "crates/sel4/config/data",

Diff for: Cargo.toml

@@ -20,11 +20,12 @@ mk {
     inherit (versions)
       proc-macro2 quote prettyplease
       bindgen xmltree glob
+      regex pest
     ;
+    pest_derive = versions.pest;
     syn = { version = versions.syn; features = [ "parsing" ]; };
     inherit (localCrates)
       sel4-build-env
-      sel4-bitfield-parser
       sel4-config
       sel4-config-data
     ;

Diff for: crates/sel4/bitfield-parser/Cargo.nix

@@ -25,10 +25,12 @@ sel4-config = { path = "../config" }
 [build-dependencies]
 bindgen = "0.70.1"
 glob = "0.3.0"
+pest = "2.4.1"
+pest_derive = "2.4.1"
 prettyplease = "0.2.25"
 proc-macro2 = "1.0.89"
 quote = "1.0.37"
-sel4-bitfield-parser = { path = "../bitfield-parser" }
+regex = "1.7.0"
 sel4-build-env = { path = "../build-env" }
 sel4-config = { path = "../config" }
 sel4-config-data = { path = "../config/data" }

Diff for: crates/sel4/bitfield-parser/Cargo.toml

@@ -11,15 +11,17 @@ use proc_macro2::{Literal, TokenStream};
 use quote::{format_ident, quote};
 use syn::Ident;
 
+mod parser;
 mod simplified;
+
 use simplified::*;
 
 pub fn generate_rust(
     blocklist_for_bindgen: &mut Vec<String>,
     bf_path: impl AsRef<Path>,
 ) -> TokenStream {
     let text = fs::read_to_string(bf_path).unwrap();
-    let file = sel4_bitfield_parser::parse(&text);
+    let file = parser::parse(&text);
     let file = simplify(&file);
     let mut generator = BitfieldGenerator::new(blocklist_for_bindgen);
     for block in file.blocks.iter() {

Diff for: crates/sel4/bitfield-parser/test/Cargo.nix

@@ -13,7 +13,7 @@ pub mod ast;
 use ast::*;
 
 #[derive(Parser)]
-#[grammar = "grammar.pest"]
+#[grammar = "build/bf/parser/grammar.pest"]
 struct BitfieldParser;
 
 pub fn parse(text: &str) -> File {
@@ -32,10 +32,6 @@ fn remove_comments(text: &str) -> String {
 }
 
 impl File {
-    pub fn parse_from_str(text: &str) -> Self {
-        parse(text)
-    }
-
     fn parse(pair: Pair<Rule>) -> Self {
         assert_eq!(pair.as_rule(), Rule::file);
 

Diff for: crates/sel4/bitfield-parser/test/Cargo.toml

@@ -7,7 +7,7 @@
 use std::collections::BTreeSet;
 use std::ops::Range;
 
-use sel4_bitfield_parser::ast;
+use super::parser::ast;
 
 pub fn simplify(orig: &ast::File) -> File {
     File::simplify(orig)