hawkinsw/gp4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Binary Operators (and Grouping in Expressions)

Browse Source 
Add support for <, <=, >, >=, && and ||.

Also, add support for grouping (with ( and )) in expressions.

Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
Will Hawkins
2026-03-23 07:53:41 -04:00
parent 6ff7c5175d
commit 7c35b2b6e5
5 changed files with 158 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tree-sitter-p4/grammar.js
+27 -3
View File
@@ -88,17 +88,32 @@ export default grammar({
parserTransitionStatement: $ => seq($.transition, $.transitionSelectionExpression, $._semicolon),
// Expressions
expression: $ => choice($.identifier, $.integer, $.booleanLiteralExpression, $.string_literal, $.binaryOperatorExpression, $.arrayAccessExpression, $.fieldAccessExpression), // Very limited.
expression: $ => choice($.grouped_expression, $.simple_expression),
grouped_expression: $ => seq('(', $.expression, ')'),
simple_expression: $ => choice($.identifier, $.integer, $.booleanLiteralExpression, $.string_literal, $.binaryOperatorExpression, $.arrayAccessExpression, $.fieldAccessExpression), // Very limited.
booleanLiteralExpression: $ => choice($.true, $.false),
selectExpression: $ => seq($.select, '(', $.expression, ')', '{', $.selectBody, '}'), // TODO: Should be expression list and not just a single expression
transitionSelectionExpression: $ => choice($.identifier, $.selectExpression),
keysetExpression: $ => $.expression,
binaryOperatorExpression: $ => choice($.binaryEqualOperatorExpression),
binaryOperatorExpression: $ => choice($.binaryEqualOperatorExpression,
$.binaryLessThanOperatorExpression,
$.binaryLessThanEqualOperatorExpression,
$.binaryGreaterThanOperatorExpression,
$.binaryGreaterThanEqualOperatorExpression,
$.binaryAndOperatorExpression,
$.binaryOrOperatorExpression,
),
arrayAccessExpression: $ => seq($.expression, $.open_bracket, $.expression, $.close_bracket),
fieldAccessExpression: $=> prec.left(2, seq($.expression, $.field_access, $.identifier)),
// Binary Operations
binaryEqualOperatorExpression: $ => prec.left(2, seq($.expression, $.double_equal, $.expression)),
binaryLessThanOperatorExpression: $ => prec.left(2, seq($.expression, $.less_than, $.expression)),
binaryLessThanEqualOperatorExpression: $ => prec.left(2, seq($.expression, $.less_than_equal, $.expression)),
binaryGreaterThanOperatorExpression: $ => prec.left(2, seq($.expression, $.greater_than, $.expression)),
binaryGreaterThanEqualOperatorExpression: $ => prec.left(2, seq($.expression, $.greater_than_equal, $.expression)),
binaryAndOperatorExpression: $ => prec.left(2, seq($.expression, $.and, $.expression)),
binaryOrOperatorExpression: $ => prec.left(2, seq($.expression, $.or, $.expression)),
// Tokens
_semicolon: $ => ";",
@@ -150,10 +165,19 @@ export default grammar({
void: $ => "void",
identifier: $ => /[A-Za-z_]+/,
type_identifier: $ => /[A-Za-z_]+/,
string_literal: $ => /".*"/,
string_literal: $ => /"[^"]*"/,
integer: $ => /[0-9]+/,
annotation_literal: $ => /@[A-Za-z_]+/,
double_equal: $=> '==',
less_than: $=> '<',
less_than_equal: $=> '<=',
greater_than: $=> '>',
greater_than_equal: $=> '>=',
and: $=> "&&",
or: $=> "||",
open_bracket: $=> '[',
close_bracket: $=> ']',
field_access: $=> '.',
tree-sitter-p4/test/corpus/declarations.txt
+2
View File
@@ -169,11 +169,13 @@ parser simple() {
(identifier)
(assignment)
(expression
(simple_expression
(string_literal)
)
)
)
)
)
(parserTransitionStatement
(transition)
(transitionSelectionExpression
tree-sitter-p4/test/corpus/expressions.txt
+28
View File
@@ -26,15 +26,19 @@ parser simple() {
(conditionalStatement
(if)
(expression
(simple_expression
(binaryOperatorExpression
(binaryEqualOperatorExpression
(expression
(simple_expression
(booleanLiteralExpression
(true)
)
)
)
(double_equal)
(expression
(simple_expression
(booleanLiteralExpression
(false)
)
@@ -42,6 +46,8 @@ parser simple() {
)
)
)
)
)
(statement
(blockStatement)
)
@@ -88,18 +94,24 @@ parser simple() {
(conditionalStatement
(if)
(expression
(simple_expression
(binaryOperatorExpression
(binaryEqualOperatorExpression
(expression
(simple_expression
(integer)
)
)
(double_equal)
(expression
(simple_expression
(integer)
)
)
)
)
)
)
(statement
(blockStatement)
)
@@ -144,20 +156,26 @@ parser simple() {
(parserStatement
(expressionStatement
(expression
(simple_expression
(arrayAccessExpression
(expression
(simple_expression
(identifier)
)
)
(open_bracket)
(expression
(simple_expression
(integer)
)
)
(close_bracket)
)
)
)
)
)
)
(parserTransitionStatement
(transition)
(transitionSelectionExpression
@@ -196,10 +214,13 @@ parser simple() {
(parserStatement
(expressionStatement
(expression
(simple_expression
(fieldAccessExpression
(expression
(simple_expression
(identifier)
)
)
(field_access)
(identifier)
)
@@ -207,6 +228,7 @@ parser simple() {
)
)
)
)
(parserTransitionStatement
(transition)
(transitionSelectionExpression
@@ -245,16 +267,21 @@ parser simple() {
(parserStatement
(expressionStatement
(expression
(simple_expression
(fieldAccessExpression
(expression
(simple_expression
(fieldAccessExpression
(expression
(simple_expression
(identifier)
)
)
(field_access)
(identifier)
)
)
)
(field_access)
(identifier)
)
@@ -262,6 +289,7 @@ parser simple() {
)
)
)
)
(parserTransitionStatement
(transition)
(transitionSelectionExpression
tree-sitter-p4/test/corpus/statements.txt
+32
View File
@@ -26,10 +26,12 @@ parser simple() {
(conditionalStatement
(if)
(expression
(simple_expression
(booleanLiteralExpression
(true)
)
)
)
(statement
(blockStatement)
)
@@ -77,10 +79,12 @@ parser simple() {
(conditionalStatement
(if)
(expression
(simple_expression
(booleanLiteralExpression
(true)
)
)
)
(statement
(blockStatement)
)
@@ -137,22 +141,28 @@ parser simple() {
(identifier)
(assignment)
(expression
(simple_expression
(string_literal)
)
)
)
)
(parserStatement
(assignmentStatement
(expression
(simple_expression
(identifier)
)
)
(assignment)
(expression
(simple_expression
(string_literal)
)
)
)
)
)
(parserTransitionStatement
(transition)
(transitionSelectionExpression
@@ -201,28 +211,35 @@ parser simple() {
(identifier)
(assignment)
(expression
(simple_expression
(booleanLiteralExpression
(true)
)
)
)
)
)
(parserStatement
(conditionalStatement
(if)
(expression
(simple_expression
(identifier)
)
)
(statement
(blockStatement
(statements
(statement
(assignmentStatement
(expression
(simple_expression
(identifier)
)
)
(assignment)
(expression
(simple_expression
(booleanLiteralExpression
(false)
)
@@ -235,6 +252,7 @@ parser simple() {
)
)
)
)
(parserTransitionStatement
(transition)
(transitionSelectionExpression
@@ -286,12 +304,14 @@ parser simple() {
(identifier)
(assignment)
(expression
(simple_expression
(booleanLiteralExpression
(true)
)
)
)
)
)
(parserStatement
(variableDeclaration
(typeRef
@@ -302,26 +322,33 @@ parser simple() {
(identifier)
(assignment)
(expression
(simple_expression
(integer)
)
)
)
)
(parserStatement
(conditionalStatement
(if)
(expression
(simple_expression
(identifier)
)
)
(statement
(blockStatement
(statements
(statement
(assignmentStatement
(expression
(simple_expression
(identifier)
)
)
(assignment)
(expression
(simple_expression
(integer)
)
)
@@ -329,6 +356,7 @@ parser simple() {
)
)
)
)
(else)
(statement
(blockStatement
@@ -336,10 +364,13 @@ parser simple() {
(statement
(assignmentStatement
(expression
(simple_expression
(identifier)
)
)
(assignment)
(expression
(simple_expression
(integer)
)
)
@@ -350,6 +381,7 @@ parser simple() {
)
)
)
)
(parserTransitionStatement
(transition)
(transitionSelectionExpression
tree-sitter-p4/test/corpus/transitions.txt
+4
View File
@@ -60,17 +60,21 @@ parser simple() {
(selectExpression
(select)
(expression
(simple_expression
(identifier)
)
)
(selectBody
(selectCase
(keysetExpression
(expression
(simple_expression
(booleanLiteralExpression
(true)
)
)
)
)
(colon)
(identifier)
)