diff options
author | Alex Kirchhoff <debian@usertracker.org> | 2018-08-04 20:08:57 -0700 |
---|---|---|
committer | Andrej Shadura <andrewsh@debian.org> | 2018-08-05 11:42:33 +0200 |
commit | a2f615da39bfb2f0659ac90f97acc6b28f159635 (patch) | |
tree | 0dcc47a067044c553707cdb84ad0449367349db2 /src/net/sourceforge/plantuml/syntax | |
parent | ea27cde858e3ef72889062e06cc1b4c90945f51f (diff) | |
parent | 293202087ef00accaa85af02c2c9359ab6b2513c (diff) |
New upstream version (1.2018.9)debian/1%1.2018.9-1
* Update pdf.patch; add libavalon-framework-java, libcommons-io-java,
libcommons-logging-java, libxml-commons-external-java,
libxmlgraphics-commons-java as dependencies
* Fix "Upgrade to version 1.2018.4 and improve description" by updating to
newest upstream and updating description with new features
(Closes: #897414)
* Update Standards-Version from 4.0.0 to 4.1.5 (no change needed)
Diffstat (limited to 'src/net/sourceforge/plantuml/syntax')
3 files changed, 44 insertions, 21 deletions
diff --git a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java index f4dfb0a..eacb667 100644 --- a/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java +++ b/src/net/sourceforge/plantuml/syntax/LanguageDescriptor.java @@ -42,6 +42,7 @@ import java.util.TreeSet; import net.sourceforge.plantuml.SkinParam; import net.sourceforge.plantuml.graphic.HtmlColorSetSimple; +import net.sourceforge.plantuml.utils.Cypher; public class LanguageDescriptor { @@ -50,7 +51,7 @@ public class LanguageDescriptor { private final Set<String> preproc = new TreeSet<String>(); public LanguageDescriptor() { - + type.add("actor"); type.add("participant"); type.add("usecase"); @@ -149,7 +150,9 @@ public class LanguageDescriptor { keyword.add("fork"); keyword.add("again"); keyword.add("kill"); + keyword.add("order"); + preproc.add("!exit"); preproc.add("!include"); preproc.add("!pragma"); preproc.add("!define"); @@ -163,6 +166,26 @@ public class LanguageDescriptor { preproc.add("!enddefinelong"); } + public Cypher getCypher() { + final Cypher cypher = new Cypher(); + for (String s : type) { + cypher.addException(s); + } + for (String s : keyword) { + cypher.addException(s.replace("@", "")); + } + for (String s : preproc) { + cypher.addException(s.substring(1)); + } + for (String s : SkinParam.getPossibleValues()) { + cypher.addException(s); + } + for (String s : new HtmlColorSetSimple().names()) { + cypher.addException(s); + } + return cypher; + } + public void print(PrintStream ps) { print(ps, "type", type); print(ps, "keyword", keyword); @@ -173,7 +196,7 @@ public class LanguageDescriptor { } private static void print(PrintStream ps, String name, Collection<String> data) { - ps.println(";"+name); + ps.println(";" + name); ps.println(";" + data.size()); for (String k : data) { ps.println(k); diff --git a/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java index abf64b1..f970fd2 100644 --- a/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java +++ b/src/net/sourceforge/plantuml/syntax/SyntaxChecker.java @@ -71,7 +71,7 @@ public class SyntaxChecker { result.setLineLocation(new LineLocationImpl(null, null).oneLineRead()); // result.setErrorLinePosition(0); result.addErrorText("No @startuml found"); - result.setSuggest(Arrays.asList("Did you mean:", "@startuml")); + // result.setSuggest(Arrays.asList("Did you mean:", "@startuml")); return result; } if (source.endsWith("@enduml\n") == false && source.endsWith("@enduml") == false) { @@ -79,7 +79,7 @@ public class SyntaxChecker { result.setLineLocation(lastLineNumber2(source)); // result.setErrorLinePosition(lastLineNumber(source)); result.addErrorText("No @enduml found"); - result.setSuggest(Arrays.asList("Did you mean:", "@enduml")); + // result.setSuggest(Arrays.asList("Did you mean:", "@enduml")); return result; } final SourceStringReader sourceStringReader = new SourceStringReader(Defines.createEmpty(), source, @@ -91,7 +91,7 @@ public class SyntaxChecker { result.setLineLocation(lastLineNumber2(source)); // result.setErrorLinePosition(lastLineNumber(source)); result.addErrorText("No @enduml found"); - result.setSuggest(Arrays.asList("Did you mean:", "@enduml")); + // result.setSuggest(Arrays.asList("Did you mean:", "@enduml")); return result; } final Diagram system = blocks.get(0).getDiagram(); @@ -108,7 +108,7 @@ public class SyntaxChecker { for (ErrorUml er : sys.getErrorsUml()) { result.addErrorText(er.getError()); } - result.setSuggest(sys.getSuggest()); + // result.setSuggest(sys.getSuggest()); } else { result.setDescription(system.getDescription().getDescription()); } @@ -125,7 +125,7 @@ public class SyntaxChecker { result.setError(true); result.setLineLocation(lastLineNumber2(source)); result.addErrorText("No @enduml found"); - result.setSuggest(Arrays.asList("Did you mean:", "@enduml")); + // result.setSuggest(Arrays.asList("Did you mean:", "@enduml")); return result; } @@ -143,7 +143,7 @@ public class SyntaxChecker { result.addErrorText(er.getError()); } result.setSystemError(sys); - result.setSuggest(sys.getSuggest()); + // result.setSuggest(sys.getSuggest()); } else { result.setDescription(system.getDescription().getDescription()); } diff --git a/src/net/sourceforge/plantuml/syntax/SyntaxResult.java b/src/net/sourceforge/plantuml/syntax/SyntaxResult.java index 629aa90..801a120 100644 --- a/src/net/sourceforge/plantuml/syntax/SyntaxResult.java +++ b/src/net/sourceforge/plantuml/syntax/SyntaxResult.java @@ -54,7 +54,7 @@ public class SyntaxResult { private String description; // private int errorLinePosition; private Collection<String> errors = new TreeSet<String>(); - private List<String> suggest; + // private List<String> suggest; private boolean hasCmapData; private PSystemError systemError; private LineLocation lineLocation; @@ -71,13 +71,13 @@ public class SyntaxResult { return description; } -// public int getErrorLinePosition() { -// return errorLinePosition; -// } + // public int getErrorLinePosition() { + // return errorLinePosition; + // } - public List<String> getSuggest() { - return suggest; - } + // public List<String> getSuggest() { + // return suggest; + // } public Collection<String> getErrors() { return Collections.unmodifiableCollection(errors); @@ -95,17 +95,17 @@ public class SyntaxResult { this.description = description; } -// public void setErrorLinePosition(int errorLinePosition) { -// this.errorLinePosition = errorLinePosition; -// } + // public void setErrorLinePosition(int errorLinePosition) { + // this.errorLinePosition = errorLinePosition; + // } public void addErrorText(String error) { this.errors.add(error); } - public void setSuggest(List<String> suggest) { - this.suggest = suggest; - } + // public void setSuggest(List<String> suggest) { + // this.suggest = suggest; + // } public final boolean hasCmapData() { return hasCmapData; |