add make rules for generating debug files

11 files changed, 127 insertions, 64 deletions

diff --git a/js/Electrical/CCS.js b/js/Electrical/CCS.js
index ac35f17d..b4e29358 100644
--- a/js/Electrical/CCS.js
+++ b/js/Electrical/CCS.js
@@ -163,7 +163,8 @@ LexToken(NUMBER,'70',1,1411)
 LexToken(COMMA,',',1,1413)
 LexToken(NUMBER,'2',1,1414)
 LexToken(COMMA,',',1,1415)
-LexToken(NUMBER,'-2',1,1416)
+LexToken(ADDITION,'-',1,1416)
+LexToken(NUMBER,'2',1,1417)
 LexToken(COMMA,',',1,1418)
 LexToken(NUMBER,'0',1,1419)
 LexToken(CLOSESQBRACKET,']',1,1420)
@@ -268,7 +269,8 @@ LexToken(COMMA,',',1,1749)
 LexToken(NUMBER,'3',1,1750)
 LexToken(CLOSEBRACKET,')',1,1751)
 LexToken(COMPARISON,'==',1,1752)
-LexToken(NUMBER,'-1',1,1754)
+LexToken(ADDITION,'-',1,1754)
+LexToken(NUMBER,'1',1,1755)
 LexToken(THEN,'then',1,1757)
 LexToken(EOL,'\n',1,1761)
 LexToken(VAR,'Typeout',1,1778)
@@ -302,7 +304,8 @@ LexToken(COMMA,',',1,1872)
 LexToken(NUMBER,'3',1,1873)
 LexToken(CLOSEBRACKET,')',1,1874)
 LexToken(COMPARISON,'==',1,1875)
-LexToken(NUMBER,'-2',1,1877)
+LexToken(ADDITION,'-',1,1877)
+LexToken(NUMBER,'2',1,1878)
 LexToken(THEN,'then',1,1880)
 LexToken(EOL,'\n',1,1884)
 LexToken(VAR,'Typeout',1,1901)
diff --git a/js/Electrical/CVS.js b/js/Electrical/CVS.js
index a8787e8f..3b2eb06e 100644
--- a/js/Electrical/CVS.js
+++ b/js/Electrical/CVS.js
@@ -163,7 +163,8 @@ LexToken(NUMBER,'70',1,1411)
 LexToken(COMMA,',',1,1413)
 LexToken(NUMBER,'2',1,1414)
 LexToken(COMMA,',',1,1415)
-LexToken(NUMBER,'-2',1,1416)
+LexToken(ADDITION,'-',1,1416)
+LexToken(NUMBER,'2',1,1417)
 LexToken(COMMA,',',1,1418)
 LexToken(NUMBER,'0',1,1419)
 LexToken(CLOSESQBRACKET,']',1,1420)
@@ -267,7 +268,8 @@ LexToken(COMMA,',',1,1748)
 LexToken(NUMBER,'3',1,1749)
 LexToken(CLOSEBRACKET,')',1,1750)
 LexToken(COMPARISON,'==',1,1751)
-LexToken(NUMBER,'-1',1,1753)
+LexToken(ADDITION,'-',1,1753)
+LexToken(NUMBER,'1',1,1754)
 LexToken(THEN,'then',1,1756)
 LexToken(EOL,'\n',1,1760)
 LexToken(VAR,'Typeout',1,1777)
@@ -301,7 +303,8 @@ LexToken(COMMA,',',1,1871)
 LexToken(NUMBER,'3',1,1872)
 LexToken(CLOSEBRACKET,')',1,1873)
 LexToken(COMPARISON,'==',1,1874)
-LexToken(NUMBER,'-2',1,1876)
+LexToken(ADDITION,'-',1,1876)
+LexToken(NUMBER,'2',1,1877)
 LexToken(THEN,'then',1,1879)
 LexToken(EOL,'\n',1,1883)
 LexToken(VAR,'Typeout',1,1900)
