Skip to content

Commit cec95e3

Browse files
runxelrunxel
committed
problem with lookbehind in regex solved
i hate fixed lookbehinds
1 parent 1846b5d commit cec95e3

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

‎Syntaxes/GDL.tmLanguage‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</dict>
2727
<dict>
2828
<key>match</key>
29-
<string>".*"</string>
29+
<string>("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*')</string>
3030
<key>name</key>
3131
<string>string.gdl</string>
3232
</dict>
@@ -38,7 +38,7 @@
3838
</dict>
3939
<dict>
4040
<key>match</key>
41-
<string>(?i)(\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)|(?&lt;=^|\s)(MOD|%|AND|&amp;|OR|\||EXOR|\@|NOT)(?=$|\s)</string>
41+
<string>(?i)(\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)|(?&lt;=^|\s)(MOD|%|AND|&amp;|OR|\||EXOR|\@|NOT)(?=$|\s|\()</string>
4242
<key>name</key>
4343
<string>keyword.operator.gdl</string>
4444
</dict>
@@ -50,13 +50,13 @@
5050
</dict>
5151
<dict>
5252
<key>match</key>
53-
<string>(?i)(?&lt;=^|\s)(ADD[2XYZ]?|ROT[2XYZ]?|MUL[2XYZ]?|XFORM|DEL(\sTOP)?)(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
53+
<string>(?i)(?&lt;=^|\s)(ADD[2XYZ]?|ROT[2XYZ]?|MUL[2XYZ]?|XFORM|DEL(\sTOP)?)(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
5454
<key>name</key>
5555
<string>keyword.gdl.transform</string>
5656
</dict>
5757
<dict>
5858
<key>match</key>
59-
<string>(?i)(?&lt;=^|\s)(ABS|CEIL|INT|FRA|ROUND_INT|SGN|ACS|ASN|ATN|COS|SIN|TAN|PI|EXP|LGT|LOG|SQR|MAX|MIN|RND|STR(\{2\})?|SPLIT|STW|STRLEN|STRSTR|STRSUB|VARDIM[1-2]|DIM|BITTEST|BITSET|REQ(UEST)?(\{2\})?|IND|NTR|VARTYPE)(?=$|\s)</string>
59+
<string>(?i)(?&lt;=^|\s)(ABS|CEIL|INT|FRA|ROUND_INT|SGN|ACS|ASN|ATN|COS|SIN|TAN|PI|EXP|LGT|LOG|SQR|MAX|MIN|RND|STR(\{2\})?|SPLIT|STW|STRLEN|STRSTR|STRSUB|VARDIM[1-2]|DIM|BITTEST|BITSET|REQ(UEST)?(\{2\})?|IND|NTR|VARTYPE)(?=$|\s|\()</string>
6060
<key>name</key>
6161
<string>keyword.other.special-method.gdl.functions</string>
6262
</dict>
@@ -146,7 +146,7 @@
146146
</dict>
147147
<dict>
148148
<key>match</key>
149-
<string>(?i)(PEN|RESOL|RADIUS|TOLER|MODEL|SHADOW|DRAWINDEX|LINE_(TYPE|PROPERTY)|SYMBOL_(LINE|FILL)|FILL[A]?|(EMPTY|TRANSLUCENT|IMAGE|(LINEAR|RADIAL)_GRADIENT)_FILL|FILLTYPES_MASK|MATERIAL|TEXTURE|STYLE(\{2\})?|PARAGRAPH|TEXTBLOCK|ADDITIONAL_DATA|SECT_(FILL|ATTRS))(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
149+
<string>(?i)(PEN|RESOL|RADIUS|TOLER|MODEL|SHADOW|DRAWINDEX|LINE_(TYPE|PROPERTY)|SYMBOL_(LINE|FILL)|FILL[A]?|(EMPTY|TRANSLUCENT|IMAGE|(LINEAR|RADIAL)_GRADIENT)_FILL|FILLTYPES_MASK|MATERIAL|TEXTURE|STYLE(\{2\})?|PARAGRAPH|TEXTBLOCK|ADDITIONAL_DATA|SECT_(FILL|ATTRS))(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
150150
<key>name</key>
151151
<string>support.type.gdl.attribute</string>
152152
</dict>
@@ -176,43 +176,43 @@
176176
</dict>
177177
<dict>
178178
<key>match</key>
179-
<string>(?i)(?&lt;=^|\s)(PRINT|OPEN|INPUT|OUTPUT|CLOSE|CALL|FILE_DEPENDENCE)(?=$|\s)</string>
179+
<string>(?i)(?&lt;=^|\s)(PRINT|OPEN|INPUT|OUTPUT|CLOSE|CALL|FILE_DEPENDENCE)(?=$|\s|\()</string>
180180
<key>name</key>
181181
<string>keyword.gdl.extern</string>
182182
</dict>
183183
<dict>
184184
<key>match</key>
185-
<string>(?i)(?&lt;=^|\s|\+|\-|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(APPLICATION_QUERY|LIBRARYGLOBAL)(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
185+
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\*|\*\*|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(APPLICATION_QUERY|LIBRARYGLOBAL)(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#|\()</string>
186186
<key>name</key>
187187
<string>keyword.gdl.request</string>
188188
</dict>
189189
<dict>
190190
<key>match</key>
191-
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_(SCRIPT_TYPE|CONTEXT|SCALE|NORTH_DIR|DRAWING_BGD_PEN|MODPAR_NAME|WORLD_ORIGO_OFFSET_(X|Y)|FRAME_NR|(FIRST|LAST)_FRAME|(EYE|TARG)POS_(X|Y|Z)|SUN_A(ZIMUTH|LTITUDE)|UI_BUTTON_ID|CUTPLANES_INFO|STRUCTURE_DISPLAY))(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
191+
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\*|\*\*|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_(SCRIPT_TYPE|CONTEXT|SCALE|NORTH_DIR|DRAWING_BGD_PEN|MODPAR_NAME|WORLD_ORIGO_OFFSET_(X|Y)|FRAME_NR|(FIRST|LAST)_FRAME|(EYE|TARG)POS_(X|Y|Z)|SUN_A(ZIMUTH|LTITUDE)|UI_BUTTON_ID|CUTPLANES_INFO|STRUCTURE_DISPLAY))(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
192192
<key>name</key>
193193
<string>keyword.gdl.globals.general</string>
194194
</dict>
195195
<dict>
196196
<key>match</key>
197-
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_((H|C)STORY_(ELEV|HEIGHT)|CH_STORY_DIST))(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
197+
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\*|\*\*|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_((H|C)STORY_(ELEV|HEIGHT)|CH_STORY_DIST))(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
198198
<key>name</key>
199199
<string>keyword.gdl.globals.story</string>
200200
</dict>
201201
<dict>
202202
<key>match</key>
203-
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_(LAYER|ID|INTGUID|ELEVATION|ELEM_TYPE))(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
203+
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\*|\*\*|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_(LAYER|ID|INTGUID|ELEVATION|ELEM_TYPE))(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
204204
<key>name</key>
205205
<string>keyword.gdl.globals.elementparameters</string>
206206
</dict>
207207
<dict>
208208
<key>match</key>
209-
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(SYMB_(LINETYPE|FILL(_PEN)?)|(FBGD|SECT|VIEW)+_PEN|MAT|POS_(X|Y|Z)+|ROTANGLE|MIRRORED|(A|B|Z)+_SIZE)(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
209+
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\*|\*\*|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(SYMB_(LINETYPE|FILL(_PEN)?)|(FBGD|SECT|VIEW)+_PEN|MAT|POS_(X|Y|Z)+|ROTANGLE|MIRRORED|(A|B|Z)+_SIZE)(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
210210
<key>name</key>
211211
<string>keyword.gdl.globals.objectparameters</string>
212212
</dict>
213213
<dict>
214214
<key>match</key>
215-
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_USER_([1-9]\b|[1][0-9]|20))(?=$|\s|\+|\-|\^|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
215+
<string>(?i)(?&lt;=^|\s|\+|\-|\^|\*|\*\*|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)(GLOB_USER_([1-9]\b|[1][0-9]|20))(?=$|\s|\+|\-|\^|\*{1,2}|\/|\=|&lt;|&gt;|&lt;\=|&gt;\=|&lt;&gt;|\#)</string>
216216
<key>name</key>
217217
<string>keyword.gdl.globals.user</string>
218218
</dict>

0 commit comments

Comments
 (0)