kirigaya/sv-parser
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

update & save

Browse Source
This commit is contained in:
锦恢 2024-10-06 15:27:50 +08:00
parent 1e390e0f44
commit 21f3e497e8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sv-parser-parser/src/source_text/system_verilog_source_text.rs
View File

@ -14,8 +14,11 @@ pub(crate) fn source_text(s: Span) -> IResult<Span, SourceText> {
#[tracable_parser] #[tracable_parser]
#[packrat_parser] #[packrat_parser]
pub(crate) fn source_text_incomplete(s: Span) -> IResult<Span, SourceText> { pub(crate) fn source_text_incomplete(s: Span) -> IResult<Span, SourceText> {
// 解析 white_space
let (s, a) = many0(white_space)(s)?; let (s, a) = many0(white_space)(s)?;
// 解析 timescale 信息
let (s, b) = opt(timeunits_declaration)(s)?; let (s, b) = opt(timeunits_declaration)(s)?;
// 解析模块信息
let (s, c) = many0(description)(s)?; let (s, c) = many0(description)(s)?;
Ok((s, SourceText { nodes: (a, b, c) })) Ok((s, SourceText { nodes: (a, b, c) }))
} }

5
sv-parser-pp/src/preprocess.rs
View File

@ -1,6 +1,5 @@
use crate::range::Range; use crate::range::Range;
use nom::combinator::all_consuming; use nom::combinator::all_consuming;
use nom::Parser;
use nom_greedyerror::error_position; use nom_greedyerror::error_position;
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
use std::convert::TryInto; use std::convert::TryInto;
@ -453,7 +452,7 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
let mut is_cover = false; let mut is_cover = false;
if let Some(define_text) = defines.get(&id) { if let Some(define_text) = defines.get(&id) {
if let Some(define_text) = define_text { if let Some(define_text) = define_text {
if define_text.text.is_some() && define_text.text.clone().unwrap().text == "dide-undefined" { if define_text.text.is_some() && define_text.text.clone().unwrap().text == "UNKNOWN_MACRO" {
is_cover = true; is_cover = true;
} }
} }
@ -619,7 +618,7 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
let mut is_cover = false; let mut is_cover = false;
if let Some(define_text) = defines.get(&id) { if let Some(define_text) = defines.get(&id) {
if let Some(define_text) = define_text { if let Some(define_text) = define_text {
if define_text.text.is_some() && define_text.text.clone().unwrap().text == "dide-undefined" { if define_text.text.is_some() && define_text.text.clone().unwrap().text == "UNKNOWN_MACRO" {
// println!("enter dide"); // println!("enter dide");
is_cover = true; is_cover = true;
} }

2
sv-parser/src/lib.rs
View File

@ -210,6 +210,8 @@ pub fn parse_sv_pp(
} else { } else {
sv_parser(span) sv_parser(span)
}; };
// println!("result {result:?}");
match result { match result {
Ok((_, x)) => Ok(( Ok((_, x)) => Ok((
SyntaxTree { SyntaxTree {