summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenedikt Böhm <bb@xnull.de>2009-05-16 12:33:17 +0200
committerBenedikt Böhm <bb@xnull.de>2009-05-16 12:33:17 +0200
commitad571051416123ac1b86ce05dbf199b6d084dbc2 (patch)
tree38eab602c05d9a7b0f9cce11734e065b1527ba81
parentb50aea83018bb8d4084e7f0438a665b5c4f4ec09 (diff)
downloadswppy-ad571051416123ac1b86ce05dbf199b6d084dbc2.tar.gz
swppy-ad571051416123ac1b86ce05dbf199b6d084dbc2.tar.xz
swppy-ad571051416123ac1b86ce05dbf199b6d084dbc2.zip
fix operators
-rw-r--r--mylang.ebnf8
1 files changed, 5 insertions, 3 deletions
diff --git a/mylang.ebnf b/mylang.ebnf
index f71d877..53be3a4 100644
--- a/mylang.ebnf
+++ b/mylang.ebnf
@@ -1,6 +1,7 @@
lowercaseLetter = "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" | "k" | "l" | "m" | "n" | "o" | "p" | "q" | "r" | "s" | "t" | "u" | "v" | "w" | "x" | "y" | "z".
uppercaseLetter = "A" | "B" | "C" | "D" | "E" | "F" | "G" | "H" | "I" | "J" | "K" | "L" | "M" | "N" | "O" | "P" | "Q" | "R" | "S" | "T" | "U" | "V" | "W" | "X" | "Y" | "Z".
letter = lowercaseLetter | uppercaseLetter.
+
digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9".
nl = "\n".
@@ -8,13 +9,14 @@ ident = letter { letter | digit }.
integer = digit { digit }.
factor = ident | integer | "(" expression ")" | "~" factor.
-term = factor {("*" | "/" | "%" | "&") factor}.
-simple_expression = ["+" | "-"] term {("+" | "-" | "|") term}.
+term = factor {("*" | "/" | "%" | "&&") factor}.
+simple_expression = ["+" | "-"] term {("+" | "-" | "||") term}.
expression = simple_expression [ ( "==" | "!=" | ">=" | "<=" | ">" | "<" ) simple_expression ].
+
ident_list = ident { "," ident }.
expression_list = expression { "," expression }.
-program = function program.
+program = function { function }.
function = "fun" ident "[" [ ident_list ] "]" statements "end".
statement = [ if_statement | while_statement | assignment | function_call | return_statement ].