From f420e2cb8132da0134b3aaff6ccfaaeb05c64626 Mon Sep 17 00:00:00 2001 From: andretshurotshka Date: Sun, 7 Jul 2019 02:19:16 +0500 Subject: [PATCH 1/2] [parser] Add comments to conditional_cover and logical_cover --- src/parser/expression_parser.ml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/parser/expression_parser.ml b/src/parser/expression_parser.ml index 954727b6887..0e467ca9149 100644 --- a/src/parser/expression_parser.ml +++ b/src/parser/expression_parser.ml @@ -80,6 +80,7 @@ module Expression let as_pattern = Pattern_cover.as_pattern (* AssignmentExpression : + * YieldExpression * ConditionalExpression * LeftHandSideExpression = AssignmentExpression * LeftHandSideExpression AssignmentOperator AssignmentExpression @@ -249,6 +250,10 @@ module Expression if op <> None then Eat.token env; op + (* ConditionalExpression : + * LogicalExpression + * LogicalExpression ? AssignmentExpression : AssignmentExpression + *) and conditional_cover env = let start_loc = Peek.loc env in let expr = logical_cover env in @@ -270,6 +275,19 @@ module Expression and conditional env = as_expression env (conditional_cover env) + (* + * LogicalANDExpression : + * BinaryExpression + * LogicalANDExpression && BitwiseORExpression + * + * LogicalORExpression : + * LogicalANDExpression + * LogicalORExpression || LogicalANDExpression + * LogicalORExpression ?? LogicalANDExpression + * + * LogicalExpression : + * LogicalORExpression + *) and logical_cover = let open Expression in let make_logical env left right operator loc = From ce019acde7b809e61338caca8f1db4c8543319f9 Mon Sep 17 00:00:00 2001 From: andretshurotshka Date: Sun, 7 Jul 2019 02:29:11 +0500 Subject: [PATCH 2/2] [parser] Add allow_yield env comment --- src/parser/expression_parser.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parser/expression_parser.ml b/src/parser/expression_parser.ml index 0e467ca9149..7c4d7a3fbe7 100644 --- a/src/parser/expression_parser.ml +++ b/src/parser/expression_parser.ml @@ -80,7 +80,7 @@ module Expression let as_pattern = Pattern_cover.as_pattern (* AssignmentExpression : - * YieldExpression + * [+Yield] YieldExpression * ConditionalExpression * LeftHandSideExpression = AssignmentExpression * LeftHandSideExpression AssignmentOperator AssignmentExpression