mirror of
https://github.com/KLayout/klayout.git
synced 2026-09-06 17:33:25 +02:00
Merge remote-tracking branch 'remotes/origin/master' into dvb
This commit is contained in:
Vendored
+19
@@ -0,0 +1,19 @@
|
||||
* written by unit test
|
||||
|
||||
* cell C2
|
||||
* pin p1
|
||||
* pin p2
|
||||
.SUBCKT C2 n1 n2
|
||||
* cell instance SC1 r0 *1 0,0
|
||||
XSC1 n1 n2 C1
|
||||
.ENDS C2
|
||||
|
||||
* cell C1
|
||||
* pin p1
|
||||
* pin p2
|
||||
.SUBCKT C1 N1 N\x202
|
||||
* device instance $1 0,0 XCLS
|
||||
XD_$1 N1 n3 XCLS PARAMS: U=-17 V=42
|
||||
* device instance $2 0,0 XCLS
|
||||
XD_$2 n3 N\x202 XCLS PARAMS: U=17 V=-42
|
||||
.ENDS C1
|
||||
Vendored
+1
-1
@@ -176,7 +176,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles)
|
||||
bits 00111111 ;# CNXYRAAF
|
||||
int 2000 ;# placement-x
|
||||
int 0 ;# placement-y
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320)
|
||||
|
||||
Vendored
+1
-1
@@ -180,7 +180,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles)
|
||||
bits 00111111 ;# CNXYRAAF
|
||||
int 2000 ;# placement-x
|
||||
int 0 ;# placement-y
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320)
|
||||
|
||||
Vendored
+4
-4
@@ -224,7 +224,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0)
|
||||
@@ -234,7 +234,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
@@ -244,7 +244,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (3 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (3 times, arbitrary displacement vectors)
|
||||
uint 1 ;# dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
int 12
|
||||
@@ -252,7 +252,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (4 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (4 times, arbitrary displacement vectors)
|
||||
uint 2 ;# dimension
|
||||
uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10)
|
||||
|
||||
|
||||
Vendored
+4
-4
@@ -228,7 +228,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0)
|
||||
@@ -238,7 +238,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
@@ -248,7 +248,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (3 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (3 times, arbitrary displacement vectors)
|
||||
uint 1 ;# dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
int 12
|
||||
@@ -256,7 +256,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (4 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (4 times, arbitrary displacement vectors)
|
||||
uint 2 ;# dimension
|
||||
uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10)
|
||||
|
||||
|
||||
Vendored
+4
-4
@@ -237,7 +237,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0)
|
||||
@@ -247,7 +247,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
@@ -257,7 +257,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (3 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (3 times, arbitrary displacement vectors)
|
||||
uint 1 ;# dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
int 12
|
||||
@@ -265,7 +265,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (4 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (4 times, arbitrary displacement vectors)
|
||||
uint 2 ;# dimension
|
||||
uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10)
|
||||
|
||||
|
||||
Vendored
+4
-4
@@ -235,7 +235,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 16*10 ] ;# n-displacement (g-delta: 10-east=10,0)
|
||||
@@ -245,7 +245,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
@@ -255,7 +255,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (3 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (3 times, arbitrary displacement vectors)
|
||||
uint 1 ;# dimension
|
||||
uint [ expr 4*11+1 ] ;# n-displacement (g-delta: 11,12)
|
||||
int 12
|
||||
@@ -263,7 +263,7 @@ record TEXT
|
||||
record TEXT
|
||||
bits 00001100 ;# 0CNXYRTL
|
||||
int -200 ;# text-y (relative)
|
||||
uint 9 ;# repetition (4 times, arbitary displacement vectors)
|
||||
uint 9 ;# repetition (4 times, arbitrary displacement vectors)
|
||||
uint 2 ;# dimension
|
||||
uint [ expr 16*10+10 ] ;# n-displacement (g-delta: 10-northwest=-10,10)
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -143,7 +143,7 @@ uint 17 ;# PLACEMENT (no mag, manhattan angles)
|
||||
bits 00111111 ;# CNXYRAAF
|
||||
int 2000 ;# placement-x
|
||||
int 0 ;# placement-y
|
||||
uint 8 ;# repetition (3x4 matrix, arbitary displacement vectors)
|
||||
uint 8 ;# repetition (3x4 matrix, arbitrary displacement vectors)
|
||||
uint 1 ;# n-dimension
|
||||
uint 2 ;# m-dimension
|
||||
uint [ expr 4*310+1 ] ;# n-displacement (g-delta: 310,320)
|
||||
|
||||
Vendored
+1
-1
@@ -1,6 +1,6 @@
|
||||
|
||||
t1.x Empty file.
|
||||
Various ways to specifiy a float (database unit).
|
||||
Various ways to specify a float (database unit).
|
||||
t2.x Cells.
|
||||
Various ways to specify cell names (id, string) and refer to them.
|
||||
t3.x Texts.
|
||||
|
||||
+7
-1
@@ -116,7 +116,13 @@ class DBLayoutToNetlist_TestClass < TestBase
|
||||
tmp = File::join($ut_testtmp, "tmp2.txt")
|
||||
nl.write(tmp, writer, "A comment")
|
||||
|
||||
assert_equal(File.open(tmp, "r").read, File.open(input, "r").read)
|
||||
a = File.open(tmp, "r").read
|
||||
a = a.gsub(/e-00/, "e-0").gsub(/e-0/, "e-")
|
||||
|
||||
b = File.open(input, "r").read
|
||||
b = a.gsub(/e-00/, "e-0").gsub(/e-0/, "e-")
|
||||
|
||||
assert_equal(a, b)
|
||||
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user