luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow new lines in net names (!)

This commit is contained in:
Stefan Frederik 2020-11-30 22:12:31 +01:00
parent 4ea2dde800
commit 3f6a9ab1f8
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/parselabel.l
View File

@ -146,13 +146,13 @@ LAB [-a-zA-Z_%$~"#/\\<>]
/* includes numbers */ /* includes numbers */
LAB_NUM [-a-zA-Z_%$~"#/\\<>0-9] LAB_NUM [-a-zA-Z_%$~"#/\\<>0-9]
/* includes numbers and space and *+(). */ /* includes numbers and space and *+(). */
IDX_LAB_NUM_SP [-a-zA-Z_%$~"#/\\<> \t0-9*+().] IDX_LAB_NUM_SP [-a-zA-Z_%$~"#/\\<> \t\n0-9*+().]
/* identifier, may start with a number */ /* identifier, may start with a number */
IDX_ID_N ({LAB_NUM}+({IDX_LAB_NUM_SP}*{LAB_NUM})*) IDX_ID_N ({LAB_NUM}+({IDX_LAB_NUM_SP}*{LAB_NUM})*)
/* identifier, not starting with a number */ /* identifier, not starting with a number */
IDX_ID (("("|{LAB})+{IDX_LAB_NUM_SP}*) IDX_ID (("("|{LAB})+{IDX_LAB_NUM_SP}*)
/* includes numbers and space and +(). and :*/ /* includes numbers and space and +(). and :*/
LAB_NUM_SP [-a-zA-Z_%$~"#:/\\<> \t0-9+().] LAB_NUM_SP [-a-zA-Z_%$~"#:/\\<> \t\n0-9+().]
/* identifier, may start with a number */ /* identifier, may start with a number */
ID_NUM ({LAB_NUM}+({LAB_NUM_SP}*{LAB_NUM})*) ID_NUM ({LAB_NUM}+({LAB_NUM_SP}*{LAB_NUM})*)
/* identifier, not starting with a number */ /* identifier, not starting with a number */

21
xschem_library/pcb/74ls00.sym
View File

@ -1,10 +1,23 @@
v {xschem version=2.9.5_RC6 file_version=1.1} v {xschem version=2.9.8 file_version=1.2}
G {type=nand G {}
K {type=nand
format="@name @pinlist @value" format="@name @pinlist @value"
verilog_format="nand #(@risedel , @falldel ) @name ( @#2 , @#0 , @#1 );" verilog_format="nand #(@risedel , @falldel ) @name ( @#2 , @#0 , @#1 );"
risedel=100
falldel=200
tedax_format="footprint @name @footprint tedax_format="footprint @name @footprint
device @name @symname" value @name @value
template="name=U1 footprint=\\"dip(14)\\" risedel=100 falldel=200 numslots=4 power=VCC ground=GND" device @name @device
spicedev @name @spicedev
spiceval @name @spiceval
comptag @name @comptag"
template="name=U1 footprint=\\"dip(14)\\"
numslots=4
power=VCC
ground=GND"
extra="power ground" extra="power ground"
extra_pinnumber="14 7"} extra_pinnumber="14 7"}
V {} V {}