diff --git a/js/Electrical/Gyrator.js b/js/Electrical/Gyrator.js
index 3d5f8802..0e3a997d 100644
--- a/js/Electrical/Gyrator.js
+++ b/js/Electrical/Gyrator.js
@@ -263,7 +263,8 @@ LexToken(NUMBER,'97.5',1,1849)
 LexToken(COMMA,',',1,1853)
 LexToken(NUMBER,'90',1,1854)
 LexToken(COMMA,',',1,1856)
-LexToken(NUMBER,'-2',1,1857)
+LexToken(ADDITION,'-',1,1857)
+LexToken(NUMBER,'2',1,1858)
 LexToken(COMMA,',',1,1859)
 LexToken(NUMBER,'0',1,1860)
 LexToken(SEMICOLON,';',1,1861)
@@ -271,7 +272,8 @@ LexToken(NUMBER,'97.5',1,1862)
 LexToken(COMMA,',',1,1866)
 LexToken(NUMBER,'10',1,1867)
 LexToken(COMMA,',',1,1869)
-LexToken(NUMBER,'-2',1,1870)
+LexToken(ADDITION,'-',1,1870)
+LexToken(NUMBER,'2',1,1871)
 LexToken(COMMA,',',1,1872)
 LexToken(NUMBER,'0',1,1873)
 LexToken(CLOSESQBRACKET,']',1,1874)
@@ -376,7 +378,8 @@ LexToken(COMMA,',',1,2207)
 LexToken(NUMBER,'3',1,2208)
 LexToken(CLOSEBRACKET,')',1,2209)
 LexToken(COMPARISON,'==',1,2210)
-LexToken(NUMBER,'-1',1,2212)
+LexToken(ADDITION,'-',1,2212)
+LexToken(NUMBER,'1',1,2213)
 LexToken(THEN,'then',1,2215)
 LexToken(EOL,'\n',1,2219)
 LexToken(VAR,'Typeout',1,2236)
@@ -410,7 +413,8 @@ LexToken(COMMA,',',1,2330)
 LexToken(NUMBER,'3',1,2331)
 LexToken(CLOSEBRACKET,')',1,2332)
 LexToken(COMPARISON,'==',1,2333)
-LexToken(NUMBER,'-2',1,2335)
+LexToken(ADDITION,'-',1,2335)
+LexToken(NUMBER,'2',1,2336)
 LexToken(THEN,'then',1,2338)
 LexToken(EOL,'\n',1,2342)
 LexToken(VAR,'Typeout',1,2359)
diff --git a/js/Electrical/IdealTransformer.js b/js/Electrical/IdealTransformer.js
index 358eec59..d994df08 100644
--- a/js/Electrical/IdealTransformer.js
+++ b/js/Electrical/IdealTransformer.js
@@ -121,7 +121,7 @@ LexToken(SEMICOLON,';',1,1333)
 LexToken(DQSTRING,'""',1,1335)
 LexToken(SEMICOLON,';',1,1336)
 LexToken(DQSTRING,'"N:"',1,1340)
-LexToken(OPERATOR,'+',1,1341)
+LexToken(ADDITION,'+',1,1341)
 LexToken(DQSTRING,'" Turn ratio (N1/N2)"',1,1378)
 LexToken(CLOSESQBRACKET,']',1,1379)
 LexToken(COMMA,',',1,1380)
@@ -249,7 +249,8 @@ LexToken(NUMBER,'97.5',1,1834)
 LexToken(COMMA,',',1,1838)
 LexToken(NUMBER,'90',1,1839)
 LexToken(COMMA,',',1,1841)
-LexToken(NUMBER,'-2',1,1842)
+LexToken(ADDITION,'-',1,1842)
+LexToken(NUMBER,'2',1,1843)
 LexToken(COMMA,',',1,1844)
 LexToken(NUMBER,'0',1,1845)
 LexToken(SEMICOLON,';',1,1846)
@@ -257,7 +258,8 @@ LexToken(NUMBER,'97.5',1,1847)
 LexToken(COMMA,',',1,1851)
 LexToken(NUMBER,'10',1,1852)
 LexToken(COMMA,',',1,1854)
