Fix strict mode for nested calls and align the parser with R operators

DESCRIPTION

@@ -30,7 +30,6 @@ URL: https://github.com/datashield/DSLite/,
     https://datashield.org/,
     https://doi.org/10.1093/ije/dyu188
 BugReports: https://github.com/datashield/DSLite/issues/
-RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
 VignetteBuilder: knitr
 Encoding: UTF-8
@@ -55,3 +54,4 @@ Collate:
     'setupDSLiteServer.R'
     'setupSURVIVALTest.R'
     'testParse.R'
+Config/roxygen2/version: 8.1.0

R/DSLiteServer.R

@@ -536,8 +536,8 @@ DSLiteServer <- R6::R6Class(
           }
         }
 
-        if (!is.null(self$children)) {
-          for (child in self$children) {
+        if (!is.null(node$children)) {
+          for (child in node$children) {
             if (!is.null(child)) {
               replaceFunctionNode(child)
             }

R/lex-yacc.R

@@ -8,17 +8,17 @@ Lexer <- R6::R6Class(
     tokens = TOKENS,
     literals = LITERALS,
 
-    t_NAME = '[a-zA-Z_][a-zA-Z\\d_\\$\\.-]*',
+    t_NAME = '[a-zA-Z_][a-zA-Z\\d_\\$\\.]*',
 
     t_STRING = '\'[a-zA-Z\\d_+-;:\\$]*\'',
 
     t_DBLSTRING = '"[a-zA-Z\\d_\\.+-;:\\$]*"',
 
     t_INTEGER = '\\d+L',
 
-    t_NUMBER = '[+-]?\\d+(\\.\\d+)?([eE][+-]?\\d+)?',
+    t_NUMBER = '\\d+(\\.\\d+)?([eE][+-]?\\d+)?',
 
-    t_PCTOP = '%[a-z]+%',
+    t_PCTOP = '%[a-z*/]*%',
 
     t_NOTOP = '!',
 
@@ -38,10 +38,17 @@ Parser <- R6::R6Class(
     tokens = TOKENS,
     literals = LITERALS,
     # Parsing rules
+    # From the loosest to the tightest binding, see ?Syntax
     precedence = list(
+      c('right', '='),
+      c('left', '~'),
+      c('right', 'NOTOP'),
       c('left', '+', '-'),
-      c('left', '*', '/', 'PCTOP', ':', '^'),
-      c('right', 'UMINUS', 'NOTOP')
+      c('left', '*', '/'),
+      c('left', 'PCTOP'),
+      c('left', ':'),
+      c('right', 'UMINUS'),
+      c('right', '^')
     ),
 
     p_expression_named = function(doc='expression : NAME "=" expression', p) {
@@ -51,49 +58,23 @@ Parser <- R6::R6Class(
       p$set(1, op)
     },
 
-    p_expression_formula = function(doc='expression : NAME "~" formula_term', p) {
+    p_expression_formula = function(doc='expression : expression "~" expression', p) {
       op <- FormulaNode$new(p$get(3))
-      op$add_child(SymbolNode$new(p$get(2)))
-      op$add_child(p$get(4))
-      p$set(1, op)
-    },
-
-    p_formula_term_binop = function(doc="formula_term : formula_term '+' formula_term
-                                                      | formula_term '-' formula_term
-                                                      | formula_term '*' formula_term
-                                                      | formula_term ':' formula_term
-                                                      | formula_term '^' formula_term
-                                                      | formula_term PCTOP formula_term", p) {
-      op <- BinaryOpNode$new(p$get(3))
       op$add_child(p$get(2))
       op$add_child(p$get(4))
+      # formulas are not mapped to the configured methods
+      op$accept(list(visit = function(node) {
+        if (inherits(node, c("FunctionNode", "StringNode")))
+          stop(sprintf("Syntax error in formula at '%s'", node$name))
+      }))
       p$set(1, op)
     },
 
-    p_formula_term_name = function(doc='formula_term : NAME', p) {
-      p$set(1, SymbolNode$new(p$get(2)))
-    },
-
-    p_formula_term_number = function(doc='formula_term : NUMBER', p) {
-      p$set(1, NumericNode$new(p$get(2)))
-    },
-
-    p_formula_term_not = function(doc='formula_term : NOTOP formula_term', p) {
-      op <- UnaryOpNode$new("!")
-      op$add_child(p$get(3))
-      p$set(1, op)
-    },
-
-    p_formula_term_group = function(doc="formula_term : '(' formula_term ')'", p) {
-      gn <- GroupNode$new()
-      gn$add_child(p$get(3))
-      p$set(1, gn)
-    },
-
     p_expression_binop = function(doc="expression : expression '+' expression
                                                   | expression '-' expression
                                                   | expression '*' expression
                                                   | expression '/' expression
+                                                  | expression '^' expression
                                                   | expression ':' expression
                                                   | expression PCTOP expression", p) {
       if (p$get(3) == ':') {
@@ -109,8 +90,9 @@ Parser <- R6::R6Class(
       }
     },
 
-    p_expression_uminus = function(doc="expression : '-' expression %prec UMINUS", p) {
-      op <- UnaryOpNode$new("-")
+    p_expression_uminus = function(doc="expression : '-' expression %prec UMINUS
+                                                  | '+' expression %prec UMINUS", p) {
+      op <- UnaryOpNode$new(p$get(2))
       op$add_child(p$get(3))
       p$set(1, op)
     },