From 66e48dd834859d49faaaa2f748acb3693429a011 Mon Sep 17 00:00:00 2001 From: Umur Ozkul Date: Mon, 25 Jul 2022 19:56:18 +0200 Subject: [PATCH] fixes #872 --- .../Reducer_Peggy_GeneratedParser.peggy | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy index befda109..dfd3eb45 100644 --- a/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy +++ b/packages/squiggle-lang/src/rescript/Reducer/Reducer_Peggy/Reducer_Peggy_GeneratedParser.peggy @@ -46,11 +46,11 @@ voidStatement return h.nodeLetStatement(variable, value); } letStatement - = variable:identifier _ assignmentOp _nl value:zeroOMoreArgumentsBlockOrExpression + = variable:variable _ assignmentOp _nl value:zeroOMoreArgumentsBlockOrExpression { return h.nodeLetStatement(variable, value) } defunStatement - = variable:identifier '(' _nl args:array_parameters _nl ')' _ assignmentOp _nl body:innerBlockOrExpression + = variable:variable '(' _nl args:array_parameters _nl ')' _ assignmentOp _nl body:innerBlockOrExpression { var value = h.nodeLambda(args, body) return h.nodeLetStatement(variable, value) } @@ -144,11 +144,11 @@ chainFunctionCall }, head)} chainedFunction - = fn:dollarIdentifier '(' _nl args:array_functionArguments _nl ')' + = fn:variable '(' _nl args:array_functionArguments _nl ')' { return {fnName: fn.value, args: args}} - / fn:dollarIdentifier '(' _nl ')' + / fn:variable '(' _nl ')' { return {fnName: fn.value, args: []}} - / fn:dollarIdentifier + / fn:variable { return {fnName: fn.value, args: []}} // end of binary operators @@ -192,13 +192,14 @@ basicLiteral = string / number / boolean - / dollarIdentifierWithModule - / dollarIdentifier + / variable / voidLiteral voidLiteral 'void' = "()" {return h.nodeVoid();} +variable = dollarIdentifierWithModule / dollarIdentifier + dollarIdentifierWithModule 'identifier' = head:$moduleIdentifier tail:('.' _nl @$moduleIdentifier)* '.' _nl