Commit d04d166df80f8cbe79e723c602f30416fef21d76
2021-12-05T14:54:45
Structured text: Improved tokenization (#3213)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230
diff --git a/components/prism-iecst.js b/components/prism-iecst.js
index 4456ad3..3e0fb97 100644
--- a/components/prism-iecst.js
+++ b/components/prism-iecst.js
@@ -3,6 +3,7 @@ Prism.languages.iecst = {
{
pattern: /(^|[^\\])(?:\/\*[\s\S]*?(?:\*\/|$)|\(\*[\s\S]*?(?:\*\)|$)|\{[\s\S]*?(?:\}|$))/,
lookbehind: true,
+ greedy: true,
},
{
pattern: /(^|[^\\:])\/\/.*/,
@@ -14,17 +15,18 @@ Prism.languages.iecst = {
pattern: /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
greedy: true,
},
- 'class-name': /\b(?:END_)?(?:PROGRAM|CONFIGURATION|INTERFACE|FUNCTION_BLOCK|FUNCTION|ACTION|TRANSITION|TYPE|STRUCT|(?:INITIAL_)?STEP|NAMESPACE|LIBRARY|CHANNEL|FOLDER|RESOURCE|VAR_(?:ACCESS|CONFIG|EXTERNAL|GLOBAL|INPUT|IN_OUT|PUTPUT|TEMP)|VAR|METHOD|PROPERTY)\b/i,
- 'keyword': /\b(?:AT|BY|(?:END_)?(?:CASE|FOR|IF|REPEAT|WHILE)|CONSTANT|CONTINUE|DO|ELSE|ELSIF|EXIT|EXTENDS|FROM|GET|GOTO|IMPLEMENTS|JMP|NON_RETAIN|PRIVATE|PROTECTED|PUBLIC|RETAIN|RETURN|SET|TASK|THEN|TO|UNTIL|USING|WITH|__CATCH|__ENDTRY|__FINALLY|__TRY)\b/,
- 'variable': /\b(?:ANY|ARRAY|AT|BOOL|BYTE|U?(?:D|L|S)?INT|(?:D|L)?WORD|DATE(?:_AND_TIME)?|DT|L?REAL|POINTER|STRING|TIME(?:_OF_DAY)?|TOD)\b/,
- 'symbol': /%[IQM][XBWDL][\d.]*|%[IQ][\d.]*/,
+ 'keyword': [
+ /\b(?:END_)?(?:PROGRAM|CONFIGURATION|INTERFACE|FUNCTION_BLOCK|FUNCTION|ACTION|TRANSITION|TYPE|STRUCT|(?:INITIAL_)?STEP|NAMESPACE|LIBRARY|CHANNEL|FOLDER|RESOURCE|VAR_(?:ACCESS|CONFIG|EXTERNAL|GLOBAL|INPUT|IN_OUT|OUTPUT|TEMP)|VAR|METHOD|PROPERTY)\b/i,
+ /\b(?:AT|BY|(?:END_)?(?:CASE|FOR|IF|REPEAT|WHILE)|CONSTANT|CONTINUE|DO|ELSE|ELSIF|EXIT|EXTENDS|FROM|GET|GOTO|IMPLEMENTS|JMP|NON_RETAIN|OF|PRIVATE|PROTECTED|PUBLIC|RETAIN|RETURN|SET|TASK|THEN|TO|UNTIL|USING|WITH|__CATCH|__ENDTRY|__FINALLY|__TRY)\b/
+ ],
+ 'class-name': /\b(?:ANY|ARRAY|BOOL|BYTE|U?(?:D|L|S)?INT|(?:D|L)?WORD|DATE(?:_AND_TIME)?|DT|L?REAL|POINTER|STRING|TIME(?:_OF_DAY)?|TOD)\b/,
+ 'address': {
+ pattern: /%[IQM][XBWDL][\d.]*|%[IQ][\d.]*/,
+ alias: 'symbol'
+ },
'number': /\b(?:16#[\da-f]+|2#[01_]+|0x[\da-f]+)\b|\b(?:D|DT|T|TOD)#[\d_shmd:]*|\b[A-Z]*#[\d.,_]*|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,
'boolean': /\b(?:FALSE|NULL|TRUE)\b/,
- 'function': /\w+(?=\()/,
- 'operator': /(?:S?R?:?=>?|&&?|\*\*?|<=?|>=?|[-:^/+])|\b(?:AND|EQ|GE|GT|LE|LT|MOD|NE|NOT|OR|XOR)\b/,
- 'punctuation': /[();]/,
- 'type': {
- 'pattern': /#/,
- 'alias': 'selector',
- },
+ 'operator': /S?R?:?=>?|&&?|\*\*?|<[=>]?|>=?|[-:^/+#]|\b(?:AND|EQ|EXPT|GE|GT|LE|LT|MOD|NE|NOT|OR|XOR)\b/,
+ 'function': /\b[a-z_]\w*(?=\s*\()/i,
+ 'punctuation': /[()[\].,;]/,
};
diff --git a/components/prism-iecst.min.js b/components/prism-iecst.min.js
index 97757be..270815b 100644
--- a/components/prism-iecst.min.js
+++ b/components/prism-iecst.min.js
@@ -1 +1 @@
-Prism.languages.iecst={comment:[{pattern:/(^|[^\\])(?:\/\*[\s\S]*?(?:\*\/|$)|\(\*[\s\S]*?(?:\*\)|$)|\{[\s\S]*?(?:\}|$))/,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},"class-name":/\b(?:END_)?(?:PROGRAM|CONFIGURATION|INTERFACE|FUNCTION_BLOCK|FUNCTION|ACTION|TRANSITION|TYPE|STRUCT|(?:INITIAL_)?STEP|NAMESPACE|LIBRARY|CHANNEL|FOLDER|RESOURCE|VAR_(?:ACCESS|CONFIG|EXTERNAL|GLOBAL|INPUT|IN_OUT|PUTPUT|TEMP)|VAR|METHOD|PROPERTY)\b/i,keyword:/\b(?:AT|BY|(?:END_)?(?:CASE|FOR|IF|REPEAT|WHILE)|CONSTANT|CONTINUE|DO|ELSE|ELSIF|EXIT|EXTENDS|FROM|GET|GOTO|IMPLEMENTS|JMP|NON_RETAIN|PRIVATE|PROTECTED|PUBLIC|RETAIN|RETURN|SET|TASK|THEN|TO|UNTIL|USING|WITH|__CATCH|__ENDTRY|__FINALLY|__TRY)\b/,variable:/\b(?:ANY|ARRAY|AT|BOOL|BYTE|U?(?:D|L|S)?INT|(?:D|L)?WORD|DATE(?:_AND_TIME)?|DT|L?REAL|POINTER|STRING|TIME(?:_OF_DAY)?|TOD)\b/,symbol:/%[IQM][XBWDL][\d.]*|%[IQ][\d.]*/,number:/\b(?:16#[\da-f]+|2#[01_]+|0x[\da-f]+)\b|\b(?:D|DT|T|TOD)#[\d_shmd:]*|\b[A-Z]*#[\d.,_]*|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,boolean:/\b(?:FALSE|NULL|TRUE)\b/,function:/\w+(?=\()/,operator:/(?:S?R?:?=>?|&&?|\*\*?|<=?|>=?|[-:^/+])|\b(?:AND|EQ|GE|GT|LE|LT|MOD|NE|NOT|OR|XOR)\b/,punctuation:/[();]/,type:{pattern:/#/,alias:"selector"}};
\ No newline at end of file
+Prism.languages.iecst={comment:[{pattern:/(^|[^\\])(?:\/\*[\s\S]*?(?:\*\/|$)|\(\*[\s\S]*?(?:\*\)|$)|\{[\s\S]*?(?:\}|$))/,lookbehind:!0,greedy:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0,greedy:!0}],string:{pattern:/(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,greedy:!0},keyword:[/\b(?:END_)?(?:PROGRAM|CONFIGURATION|INTERFACE|FUNCTION_BLOCK|FUNCTION|ACTION|TRANSITION|TYPE|STRUCT|(?:INITIAL_)?STEP|NAMESPACE|LIBRARY|CHANNEL|FOLDER|RESOURCE|VAR_(?:ACCESS|CONFIG|EXTERNAL|GLOBAL|INPUT|IN_OUT|OUTPUT|TEMP)|VAR|METHOD|PROPERTY)\b/i,/\b(?:AT|BY|(?:END_)?(?:CASE|FOR|IF|REPEAT|WHILE)|CONSTANT|CONTINUE|DO|ELSE|ELSIF|EXIT|EXTENDS|FROM|GET|GOTO|IMPLEMENTS|JMP|NON_RETAIN|OF|PRIVATE|PROTECTED|PUBLIC|RETAIN|RETURN|SET|TASK|THEN|TO|UNTIL|USING|WITH|__CATCH|__ENDTRY|__FINALLY|__TRY)\b/],"class-name":/\b(?:ANY|ARRAY|BOOL|BYTE|U?(?:D|L|S)?INT|(?:D|L)?WORD|DATE(?:_AND_TIME)?|DT|L?REAL|POINTER|STRING|TIME(?:_OF_DAY)?|TOD)\b/,address:{pattern:/%[IQM][XBWDL][\d.]*|%[IQ][\d.]*/,alias:"symbol"},number:/\b(?:16#[\da-f]+|2#[01_]+|0x[\da-f]+)\b|\b(?:D|DT|T|TOD)#[\d_shmd:]*|\b[A-Z]*#[\d.,_]*|(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i,boolean:/\b(?:FALSE|NULL|TRUE)\b/,operator:/S?R?:?=>?|&&?|\*\*?|<[=>]?|>=?|[-:^/+#]|\b(?:AND|EQ|EXPT|GE|GT|LE|LT|MOD|NE|NOT|OR|XOR)\b/,function:/\b[a-z_]\w*(?=\s*\()/i,punctuation:/[()[\].,;]/};
\ No newline at end of file
diff --git a/tests/languages/iecst/address_feature.test b/tests/languages/iecst/address_feature.test
new file mode 100644
index 0000000..e556407
--- /dev/null
+++ b/tests/languages/iecst/address_feature.test
@@ -0,0 +1,24 @@
+VAR
+ varname AT %QX1.0.0: BOOL := TRUE;
+END_VAR
+
+----------------------------------------------------
+
+[
+ ["keyword", "VAR"],
+
+ "\r\n varname ",
+ ["keyword", "AT"],
+ ["address", "%QX1.0.0"],
+ ["operator", ":"],
+ ["class-name", "BOOL"],
+ ["operator", ":="],
+ ["boolean", "TRUE"],
+ ["punctuation", ";"],
+
+ ["keyword", "END_VAR"]
+]
+
+----------------------------------------------------
+
+Checks symbols.
diff --git a/tests/languages/iecst/number.test b/tests/languages/iecst/number.test
deleted file mode 100644
index 666f8fb..0000000
--- a/tests/languages/iecst/number.test
+++ /dev/null
@@ -1,13 +0,0 @@
-a := 100
-
-----------------------------------------------------
-
-[
- "a ",
- ["operator", ":="],
- ["number", "100"]
-]
-
-----------------------------------------------------
-
-Checks number.
diff --git a/tests/languages/iecst/number_feature.test b/tests/languages/iecst/number_feature.test
new file mode 100644
index 0000000..666f8fb
--- /dev/null
+++ b/tests/languages/iecst/number_feature.test
@@ -0,0 +1,13 @@
+a := 100
+
+----------------------------------------------------
+
+[
+ "a ",
+ ["operator", ":="],
+ ["number", "100"]
+]
+
+----------------------------------------------------
+
+Checks number.
diff --git a/tests/languages/iecst/operator_feature.test b/tests/languages/iecst/operator_feature.test
new file mode 100644
index 0000000..68b5b74
--- /dev/null
+++ b/tests/languages/iecst/operator_feature.test
@@ -0,0 +1,54 @@
+= <> < <= > >=
++ - * / ** ^ & &&
+
+: :=
+#
+
+AND
+EQ
+EXPT
+GE
+GT
+LE
+LT
+MOD
+NE
+NOT
+OR
+XOR
+
+----------------------------------------------------
+
+[
+ ["operator", "="],
+ ["operator", "<>"],
+ ["operator", "<"],
+ ["operator", "<="],
+ ["operator", ">"],
+ ["operator", ">="],
+
+ ["operator", "+"],
+ ["operator", "-"],
+ ["operator", "*"],
+ ["operator", "/"],
+ ["operator", "**"],
+ ["operator", "^"],
+ ["operator", "&"],
+ ["operator", "&&"],
+
+ ["operator", ":"], ["operator", ":="],
+ ["operator", "#"],
+
+ ["operator", "AND"],
+ ["operator", "EQ"],
+ ["operator", "EXPT"],
+ ["operator", "GE"],
+ ["operator", "GT"],
+ ["operator", "LE"],
+ ["operator", "LT"],
+ ["operator", "MOD"],
+ ["operator", "NE"],
+ ["operator", "NOT"],
+ ["operator", "OR"],
+ ["operator", "XOR"]
+]
diff --git a/tests/languages/iecst/punctuation_feature.test b/tests/languages/iecst/punctuation_feature.test
new file mode 100644
index 0000000..b1400d0
--- /dev/null
+++ b/tests/languages/iecst/punctuation_feature.test
@@ -0,0 +1,15 @@
+( ) [ ]
+, ; .
+
+----------------------------------------------------
+
+[
+ ["punctuation", "("],
+ ["punctuation", ")"],
+ ["punctuation", "["],
+ ["punctuation", "]"],
+
+ ["punctuation", ","],
+ ["punctuation", ";"],
+ ["punctuation", "."]
+]
diff --git a/tests/languages/iecst/symbol.test b/tests/languages/iecst/symbol.test
deleted file mode 100644
index a55153d..0000000
--- a/tests/languages/iecst/symbol.test
+++ /dev/null
@@ -1,24 +0,0 @@
-VAR
- varname AT %QX1.0.0: BOOL := TRUE;
-END_VAR
-
-----------------------------------------------------
-
-[
- ["class-name", "VAR"],
-
- "\r\n varname ",
- ["keyword", "AT"],
- ["symbol", "%QX1.0.0"],
- ["operator", ":"],
- ["variable", "BOOL"],
- ["operator", ":="],
- ["boolean", "TRUE"],
- ["punctuation", ";"],
-
- ["class-name", "END_VAR"]
-]
-
-----------------------------------------------------
-
-Checks symbols.