Skip to content

Commit 40a1427

Browse files
authored
Merge pull request #168 from returntocorp/export_default
Allow default export for any declaration (extension of #160)
2 parents 4a95461 + 1969bc5 commit 40a1427

File tree

4 files changed

+26271
-25730
lines changed

4 files changed

+26271
-25730
lines changed

grammar.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,16 @@ module.exports = grammar({
111111
field('declaration', $.declaration),
112112
seq(
113113
'default',
114-
field('value', $.expression),
115-
$._semicolon
114+
choice(
115+
field('declaration', $.declaration),
116+
seq(
117+
field('value', $.expression),
118+
$._semicolon
119+
)
120+
)
116121
)
117122
)
118-
),
123+
)
119124
),
120125

121126
export_clause: $ => seq(

src/grammar.json

+32-14
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,34 @@
131131
"value": "default"
132132
},
133133
{
134-
"type": "FIELD",
135-
"name": "value",
136-
"content": {
137-
"type": "SYMBOL",
138-
"name": "expression"
139-
}
140-
},
141-
{
142-
"type": "SYMBOL",
143-
"name": "_semicolon"
134+
"type": "CHOICE",
135+
"members": [
136+
{
137+
"type": "FIELD",
138+
"name": "declaration",
139+
"content": {
140+
"type": "SYMBOL",
141+
"name": "declaration"
142+
}
143+
},
144+
{
145+
"type": "SEQ",
146+
"members": [
147+
{
148+
"type": "FIELD",
149+
"name": "value",
150+
"content": {
151+
"type": "SYMBOL",
152+
"name": "expression"
153+
}
154+
},
155+
{
156+
"type": "SYMBOL",
157+
"name": "_semicolon"
158+
}
159+
]
160+
}
161+
]
144162
}
145163
]
146164
}
@@ -4806,7 +4824,7 @@
48064824
},
48074825
{
48084826
"type": "PATTERN",
4809-
"value": "[^*]*\\*+([^/*][^*]*\\*+)*"
4827+
"value": "[^*]*\\*+([^\\/*][^*]*\\*+)*"
48104828
},
48114829
{
48124830
"type": "STRING",
@@ -4970,7 +4988,7 @@
49704988
},
49714989
{
49724990
"type": "PATTERN",
4973-
"value": "[^/\\\\\\[\\n]"
4991+
"value": "[^\\/\\\\\\[\\n]"
49744992
}
49754993
]
49764994
}
@@ -5480,13 +5498,13 @@
54805498
"members": [
54815499
{
54825500
"type": "PATTERN",
5483-
"value": "[^\\x00-\\x1F\\s0-9:;`\"'@#.,|^&<=>+\\-*/\\\\%?!~()\\[\\]{}\\uFEFF\\u2060\\u200B\\u00A0]|\\\\u[0-9a-fA-F]{4}|\\\\u\\{[0-9a-fA-F]+\\}"
5501+
"value": "[^\\x00-\\x1F\\s0-9:;`\"'@#.,|^&<=>+\\-*\\/\\\\%?!~()\\[\\]{}\\uFEFF\\u2060\\u200B\\u00A0]|\\\\u[0-9a-fA-F]{4}|\\\\u\\{[0-9a-fA-F]+\\}"
54845502
},
54855503
{
54865504
"type": "REPEAT",
54875505
"content": {
54885506
"type": "PATTERN",
5489-
"value": "[^\\x00-\\x1F\\s:;`\"'@#.,|^&<=>+\\-*/\\\\%?!~()\\[\\]{}\\uFEFF\\u2060\\u200B\\u00A0]|\\\\u[0-9a-fA-F]{4}|\\\\u\\{[0-9a-fA-F]+\\}"
5507+
"value": "[^\\x00-\\x1F\\s:;`\"'@#.,|^&<=>+\\-*\\/\\\\%?!~()\\[\\]{}\\uFEFF\\u2060\\u200B\\u00A0]|\\\\u[0-9a-fA-F]{4}|\\\\u\\{[0-9a-fA-F]+\\}"
54905508
}
54915509
}
54925510
]

0 commit comments

Comments
 (0)