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

In code components is is allowed to write to the args-struct, see #657

Browse Source
This commit is contained in:
hneemann 2021-02-22 12:10:19 +01:00
parent 00ed64e228
commit e051c5cd25
1 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/main/java/de/neemann/digital/draw/library/ResolveGenerics.java
View File

@ -128,30 +128,14 @@ public class ResolveGenerics {
ArrayList<VisualElement> newComponents = new ArrayList<>();
ArrayList<Wire> newWires = new ArrayList<>();
for (VisualElement ve : c.getElements()) {
ElementAttributes elementAttributes = ve.getElementAttributes();
String gen = elementAttributes.get(Keys.GENERIC).trim();
try {
if (!gen.isEmpty()) {
ElementTypeDescription elementTypeDescription = library.getElementType(ve.getElementName(), elementAttributes);
for (VisualElement ve : c.getElements())
if (ve.equalsDescription(GenericCode.DESCRIPTION))
handleVisualElement(c, ve, args, newComponents, newWires);
args.lock(); // allow write only in code components
for (VisualElement ve : c.getElements())
if (!ve.equalsDescription(GenericCode.DESCRIPTION))
handleVisualElement(c, ve, args, newComponents, newWires);
boolean isCustom = elementTypeDescription instanceof ElementTypeDescriptionCustom;
Statement genS = getStatement(gen);
Context mod = createContext(c, newComponents, newWires, args)
.declareVar("args", args);
if (isCustom) {
mod.declareFunc("setCircuit", new SetCircuitFunc(ve));
genS.execute(mod);
} else {
mod.declareVar("this", new SubstituteLibrary.AllowSetAttributes(elementAttributes));
genS.execute(mod);
}
elementAttributes.putToCache(GEN_ARGS_KEY, mod);
}
} catch (HGSEvalException | ParserException | IOException e) {
throw new NodeException(Lang.get("err_evaluatingGenericsCode_N_N", ve, gen), e);
}
}
c.add(newWires);
for (VisualElement ve : newComponents)
c.add(ve);
@ -159,6 +143,31 @@ public class ResolveGenerics {
return new CircuitHolder(c, args);
}
private void handleVisualElement(Circuit c, VisualElement ve, Args args, ArrayList<VisualElement> newComponents, ArrayList<Wire> newWires) throws ElementNotFoundException, NodeException {
ElementAttributes elementAttributes = ve.getElementAttributes();
String gen = elementAttributes.get(Keys.GENERIC).trim();
try {
if (!gen.isEmpty()) {
ElementTypeDescription elementTypeDescription = library.getElementType(ve.getElementName(), elementAttributes);
boolean isCustom = elementTypeDescription instanceof ElementTypeDescriptionCustom;
Statement genS = getStatement(gen);
Context mod = createContext(c, newComponents, newWires, args)
.declareVar("args", args);
if (isCustom) {
mod.declareFunc("setCircuit", new SetCircuitFunc(ve));
genS.execute(mod);
} else {
mod.declareVar("this", new SubstituteLibrary.AllowSetAttributes(elementAttributes));
genS.execute(mod);
}
elementAttributes.putToCache(GEN_ARGS_KEY, mod);
}
} catch (HGSEvalException | ParserException | IOException e) {
throw new NodeException(Lang.get("err_evaluatingGenericsCode_N_N", ve, gen), e);
}
}
private Context createContext(Circuit circuit, ArrayList<VisualElement> newComponents, ArrayList<Wire> newWires, Args args) throws NodeException {
try {
Context context = new Context();
@ -188,9 +197,11 @@ public class ResolveGenerics {
*/
public static final class Args implements HGSMap {
private final Context args;
private boolean writeEnabled;
private Args(Context args) {
this.args = args;
writeEnabled = true;
}
@Override
@ -205,6 +216,18 @@ public class ResolveGenerics {
return v;
}
@Override
public void hgsMapPut(String key, Object val) throws HGSEvalException {
if (writeEnabled)
args.declareVar(key, val);
else
args.hgsMapPut(key, val);
}
private void lock() {
writeEnabled = false;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;