From 53b90ee689abe532e27e976540cbcf316a72b8da Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Tue, 18 Mar 2025 15:53:47 +0100
Subject: [PATCH] conversions from eng notation: add x in addition to meg as
 suffix for 1e6 (Xyce extension)

---
 src/editprop.c | 12 ++++++++----
 src/xschem.tcl |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/editprop.c b/src/editprop.c
index dbe65604..ad7b0482 100644
--- a/src/editprop.c
+++ b/src/editprop.c
@@ -473,10 +473,11 @@ double atof_spice(const char *s)
   } else if(n == 1) {
     mul = 1.0;
   } else {
-    p = strpbrk(suffix, "tgmkunpfa");
+    p = strpbrk(suffix, "tgmxkunpfa");
     if(p != suffix ) mul = 1.0;
     else if(*p == 't') mul=1e12;
     else if(*p == 'g') mul=1e9;
+    else if(*p == 'x') mul=1e6; /* Xyce extension */
     else if(*p == 'm') {
       if(strstr(p, "meg") == p) mul=1e6;
       else if(strstr(p, "mil") == p) mul=25.4e-6;
@@ -495,12 +496,13 @@ double atof_spice(const char *s)
 }
 
 
-/* same as atof_spice, but recognizes 'M' ae Mega, and 'm' as Milli */
+/* same as atof_spice, but recognizes 'M' as Mega, and 'm' as Milli
+ * as long as not 'MEG' or 'meg' which is always Mega */
 double atof_eng(const char *s)
 {
   int n;
   double a = 0.0, mul=1.0;
-  char suffix[100]={0};
+  char suffix[100]={0, 0, 0, 0, 0};
   const char *p;
 
   if(!s) return 0.0;
@@ -510,10 +512,12 @@ double atof_eng(const char *s)
   } else if(n == 1) {
     mul = 1.0;
   } else {
-    p = strpbrk(suffix, "TGMKUNPFAtgmkunpfa");
+    p = strpbrk(suffix, "TGMXKUNPFAtgmxkunpfa");
     if(p != suffix ) mul = 1.0;
     else if(tolower(*p) == 't') mul=1e12;
     else if(tolower(*p) == 'g') mul=1e9;
+    else if(tolower(*p) == 'x') mul=1e6; /* Xyce extension */
+    else if(tolower(p[0]) == 'm' && tolower(p[1]) == 'e' && tolower(p[2]) == 'g') mul=1e6;
     else if(*p == 'M') mul=1e6;
     else if(*p == 'm') mul=1e-3;
     else if(tolower(*p) == 'k') mul=1e3;
diff --git a/src/xschem.tcl b/src/xschem.tcl
index f8bff106..8b4f57b8 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -617,6 +617,7 @@ proc from_eng {i} {
     u         { expr {1e-6}}
     m         { expr {1e-3}}
     k         { expr {1e3}}
+    x         { expr {1e6}} ;# Xyce extension
     meg       { expr {1e6}}
     g         { expr {1e9}}
     t         { expr {1e12}}