Impl library_source_text

src/parser/source_text/library_source_text.rs

@@ -1,8 +1,9 @@
 use crate::parser::*;
-//use nom::branch::*;
-//use nom::combinator::*;
-use nom::error::*;
-use nom::{Err, IResult};
+use nom::branch::*;
+use nom::combinator::*;
+use nom::multi::*;
+use nom::sequence::*;
+use nom::IResult;
 
 // -----------------------------------------------------------------------------
 
@@ -16,41 +17,100 @@ pub enum LibraryDescription<'a> {
     LibraryDeclaration(LibraryDeclaration<'a>),
     IncludeStatement(IncludeStatement<'a>),
     ConfigDeclaration(ConfigDeclaration<'a>),
+    Null(Symbol<'a>),
 }
 
 #[derive(Debug)]
 pub struct LibraryDeclaration<'a> {
     pub nodes: (
+        Symbol<'a>,
         LibraryIdentifier<'a>,
-        Vec<FilePathSpec<'a>>,
-        Option<Vec<FilePathSpec<'a>>>,
+        FilePathSpec<'a>,
+        Vec<(Symbol<'a>, FilePathSpec<'a>)>,
+        Option<(
+            Symbol<'a>,
+            FilePathSpec<'a>,
+            Vec<(Symbol<'a>, FilePathSpec<'a>)>,
+        )>,
+        Symbol<'a>,
     ),
 }
 
 #[derive(Debug)]
 pub struct IncludeStatement<'a> {
-    pub nodes: (FilePathSpec<'a>,),
+    pub nodes: (Symbol<'a>, FilePathSpec<'a>, Symbol<'a>),
 }
 
 #[derive(Debug)]
 pub struct FilePathSpec<'a> {
-    pub nodes: (Span<'a>,),
+    pub nodes: (StringLiteral<'a>,),
 }
 
 // -----------------------------------------------------------------------------
 
 pub fn library_text(s: Span) -> IResult<Span, LibraryText> {
-    Err(Err::Error(make_error(s, ErrorKind::Fix)))
+    let (s, a) = many0(library_description)(s)?;
+    Ok((s, LibraryText { nodes: (a,) }))
 }
 
 pub fn library_description(s: Span) -> IResult<Span, LibraryDescription> {
-    Err(Err::Error(make_error(s, ErrorKind::Fix)))
+    alt((
+        map(library_declaration, |x| {
+            LibraryDescription::LibraryDeclaration(x)
+        }),
+        map(include_statement, |x| {
+            LibraryDescription::IncludeStatement(x)
+        }),
+        map(config_declaration, |x| {
+            LibraryDescription::ConfigDeclaration(x)
+        }),
+        map(symbol(";"), |x| LibraryDescription::Null(x)),
+    ))(s)
 }
 
 pub fn library_declaration(s: Span) -> IResult<Span, LibraryDeclaration> {
-    Err(Err::Error(make_error(s, ErrorKind::Fix)))
+    let (s, a) = symbol("library")(s)?;
+    let (s, b) = library_identifier(s)?;
+    let (s, c) = file_path_spec(s)?;
+    let (s, d) = many0(pair(symbol(","), file_path_spec))(s)?;
+    let (s, e) = opt(tuple((
+        symbol("-incdir"),
+        file_path_spec,
+        many0(pair(symbol(","), file_path_spec)),
+    )))(s)?;
+    let (s, f) = symbol(";")(s)?;
+    Ok((
+        s,
+        LibraryDeclaration {
+            nodes: (a, b, c, d, e, f),
+        },
+    ))
 }
 
 pub fn include_statement(s: Span) -> IResult<Span, IncludeStatement> {
-    Err(Err::Error(make_error(s, ErrorKind::Fix)))
+    let (s, a) = symbol("include")(s)?;
+    let (s, b) = file_path_spec(s)?;
+    let (s, c) = symbol(";")(s)?;
+    Ok((s, IncludeStatement { nodes: (a, b, c) }))
+}
+
+pub fn file_path_spec(s: Span) -> IResult<Span, FilePathSpec> {
+    let (s, a) = string_literal(s)?;
+    Ok((s, FilePathSpec { nodes: (a,) }))
+}
+
+// -----------------------------------------------------------------------------
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_library_text() {
+        parser_test!(
+            library_text,
+            "library rtlLib \"*.v\" -incdir \"aaa\";\ninclude \"bbb\";;",
+            Ok((_, _))
+        );
+    }
 }