EXPR =
'<expr>' [ DEFUN | DEFMACRO | DEFVAR | TERM ] * '</expr>'
-TERM = [ INT | STRING | SYMBOL | LIST | ERROR | VAR | FUNCALL ]
+TERM = [ INT | STRING | SYMBOL | LIST | ERROR | VARREF | FUNCALL ]
DEFUN =
'<defun fname="' FNAME ? ">'
REST =
'<rest vname="' VNAME '">'
-DEFVAR = DEFVAR-INT DEFVAR-STR DEFVAR-SYM
+DEFVAR = DEFVAR-INT | DEFVAR-STR | DEFVAR-SYM
DEFVAR-INT =
'<defvar vname="' VNAME '">'