Merge pull request #35 from ryangjchandler/feature/do-while-loops

trunk_lexer/src/lexer.rs

@@ -833,6 +833,7 @@ fn identifier_to_keyword(ident: &str) -> Option<TokenKind> {
         "const" => TokenKind::Const,
         "declare" => TokenKind::Declare,
         "default" => TokenKind::Default,
+        "do" => TokenKind::Do,
         "echo" => TokenKind::Echo,
         "else" => TokenKind::Else,
         "elseif" => TokenKind::ElseIf,

trunk_parser/src/ast.rs

@@ -169,6 +169,10 @@ pub enum Statement {
     Static {
         vars: Vec<StaticVar>,
     },
+    DoWhile {
+        condition: Expression,
+        body: Block,
+    },
     While {
         condition: Expression,
         body: Block,

trunk_parser/src/parser/mod.rs

@@ -193,6 +193,22 @@ impl Parser {
                 self.next();
                 s
             }
+            TokenKind::Do => {
+                self.next();
+
+                self.lbrace()?;
+                let body = self.block(&TokenKind::RightBrace)?;
+                self.rbrace()?;
+
+                expect!(self, TokenKind::While, "expected while");
+
+                self.lparen()?;
+                let condition = self.expression(0)?;
+                self.rparen()?;
+                self.semi()?;
+
+                Statement::DoWhile { condition, body }
+            }
             TokenKind::While => {
                 self.next();
                 self.lparen()?;
@@ -3045,6 +3061,33 @@ mod tests {
         );
     }
 
+    #[test]
+    fn do_while() {
+        assert_ast(
+            "<?php do { } while ($a);",
+            &[Statement::DoWhile {
+                condition: Expression::Variable { name: "a".into() },
+                body: vec![],
+            }],
+        );
+
+        assert_ast(
+            "<?php 
+        do {
+            echo 'Hi!';
+        } while (true);
+        ",
+            &[Statement::DoWhile {
+                condition: Expression::Bool { value: true },
+                body: vec![Statement::Echo {
+                    values: vec![Expression::ConstantString {
+                        value: "Hi!".into(),
+                    }],
+                }],
+            }],
+        )
+    }
+
     fn assert_ast(source: &str, expected: &[Statement]) {
         let mut lexer = Lexer::new(None);
         let tokens = lexer.tokenize(source).unwrap();