TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-19 01:44:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

CuplCreator checks if variable names are valid in CUPL.

Browse Source
This commit is contained in:
hneemann 2016-05-23 15:51:40 +02:00
parent 662f940f9d
commit 4edfdd405b
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/de/neemann/digital/draw/builder/CuplCreator.java
View File

@ -12,10 +12,7 @@ import java.io.OutputStream;
import java.io.PrintStream;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.TreeSet;
import java.util.*;
import static de.neemann.digital.analyse.expression.Not.not;
import static de.neemann.digital.analyse.expression.Operation.and;
@ -110,7 +107,7 @@ public class CuplCreator implements BuilderInterface<CuplCreator> {
.append("Company unknown ;\r\n")
.append("Assembly None ;\r\n")
.append("Location unknown ;\r\n")
.append("Device g16v8a ;\r\n\r\n");
.append("Device g16v8a ;\r\n");
ArrayList<String> inputs = new ArrayList<>();
for (Variable v : vars.getVariables())
@ -118,9 +115,9 @@ public class CuplCreator implements BuilderInterface<CuplCreator> {
inputs.add(v.getIdentifier());
out.append("\r\n/* inputs */\r\n");
int inNum = 1;
if (sequential)
out.append("PIN ").append(Integer.toString(inNum++)).append(" = CLK;\r\n");
out.append("PIN 1 = CLK;\r\n");
int inNum = 2;
for (String in : inputs)
out.append("PIN ").append(Integer.toString(inNum++)).append(" = ").append(in).append(";\r\n");
@ -146,10 +143,21 @@ public class CuplCreator implements BuilderInterface<CuplCreator> {
private static final class NotAllowedVariablesVisitor implements ExpressionVisitor {
private final HashSet<String> notAllowed;
private final String notAllowedChars = " &#()-+[]/:.*;,!'=@$^\"";
NotAllowedVariablesVisitor() {
notAllowed = new HashSet<>();
notAllowed.add("D");
add("APPEND", "FUNCTION", "PARTNO", "ASSEMBLY", "FUSE", "PIN",
"ASSY", "GROUP", "PINNNODE", "COMPANY", "IF", "PRESENT",
"CONDITION", "JUMP", "REV", "DATE", "LOC", "REVISION",
"DEFAULT", "LOCATION", "SEQUENCE", "DESIGNER", "MACRO", "SEQUENCED",
"DEVICE", "MIN", "SEQUENCEJK", "ELSE", "NAME", "SEQUENCERS",
"FIELD", "NODE", "SEQUENCET", "FLD", "OUT", "TABLE", "FORMAT");
add("D");
}
private void add(String... names) {
Collections.addAll(notAllowed, names);
}
@Override
@ -162,6 +170,9 @@ public class CuplCreator implements BuilderInterface<CuplCreator> {
}
private void check(String v) {
for (int i = 0; i < notAllowedChars.length(); i++)
if (v.indexOf(notAllowedChars.charAt(i)) >= 0)
throw new RuntimeException(Lang.get("err_varNotAllowedInCUPL_N", v));
if (notAllowed.contains(v))
throw new RuntimeException(Lang.get("err_varNotAllowedInCUPL_N", v));
}

2
src/test/java/de/neemann/digital/draw/builder/CuplCreatorTest.java
View File

@ -15,6 +15,7 @@ import static de.neemann.digital.analyse.expression.Operation.or;
* @author hneemann
*/
public class CuplCreatorTest extends TestCase {
public void testCUPLBuilder() throws Exception {
Variable y0 = new Variable("Y_0");
Variable y1 = new Variable("Y_1");
@ -40,7 +41,6 @@ public class CuplCreatorTest extends TestCase {
"Location unknown ;\r\n" +
"Device g16v8a ;\r\n" +
"\r\n" +
"\r\n" +
"/* inputs */\r\n" +
"PIN 1 = CLK;\r\n" +
"\r\n" +