-LexToken(NUMBER,'-2',1,1855)
+LexToken(ADDITION,'-',1,1855)
+LexToken(NUMBER,'2',1,1856)
 LexToken(COMMA,',',1,1857)
 LexToken(NUMBER,'0',1,1858)
 LexToken(CLOSESQBRACKET,']',1,1859)
@@ -362,7 +364,8 @@ LexToken(COMMA,',',1,2192)
 LexToken(NUMBER,'3',1,2193)
 LexToken(CLOSEBRACKET,')',1,2194)
 LexToken(COMPARISON,'==',1,2195)
-LexToken(NUMBER,'-1',1,2197)
+LexToken(ADDITION,'-',1,2197)
+LexToken(NUMBER,'1',1,2198)
 LexToken(THEN,'then',1,2200)
 LexToken(EOL,'\n',1,2204)
 LexToken(VAR,'Typeout',1,2221)
@@ -396,7 +399,8 @@ LexToken(COMMA,',',1,2315)
 LexToken(NUMBER,'3',1,2316)
 LexToken(CLOSEBRACKET,')',1,2317)
 LexToken(COMPARISON,'==',1,2318)
-LexToken(NUMBER,'-2',1,2320)
+LexToken(ADDITION,'-',1,2320)
+LexToken(NUMBER,'2',1,2321)
 LexToken(THEN,'then',1,2323)
 LexToken(EOL,'\n',1,2327)
 LexToken(VAR,'Typeout',1,2344)
diff --git a/js/Electrical/Inductor.js b/js/Electrical/Inductor.js
index 04ebeca1..2e6d8e25 100644
--- a/js/Electrical/Inductor.js
+++ b/js/Electrical/Inductor.js
@@ -201,7 +201,8 @@ LexToken(VAR,'L',1,1570)
 LexToken(ASSIGNMENT,'=',1,1571)
 LexToken(NUMBER,'1.',1,1572)
 LexToken(VAR,'d',1,1574)
-LexToken(NUMBER,'-5',1,1575)
+LexToken(ADDITION,'-',1,1575)
+LexToken(NUMBER,'5',1,1576)
 LexToken(EOL,'\n',1,1577)
 LexToken(VAR,'model',1,1586)
 LexToken(DOT,'.',1,1591)
diff --git a/js/Electrical/NMOS.js b/js/Electrical/NMOS.js
index 1c2ae7ae..3c57cd23 100644
--- a/js/Electrical/NMOS.js
+++ b/js/Electrical/NMOS.js
@@ -143,39 +143,48 @@ LexToken(VAR,'list',1,1564)
 LexToken(OPENBRACKET,'(',1,1568)
 LexToken(DQSTRING,'"vec"',1,1573)
 LexToken(COMMA,',',1,1574)
-LexToken(NUMBER,'-1',1,1575)
+LexToken(ADDITION,'-',1,1575)
+LexToken(NUMBER,'1',1,1576)
 LexToken(COMMA,',',1,1577)
 LexToken(DQSTRING,'"vec"',1,1582)
 LexToken(COMMA,',',1,1583)
-LexToken(NUMBER,'-1',1,1584)
+LexToken(ADDITION,'-',1,1584)
+LexToken(NUMBER,'1',1,1585)
 LexToken(COMMA,',',1,1586)
 LexToken(DQSTRING,'"vec"',1,1591)
 LexToken(COMMA,',',1,1592)
-LexToken(NUMBER,'-1',1,1593)
+LexToken(ADDITION,'-',1,1593)
+LexToken(NUMBER,'1',1,1594)
 LexToken(COMMA,',',1,1595)
 LexToken(DQSTRING,'"vec"',1,1600)
 LexToken(COMMA,',',1,1601)
-LexToken(NUMBER,'-1',1,1602)
+LexToken(ADDITION,'-',1,1602)
+LexToken(NUMBER,'1',1,1603)
 LexToken(COMMA,',',1,1604)
 LexToken(DQSTRING,'"vec"',1,1609)
 LexToken(COMMA,',',1,1610)
