Skip to content

Commit 8f9e82f

Browse files
authored
Update Core lexer to adjust for removed keyword enum (#1136)
1 parent 685ad2c commit 8f9e82f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

lexers/embedded/core.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<rule pattern="//(.*?)\n">
1414
<token type="CommentSingle"/>
1515
</rule>
16-
<rule pattern="(class|value|union|enum|trait|impl|annotation)\b">
16+
<rule pattern="(class|value|union|trait|impl|annotation)\b">
1717
<token type="KeywordDeclaration"/>
1818
</rule>
1919
<rule pattern="(fun|let|var)\b">

lexers/testdata/core.actual

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl StacktraceElement {
143143
fun sortsSame(other: Self): Bool
144144
}
145145

146-
@pub enum Option[T] {
146+
@pub union Option[T] {
147147
Some(T),
148148
None,
149149
}
@@ -168,7 +168,7 @@ impl[T] Option[Option[T]] {
168168
... is None { None[T] }
169169
}
170170

171-
@pub enum Result[T, E] {
171+
@pub union Result[T, E] {
172172
Pass(T),
173173
Fail(E),
174174
}

lexers/testdata/core.expected

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@
981981
{"type":"TextWhitespace","value":"\n\n"},
982982
{"type":"NameAttribute","value":"@pub"},
983983
{"type":"TextWhitespace","value":" "},
984-
{"type":"KeywordDeclaration","value":"enum"},
984+
{"type":"KeywordDeclaration","value":"union"},
985985
{"type":"TextWhitespace","value":" "},
986986
{"type":"NameClass","value":"Option"},
987987
{"type":"Punctuation","value":"["},
@@ -1180,7 +1180,7 @@
11801180
{"type":"TextWhitespace","value":"\n\n"},
11811181
{"type":"NameAttribute","value":"@pub"},
11821182
{"type":"TextWhitespace","value":" "},
1183-
{"type":"KeywordDeclaration","value":"enum"},
1183+
{"type":"KeywordDeclaration","value":"union"},
11841184
{"type":"TextWhitespace","value":" "},
11851185
{"type":"NameClass","value":"Result"},
11861186
{"type":"Punctuation","value":"["},

0 commit comments

Comments
 (0)