Commit e7ba877bc1ba4980072a61336bbcf9652ed01771

Michael Schmidt 2021-10-11T16:54:19

PL/SQL: Updated keywords + other improvements (#3109)

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
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
diff --git a/components/prism-plsql.js b/components/prism-plsql.js
index 0197bc3..15967b9 100644
--- a/components/prism-plsql.js
+++ b/components/prism-plsql.js
@@ -1,26 +1,17 @@
-(function (Prism) {
+Prism.languages.plsql = Prism.languages.extend('sql', {
+	'comment': {
+		pattern: /\/\*[\s\S]*?\*\/|--.*/,
+		greedy: true
+	},
+	// https://docs.oracle.com/en/database/oracle/oracle-database/21/lnpls/plsql-reserved-words-keywords.html
+	'keyword': /\b(?:A|ACCESSIBLE|ADD|AGENT|AGGREGATE|ALL|ALTER|AND|ANY|ARRAY|AS|ASC|AT|ATTRIBUTE|AUTHID|AVG|BEGIN|BETWEEN|BFILE_BASE|BINARY|BLOB_BASE|BLOCK|BODY|BOTH|BOUND|BULK|BY|BYTE|C|CALL|CALLING|CASCADE|CASE|CHAR|CHARACTER|CHARSET|CHARSETFORM|CHARSETID|CHAR_BASE|CHECK|CLOB_BASE|CLONE|CLOSE|CLUSTER|CLUSTERS|COLAUTH|COLLECT|COLUMNS|COMMENT|COMMIT|COMMITTED|COMPILED|COMPRESS|CONNECT|CONSTANT|CONSTRUCTOR|CONTEXT|CONTINUE|CONVERT|COUNT|CRASH|CREATE|CREDENTIAL|CURRENT|CURSOR|CUSTOMDATUM|DANGLING|DATA|DATE|DATE_BASE|DAY|DECLARE|DEFAULT|DEFINE|DELETE|DESC|DETERMINISTIC|DIRECTORY|DISTINCT|DOUBLE|DROP|DURATION|ELEMENT|ELSE|ELSIF|EMPTY|END|ESCAPE|EXCEPT|EXCEPTION|EXCEPTIONS|EXCLUSIVE|EXECUTE|EXISTS|EXIT|EXTERNAL|FETCH|FINAL|FIRST|FIXED|FLOAT|FOR|FORALL|FORCE|FROM|FUNCTION|GENERAL|GOTO|GRANT|GROUP|HASH|HAVING|HEAP|HIDDEN|HOUR|IDENTIFIED|IF|IMMEDIATE|IMMUTABLE|IN|INCLUDING|INDEX|INDEXES|INDICATOR|INDICES|INFINITE|INSERT|INSTANTIABLE|INT|INTERFACE|INTERSECT|INTERVAL|INTO|INVALIDATE|IS|ISOLATION|JAVA|LANGUAGE|LARGE|LEADING|LENGTH|LEVEL|LIBRARY|LIKE|LIKE2|LIKE4|LIKEC|LIMIT|LIMITED|LOCAL|LOCK|LONG|LOOP|MAP|MAX|MAXLEN|MEMBER|MERGE|MIN|MINUS|MINUTE|MOD|MODE|MODIFY|MONTH|MULTISET|MUTABLE|NAME|NAN|NATIONAL|NATIVE|NCHAR|NEW|NOCOMPRESS|NOCOPY|NOT|NOWAIT|NULL|NUMBER_BASE|OBJECT|OCICOLL|OCIDATE|OCIDATETIME|OCIDURATION|OCIINTERVAL|OCILOBLOCATOR|OCINUMBER|OCIRAW|OCIREF|OCIREFCURSOR|OCIROWID|OCISTRING|OCITYPE|OF|OLD|ON|ONLY|OPAQUE|OPEN|OPERATOR|OPTION|OR|ORACLE|ORADATA|ORDER|ORGANIZATION|ORLANY|ORLVARY|OTHERS|OUT|OVERLAPS|OVERRIDING|PACKAGE|PARALLEL_ENABLE|PARAMETER|PARAMETERS|PARENT|PARTITION|PASCAL|PERSISTABLE|PIPE|PIPELINED|PLUGGABLE|POLYMORPHIC|PRAGMA|PRECISION|PRIOR|PRIVATE|PROCEDURE|PUBLIC|RAISE|RANGE|RAW|READ|RECORD|REF|REFERENCE|RELIES_ON|REM|REMAINDER|RENAME|RESOURCE|RESULT|RESULT_CACHE|RETURN|RETURNING|REVERSE|REVOKE|ROLLBACK|ROW|SAMPLE|SAVE|SAVEPOINT|SB1|SB2|SB4|SECOND|SEGMENT|SELECT|SELF|SEPARATE|SEQUENCE|SERIALIZABLE|SET|SHARE|SHORT|SIZE|SIZE_T|SOME|SPARSE|SQL|SQLCODE|SQLDATA|SQLNAME|SQLSTATE|STANDARD|START|STATIC|STDDEV|STORED|STRING|STRUCT|STYLE|SUBMULTISET|SUBPARTITION|SUBSTITUTABLE|SUBTYPE|SUM|SYNONYM|TABAUTH|TABLE|TDO|THE|THEN|TIME|TIMESTAMP|TIMEZONE_ABBR|TIMEZONE_HOUR|TIMEZONE_MINUTE|TIMEZONE_REGION|TO|TRAILING|TRANSACTION|TRANSACTIONAL|TRUSTED|TYPE|UB1|UB2|UB4|UNDER|UNION|UNIQUE|UNPLUG|UNSIGNED|UNTRUSTED|UPDATE|USE|USING|VALIST|VALUE|VALUES|VARIABLE|VARIANCE|VARRAY|VARYING|VIEW|VIEWS|VOID|WHEN|WHERE|WHILE|WITH|WORK|WRAPPED|WRITE|YEAR|ZONE)\b/i,
+	// https://docs.oracle.com/en/database/oracle/oracle-database/21/lnpls/plsql-language-fundamentals.html#GUID-96A42F7C-7A71-4B90-8255-CA9C8BD9722E
+	'operator': /:=?|=>|[<>^~!]=|\.\.|\|\||\*\*|[-+*/%<>=@]/
+});
 
-	var plsql = Prism.languages.plsql = Prism.languages.extend('sql', {
-		'comment': [
-			/\/\*[\s\S]*?\*\//,
-			/--.*/
-		]
-	});
-
-	var keyword = plsql['keyword'];
-	if (!Array.isArray(keyword)) {
-		keyword = plsql['keyword'] = [keyword];
-	}
-	keyword.unshift(
-		/\b(?:ACCESS|AGENT|AGGREGATE|ARRAY|ARROW|AT|ATTRIBUTE|AUDIT|AUTHID|BFILE_BASE|BLOB_BASE|BLOCK|BODY|BOTH|BOUND|BYTE|CALLING|CHARSET(?:FORM|ID)|CHAR_BASE|CLOB_BASE|CLUSTERS?|COLAUTH|COLLECT|COMPILED|COMPRESS|CONSTANT|CONSTRUCTOR|CONTEXT|CRASH|CUSTOMDATUM|DANGLING|DATE_BASE|DEFINE|DETERMINISTIC|DURATION|ELEMENT|EMPTY|EXCEPTIONS?|EXCLUSIVE|EXTERNAL|FINAL|FORALL|FORM|FOUND|GENERAL|HEAP|HIDDEN|IDENTIFIED|IMMEDIATE|INCLUDING|INCREMENT|INDEXES|INDICATOR|INDICES|INFINITE|INITIAL|INSTANTIABLE|INTERFACE|INVALIDATE|ISOPEN|JAVA|LARGE|LEADING|LENGTH|LIBRARY|LIKE[24C]|LIMITED|LONG|LOOP|MAP|MAXEXTENTS|MAXLEN|MEMBER|MINUS|MLSLABEL|MULTISET|NAME|NAN|NATIVE|NEW|NOAUDIT|NOCOMPRESS|NOCOPY|NOTFOUND|NOWAIT|NUMBER(?:_BASE)?|OBJECT|OCI(?:COLL|DATE|DATETIME|DURATION|INTERVAL|LOBLOCATOR|NUMBER|RAW|REF|REFCURSOR|ROWID|STRING|TYPE)|OFFLINE|ONLINE|ONLY|OPAQUE|OPERATOR|ORACLE|ORADATA|ORGANIZATION|ORL(?:ANY|VARY)|OTHERS|OVERLAPS|OVERRIDING|PACKAGE|PARALLEL_ENABLE|PARAMETERS?|PASCAL|PCTFREE|PIPE(?:LINED)?|PRAGMA|PRIOR|PRIVATE|RAISE|RANGE|RAW|RECORD|REF|REFERENCE|REM|REMAINDER|RESOURCE|RESULT|RETURNING|REVERSE|ROW(?:ID|NUM|TYPE)|SAMPLE|SB[124]|SEGMENT|SELF|SEPARATE|SEQUENCE|SHORT|SIZE(?:_T)?|SPARSE|SQL(?:CODE|DATA|NAME|STATE)|STANDARD|STATIC|STDDEV|STORED|STRING|STRUCT|STYLE|SUBMULTISET|SUBPARTITION|SUBSTITUTABLE|SUBTYPE|SUCCESSFUL|SYNONYM|SYSDATE|TABAUTH|TDO|THE|TIMEZONE_(?:ABBR|HOUR|MINUTE|REGION)|TRAILING|TRANSAC(?:TIONAL)?|TRUSTED|UB[124]|UID|UNDER|UNTRUSTED|VALIDATE|VALIST|VARCHAR2|VARIABLE|VARIANCE|VARRAY|VIEWS|VOID|WHENEVER|WRAPPED|ZONE)\b/i
-	);
-
-	var operator = plsql['operator'];
-	if (!Array.isArray(operator)) {
-		operator = plsql['operator'] = [operator];
-	}
-	operator.unshift(
-		/:=/
-	);
-
-}(Prism));
+Prism.languages.insertBefore('plsql', 'operator', {
+	'label': {
+		pattern: /<<\s*\w+\s*>>/,
+		alias: 'symbol'
+	},
+});
diff --git a/components/prism-plsql.min.js b/components/prism-plsql.min.js
index ffd7438..e20f68e 100644
--- a/components/prism-plsql.min.js
+++ b/components/prism-plsql.min.js
@@ -1 +1 @@
-!function(E){var A=E.languages.plsql=E.languages.extend("sql",{comment:[/\/\*[\s\S]*?\*\//,/--.*/]}),T=A.keyword;Array.isArray(T)||(T=A.keyword=[T]),T.unshift(/\b(?:ACCESS|AGENT|AGGREGATE|ARRAY|ARROW|AT|ATTRIBUTE|AUDIT|AUTHID|BFILE_BASE|BLOB_BASE|BLOCK|BODY|BOTH|BOUND|BYTE|CALLING|CHARSET(?:FORM|ID)|CHAR_BASE|CLOB_BASE|CLUSTERS?|COLAUTH|COLLECT|COMPILED|COMPRESS|CONSTANT|CONSTRUCTOR|CONTEXT|CRASH|CUSTOMDATUM|DANGLING|DATE_BASE|DEFINE|DETERMINISTIC|DURATION|ELEMENT|EMPTY|EXCEPTIONS?|EXCLUSIVE|EXTERNAL|FINAL|FORALL|FORM|FOUND|GENERAL|HEAP|HIDDEN|IDENTIFIED|IMMEDIATE|INCLUDING|INCREMENT|INDEXES|INDICATOR|INDICES|INFINITE|INITIAL|INSTANTIABLE|INTERFACE|INVALIDATE|ISOPEN|JAVA|LARGE|LEADING|LENGTH|LIBRARY|LIKE[24C]|LIMITED|LONG|LOOP|MAP|MAXEXTENTS|MAXLEN|MEMBER|MINUS|MLSLABEL|MULTISET|NAME|NAN|NATIVE|NEW|NOAUDIT|NOCOMPRESS|NOCOPY|NOTFOUND|NOWAIT|NUMBER(?:_BASE)?|OBJECT|OCI(?:COLL|DATE|DATETIME|DURATION|INTERVAL|LOBLOCATOR|NUMBER|RAW|REF|REFCURSOR|ROWID|STRING|TYPE)|OFFLINE|ONLINE|ONLY|OPAQUE|OPERATOR|ORACLE|ORADATA|ORGANIZATION|ORL(?:ANY|VARY)|OTHERS|OVERLAPS|OVERRIDING|PACKAGE|PARALLEL_ENABLE|PARAMETERS?|PASCAL|PCTFREE|PIPE(?:LINED)?|PRAGMA|PRIOR|PRIVATE|RAISE|RANGE|RAW|RECORD|REF|REFERENCE|REM|REMAINDER|RESOURCE|RESULT|RETURNING|REVERSE|ROW(?:ID|NUM|TYPE)|SAMPLE|SB[124]|SEGMENT|SELF|SEPARATE|SEQUENCE|SHORT|SIZE(?:_T)?|SPARSE|SQL(?:CODE|DATA|NAME|STATE)|STANDARD|STATIC|STDDEV|STORED|STRING|STRUCT|STYLE|SUBMULTISET|SUBPARTITION|SUBSTITUTABLE|SUBTYPE|SUCCESSFUL|SYNONYM|SYSDATE|TABAUTH|TDO|THE|TIMEZONE_(?:ABBR|HOUR|MINUTE|REGION)|TRAILING|TRANSAC(?:TIONAL)?|TRUSTED|UB[124]|UID|UNDER|UNTRUSTED|VALIDATE|VALIST|VARCHAR2|VARIABLE|VARIANCE|VARRAY|VIEWS|VOID|WHENEVER|WRAPPED|ZONE)\b/i);var R=A.operator;Array.isArray(R)||(R=A.operator=[R]),R.unshift(/:=/)}(Prism);
\ No newline at end of file
+Prism.languages.plsql=Prism.languages.extend("sql",{comment:{pattern:/\/\*[\s\S]*?\*\/|--.*/,greedy:!0},keyword:/\b(?:A|ACCESSIBLE|ADD|AGENT|AGGREGATE|ALL|ALTER|AND|ANY|ARRAY|AS|ASC|AT|ATTRIBUTE|AUTHID|AVG|BEGIN|BETWEEN|BFILE_BASE|BINARY|BLOB_BASE|BLOCK|BODY|BOTH|BOUND|BULK|BY|BYTE|C|CALL|CALLING|CASCADE|CASE|CHAR|CHARACTER|CHARSET|CHARSETFORM|CHARSETID|CHAR_BASE|CHECK|CLOB_BASE|CLONE|CLOSE|CLUSTER|CLUSTERS|COLAUTH|COLLECT|COLUMNS|COMMENT|COMMIT|COMMITTED|COMPILED|COMPRESS|CONNECT|CONSTANT|CONSTRUCTOR|CONTEXT|CONTINUE|CONVERT|COUNT|CRASH|CREATE|CREDENTIAL|CURRENT|CURSOR|CUSTOMDATUM|DANGLING|DATA|DATE|DATE_BASE|DAY|DECLARE|DEFAULT|DEFINE|DELETE|DESC|DETERMINISTIC|DIRECTORY|DISTINCT|DOUBLE|DROP|DURATION|ELEMENT|ELSE|ELSIF|EMPTY|END|ESCAPE|EXCEPT|EXCEPTION|EXCEPTIONS|EXCLUSIVE|EXECUTE|EXISTS|EXIT|EXTERNAL|FETCH|FINAL|FIRST|FIXED|FLOAT|FOR|FORALL|FORCE|FROM|FUNCTION|GENERAL|GOTO|GRANT|GROUP|HASH|HAVING|HEAP|HIDDEN|HOUR|IDENTIFIED|IF|IMMEDIATE|IMMUTABLE|IN|INCLUDING|INDEX|INDEXES|INDICATOR|INDICES|INFINITE|INSERT|INSTANTIABLE|INT|INTERFACE|INTERSECT|INTERVAL|INTO|INVALIDATE|IS|ISOLATION|JAVA|LANGUAGE|LARGE|LEADING|LENGTH|LEVEL|LIBRARY|LIKE|LIKE2|LIKE4|LIKEC|LIMIT|LIMITED|LOCAL|LOCK|LONG|LOOP|MAP|MAX|MAXLEN|MEMBER|MERGE|MIN|MINUS|MINUTE|MOD|MODE|MODIFY|MONTH|MULTISET|MUTABLE|NAME|NAN|NATIONAL|NATIVE|NCHAR|NEW|NOCOMPRESS|NOCOPY|NOT|NOWAIT|NULL|NUMBER_BASE|OBJECT|OCICOLL|OCIDATE|OCIDATETIME|OCIDURATION|OCIINTERVAL|OCILOBLOCATOR|OCINUMBER|OCIRAW|OCIREF|OCIREFCURSOR|OCIROWID|OCISTRING|OCITYPE|OF|OLD|ON|ONLY|OPAQUE|OPEN|OPERATOR|OPTION|OR|ORACLE|ORADATA|ORDER|ORGANIZATION|ORLANY|ORLVARY|OTHERS|OUT|OVERLAPS|OVERRIDING|PACKAGE|PARALLEL_ENABLE|PARAMETER|PARAMETERS|PARENT|PARTITION|PASCAL|PERSISTABLE|PIPE|PIPELINED|PLUGGABLE|POLYMORPHIC|PRAGMA|PRECISION|PRIOR|PRIVATE|PROCEDURE|PUBLIC|RAISE|RANGE|RAW|READ|RECORD|REF|REFERENCE|RELIES_ON|REM|REMAINDER|RENAME|RESOURCE|RESULT|RESULT_CACHE|RETURN|RETURNING|REVERSE|REVOKE|ROLLBACK|ROW|SAMPLE|SAVE|SAVEPOINT|SB1|SB2|SB4|SECOND|SEGMENT|SELECT|SELF|SEPARATE|SEQUENCE|SERIALIZABLE|SET|SHARE|SHORT|SIZE|SIZE_T|SOME|SPARSE|SQL|SQLCODE|SQLDATA|SQLNAME|SQLSTATE|STANDARD|START|STATIC|STDDEV|STORED|STRING|STRUCT|STYLE|SUBMULTISET|SUBPARTITION|SUBSTITUTABLE|SUBTYPE|SUM|SYNONYM|TABAUTH|TABLE|TDO|THE|THEN|TIME|TIMESTAMP|TIMEZONE_ABBR|TIMEZONE_HOUR|TIMEZONE_MINUTE|TIMEZONE_REGION|TO|TRAILING|TRANSACTION|TRANSACTIONAL|TRUSTED|TYPE|UB1|UB2|UB4|UNDER|UNION|UNIQUE|UNPLUG|UNSIGNED|UNTRUSTED|UPDATE|USE|USING|VALIST|VALUE|VALUES|VARIABLE|VARIANCE|VARRAY|VARYING|VIEW|VIEWS|VOID|WHEN|WHERE|WHILE|WITH|WORK|WRAPPED|WRITE|YEAR|ZONE)\b/i,operator:/:=?|=>|[<>^~!]=|\.\.|\|\||\*\*|[-+*/%<>=@]/}),Prism.languages.insertBefore("plsql","operator",{label:{pattern:/<<\s*\w+\s*>>/,alias:"symbol"}});
\ No newline at end of file
diff --git a/tests/languages/plsql/keyword_feature.test b/tests/languages/plsql/keyword_feature.test
index e000f72..db916e7 100644
--- a/tests/languages/plsql/keyword_feature.test
+++ b/tests/languages/plsql/keyword_feature.test
@@ -1,94 +1,181 @@
-ACCESS
+A
+ACCESSIBLE
+ADD
 AGENT
 AGGREGATE
+ALL
+ALTER
+AND
+ANY
 ARRAY
-ARROW
+AS
+ASC
 AT
 ATTRIBUTE
-AUDIT
 AUTHID
+AVG
+BEGIN
+BETWEEN
 BFILE_BASE
+BINARY
 BLOB_BASE
 BLOCK
 BODY
 BOTH
 BOUND
+BULK
+BY
 BYTE
+C
+CALL
 CALLING
+CASCADE
+CASE
+CHAR
 CHAR_BASE
+CHARACTER
+CHARSET
 CHARSETFORM
 CHARSETID
+CHECK
 CLOB_BASE
-COLAUTH
-COLLECT
+CLONE
+CLOSE
 CLUSTER
 CLUSTERS
+COLAUTH
+COLLECT
+COLUMNS
+COMMENT
+COMMIT
+COMMITTED
 COMPILED
 COMPRESS
+CONNECT
 CONSTANT
 CONSTRUCTOR
 CONTEXT
+CONTINUE
+CONVERT
+COUNT
 CRASH
+CREATE
+CREDENTIAL
+CURRENT
+CURSOR
 CUSTOMDATUM
 DANGLING
+DATA
+DATE
 DATE_BASE
+DAY
+DECLARE
+DEFAULT
 DEFINE
+DELETE
+DESC
 DETERMINISTIC
+DIRECTORY
+DISTINCT
+DOUBLE
+DROP
 DURATION
 ELEMENT
+ELSE
+ELSIF
 EMPTY
+END
+ESCAPE
+EXCEPT
 EXCEPTION
 EXCEPTIONS
 EXCLUSIVE
+EXECUTE
+EXISTS
+EXIT
 EXTERNAL
+FETCH
 FINAL
+FIRST
+FIXED
+FLOAT
+FOR
 FORALL
-FORM
-FOUND
+FORCE
+FROM
+FUNCTION
 GENERAL
+GOTO
+GRANT
+GROUP
+HASH
+HAVING
 HEAP
 HIDDEN
+HOUR
 IDENTIFIED
+IF
 IMMEDIATE
+IMMUTABLE
+IN
 INCLUDING
-INCREMENT
-INDICATOR
+INDEX
 INDEXES
+INDICATOR
 INDICES
 INFINITE
-INITIAL
-ISOPEN
+INSERT
 INSTANTIABLE
+INT
 INTERFACE
+INTERSECT
+INTERVAL
+INTO
 INVALIDATE
+IS
+ISOLATION
 JAVA
+LANGUAGE
 LARGE
 LEADING
 LENGTH
+LEVEL
 LIBRARY
+LIKE
 LIKE2
 LIKE4
 LIKEC
+LIMIT
 LIMITED
+LOCAL
+LOCK
 LONG
 LOOP
 MAP
-MAXEXTENTS
+MAX
 MAXLEN
 MEMBER
+MERGE
+MIN
 MINUS
-MLSLABEL
+MINUTE
+MOD
+MODE
+MODIFY
+MONTH
 MULTISET
+MUTABLE
 NAME
 NAN
+NATIONAL
 NATIVE
+NCHAR
 NEW
-NOAUDIT
 NOCOMPRESS
 NOCOPY
-NOTFOUND
+NOT
 NOWAIT
-NUMBER
+NULL
 NUMBER_BASE
 OBJECT
 OCICOLL
@@ -104,62 +191,90 @@ OCIREFCURSOR
 OCIROWID
 OCISTRING
 OCITYPE
-OFFLINE
-ONLINE
+OF
+OLD
+ON
 ONLY
 OPAQUE
+OPEN
 OPERATOR
+OPTION
+OR
 ORACLE
 ORADATA
+ORDER
 ORGANIZATION
 ORLANY
 ORLVARY
 OTHERS
+OUT
 OVERLAPS
 OVERRIDING
 PACKAGE
 PARALLEL_ENABLE
 PARAMETER
 PARAMETERS
+PARENT
+PARTITION
 PASCAL
-PCTFREE
+PERSISTABLE
 PIPE
 PIPELINED
+PLUGGABLE
+POLYMORPHIC
 PRAGMA
+PRECISION
 PRIOR
 PRIVATE
+PROCEDURE
+PUBLIC
 RAISE
 RANGE
 RAW
+READ
 RECORD
 REF
 REFERENCE
+RELIES_ON
 REM
 REMAINDER
-RESULT
+RENAME
 RESOURCE
+RESULT
+RESULT_CACHE
+RETURN
 RETURNING
 REVERSE
-ROWID
-ROWNUM
-ROWTYPE
+REVOKE
+ROLLBACK
+ROW
 SAMPLE
+SAVE
+SAVEPOINT
 SB1
 SB2
 SB4
+SECOND
 SEGMENT
+SELECT
 SELF
 SEPARATE
 SEQUENCE
+SERIALIZABLE
+SET
+SHARE
 SHORT
 SIZE
 SIZE_T
+SOME
 SPARSE
+SQL
 SQLCODE
 SQLDATA
 SQLNAME
 SQLSTATE
 STANDARD
+START
 STATIC
 STDDEV
 STORED
@@ -170,132 +285,238 @@ SUBMULTISET
 SUBPARTITION
 SUBSTITUTABLE
 SUBTYPE
-SUCCESSFUL
+SUM
 SYNONYM
-SYSDATE
 TABAUTH
+TABLE
 TDO
 THE
+THEN
+TIME
+TIMESTAMP
 TIMEZONE_ABBR
 TIMEZONE_HOUR
 TIMEZONE_MINUTE
 TIMEZONE_REGION
+TO
 TRAILING
-TRANSAC
+TRANSACTION
 TRANSACTIONAL
 TRUSTED
+TYPE
 UB1
 UB2
 UB4
-UID
 UNDER
+UNION
+UNIQUE
+UNPLUG
+UNSIGNED
 UNTRUSTED
-VALIDATE
+UPDATE
+USE
+USING
 VALIST
-VARCHAR2
+VALUE
+VALUES
 VARIABLE
 VARIANCE
 VARRAY
+VARYING
+VIEW
 VIEWS
 VOID
-WHENEVER
+WHEN
+WHERE
+WHILE
+WITH
+WORK
 WRAPPED
+WRITE
+YEAR
 ZONE
 
 ----------------------------------------------------
 
 [
-	["keyword", "ACCESS"],
+	["keyword", "A"],
+	["keyword", "ACCESSIBLE"],
+	["keyword", "ADD"],
 	["keyword", "AGENT"],
 	["keyword", "AGGREGATE"],
+	["keyword", "ALL"],
+	["keyword", "ALTER"],
+	["keyword", "AND"],
+	["keyword", "ANY"],
 	["keyword", "ARRAY"],
-	["keyword", "ARROW"],
+	["keyword", "AS"],
+	["keyword", "ASC"],
 	["keyword", "AT"],
 	["keyword", "ATTRIBUTE"],
-	["keyword", "AUDIT"],
 	["keyword", "AUTHID"],
+	["keyword", "AVG"],
+	["keyword", "BEGIN"],
+	["keyword", "BETWEEN"],
 	["keyword", "BFILE_BASE"],
+	["keyword", "BINARY"],
 	["keyword", "BLOB_BASE"],
 	["keyword", "BLOCK"],
 	["keyword", "BODY"],
 	["keyword", "BOTH"],
 	["keyword", "BOUND"],
+	["keyword", "BULK"],
+	["keyword", "BY"],
 	["keyword", "BYTE"],
+	["keyword", "C"],
+	["keyword", "CALL"],
 	["keyword", "CALLING"],
+	["keyword", "CASCADE"],
+	["keyword", "CASE"],
+	["keyword", "CHAR"],
 	["keyword", "CHAR_BASE"],
+	["keyword", "CHARACTER"],
+	["keyword", "CHARSET"],
 	["keyword", "CHARSETFORM"],
 	["keyword", "CHARSETID"],
+	["keyword", "CHECK"],
 	["keyword", "CLOB_BASE"],
-	["keyword", "COLAUTH"],
-	["keyword", "COLLECT"],
+	["keyword", "CLONE"],
+	["keyword", "CLOSE"],
 	["keyword", "CLUSTER"],
 	["keyword", "CLUSTERS"],
+	["keyword", "COLAUTH"],
+	["keyword", "COLLECT"],
+	["keyword", "COLUMNS"],
+	["keyword", "COMMENT"],
+	["keyword", "COMMIT"],
+	["keyword", "COMMITTED"],
 	["keyword", "COMPILED"],
 	["keyword", "COMPRESS"],
+	["keyword", "CONNECT"],
 	["keyword", "CONSTANT"],
 	["keyword", "CONSTRUCTOR"],
 	["keyword", "CONTEXT"],
+	["keyword", "CONTINUE"],
+	["keyword", "CONVERT"],
+	["keyword", "COUNT"],
 	["keyword", "CRASH"],
+	["keyword", "CREATE"],
+	["keyword", "CREDENTIAL"],
+	["keyword", "CURRENT"],
+	["keyword", "CURSOR"],
 	["keyword", "CUSTOMDATUM"],
 	["keyword", "DANGLING"],
+	["keyword", "DATA"],
+	["keyword", "DATE"],
 	["keyword", "DATE_BASE"],
+	["keyword", "DAY"],
+	["keyword", "DECLARE"],
+	["keyword", "DEFAULT"],
 	["keyword", "DEFINE"],
+	["keyword", "DELETE"],
+	["keyword", "DESC"],
 	["keyword", "DETERMINISTIC"],
+	["keyword", "DIRECTORY"],
+	["keyword", "DISTINCT"],
+	["keyword", "DOUBLE"],
+	["keyword", "DROP"],
 	["keyword", "DURATION"],
 	["keyword", "ELEMENT"],
+	["keyword", "ELSE"],
+	["keyword", "ELSIF"],
 	["keyword", "EMPTY"],
+	["keyword", "END"],
+	["keyword", "ESCAPE"],
+	["keyword", "EXCEPT"],
 	["keyword", "EXCEPTION"],
 	["keyword", "EXCEPTIONS"],
 	["keyword", "EXCLUSIVE"],
+	["keyword", "EXECUTE"],
+	["keyword", "EXISTS"],
+	["keyword", "EXIT"],
 	["keyword", "EXTERNAL"],
+	["keyword", "FETCH"],
 	["keyword", "FINAL"],
+	["keyword", "FIRST"],
+	["keyword", "FIXED"],
+	["keyword", "FLOAT"],
+	["keyword", "FOR"],
 	["keyword", "FORALL"],
-	["keyword", "FORM"],
-	["keyword", "FOUND"],
+	["keyword", "FORCE"],
+	["keyword", "FROM"],
+	["keyword", "FUNCTION"],
 	["keyword", "GENERAL"],
+	["keyword", "GOTO"],
+	["keyword", "GRANT"],
+	["keyword", "GROUP"],
+	["keyword", "HASH"],
+	["keyword", "HAVING"],
 	["keyword", "HEAP"],
 	["keyword", "HIDDEN"],
+	["keyword", "HOUR"],
 	["keyword", "IDENTIFIED"],
+	["keyword", "IF"],
 	["keyword", "IMMEDIATE"],
+	["keyword", "IMMUTABLE"],
+	["keyword", "IN"],
 	["keyword", "INCLUDING"],
-	["keyword", "INCREMENT"],
-	["keyword", "INDICATOR"],
+	["keyword", "INDEX"],
 	["keyword", "INDEXES"],
+	["keyword", "INDICATOR"],
 	["keyword", "INDICES"],
 	["keyword", "INFINITE"],
-	["keyword", "INITIAL"],
-	["keyword", "ISOPEN"],
+	["keyword", "INSERT"],
 	["keyword", "INSTANTIABLE"],
+	["keyword", "INT"],
 	["keyword", "INTERFACE"],
+	["keyword", "INTERSECT"],
+	["keyword", "INTERVAL"],
+	["keyword", "INTO"],
 	["keyword", "INVALIDATE"],
+	["keyword", "IS"],
+	["keyword", "ISOLATION"],
 	["keyword", "JAVA"],
+	["keyword", "LANGUAGE"],
 	["keyword", "LARGE"],
 	["keyword", "LEADING"],
 	["keyword", "LENGTH"],
+	["keyword", "LEVEL"],
 	["keyword", "LIBRARY"],
+	["keyword", "LIKE"],
 	["keyword", "LIKE2"],
 	["keyword", "LIKE4"],
 	["keyword", "LIKEC"],
+	["keyword", "LIMIT"],
 	["keyword", "LIMITED"],
+	["keyword", "LOCAL"],
+	["keyword", "LOCK"],
 	["keyword", "LONG"],
 	["keyword", "LOOP"],
 	["keyword", "MAP"],
-	["keyword", "MAXEXTENTS"],
+	["keyword", "MAX"],
 	["keyword", "MAXLEN"],
 	["keyword", "MEMBER"],
+	["keyword", "MERGE"],
+	["keyword", "MIN"],
 	["keyword", "MINUS"],
-	["keyword", "MLSLABEL"],
+	["keyword", "MINUTE"],
+	["keyword", "MOD"],
+	["keyword", "MODE"],
+	["keyword", "MODIFY"],
+	["keyword", "MONTH"],
 	["keyword", "MULTISET"],
+	["keyword", "MUTABLE"],
 	["keyword", "NAME"],
 	["keyword", "NAN"],
+	["keyword", "NATIONAL"],
 	["keyword", "NATIVE"],
+	["keyword", "NCHAR"],
 	["keyword", "NEW"],
-	["keyword", "NOAUDIT"],
 	["keyword", "NOCOMPRESS"],
 	["keyword", "NOCOPY"],
-	["keyword", "NOTFOUND"],
+	["keyword", "NOT"],
 	["keyword", "NOWAIT"],
-	["keyword", "NUMBER"],
+	["keyword", "NULL"],
 	["keyword", "NUMBER_BASE"],
 	["keyword", "OBJECT"],
 	["keyword", "OCICOLL"],
@@ -311,62 +532,90 @@ ZONE
 	["keyword", "OCIROWID"],
 	["keyword", "OCISTRING"],
 	["keyword", "OCITYPE"],
-	["keyword", "OFFLINE"],
-	["keyword", "ONLINE"],
+	["keyword", "OF"],
+	["keyword", "OLD"],
+	["keyword", "ON"],
 	["keyword", "ONLY"],
 	["keyword", "OPAQUE"],
+	["keyword", "OPEN"],
 	["keyword", "OPERATOR"],
+	["keyword", "OPTION"],
+	["keyword", "OR"],
 	["keyword", "ORACLE"],
 	["keyword", "ORADATA"],
+	["keyword", "ORDER"],
 	["keyword", "ORGANIZATION"],
 	["keyword", "ORLANY"],
 	["keyword", "ORLVARY"],
 	["keyword", "OTHERS"],
+	["keyword", "OUT"],
 	["keyword", "OVERLAPS"],
 	["keyword", "OVERRIDING"],
 	["keyword", "PACKAGE"],
 	["keyword", "PARALLEL_ENABLE"],
 	["keyword", "PARAMETER"],
 	["keyword", "PARAMETERS"],
+	["keyword", "PARENT"],
+	["keyword", "PARTITION"],
 	["keyword", "PASCAL"],
-	["keyword", "PCTFREE"],
+	["keyword", "PERSISTABLE"],
 	["keyword", "PIPE"],
 	["keyword", "PIPELINED"],
+	["keyword", "PLUGGABLE"],
+	["keyword", "POLYMORPHIC"],
 	["keyword", "PRAGMA"],
+	["keyword", "PRECISION"],
 	["keyword", "PRIOR"],
 	["keyword", "PRIVATE"],
+	["keyword", "PROCEDURE"],
+	["keyword", "PUBLIC"],
 	["keyword", "RAISE"],
 	["keyword", "RANGE"],
 	["keyword", "RAW"],
+	["keyword", "READ"],
 	["keyword", "RECORD"],
 	["keyword", "REF"],
 	["keyword", "REFERENCE"],
+	["keyword", "RELIES_ON"],
 	["keyword", "REM"],
 	["keyword", "REMAINDER"],
-	["keyword", "RESULT"],
+	["keyword", "RENAME"],
 	["keyword", "RESOURCE"],
+	["keyword", "RESULT"],
+	["keyword", "RESULT_CACHE"],
+	["keyword", "RETURN"],
 	["keyword", "RETURNING"],
 	["keyword", "REVERSE"],
-	["keyword", "ROWID"],
-	["keyword", "ROWNUM"],
-	["keyword", "ROWTYPE"],
+	["keyword", "REVOKE"],
+	["keyword", "ROLLBACK"],
+	["keyword", "ROW"],
 	["keyword", "SAMPLE"],
+	["keyword", "SAVE"],
+	["keyword", "SAVEPOINT"],
 	["keyword", "SB1"],
 	["keyword", "SB2"],
 	["keyword", "SB4"],
+	["keyword", "SECOND"],
 	["keyword", "SEGMENT"],
+	["keyword", "SELECT"],
 	["keyword", "SELF"],
 	["keyword", "SEPARATE"],
 	["keyword", "SEQUENCE"],
+	["keyword", "SERIALIZABLE"],
+	["keyword", "SET"],
+	["keyword", "SHARE"],
 	["keyword", "SHORT"],
 	["keyword", "SIZE"],
 	["keyword", "SIZE_T"],
+	["keyword", "SOME"],
 	["keyword", "SPARSE"],
+	["keyword", "SQL"],
 	["keyword", "SQLCODE"],
 	["keyword", "SQLDATA"],
 	["keyword", "SQLNAME"],
 	["keyword", "SQLSTATE"],
 	["keyword", "STANDARD"],
+	["keyword", "START"],
 	["keyword", "STATIC"],
 	["keyword", "STDDEV"],
 	["keyword", "STORED"],
@@ -377,39 +626,54 @@ ZONE
 	["keyword", "SUBPARTITION"],
 	["keyword", "SUBSTITUTABLE"],
 	["keyword", "SUBTYPE"],
-	["keyword", "SUCCESSFUL"],
+	["keyword", "SUM"],
 	["keyword", "SYNONYM"],
-	["keyword", "SYSDATE"],
 	["keyword", "TABAUTH"],
+	["keyword", "TABLE"],
 	["keyword", "TDO"],
 	["keyword", "THE"],
+	["keyword", "THEN"],
+	["keyword", "TIME"],
+	["keyword", "TIMESTAMP"],
 	["keyword", "TIMEZONE_ABBR"],
 	["keyword", "TIMEZONE_HOUR"],
 	["keyword", "TIMEZONE_MINUTE"],
 	["keyword", "TIMEZONE_REGION"],
+	["keyword", "TO"],
 	["keyword", "TRAILING"],
-	["keyword", "TRANSAC"],
+	["keyword", "TRANSACTION"],
 	["keyword", "TRANSACTIONAL"],
 	["keyword", "TRUSTED"],
+	["keyword", "TYPE"],
 	["keyword", "UB1"],
 	["keyword", "UB2"],
 	["keyword", "UB4"],
-	["keyword", "UID"],
 	["keyword", "UNDER"],
+	["keyword", "UNION"],
+	["keyword", "UNIQUE"],
+	["keyword", "UNPLUG"],
+	["keyword", "UNSIGNED"],
 	["keyword", "UNTRUSTED"],
-	["keyword", "VALIDATE"],
+	["keyword", "UPDATE"],
+	["keyword", "USE"],
+	["keyword", "USING"],
 	["keyword", "VALIST"],
-	["keyword", "VARCHAR2"],
+	["keyword", "VALUE"],
+	["keyword", "VALUES"],
 	["keyword", "VARIABLE"],
 	["keyword", "VARIANCE"],
 	["keyword", "VARRAY"],
+	["keyword", "VARYING"],
+	["keyword", "VIEW"],
 	["keyword", "VIEWS"],
 	["keyword", "VOID"],
-	["keyword", "WHENEVER"],
+	["keyword", "WHEN"],
+	["keyword", "WHERE"],
+	["keyword", "WHILE"],
+	["keyword", "WITH"],
+	["keyword", "WORK"],
 	["keyword", "WRAPPED"],
+	["keyword", "WRITE"],
+	["keyword", "YEAR"],
 	["keyword", "ZONE"]
 ]
-
-----------------------------------------------------
-
-Checks for all keywords.
\ No newline at end of file
diff --git a/tests/languages/plsql/label_feature.test b/tests/languages/plsql/label_feature.test
new file mode 100644
index 0000000..478b3cb
--- /dev/null
+++ b/tests/languages/plsql/label_feature.test
@@ -0,0 +1,7 @@
+<< foo >>
+
+----------------------------------------------------
+
+[
+	["label", "<< foo >>"]
+]
diff --git a/tests/languages/plsql/operator_feature.test b/tests/languages/plsql/operator_feature.test
index 1422bca..3935118 100644
--- a/tests/languages/plsql/operator_feature.test
+++ b/tests/languages/plsql/operator_feature.test
@@ -1,11 +1,42 @@
-:=
++ - * / **
+:= :
+=>
+%
+||
+..
+
+= != <> ~= ^= < > <= >=
+@
 
 ----------------------------------------------------
 
 [
-	["operator", ":="]
+	["operator", "+"],
+	["operator", "-"],
+	["operator", "*"],
+	["operator", "/"],
+	["operator", "**"],
+	["operator", ":="],
+	["operator", ":"],
+	["operator", "=>"],
+	["operator", "%"],
+	["operator", "||"],
+	["operator", ".."],
+
+	["operator", "="],
+	["operator", "!="],
+	["operator", "<"],
+	["operator", ">"],
+	["operator", "~="],
+	["operator", "^="],
+	["operator", "<"],
+	["operator", ">"],
+	["operator", "<="],
+	["operator", ">="],
+
+	["operator", "@"]
 ]
 
 ----------------------------------------------------
 
-Checks for all operators.
\ No newline at end of file
+Checks for all operators.