-LexToken(NUMBER,'-1',1,1611)
+LexToken(ADDITION,'-',1,1611)
+LexToken(NUMBER,'1',1,1612)
 LexToken(COMMA,',',1,1613)
 LexToken(DQSTRING,'"vec"',1,1618)
 LexToken(COMMA,',',1,1619)
-LexToken(NUMBER,'-1',1,1620)
+LexToken(ADDITION,'-',1,1620)
+LexToken(NUMBER,'1',1,1621)
 LexToken(COMMA,',',1,1622)
 LexToken(DQSTRING,'"vec"',1,1627)
 LexToken(COMMA,',',1,1628)
-LexToken(NUMBER,'-1',1,1629)
+LexToken(ADDITION,'-',1,1629)
+LexToken(NUMBER,'1',1,1630)
 LexToken(COMMA,',',1,1631)
 LexToken(DQSTRING,'"vec"',1,1636)
 LexToken(COMMA,',',1,1637)
-LexToken(NUMBER,'-1',1,1638)
+LexToken(ADDITION,'-',1,1638)
+LexToken(NUMBER,'1',1,1639)
 LexToken(COMMA,',',1,1640)
 LexToken(DQSTRING,'"vec"',1,1645)
 LexToken(COMMA,',',1,1646)
-LexToken(NUMBER,'-1',1,1647)
+LexToken(ADDITION,'-',1,1647)
+LexToken(NUMBER,'1',1,1648)
 LexToken(CLOSEBRACKET,')',1,1649)
 LexToken(COMMA,',',1,1650)
 LexToken(VAR,'exprs',1,1651)
@@ -287,12 +296,14 @@ LexToken(SEMICOLON,';',1,2082)
 LexToken(EOL,'\n',1,2083)
 LexToken(VAR,'dW',1,2092)
 LexToken(ASSIGNMENT,'=',1,2094)
-LexToken(NUMBER,'-2.5e-6',1,2095)
+LexToken(ADDITION,'-',1,2095)
+LexToken(NUMBER,'2.5e-6',1,2096)
 LexToken(SEMICOLON,';',1,2102)
 LexToken(EOL,'\n',1,2103)
 LexToken(VAR,'dL',1,2112)
 LexToken(ASSIGNMENT,'=',1,2114)
-LexToken(NUMBER,'-1.5e-6',1,2116)
+LexToken(ADDITION,'-',1,2116)
+LexToken(NUMBER,'1.5e-6',1,2117)
 LexToken(SEMICOLON,';',1,2123)
 LexToken(EOL,'\n',1,2124)
 LexToken(VAR,'RDS',1,2133)
diff --git a/js/Electrical/NPN.js b/js/Electrical/NPN.js
index 2f0ca464..2c270636 100644
--- a/js/Electrical/NPN.js
+++ b/js/Electrical/NPN.js
@@ -354,23 +354,28 @@ LexToken(NUMBER,'0.02',1,2499)
 LexToken(SEMICOLON,';',1,2503)
 LexToken(NUMBER,'1.200',1,2504)
 LexToken(VAR,'D',1,2509)
-LexToken(NUMBER,'-10',1,2510)
+LexToken(ADDITION,'-',1,2510)
+LexToken(NUMBER,'10',1,2511)
 LexToken(SEMICOLON,';',1,2513)
 LexToken(NUMBER,'5.000',1,2514)
 LexToken(VAR,'D',1,2519)
-LexToken(NUMBER,'-09',1,2520)
+LexToken(ADDITION,'-',1,2520)
+LexToken(NUMBER,'09',1,2521)
 LexToken(SEMICOLON,';',1,2523)
 LexToken(NUMBER,'1.000',1,2524)
 LexToken(VAR,'D',1,2529)
-LexToken(NUMBER,'-12',1,2530)
+LexToken(ADDITION,'-',1,2530)
+LexToken(NUMBER,'12',1,2531)
 LexToken(SEMICOLON,';',1,2533)
 LexToken(NUMBER,'4.000',1,2534)
 LexToken(VAR,'D',1,2539)
