Repository navigation
Commit f6bf876
authored
fix: Allow underscores in a combination expression (#367)
* fix: Allow '_' in a combination expression
Template Schemas §3.4.3 constraint 1 gives a <CombinationExpr> the characters
allowed in an <Identifier> plus the space and the operators, and §7.1 puts the
underscore among an <Identifier>'s characters. The character class here omitted
it, so a task parameter named Frame_Range was rejected by the pattern before the
expression parser saw it:
steps[0] -> parameterSpace -> combination:
String should match pattern '(?-m:^[A-Za-z0-9\*\(\), ]+\z)'
The name itself was legal, so such a parameter could be declared and never
referenced. Its own comment already claimed the intended relationship to
<Identifier>, so bind both classes to one constant rather than restating it:
the two cannot drift again. The rendered _identifier_regex is unchanged.
The Rust path accepted these all along, so the two lanes disagreed. Add a
control on the v1 side pinning its half of the parity.
Signed-off-by: David Leong <116610336+leongdl@users.noreply.github.com>
* fix: Address review on the combination expression class
Two findings from the automated review.
Scope the comment's claim. It said the shared constant meant Identifier and
CombinationExpr "cannot drift", which is stronger than the code provides: only
the character class is shared, not the leading-character rule. Say what is
actually shared, and record why the space is U+0020 alone.
Whitespace stays narrow, deliberately. The shared TokenStream folds every
whitespace run to a space before lexing, so CombinationExpressionParser on its
own accepts a newline that the pattern refuses. §3.4.3 allows "the space", and
openjd-rs refuses a newline too, so the pattern is the conformant side and
widening it to \s would create a divergence rather than close one. Pin it with
a newline case instead of leaving the decision implicit.
Assert the shared constant, not the rendered pattern. Hardcoding the expanded
regex meant a deliberate widening of _identifier_chars would break a test about
hyphens, which is the opposite of what factoring the constant out was for.
Verified: widening the constant now leaves the negative controls green, while
reverting it, widening to any character, and widening the space to \s are each
caught.
Signed-off-by: David Leong <116610336+leongdl@users.noreply.github.com>
---------
Signed-off-by: David Leong <116610336+leongdl@users.noreply.github.com>1 parent 9a56a9b commit f6bf876
3 files changed
Lines changed: 167 additions & 5 deletions
File tree
- src/openjd/model/v2023_09
- test/openjd
- model_v0/v2023_09
- model_v1
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
193 | 193 | | |
194 | 194 | | |
195 | 195 | | |
196 | | - | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
197 | 199 | | |
198 | 200 | | |
199 | 201 | | |
| |||
1777 | 1779 | | |
1778 | 1780 | | |
1779 | 1781 | | |
1780 | | - | |
1781 | | - | |
| 1782 | + | |
| 1783 | + | |
| 1784 | + | |
| 1785 | + | |
1782 | 1786 | | |
1783 | 1787 | | |
1784 | 1788 | | |
1785 | | - | |
| 1789 | + | |
| 1790 | + | |
| 1791 | + | |
| 1792 | + | |
1786 | 1793 | | |
1787 | 1794 | | |
1788 | 1795 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
10 | 16 | | |
11 | 17 | | |
12 | 18 | | |
| |||
17 | 23 | | |
18 | 24 | | |
19 | 25 | | |
| 26 | + | |
20 | 27 | | |
21 | 28 | | |
22 | 29 | | |
| |||
1071 | 1078 | | |
1072 | 1079 | | |
1073 | 1080 | | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
| 1084 | + | |
| 1085 | + | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
| 1089 | + | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
| 1099 | + | |
| 1100 | + | |
| 1101 | + | |
| 1102 | + | |
| 1103 | + | |
| 1104 | + | |
| 1105 | + | |
| 1106 | + | |
| 1107 | + | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
| 1111 | + | |
| 1112 | + | |
| 1113 | + | |
| 1114 | + | |
| 1115 | + | |
| 1116 | + | |
| 1117 | + | |
| 1118 | + | |
| 1119 | + | |
| 1120 | + | |
| 1121 | + | |
| 1122 | + | |
| 1123 | + | |
| 1124 | + | |
| 1125 | + | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
| 1131 | + | |
| 1132 | + | |
| 1133 | + | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
| 1191 | + | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
| 1199 | + | |
| 1200 | + | |
| 1201 | + | |
| 1202 | + | |
| 1203 | + | |
| 1204 | + | |
| 1205 | + | |
| 1206 | + | |
| 1207 | + | |
| 1208 | + | |
| 1209 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
115 | 134 | | |
116 | 135 | | |
117 | 136 | | |
| |||
0 commit comments