Add tilde unary operator in syntax.

Author: windelbouwman

parser/src/ast.rs

@@ -286,8 +286,10 @@ pub enum BooleanOperator {
 
 #[derive(Debug, PartialEq)]
 pub enum UnaryOperator {
+    Pos,
     Neg,
     Not,
+    Inv,
 }
 
 #[derive(Debug, PartialEq)]

parser/src/parser.rs

@@ -33,13 +33,9 @@ pub fn read_file(filename: &Path) -> Result<String, String> {
 
 pub fn parse(filename: &Path) -> Result<ast::Program, String> {
     info!("Parsing: {}", filename.display());
-    match read_file(filename) {
-        Ok(txt) => {
-            debug!("Read contents of file: {}", txt);
-            parse_program(&txt)
-        }
-        Err(msg) => Err(msg),
-    }
+    let txt = read_file(filename)?;
+    debug!("Read contents of file: {}", txt);
+    parse_program(&txt)
 }
 
 macro_rules! do_lalr_parsing {

parser/src/python.lalrpop

@@ -748,8 +748,9 @@ MulOp: ast::Operator = {
 };
 
 Factor: ast::Expression = {
-    "+" <e:Factor> => e,
+    "+" <e:Factor> => ast::Expression::Unop { a: Box::new(e), op: ast::UnaryOperator::Pos },
     "-" <e:Factor> => ast::Expression::Unop { a: Box::new(e), op: ast::UnaryOperator::Neg },
+    "~" <e:Factor> => ast::Expression::Unop { a: Box::new(e), op: ast::UnaryOperator::Inv },
     <e:Power> => e,
 };
 
@@ -1013,6 +1014,7 @@ extern {
         StartExpression => lexer::Tok::StartExpression,
         "+" => lexer::Tok::Plus,
         "-" => lexer::Tok::Minus,
+        "~" => lexer::Tok::Tilde,
         ":" => lexer::Tok::Colon,
         "." => lexer::Tok::Dot,
         "," => lexer::Tok::Comma,

vm/src/compile.rs

@@ -847,8 +847,10 @@ impl Compiler {
 
                 // Perform operation:
                 let i = match op {
+                    ast::UnaryOperator::Pos => bytecode::UnaryOperator::Plus,
                     ast::UnaryOperator::Neg => bytecode::UnaryOperator::Minus,
                     ast::UnaryOperator::Not => bytecode::UnaryOperator::Not,
+                    ast::UnaryOperator::Inv => bytecode::UnaryOperator::Invert,
                 };
                 let i = Instruction::UnaryOperation { op: i };
                 self.emit(i);

vm/src/stdlib/ast.rs

@@ -1,9 +1,7 @@
-/*
- * Ast standard module
- *
- * This module makes use of the parser logic, and translates all ast nodes
- * into python ast.AST objects.
- */
+//! `ast` standard module for abstract syntax trees.
+//!
+//! This module makes use of the parser logic, and translates all ast nodes
+//! into python ast.AST objects.
 
 extern crate rustpython_parser;
 
@@ -302,7 +300,9 @@ fn expression_to_ast(ctx: &PyContext, expression: &ast::Expression) -> PyObjectR
 
             let str_op = match op {
                 ast::UnaryOperator::Not => "Not",
+                ast::UnaryOperator::Inv => "Invert",
                 ast::UnaryOperator::Neg => "USub",
+                ast::UnaryOperator::Pos => "UAdd",
             };
             let py_op = ctx.new_str(str_op.to_string());
             node.set_attr("op", py_op);