-LexToken(NUMBER,'-13',1,2540)
+LexToken(ADDITION,'-',1,2540)
+LexToken(NUMBER,'13',1,2541)
 LexToken(SEMICOLON,';',1,2543)
 LexToken(NUMBER,'5.000',1,2544)
 LexToken(VAR,'D',1,2549)
-LexToken(NUMBER,'-13',1,2550)
+LexToken(ADDITION,'-',1,2550)
+LexToken(NUMBER,'13',1,2551)
 LexToken(SEMICOLON,';',1,2553)
 LexToken(NUMBER,'0.8',1,2554)
 LexToken(SEMICOLON,';',1,2557)
@@ -382,11 +387,13 @@ LexToken(NUMBER,'0.333',1,2566)
 LexToken(SEMICOLON,';',1,2571)
 LexToken(NUMBER,'1.000',1,2572)
 LexToken(VAR,'D',1,2577)
-LexToken(NUMBER,'-15',1,2578)
+LexToken(ADDITION,'-',1,2578)
+LexToken(NUMBER,'15',1,2579)
 LexToken(SEMICOLON,';',1,2581)
 LexToken(NUMBER,'1.000',1,2582)
 LexToken(VAR,'D',1,2587)
-LexToken(NUMBER,'-15',1,2588)
+LexToken(ADDITION,'-',1,2588)
+LexToken(NUMBER,'15',1,2589)
 LexToken(SEMICOLON,';',1,2591)
 LexToken(NUMBER,'0.02585',1,2592)
 LexToken(SEMICOLON,';',1,2599)
@@ -467,7 +474,8 @@ LexToken(NUMBER,'100',1,2841)
 LexToken(COMMA,',',1,2844)
 LexToken(NUMBER,'90',1,2845)
 LexToken(COMMA,',',1,2847)
-LexToken(NUMBER,'-2',1,2848)
+LexToken(ADDITION,'-',1,2848)
+LexToken(NUMBER,'2',1,2849)
 LexToken(COMMA,',',1,2850)
 LexToken(NUMBER,'0',1,2851)
 LexToken(SEMICOLON,';',1,2852)
@@ -483,7 +491,8 @@ LexToken(NUMBER,'100',1,2864)
 LexToken(COMMA,',',1,2867)
 LexToken(NUMBER,'10',1,2868)
 LexToken(COMMA,',',1,2870)
-LexToken(NUMBER,'-2',1,2871)
+LexToken(ADDITION,'-',1,2871)
+LexToken(NUMBER,'2',1,2872)
 LexToken(COMMA,',',1,2873)
 LexToken(NUMBER,'0',1,2874)
 LexToken(CLOSESQBRACKET,']',1,2875)
@@ -586,7 +595,8 @@ LexToken(COMMA,',',1,3200)
 LexToken(NUMBER,'3',1,3201)
 LexToken(CLOSEBRACKET,')',1,3202)
 LexToken(COMPARISON,'==',1,3203)
-LexToken(NUMBER,'-1',1,3205)
+LexToken(ADDITION,'-',1,3205)
+LexToken(NUMBER,'1',1,3206)
 LexToken(THEN,'then',1,3208)
 LexToken(EOL,'\n',1,3212)
 LexToken(VAR,'Typeout',1,3229)
@@ -620,7 +630,8 @@ LexToken(COMMA,',',1,3323)
 LexToken(NUMBER,'3',1,3324)
 LexToken(CLOSEBRACKET,')',1,3325)
 LexToken(COMPARISON,'==',1,3326)
-LexToken(NUMBER,'-2',1,3328)
+LexToken(ADDITION,'-',1,3328)
+LexToken(NUMBER,'2',1,3329)
 LexToken(THEN,'then',1,3331)
 LexToken(EOL,'\n',1,3335)
 LexToken(VAR,'Typeout',1,3352)
