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

more expressive error message in model analyzer

Browse Source
This commit is contained in:
hneemann 2017-03-06 10:22:25 +01:00
parent 8180fa3990
commit a1e7ea82d6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/de/neemann/digital/analyse/ModelAnalyser.java
View File

@ -23,6 +23,7 @@ import java.util.List;
* @author hneemann * @author hneemann
*/ */
public class ModelAnalyser { public class ModelAnalyser {
private static final int MAX_INPUTS_ALLOWED = 18;
private final Model model; private final Model model;
private final ArrayList<Signal> inputs; private final ArrayList<Signal> inputs;
@ -75,8 +76,8 @@ public class ModelAnalyser {
if (inputs.size() == 0) if (inputs.size() == 0)
throw new AnalyseException(Lang.get("err_analyseNoInputs")); throw new AnalyseException(Lang.get("err_analyseNoInputs"));
if (inputs.size() > 12) if (inputs.size() > MAX_INPUTS_ALLOWED)
throw new AnalyseException(Lang.get("err_toManyInputs_N", 12)); throw new AnalyseException(Lang.get("err_toManyInputs_max_N0_is_N1", MAX_INPUTS_ALLOWED, inputs.size()));
if (outputs.size() == 0) if (outputs.size() == 0)
throw new AnalyseException(Lang.get("err_analyseNoOutputs")); throw new AnalyseException(Lang.get("err_analyseNoOutputs"));
rows = 1 << inputs.size(); rows = 1 << inputs.size();

2
src/main/resources/lang/lang_de.xml
View File

@ -404,7 +404,7 @@ Zur Analyse können Sie die Schaltung im Gatterschrittmodus ausführen.</string>
<string name="err_spitterDefSyntaxError">Fehler in der Definition {0} eines Splitters</string> <string name="err_spitterDefSyntaxError">Fehler in der Definition {0} eines Splitters</string>
<string name="err_splitterBitsMismatch">Die Bitzahl am Spiltter passt nicht</string> <string name="err_splitterBitsMismatch">Die Bitzahl am Spiltter passt nicht</string>
<string name="err_tableBecomesToSmall">Es sind mindestens zwei Eingänge erforderlich!</string> <string name="err_tableBecomesToSmall">Es sind mindestens zwei Eingänge erforderlich!</string>
<string name="err_toManyInputs_N">Zu viele Eingänge. Es sind nur {0} Eingänge erlaubt.</string> <string name="err_toManyInputs_max_N0_is_N1">Zu viele Eingänge. Es sind nur {0} Eingänge erlaubt, es wurden aber {1} gefunden.</string>
<string name="err_varNotAllowedInCUPL_N">In CUPL ist die Variable {0} nicht erlaubt!</string> <string name="err_varNotAllowedInCUPL_N">In CUPL ist die Variable {0} nicht erlaubt!</string>
<string name="err_varNotDefined_N">Variable {0} ist nicht definiert.</string> <string name="err_varNotDefined_N">Variable {0} ist nicht definiert.</string>
<string name="err_parserUnexpectedToken_N">Unerwartetes Zeichen {0}</string> <string name="err_parserUnexpectedToken_N">Unerwartetes Zeichen {0}</string>

2
src/main/resources/lang/lang_en.xml
View File

@ -390,7 +390,7 @@ To analyse you can run the circuit in single gate step mode.</string>
<string name="err_spitterDefSyntaxError">Syntax error in splitter definition {0}</string> <string name="err_spitterDefSyntaxError">Syntax error in splitter definition {0}</string>
<string name="err_splitterBitsMismatch">Bit count of splitter is not matching</string> <string name="err_splitterBitsMismatch">Bit count of splitter is not matching</string>
<string name="err_tableBecomesToSmall">Two inputs are required!</string> <string name="err_tableBecomesToSmall">Two inputs are required!</string>
<string name="err_toManyInputs_N">To many inputs, allowed are {0}</string> <string name="err_toManyInputs_max_N0_is_N1">To many inputs, allowed are {0} but {1} are found.</string>
<string name="err_varNotAllowedInCUPL_N">Variable {0} is not allowed in CUPL source!</string> <string name="err_varNotAllowedInCUPL_N">Variable {0} is not allowed in CUPL source!</string>
<string name="err_varNotDefined_N">Variable {0} not defined</string> <string name="err_varNotDefined_N">Variable {0} not defined</string>
<string name="err_parserUnexpectedToken_N">Unexpected Token {0}</string> <string name="err_parserUnexpectedToken_N">Unexpected Token {0}</string>