From 7d1c0e16a835feb7c8ae49b5463bcb76bdfd027f Mon Sep 17 00:00:00 2001
From: Yehowshua Immanuel <programmed4jesus@gmail.com>
Date: Thu, 19 May 2022 03:44:24 -0400
Subject: [PATCH] preliminary parser progress

---
 Cargo.toml  |  2 +-
 README.md   | 37 ++++++++++++++++++++++++++++++++-
 src/main.rs | 59 +++++++++++++++++++++++++++++++++++++++++++----------
 3 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 78e1485..64aa6cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 num = "0.4"
 clap = { version = "3.1.8", features = ["derive"] }
-next-gen = "0.1.1"
\ No newline at end of file
+chrono = "0.4"
\ No newline at end of file
diff --git a/README.md b/README.md
index d655fe1..3580a09 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,44 @@ The first build of the program may take some time.
 
 # TODO
  - [x] We need a way to merge lines.
+ - [ ] Need to perform signal aliasing
+     - use vec of enum {Sig, Alias}
+ - [ ] Should insert nodes in BFS order
  - [ ] We need to start regression testing the parser over all files
  - [ ] Take a look at GTKWave parser to compare effificiency.
  - [ ] Send survey to community channel.
 
 ### May 18
- - [ ] move while loop into word yielding iterator
\ No newline at end of file
+ - [ ] move while loop into word yielding iterator
+
+# Files
+./test-vcd-files/aldec/SPI_Write.vcd
+./test-vcd-files/ghdl/alu.vcd
+./test-vcd-files/ghdl/idea.vcd
+./test-vcd-files/ghdl/pcpu.vcd
+./test-vcd-files/gtkwave-analyzer/perm_current.vcd
+./test-vcd-files/icarus/CPU.vcd
+./test-vcd-files/icarus/rv32_soc_TB.vcd
+./test-vcd-files/icarus/test1.vcd
+./test-vcd-files/model-sim/CPU_Design.msim.vcd
+./test-vcd-files/model-sim/clkdiv2n_tb.vcd
+./test-vcd-files/my-hdl/Simple_Memory.vcd
+./test-vcd-files/my-hdl/sigmoid_tb.vcd
+./test-vcd-files/my-hdl/top.vcd
+./test-vcd-files/ncsim/ffdiv_32bit_tb.vcd
+./test-vcd-files/quartus/mipsHardware.vcd
+./test-vcd-files/quartus/wave_registradores.vcd
+./test-vcd-files/questa-sim/dump.vcd
+./test-vcd-files/questa-sim/test.vcd
+./test-vcd-files/riviera-pro/dump.vcd
+./test-vcd-files/systemc/waveform.vcd
+./test-vcd-files/treadle/GCD.vcd
+./test-vcd-files/vcs/Apb_slave_uvm_new.vcd
+./test-vcd-files/vcs/datapath_log.vcd
+./test-vcd-files/vcs/processor.vcd
+./test-vcd-files/verilator/swerv1.vcd
+./test-vcd-files/verilator/vlt_dump.vcd
+./test-vcd-files/vivado/iladata.vcd
+./test-vcd-files/xilinx_isim/test.vcd
+./test-vcd-files/xilinx_isim/test1.vcd
+./test-vcd-files/xilinx_isim/test2x2_regex22_string1.vcd
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index bec0fc8..a8f468b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,8 @@ use std::io::prelude::*;
 use std::io;
 use std::fs::File;
 use std::collections::BTreeMap;
-use ::next_gen::prelude::*;
+use chrono::prelude::*;
+use std::rc::Rc;
 
 use num::*;
 use clap::Parser;
@@ -14,16 +15,53 @@ struct Cli {
     path: std::path::PathBuf,
 }
 
+
+// TODO: implement any timescales greater than a second
+enum Timescale {ps, ns, us, ms, s}
+
+struct Metadata {
+    date      : DateTime<FixedOffset>,
+    version   : String,
+    timescale : Timescale
+}
+
 struct Signal {
     name          : String,
     timeline      : BTreeMap<BigInt, BigInt>,
     children_arena: Vec<usize>,
     parent_index  : usize
+
+} 
+
+struct SignalAlias {
+    name          : String,
+    signal_alias  : Rc<Signal>
+}
+
+enum SignalGeneric{
+    Signal(Signal),
+    SignalAlias(SignalAlias),
+}
+
+struct Scope {
+    name    : String,
+    signals : Vec<SignalGeneric>,
+    scopes  : Vec<Scope>,
+}
+
+struct VCD {
+    metadata   : Metadata,
+    top_scopes : Vec<Scope>
 }
 
 
-#[generator(yield(&str))]
-fn yield_words(file : File) {
+enum VCD_Parser_State {Date, Version, Timescale, SignalTree, Values}
+enum Date_Parser_State {Date, Day, Month, HHMMSS, Year}
+
+fn parse_vcd(word: &str, mut state : VCD_Parser_State) {}
+fn parse_date(word : &str, mut state : Date_Parser_State) {}
+
+fn yield_word_and_apply(file : File, mut f : impl FnMut(&str)) {
     let mut reader = io::BufReader::new(file);
 
     let mut buffer = String::new();
@@ -43,24 +81,23 @@ fn yield_words(file : File) {
         let words = buffer.split_ascii_whitespace();
 
         for word in words {
-            yield_!(word);
+            f(word);
         }
         
         buffer.clear();
     }
 
-
 }
 
 fn main() -> std::io::Result<()> {
     let args = Cli::parse();
 
-    let file       = File::open(&args.path)?;
-    let mut word_count = 0;
-    mk_gen!(let mut generator = yield_words(file));
+    // let dt = Utc.datetime_from_str("Fri Nov 28 12:00:09 2014", "%a %b %e %T %Y");
 
-    for word in generator {
-        word_count += 1;
-    }
+    let file           = File::open(&args.path)?;
+    let mut word_count = 0;
+
+    yield_word_and_apply(file, |word| {word_count += 1});
+    dbg!(word_count);
     Ok(())
 }