diff --git a/js/Electrical/PMOS.js b/js/Electrical/PMOS.js
index e0bb3cec..02feeec9 100644
--- a/js/Electrical/PMOS.js
+++ b/js/Electrical/PMOS.js
@@ -143,39 +143,48 @@ LexToken(VAR,'list',1,1558)
 LexToken(OPENBRACKET,'(',1,1562)
 LexToken(DQSTRING,'"vec"',1,1567)
 LexToken(COMMA,',',1,1568)
-LexToken(NUMBER,'-1',1,1569)
+LexToken(ADDITION,'-',1,1569)
+LexToken(NUMBER,'1',1,1570)
 LexToken(COMMA,',',1,1571)
 LexToken(DQSTRING,'"vec"',1,1576)
 LexToken(COMMA,',',1,1577)
-LexToken(NUMBER,'-1',1,1578)
+LexToken(ADDITION,'-',1,1578)
+LexToken(NUMBER,'1',1,1579)
 LexToken(COMMA,',',1,1580)
 LexToken(DQSTRING,'"vec"',1,1585)
 LexToken(COMMA,',',1,1586)
-LexToken(NUMBER,'-1',1,1587)
+LexToken(ADDITION,'-',1,1587)
+LexToken(NUMBER,'1',1,1588)
 LexToken(COMMA,',',1,1589)
 LexToken(DQSTRING,'"vec"',1,1594)
 LexToken(COMMA,',',1,1595)
-LexToken(NUMBER,'-1',1,1596)
+LexToken(ADDITION,'-',1,1596)
+LexToken(NUMBER,'1',1,1597)
 LexToken(COMMA,',',1,1598)
 LexToken(DQSTRING,'"vec"',1,1603)
 LexToken(COMMA,',',1,1604)
-LexToken(NUMBER,'-1',1,1605)
+LexToken(ADDITION,'-',1,1605)
+LexToken(NUMBER,'1',1,1606)
 LexToken(COMMA,',',1,1607)
 LexToken(DQSTRING,'"vec"',1,1612)
 LexToken(COMMA,',',1,1613)
-LexToken(NUMBER,'-1',1,1614)
+LexToken(ADDITION,'-',1,1614)
+LexToken(NUMBER,'1',1,1615)
 LexToken(COMMA,',',1,1616)
 LexToken(DQSTRING,'"vec"',1,1621)
 LexToken(COMMA,',',1,1622)
-LexToken(NUMBER,'-1',1,1623)
+LexToken(ADDITION,'-',1,1623)
+LexToken(NUMBER,'1',1,1624)
 LexToken(COMMA,',',1,1625)
 LexToken(DQSTRING,'"vec"',1,1630)
 LexToken(COMMA,',',1,1631)
-LexToken(NUMBER,'-1',1,1632)
+LexToken(ADDITION,'-',1,1632)
+LexToken(NUMBER,'1',1,1633)
 LexToken(COMMA,',',1,1634)
 LexToken(DQSTRING,'"vec"',1,1639)
 LexToken(COMMA,',',1,1640)
-LexToken(NUMBER,'-1',1,1641)
+LexToken(ADDITION,'-',1,1641)
+LexToken(NUMBER,'1',1,1642)
 LexToken(CLOSEBRACKET,')',1,1643)
 LexToken(COMMA,',',1,1644)
 LexToken(VAR,'exprs',1,1645)
@@ -272,7 +281,8 @@ LexToken(SEMICOLON,';',1,2025)
 LexToken(EOL,'\n',1,2026)
 LexToken(VAR,'Vt',1,2035)
 LexToken(ASSIGNMENT,'=',1,2037)
-LexToken(NUMBER,'-1',1,2038)
+LexToken(ADDITION,'-',1,2038)
+LexToken(NUMBER,'1',1,2039)
 LexToken(SEMICOLON,';',1,2040)
 LexToken(EOL,'\n',1,2041)
 LexToken(VAR,'K2',1,2050)
@@ -287,12 +297,14 @@ LexToken(SEMICOLON,';',1,2075)
 LexToken(EOL,'\n',1,2076)
 LexToken(VAR,'dW',1,2085)
 LexToken(ASSIGNMENT,'=',1,2087)
