diff --git a/src/main/dig/cmos/and.dig b/src/main/dig/cmos/andCmos.dig similarity index 100% rename from src/main/dig/cmos/and.dig rename to src/main/dig/cmos/andCmos.dig diff --git a/src/main/dig/cmos/inverter.dig b/src/main/dig/cmos/inverterCmos.dig similarity index 100% rename from src/main/dig/cmos/inverter.dig rename to src/main/dig/cmos/inverterCmos.dig diff --git a/src/main/dig/cmos/nand.dig b/src/main/dig/cmos/nandCmos.dig similarity index 100% rename from src/main/dig/cmos/nand.dig rename to src/main/dig/cmos/nandCmos.dig diff --git a/src/main/dig/cmos/nor.dig b/src/main/dig/cmos/norCmos.dig similarity index 100% rename from src/main/dig/cmos/nor.dig rename to src/main/dig/cmos/norCmos.dig diff --git a/src/main/dig/cmos/or.dig b/src/main/dig/cmos/orCmos.dig similarity index 100% rename from src/main/dig/cmos/or.dig rename to src/main/dig/cmos/orCmos.dig diff --git a/src/main/dig/cmos/xor.dig b/src/main/dig/cmos/xorCmos.dig similarity index 100% rename from src/main/dig/cmos/xor.dig rename to src/main/dig/cmos/xorCmos.dig diff --git a/src/main/dig/generic/barrelShifter/Test.dig b/src/main/dig/generic/barrelShifter/TestBarrelShifter.dig similarity index 100% rename from src/main/dig/generic/barrelShifter/Test.dig rename to src/main/dig/generic/barrelShifter/TestBarrelShifter.dig diff --git a/src/main/dig/generic/gray/Test.dig b/src/main/dig/generic/gray/TestGray.dig similarity index 100% rename from src/main/dig/generic/gray/Test.dig rename to src/main/dig/generic/gray/TestGray.dig diff --git a/src/main/dig/nmos/and.dig b/src/main/dig/nmos/andNmos.dig similarity index 100% rename from src/main/dig/nmos/and.dig rename to src/main/dig/nmos/andNmos.dig diff --git a/src/main/dig/nmos/inverter.dig b/src/main/dig/nmos/inverterNmos.dig similarity index 100% rename from src/main/dig/nmos/inverter.dig rename to src/main/dig/nmos/inverterNmos.dig diff --git a/src/main/dig/nmos/nand.dig b/src/main/dig/nmos/nandNmos.dig similarity index 100% rename from src/main/dig/nmos/nand.dig rename to src/main/dig/nmos/nandNmos.dig diff --git a/src/main/dig/nmos/nor.dig b/src/main/dig/nmos/norNmos.dig similarity index 100% rename from src/main/dig/nmos/nor.dig rename to src/main/dig/nmos/norNmos.dig diff --git a/src/main/dig/nmos/or.dig b/src/main/dig/nmos/orNmos.dig similarity index 100% rename from src/main/dig/nmos/or.dig rename to src/main/dig/nmos/orNmos.dig diff --git a/src/main/dig/nmos/xor.dig b/src/main/dig/nmos/xorNmos.dig similarity index 100% rename from src/main/dig/nmos/xor.dig rename to src/main/dig/nmos/xorNmos.dig diff --git a/src/main/dig/processor/core/Interrupt.dig b/src/main/dig/processor/core/Interrupt.dig index 2f4d4a5ab..b3b712ec1 100644 --- a/src/main/dig/processor/core/Interrupt.dig +++ b/src/main/dig/processor/core/Interrupt.dig @@ -122,23 +122,13 @@ die Interrupts wieder freigegeben.}} - RS.dig - - - Label - intLock - - + RSpSet.dig + - RS.dig - - - Label - intr - - + RSpSet.dig + diff --git a/src/main/dig/processor/core/RS.dig b/src/main/dig/processor/core/RSpSet.dig similarity index 100% rename from src/main/dig/processor/core/RS.dig rename to src/main/dig/processor/core/RSpSet.dig diff --git a/src/test/java/de/neemann/digital/integration/TestExampleNamesUnique.java b/src/test/java/de/neemann/digital/integration/TestExampleNamesUnique.java new file mode 100644 index 000000000..00fa21325 --- /dev/null +++ b/src/test/java/de/neemann/digital/integration/TestExampleNamesUnique.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2020 Helmut Neemann. + * Use of this source code is governed by the GPL v3 license + * that can be found in the LICENSE file. + */ +package de.neemann.digital.integration; + +import junit.framework.TestCase; +import org.jdom2.Element; +import org.jdom2.input.SAXBuilder; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; + +public class TestExampleNamesUnique extends TestCase { + + public void testExamples() throws Exception { + File basedir = new File(Resources.getRoot(), "../../../"); + File sourceFilename = new File(basedir, "distribution/Assembly.xml"); + + HashMap names = new HashMap<>(); + Element assembly = new SAXBuilder().build(sourceFilename).getRootElement(); + for (Element fs : assembly.getChild("fileSets", null).getChildren("fileSet", null)) { + String outDir = fs.getChild("outputDirectory", null).getText(); + if (outDir.startsWith("/examples/")) { + String srcDir = fs.getChild("directory", null).getText(); + srcDir = srcDir.replace("${basedir}", basedir.getPath()); + new FileScanner(f -> { + String name = f.getName(); + File present = names.get(name); + if (present != null) { + throw new IOException("name not unique\n" + present.getPath() + "\n" + f.getPath()); + } + names.put(name, f); + }).noOutput().scan(new File(srcDir)); + } + } + } + +}