From 5aa4c404a590c62bf128e7e199221dbb1125e2a4 Mon Sep 17 00:00:00 2001 From: greg Date: Sun, 31 Jan 2016 00:37:21 -0800 Subject: [PATCH] Added conditionals to grammar --- src/parser.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/parser.rs b/src/parser.rs index 29b2cf3..a8a6876 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -11,10 +11,11 @@ use tokenizer::{Token, Kw, Op}; exprlist := Expression (Comma Expression)* | e expression := primary_expression (op primary_expression)* - primary_expression := Number | String | identifier_expr | paren_expr + primary_expression := Number | String | identifier_expr | paren_expr | conditional_expr identifier_expr := call_expression | Variable paren_expr := LParen expression RParen call_expr := Identifier LParen exprlist RParen + conditional_expr := IF expression THEN (expression delimiter?)* ELSE (expresion delimiter?)* END op := '+', '-', etc. */