-LexToken(NUMBER,'-2.5e-6',1,2088)
+LexToken(ADDITION,'-',1,2088)
+LexToken(NUMBER,'2.5e-6',1,2089)
 LexToken(SEMICOLON,';',1,2095)
 LexToken(EOL,'\n',1,2096)
 LexToken(VAR,'dL',1,2105)
 LexToken(ASSIGNMENT,'=',1,2107)
-LexToken(NUMBER,'-2.1e-6',1,2108)
+LexToken(ADDITION,'-',1,2108)
+LexToken(NUMBER,'2.1e-6',1,2109)
 LexToken(SEMICOLON,';',1,2115)
 LexToken(EOL,'\n',1,2116)
 LexToken(VAR,'RDS',1,2125)
diff --git a/js/Electrical/PNP.js b/js/Electrical/PNP.js
index 20ba55a1..74e74b17 100644
--- a/js/Electrical/PNP.js
+++ b/js/Electrical/PNP.js
@@ -356,23 +356,28 @@ LexToken(NUMBER,'0.02',1,2510)
 LexToken(SEMICOLON,';',1,2514)
 LexToken(NUMBER,'1.200',1,2515)
 LexToken(VAR,'D',1,2520)
-LexToken(NUMBER,'-10',1,2521)
+LexToken(ADDITION,'-',1,2521)
+LexToken(NUMBER,'10',1,2522)
 LexToken(SEMICOLON,';',1,2524)
 LexToken(NUMBER,'5.000',1,2525)
 LexToken(VAR,'D',1,2530)
-LexToken(NUMBER,'-09',1,2531)
+LexToken(ADDITION,'-',1,2531)
+LexToken(NUMBER,'09',1,2532)
 LexToken(SEMICOLON,';',1,2534)
 LexToken(NUMBER,'1.000',1,2535)
 LexToken(VAR,'D',1,2540)
-LexToken(NUMBER,'-12',1,2541)
+LexToken(ADDITION,'-',1,2541)
+LexToken(NUMBER,'12',1,2542)
 LexToken(SEMICOLON,';',1,2544)
 LexToken(NUMBER,'4.000',1,2545)
 LexToken(VAR,'D',1,2550)
-LexToken(NUMBER,'-13',1,2551)
+LexToken(ADDITION,'-',1,2551)
+LexToken(NUMBER,'13',1,2552)
 LexToken(SEMICOLON,';',1,2554)
 LexToken(NUMBER,'5.000',1,2555)
 LexToken(VAR,'D',1,2560)
-LexToken(NUMBER,'-13',1,2561)
+LexToken(ADDITION,'-',1,2561)
+LexToken(NUMBER,'13',1,2562)
 LexToken(SEMICOLON,';',1,2564)
 LexToken(NUMBER,'0.8',1,2565)
 LexToken(SEMICOLON,';',1,2568)
@@ -384,11 +389,13 @@ LexToken(NUMBER,'0.333',1,2577)
 LexToken(SEMICOLON,';',1,2582)
 LexToken(NUMBER,'1.000',1,2583)
 LexToken(VAR,'D',1,2588)
-LexToken(NUMBER,'-15',1,2589)
+LexToken(ADDITION,'-',1,2589)
+LexToken(NUMBER,'15',1,2590)
 LexToken(SEMICOLON,';',1,2592)
 LexToken(NUMBER,'1.000',1,2593)
 LexToken(VAR,'D',1,2598)
-LexToken(NUMBER,'-15',1,2599)
+LexToken(ADDITION,'-',1,2599)
+LexToken(NUMBER,'15',1,2600)
 LexToken(SEMICOLON,';',1,2602)
 LexToken(NUMBER,'0.02585',1,2603)
 LexToken(SEMICOLON,';',1,2610)
@@ -469,7 +476,8 @@ LexToken(NUMBER,'100',1,2852)
 LexToken(COMMA,',',1,2855)
 LexToken(NUMBER,'90',1,2856)
 LexToken(COMMA,',',1,2858)
