Merge branch 'parallaxsw:master' into main

Silimate · Nov 5, 2024 · 89de886 · 89de886
2 parents bf5db35 + 9f0997e
commit 89de886
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/liberty/LibertyLex.ll b/liberty/LibertyLex.ll
@@ -70,7 +70,7 @@ HNAME ({PIN_NAME}|{BUS_NAME}|{MIXED_NAME})([\/.]({PIN_NAME}|{BUS_NAME}|{MIXED_NA
 /* default_operating_conditions : slow_100_3.00 ; */
 /* revision : 1.0.17; */
 /* default_wire_load : xc2v250-5_avg; */
-TOKEN ({ALPHA}|{DIGIT}|_)({ALPHA}|{DIGIT}|[._\-:])*
+TOKEN ({ALPHA}|{DIGIT}|_)({ALPHA}|{DIGIT}|[._\-])*(:({ALPHA}|{DIGIT}|_)+)?
 /* bus_naming_style : %s[%d] ; */
 BUS_STYLE "%s"{BUS_LEFT}"%d"{BUS_RIGHT}
 PUNCTUATION [,\:;|(){}+*&!'=]

diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc
@@ -3302,7 +3302,7 @@ void
 LibertyReader::endBundle(LibertyGroup *group)
 {
   if (cell_) {
-    if (ports_->empty())
+    if (ports_ && ports_->empty())
       libWarn(1237, group, "bundle %s member not found.", group->firstName());
     endBusOrBundle();
     in_bundle_ = false;