Merge remote-tracking branch 'origin/master' into bugfix/stil_annotation

Origen-SDK · Jan 17, 2025 · 6a35a76 · 6a35a76
2 parents 7fe7d04 + 79675ad
commit 6a35a76
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 6 deletions.
diff --git a/rust/origen_metal/Cargo.lock b/rust/origen_metal/Cargo.lock
diff --git a/rust/origen_metal/src/stil/nodes.rs b/rust/origen_metal/src/stil/nodes.rs
@@ -41,8 +41,8 @@ pub enum STIL {
     DefaultState(stil::State),
     Base(stil::Base, String),
     Alignment(stil::Alignment),
-    ScanIn(u32),
-    ScanOut(u32),
+    ScanIn(Option<u32>),
+    ScanOut(Option<u32>),
     DataBitCount(u32),
     SignalGroups(Option<String>),
     SignalGroup(String),

diff --git a/rust/origen_metal/src/stil/parser.rs b/rust/origen_metal/src/stil/parser.rs
@@ -431,8 +431,22 @@ pub fn to_ast(mut pair: Pair<Rule>, source_file: Option<&str>) -> Result<AST<STI
             Rule::alignment => {
                 ast.push(node!(STIL::Alignment, inner_strs(pair)[0].parse().unwrap()))
             }
-            Rule::scan_in => ast.push(node!(STIL::ScanIn, inner_strs(pair)[0].parse().unwrap())),
-            Rule::scan_out => ast.push(node!(STIL::ScanOut, inner_strs(pair)[0].parse().unwrap())),
+            Rule::scan_in => {
+                let vals = inner_strs(pair);
+                ast.push(if vals.len() == 0 {
+                    node!(STIL::ScanIn, None)
+                } else {
+                    node!(STIL::ScanIn, Some(vals[0].parse().unwrap()))
+                })
+            }
+            Rule::scan_out => {
+                let vals = inner_strs(pair);
+                ast.push(if vals.len() == 0 {
+                    node!(STIL::ScanOut, None)
+                } else {
+                    node!(STIL::ScanOut, Some(vals[0].parse().unwrap()))
+                })
+            }
             Rule::data_bit_count => ast.push(node!(
                 STIL::DataBitCount,
                 inner_strs(pair)[0].parse().unwrap()

diff --git a/rust/origen_metal/src/stil/stil.pest b/rust/origen_metal/src/stil/stil.pest
@@ -121,8 +121,8 @@ base_val = { ("Hex" | "Dec") }
 
 alignment = { "Alignment" ~ alignment_val ~ EOS }
 alignment_val = { ("MSB" | "LSB") }
-scan_in = { "ScanIn" ~ integer ~ EOS }
-scan_out = { "ScanOut" ~ integer ~ EOS }
+scan_in = { "ScanIn" ~ integer? ~ EOS }
+scan_out = { "ScanOut" ~ integer? ~ EOS }
 data_bit_count = { "DataBitCount" ~ integer ~ EOS }
 waveform_character_list = @{ waveform_character+ }
 waveform_character = { ASCII_ALPHANUMERIC }

diff --git a/test_apps/python_app/vendor/stil/file_that_contains_signal_groups.extension b/test_apps/python_app/vendor/stil/file_that_contains_signal_groups.extension
@@ -17,6 +17,8 @@ SignalGroups {
 
   MULTIGROUP0 = 'group0 + group1 + group2';
   MULTIGROUP1 = 'group3 + group4 + group5 + group6' ;
+  ScanIO_1 = 'PIN0' {ScanOut;}
+  ScanIO_2 = 'PIN1' {ScanOut 2;}
   AllPins = 'group0 + group1 + group2 + group3 + group4 + group5 + group6 + group7 + group8 + group9 + group10 + group11 + group12';
 
 }