Fixed two more unit tests and renamed new 'define_layer' to 'define_opt_layer' for disambiguation

This commit is contained in:
Matthias Koefferlein 2019-05-29 01:22:11 +02:00
parent 10667d8e35
commit 3b3791204d
2 changed files with 8 additions and 6 deletions

View File

@ -284,12 +284,14 @@ Class<GenericDeviceExtractor> decl_GenericDeviceExtractor (decl_dbNetlistDeviceE
"the device layers. The actual geometries are later available to \\extract_devices\n"
"in the order the layers are defined.\n"
) +
gsi::method ("define_layer", (const db::NetlistDeviceExtractorLayerDefinition &(GenericDeviceExtractor::*) (const std::string &name, const std::string &)) &GenericDeviceExtractor::define_layer, gsi::arg ("name"), gsi::arg ("description"),
gsi::method ("define_opt_layer", (const db::NetlistDeviceExtractorLayerDefinition &(GenericDeviceExtractor::*) (const std::string &name, const std::string &)) &GenericDeviceExtractor::define_layer, gsi::arg ("name"), gsi::arg ("description"),
"@brief Defines a layer with a fallback layer.\n"
"@return The layer descriptor object created for this layer (use 'index' to get the layer's index)\n"
"This version of 'define_layer' allows specification of a fallback layer. If this particular layer is not given "
"when the device is extracted, the fallback layer will be used. The fallback layer is given by it's "
"index and must be defined before the layer using the fallback layer is defined."
"As \\define_layer, this method allows specification of device extraction layer. In addition to \\define_layout, it features "
"a fallback layer. If in the device extraction statement, the primary layer is not given, "
"the fallback layer will be used. Hence, this layer is optional. The fallback layer is given by it's "
"index and must be defined before the layer using the fallback layer is defined. "
"For the index, 0 is the first layer defined, 1 the second and so forth."
) +
gsi::method ("create_device", &GenericDeviceExtractor::create_device,
"@brief Creates a device.\n"

View File

@ -212,7 +212,7 @@ layout(
# Devices and their connections
device(1 D$PMOS
device(D$PMOS$1 800 0)
device(D$PMOS$1 location(800 0))
connect(0 S S)
connect(1 S D)
connect(0 G G)
@ -234,7 +234,7 @@ layout(
terminal(B 1)
)
device(2 D$NMOS
device(D$NMOS$1 800 0)
device(D$NMOS$1 location(800 0))
connect(0 S S)
connect(1 S D)
connect(0 G G)