-LexToken(NUMBER,'-2',1,2859)
+LexToken(ADDITION,'-',1,2859)
+LexToken(NUMBER,'2',1,2860)
 LexToken(COMMA,',',1,2861)
 LexToken(NUMBER,'0',1,2862)
 LexToken(SEMICOLON,';',1,2863)
@@ -485,7 +493,8 @@ LexToken(NUMBER,'100',1,2873)
 LexToken(COMMA,',',1,2876)
 LexToken(NUMBER,'10',1,2877)
 LexToken(COMMA,',',1,2879)
-LexToken(NUMBER,'-2',1,2880)
+LexToken(ADDITION,'-',1,2880)
+LexToken(NUMBER,'2',1,2881)
 LexToken(COMMA,',',1,2882)
 LexToken(NUMBER,'0',1,2883)
 LexToken(CLOSESQBRACKET,']',1,2884)
@@ -588,7 +597,8 @@ LexToken(COMMA,',',1,3209)
 LexToken(NUMBER,'3',1,3210)
 LexToken(CLOSEBRACKET,')',1,3211)
 LexToken(COMPARISON,'==',1,3212)
-LexToken(NUMBER,'-1',1,3214)
+LexToken(ADDITION,'-',1,3214)
+LexToken(NUMBER,'1',1,3215)
 LexToken(THEN,'then',1,3217)
 LexToken(EOL,'\n',1,3221)
 LexToken(VAR,'Typeout',1,3238)
@@ -622,7 +632,8 @@ LexToken(COMMA,',',1,3332)
 LexToken(NUMBER,'3',1,3333)
 LexToken(CLOSEBRACKET,')',1,3334)
 LexToken(COMPARISON,'==',1,3335)
-LexToken(NUMBER,'-2',1,3337)
+LexToken(ADDITION,'-',1,3337)
+LexToken(NUMBER,'2',1,3338)
 LexToken(THEN,'then',1,3340)
 LexToken(EOL,'\n',1,3344)
 LexToken(VAR,'Typeout',1,3361)
diff --git a/js/Electrical/VVsourceAC.js b/js/Electrical/VVsourceAC.js
index 4601377f..a87c722f 100644
--- a/js/Electrical/VVsourceAC.js
+++ b/js/Electrical/VVsourceAC.js
@@ -115,7 +115,8 @@ LexToken(VAR,'list',1,1406)
 LexToken(OPENBRACKET,'(',1,1410)
 LexToken(DQSTRING,'"vec"',1,1415)
 LexToken(COMMA,',',1,1416)
-LexToken(NUMBER,'-1',1,1417)
+LexToken(ADDITION,'-',1,1417)
+LexToken(NUMBER,'1',1,1418)
 LexToken(CLOSEBRACKET,')',1,1419)
 LexToken(COMMA,',',1,1420)
 LexToken(VAR,'exprs',1,1421)
diff --git a/js/Electrical/VsourceAC.js b/js/Electrical/VsourceAC.js
index dc2e87e7..8839bbe0 100644
--- a/js/Electrical/VsourceAC.js
+++ b/js/Electrical/VsourceAC.js
@@ -119,11 +119,13 @@ LexToken(VAR,'list',1,1427)
 LexToken(OPENBRACKET,'(',1,1431)
 LexToken(DQSTRING,'"vec"',1,1436)
 LexToken(COMMA,',',1,1437)
-LexToken(NUMBER,'-1',1,1438)
+LexToken(ADDITION,'-',1,1438)
+LexToken(NUMBER,'1',1,1439)
 LexToken(COMMA,',',1,1440)
 LexToken(DQSTRING,'"vec"',1,1445)
 LexToken(COMMA,',',1,1446)
-LexToken(NUMBER,'-1',1,1447)
+LexToken(ADDITION,'-',1,1447)
+LexToken(NUMBER,'1',1,1448)
 LexToken(CLOSEBRACKET,')',1,1449)
 LexToken(COMMA,',',1,1450)
 LexToken(VAR,'exprs',1,1451)