TAPAAL

Merge lp:~tapaal-contributor/tapaal/slash-in-name-fix-1575006 into lp:tapaal

  1. slash-in-name-fix-1575006
  2. Merge into trunk
Proposed by Mads Johannsen
Status: Merged
Approved by: Jiri Srba
Approved revision: 932
Merged at revision: 933
Proposed branch: lp:~tapaal-contributor/tapaal/slash-in-name-fix-1575006
Merge into: lp:tapaal
Diff against target: 64 lines (+5/-5)
5 files modified
src/dk/aau/cs/model/tapn/Constant.java (+1/-1)
src/dk/aau/cs/model/tapn/LocalTimedPlace.java (+1/-1)
src/dk/aau/cs/model/tapn/SharedPlace.java (+1/-1)
src/dk/aau/cs/model/tapn/SharedTransition.java (+1/-1)
src/dk/aau/cs/model/tapn/TimedTransition.java (+1/-1)
To merge this branch: bzr merge lp:~tapaal-contributor/tapaal/slash-in-name-fix-1575006
Reviewer Review Type Date Requested Status
Jiri Srba Approve
Review via email: mp+293266@code.launchpad.net

Commit message

Using slash and equality sign in place/transition/constant names is now disallowed.

Description of the change

Makes it impossible to use slashes and equality symbols in place, transition, and constant names.

To post a comment you must log in.
Revision history for this message
Jiri Srba (srba) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/dk/aau/cs/model/tapn/Constant.java'
2--- src/dk/aau/cs/model/tapn/Constant.java 2014-02-27 13:04:19 +0000
3+++ src/dk/aau/cs/model/tapn/Constant.java 2016-04-28 13:20:15 +0000
4@@ -5,7 +5,7 @@
5 import dk.aau.cs.util.Require;
6
7 public class Constant {
8- private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");
9+ private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
10
11 private String name;
12 private int value;
13
14=== modified file 'src/dk/aau/cs/model/tapn/LocalTimedPlace.java'
15--- src/dk/aau/cs/model/tapn/LocalTimedPlace.java 2014-02-27 13:04:19 +0000
16+++ src/dk/aau/cs/model/tapn/LocalTimedPlace.java 2016-04-28 13:20:15 +0000
17@@ -13,7 +13,7 @@
18 import dk.aau.cs.util.Tuple;
19
20 public class LocalTimedPlace extends TimedPlace {
21- private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");
22+ private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
23
24 private String name;
25 private TimeInvariant invariant;
26
27=== modified file 'src/dk/aau/cs/model/tapn/SharedPlace.java'
28--- src/dk/aau/cs/model/tapn/SharedPlace.java 2015-09-29 09:26:14 +0000
29+++ src/dk/aau/cs/model/tapn/SharedPlace.java 2016-04-28 13:20:15 +0000
30@@ -12,7 +12,7 @@
31 import dk.aau.cs.util.Tuple;
32
33 public class SharedPlace extends TimedPlace{
34- private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");
35+ private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
36
37 private String name;
38 private TimeInvariant invariant;
39
40=== modified file 'src/dk/aau/cs/model/tapn/SharedTransition.java'
41--- src/dk/aau/cs/model/tapn/SharedTransition.java 2014-02-27 13:04:19 +0000
42+++ src/dk/aau/cs/model/tapn/SharedTransition.java 2016-04-28 13:20:15 +0000
43@@ -9,7 +9,7 @@
44 import dk.aau.cs.util.Require;
45
46 public class SharedTransition {
47- private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");
48+ private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
49
50 private String name;
51 private List<TimedTransition> transitions = new ArrayList<TimedTransition>();
52
53=== modified file 'src/dk/aau/cs/model/tapn/TimedTransition.java'
54--- src/dk/aau/cs/model/tapn/TimedTransition.java 2014-02-27 13:04:19 +0000
55+++ src/dk/aau/cs/model/tapn/TimedTransition.java 2016-04-28 13:20:15 +0000
56@@ -14,7 +14,7 @@
57 import dk.aau.cs.util.Require;
58
59 public class TimedTransition extends TAPNElement {
60- private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_/=][a-zA-Z0-9_/=]*$");
61+ private static final Pattern namePattern = Pattern.compile("^[a-zA-Z_][a-zA-Z0-9_]*$");
62
63 private String name;
64 private List<TimedOutputArc> postset = new ArrayList<TimedOutputArc>();

Subscribers

People subscribed via source and target branches