From 3d1f361953b8d7ac6c2162977237861328f86771 Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Mon, 30 Mar 2026 10:00:14 +0200
Subject: [PATCH] spectre.awk: quote invalid identifiers (nodes, refdes)

---
 src/spectre.awk                  | 37 +++++++++++++++++++++++---------
 src/spice.awk                    |  8 ++++---
 tests/xschemtest.tcl             |  2 +-
 xschem_library/devices/iopin.sym |  4 +++-
 xschem_library/devices/ipin.sym  |  4 +++-
 xschem_library/devices/opin.sym  |  4 +++-
 6 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/spectre.awk b/src/spectre.awk
index 591e60d9..5bfec6cd 100755
--- a/src/spectre.awk
+++ b/src/spectre.awk
@@ -36,9 +36,7 @@ BEGIN{
  }
 }
 
-# join split lines
 {
-
   if($0 ~ /^\/\/\/\/ begin user (architecture|header) code/) {
      user_code = 1
   }
@@ -120,6 +118,7 @@ function sign(x)
 
 function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
 {
+  gsub(/ *= */, "=")
   indent = $0
   sub(/[^ \t].*/, "", indent)
   if($0 ~/\/\/\/\/ end_element/){
@@ -154,7 +153,7 @@ function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
   }
 
  # 20181208 do not process commented lines
- if($1 ~/^\//) {
+ if($1 ~/^\/\//) {
    print
    return
  }
@@ -223,13 +222,19 @@ function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
 
  if($0 ~ /^D/ ) sub(/PERI[ \t]*=/,"PJ=")
 
- if( $1 ~ /^\/\.(ipin|opin|iopin)/ ) {
-   num=split($2,name,",")
-   for(i=1;i<=num;i++) print $1 " " name[i]
- } else if(  tolower($1) ~ /subckt/) {
+ #### this is never executed: commented lines are processed and skipped above
+ # if( $1 ~ /^\/\/\.(ipin|opin|iopin)/ ) {
+ #   num=split($2,name,",")
+ #   for(i=1;i<=num;i++) print $1 " " name[i]
+ # } else
+
+ if(  tolower($1) ~ /subckt/) {
   # remove m=.. from subcircuit definition since m= is a multiplier not a param
   sub(/ m=[0-9]+/," ",$0)
   gsub(","," ",$0)
+  for(i = 1; i <= NF; i++) {
+    $i = q($i)
+  }
   print $0
  } else {
   num = split($1, name, ",")
@@ -248,7 +253,7 @@ function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
   }
   for(i=1;i<=num;i++)
   {
-   printf "%s ", indent spiceprefix name[i]
+   printf "%s ", indent spiceprefix q(name[i])
 
    for(j=2;j<=NF;j++)
    {
@@ -256,7 +261,7 @@ function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
     # some CDL netlists have this: $SUB=?1 B where B is a node
     if($j !~ /^(.*=)?\?-?[0-9]+$/)
     {
-      printf "%s ", $j # if not a node just print it
+      printf "%s ", q($j) # if not a node just print it
     }
     else
     {
@@ -271,7 +276,7 @@ function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
      for(l=0;l<nmult+0;l++)
      {
       ii=(l+nmult*(i-1))%arg_num[j]+1
-      printf "%s ", arg_name[j,ii]
+      printf "%s ", q(arg_name[j,ii])
      }
     }
    }
@@ -280,3 +285,15 @@ function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
  }
 }
 
+
+
+function q(s)
+{
+  if(s ~/.+=.+/) return s
+  if(s ~ /^[()=]$/) return s
+  if(s ~ /[^a-zA-Z0-9_$]/) {
+    gsub(/'/, "''", s)
+    s = "'" s "'"
+  }
+  return s
+}
diff --git a/src/spice.awk b/src/spice.awk
index 724206f3..2e55ac10 100755
--- a/src/spice.awk
+++ b/src/spice.awk
@@ -274,9 +274,11 @@ function process(        i,j, iprefix, saveinstr, savetype, saveanalysis)
      }
    }
 
- } else if( $1 ~ /^\*\.(ipin|opin|iopin)/ ) {
-   num=split($2,name,",")
-   for(i=1;i<=num;i++) print $1 " " name[i]
+ #### this is never executed: commented lines are processed and skipped above
+ # } else if( $1 ~ /^\*\.(ipin|opin|iopin)/ ) {
+ #   num=split($2,name,",")
+ #   for(i=1;i<=num;i++) print $1 " " name[i]
+
  } else if(  tolower($1) ~ /\.subckt/) {
   # remove m=.. from subcircuit definition since m= is a multiplier not a param
   sub(/ m=[0-9]+/," ",$0)
diff --git a/tests/xschemtest.tcl b/tests/xschemtest.tcl
index f73bda59..83359879 100644
--- a/tests/xschemtest.tcl
+++ b/tests/xschemtest.tcl
@@ -133,7 +133,7 @@ proc draw_trim_wiregrid {} {
   set n [xschem get lastsel]
   xschem unselect_all
   ## if all wires trimmed correctly we should have 129*128*2 = 33024 segments.
-  if {$n == 33024} { puts "Trim wire test: $n segments, OK"} else { puts "Trim wire test FAIL"}
+  if {$n == 33024} { puts "Trim wire test: $n segments, OK"} else { puts "Trim wire test FAIL, $n segments"}
   xschem clear force
 }
 
diff --git a/xschem_library/devices/iopin.sym b/xschem_library/devices/iopin.sym
index f46f5b37..ad34a70d 100644
--- a/xschem_library/devices/iopin.sym
+++ b/xschem_library/devices/iopin.sym
@@ -1,4 +1,4 @@
-v {xschem version=3.4.4 file_version=1.2
+v {xschem version=3.4.8RC file_version=1.3
 *
 * This file is part of XSCHEM,
 * a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
@@ -22,10 +22,12 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=iopin
 format="*.iopin @lab"
+spectre_format="//.iopin @lab"
 template="name=p1 lab=xxx"
 }
 V {}
 S {}
+F {}
 E {}
 L 5 -0 -0 3.125 0 {}
 B 5 -1.25 -1.25 1.25 1.25 {name=p dir=inout}
diff --git a/xschem_library/devices/ipin.sym b/xschem_library/devices/ipin.sym
index 22957839..a9b80d5f 100644
--- a/xschem_library/devices/ipin.sym
+++ b/xschem_library/devices/ipin.sym
@@ -1,4 +1,4 @@
-v {xschem version=3.4.4 file_version=1.2
+v {xschem version=3.4.8RC file_version=1.3
 *
 * This file is part of XSCHEM,
 * a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
@@ -22,10 +22,12 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=ipin
 format="*.ipin @lab"
+spectre_format="//.ipin @lab"
 template="name=p1 lab=xxx"
 }
 V {}
 S {}
+F {}
 E {}
 L 5 -5 0 0 0 {}
 B 5 -1.25 -1.25 1.25 1.25 {name=p dir=out}
diff --git a/xschem_library/devices/opin.sym b/xschem_library/devices/opin.sym
index 4e81f4f0..75c248a8 100644
--- a/xschem_library/devices/opin.sym
+++ b/xschem_library/devices/opin.sym
@@ -1,4 +1,4 @@
-v {xschem version=3.4.4 file_version=1.2
+v {xschem version=3.4.8RC file_version=1.3
 *
 * This file is part of XSCHEM,
 * a schematic capture and Spice/Vhdl/Verilog netlisting tool for circuit
@@ -22,10 +22,12 @@ v {xschem version=3.4.4 file_version=1.2
 G {}
 K {type=opin
 format="*.opin @lab"
+spectre_format="//.opin @lab"
 template="name=p1 lab=xxx"
 }
 V {}
 S {}
+F {}
 E {}
 L 5 0 0 8.75 0 {}
 B 5 -1.25 -1.25 1.25 1.25 {name=p dir=in}