From 5fc231cb1aee84d74cd8cf3daf2ceef52e1e39e0 Mon Sep 17 00:00:00 2001 From: hneemann Date: Tue, 26 Jan 2021 13:07:21 +0100 Subject: [PATCH] adds a xml alias --- distribution/ReleaseNotes.txt | 2 ++ src/main/java/de/neemann/digital/draw/elements/Circuit.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt index 8902b8925..7d808cd68 100644 --- a/distribution/ReleaseNotes.txt +++ b/distribution/ReleaseNotes.txt @@ -3,6 +3,8 @@ Release Notes HEAD, planned as v0.27 - Added fixed point and floating point number formats +- Refactoring of the expression format setting. + CAUTION: All the general settings are maybe lost at restart! v0.26, released on 25. Jan. 2021 - Performance improvement of the simulation start. diff --git a/src/main/java/de/neemann/digital/draw/elements/Circuit.java b/src/main/java/de/neemann/digital/draw/elements/Circuit.java index d6e7c557e..61bee0b52 100644 --- a/src/main/java/de/neemann/digital/draw/elements/Circuit.java +++ b/src/main/java/de/neemann/digital/draw/elements/Circuit.java @@ -8,6 +8,7 @@ package de.neemann.digital.draw.elements; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; import de.neemann.digital.XStreamValid; +import de.neemann.digital.analyse.expression.format.FormatToExpression; import de.neemann.digital.core.Observer; import de.neemann.digital.core.*; import de.neemann.digital.core.arithmetic.BarrelShifterMode; @@ -70,6 +71,7 @@ public class Circuit implements Copyable { xStream.alias("wire", Wire.class); xStream.alias("circuit", Circuit.class); xStream.alias("intFormat", IntFormat.class); + xStream.alias("exprFormat", FormatToExpression.class); xStream.alias("barrelShifterMode", BarrelShifterMode.class); xStream.alias("direction", LeftRightFormat.class); xStream.alias("rotation", Rotation.class);