Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Visitor.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import BasicVisitor from './BasicVisitor.js';
import type { ArrayInitialiser, AssignOp, BitAndOp, BitNotOp, BitOrOp, BitXorOp, Block, Bool, BoundFunction, Break, ChainedComparisonOp, Class_, ClassProtoAssignOp, CompoundAssignOp, Conditional, Constructor, Continue, DefaultParam, DeleteOp, DivideOp, DoOp, DynamicMemberAccessOp, EQOp, ExistsOp, ExpOp, Expansion, Expression, ExtendsOp, Float, FloorDivideOp, ForIn, ForOf, Function_, FunctionApplication, GeneratorFunction, GTEOp, GTOp, Herestring, Identifier, InOp, InstanceofOp, Int, JavaScript, LTEOp, LTOp, LeftShiftOp, LogicalAndOp, LogicalNotOp, LogicalOrOp, MemberAccessOp, MultiplyOp, NEQOp, NewOp, Node, Null, ObjectInitialiser, ObjectInitialiserMember, OfOp, PlusOp, PostDecrementOp, PostIncrementOp, PreDecrementOp, PreIncrementOp, Program, ProtoMemberAccessOp, Range, RegExp, RemOp, Rest, Return, SeqOp, SignedRightShiftOp, Slice, SoakedDynamicMemberAccessOp, SoakedFunctionApplication, SoakedMemberAccessOp, Spread, Statement, String, SubtractOp, Super, Switch, SwitchCase, TemplateLiteral, This, Throw, Try, TypeofOp, UnaryExistsOp, UnaryNegateOp, UnaryPlusOp, Undefined, UnsignedRightShiftOp, While, Yield, YieldFrom, Functions, Assignee, Parameter } from './types.js';
import type { ArrayInitialiser, AssignOp, BitAndOp, BitNotOp, BitOrOp, BitXorOp, Block, Bool, BoundFunction, Break, ChainedComparisonOp, Class_, ClassProtoAssignOp, CompoundAssignOp, Conditional, Constructor, Continue, DefaultParam, DeleteOp, DivideOp, DoOp, DynamicMemberAccessOp, EQOp, ExistsOp, ExpOp, Expansion, Expression, ExtendsOp, Float, FloorDivideOp, ForIn, ForOf, Function_, FunctionApplication, GeneratorFunction, GTEOp, GTOp, Herestring, Identifier, InOp, InstanceofOp, Int, JavaScript, LTEOp, LTOp, LeftShiftOp, LogicalAndOp, LogicalNotOp, LogicalOrOp, MemberAccessOp, ModuloOp, MultiplyOp, NEQOp, NewOp, Node, Null, ObjectInitialiser, ObjectInitialiserMember, OfOp, PlusOp, PostDecrementOp, PostIncrementOp, PreDecrementOp, PreIncrementOp, Program, ProtoMemberAccessOp, Range, RegExp, RemOp, Rest, Return, SeqOp, SignedRightShiftOp, Slice, SoakedDynamicMemberAccessOp, SoakedFunctionApplication, SoakedMemberAccessOp, Spread, Statement, String, SubtractOp, Super, Switch, SwitchCase, TemplateLiteral, This, Throw, Try, TypeofOp, UnaryExistsOp, UnaryNegateOp, UnaryPlusOp, Undefined, UnsignedRightShiftOp, While, Yield, YieldFrom, Functions, Assignee, Parameter } from './types.js';

/**
* Implements the visitor pattern for decaffeinate-parser ASTs.
Expand Down Expand Up @@ -211,6 +211,10 @@ export default class Visitor extends BasicVisitor {
this.visitMemberAccessOp(node);
break;

case 'ModuloOp':
this.visitModuloOp(node);
break;

case 'MultiplyOp':
this.visitMultiplyOp(node);
break;
Expand Down Expand Up @@ -655,6 +659,11 @@ export default class Visitor extends BasicVisitor {
this.descend(node.expression);
}

visitModuloOp(node: ModuloOp) {
this.descend(node.left);
this.descend(node.right);
}

visitMultiplyOp(node: MultiplyOp) {
this.descend(node.left);
this.descend(node.right);
Expand Down
12 changes: 12 additions & 0 deletions src/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,17 @@ export type MemberAccessOp = {
virtual?: boolean;
};

export type ModuloOp = {
type: 'ModuloOp';
left: Expression;
right: Expression;
raw: string;
line: number;
column: number;
range: [ number, number ];
virtual?: boolean;
};

export type MultiplyOp = {
type: 'MultiplyOp';
left: Expression;
Expand Down Expand Up @@ -1034,6 +1045,7 @@ export type Expression =
LogicalNotOp |
LogicalOrOp |
MemberAccessOp |
ModuloOp |
MultiplyOp |
NEQOp |
NewOp |
Expand Down
21 changes: 21 additions & 0 deletions test/Visitor_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,27 @@ describe('Visitor', () => {
)
});

it('handles interesting operators', () => {
let visitor = new TrackVisitsVisitor();
visitor.visit(parse('a %% b'));

deepEqual(
visitor.visited,
[
[ '↓', 'Program' ],
[ '↓', 'Block' ],
[ '↓', 'ModuloOp' ],
[ '↓', 'Identifier' ],
[ '↑', 'Identifier' ],
[ '↓', 'Identifier' ],
[ '↑', 'Identifier' ],
[ '↑', 'ModuloOp' ],
[ '↑', 'Block' ],
[ '↑', 'Program' ]
]
)
});

it('skips missing child nodes', () => {
let visitor = new TrackVisitsVisitor();
visitor.visit(parse('if a then 0 # no `else` clause'));
Expand Down
14 changes: 14 additions & 0 deletions types.json
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,20 @@
}
]
},
{
"name": "ModuloOp",
"extends": "Expression",
"properties": [
{
"name": "left",
"type": "Expression"
},
{
"name": "right",
"type": "Expression"
}
]
},
{
"name": "MultiplyOp",
"extends": "Expression",
Expand Down