Skip to content

Commit 70259f7

Browse files
committed
Updating whitespace type to be consistent
1 parent 1893294 commit 70259f7

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"engines": {
44
"node": ">=16"
55
},
6-
"version": "1.4.1",
6+
"version": "1.4.2",
77
"description": "A GLSL ES 1.0 and 3.0 parser and preprocessor that can preserve whitespace and comments",
88
"scripts": {
99
"prepare": "npm run build && ./prepublish.sh",

src/ast/node.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,24 @@ export interface BaseNode {
1515
location?: LocationObject;
1616
}
1717

18+
type Whitespace = string | string[];
19+
1820
export interface LiteralNode extends BaseNode {
1921
type: 'literal';
2022
literal: string;
21-
whitespace: string | string[];
23+
whitespace: Whitespace;
2224
}
2325

2426
export interface KeywordNode extends BaseNode {
2527
type: 'keyword';
2628
token: string;
27-
whitespace: string | string[];
29+
whitespace: Whitespace;
2830
}
2931

3032
export interface IdentifierNode extends BaseNode {
3133
type: 'identifier';
3234
identifier: string;
33-
whitespace: string;
35+
whitespace: Whitespace;
3436
}
3537

3638
export interface ArraySpecifierNode extends BaseNode {
@@ -62,7 +64,7 @@ export interface BinaryNode extends BaseNode {
6264
export interface BoolConstantNode extends BaseNode {
6365
type: 'bool_constant';
6466
token: string;
65-
whitespace: string;
67+
whitespace: Whitespace;
6668
}
6769

6870
export interface BreakStatementNode extends BaseNode {
@@ -140,7 +142,7 @@ export interface DoStatementNode extends BaseNode {
140142
export interface DoubleConstantNode extends BaseNode {
141143
type: 'double_constant';
142144
token: string;
143-
whitespace: string;
145+
whitespace: Whitespace;
144146
}
145147

146148
export interface ExpressionStatementNode extends BaseNode {
@@ -158,7 +160,7 @@ export interface FieldSelectionNode extends BaseNode {
158160
export interface FloatConstantNode extends BaseNode {
159161
type: 'float_constant';
160162
token: string;
161-
whitespace: string;
163+
whitespace: Whitespace;
162164
}
163165

164166
export interface ForStatementNode extends BaseNode {
@@ -237,7 +239,7 @@ export interface InitializerListNode extends BaseNode {
237239
export interface IntConstantNode extends BaseNode {
238240
type: 'int_constant';
239241
token: string;
240-
whitespace: string;
242+
whitespace: Whitespace;
241243
}
242244

243245
export interface InterfaceDeclaratorNode extends BaseNode {
@@ -393,7 +395,7 @@ export interface TypeSpecifierNode extends BaseNode {
393395
export interface UintConstantNode extends BaseNode {
394396
type: 'uint_constant';
395397
token: string;
396-
whitespace: string;
398+
whitespace: Whitespace;
397399
}
398400

399401
export interface UnaryNode extends BaseNode {

0 commit comments

Comments
 (0)