Commit9364902

committed

Add tilde unary operator in syntax.

1 parent17fc5a2 commit9364902Copy full SHA for 9364902

File tree

+16

-14

lines changed

+16

-14

lines changed

Lines changed: 2 additions & 0 deletions

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,9 @@ pub fn read_file(filename: &Path) -> Result<String, String> {`
`33`	`33`
`34`	`34`	`pubfnparse(filename:&Path) ->Result<ast::Program,String>{`
`35`	`35`	`info!("Parsing: {}", filename.display());`
`36`		`-matchread_file(filename){`
`37`		`-Ok(txt) =>{`
`38`		`-debug!("Read contents of file: {}", txt);`
`39`		`-parse_program(&txt)`
`40`		`-}`
`41`		`-Err(msg) =>Err(msg),`
`42`		`-}`
	`36`	`+let txt =read_file(filename)?;`
	`37`	`+debug!("Read contents of file: {}", txt);`
	`38`	`+parse_program(&txt)`
`43`	`39`	`}`
`44`	`40`
`45`	`41`	`macro_rules! do_lalr_parsing{`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -748,8 +748,9 @@ MulOp: ast::Operator = {`
`748`	`748`	`};`
`749`	`749`
`750`	`750`	`Factor: ast::Expression = {`
`751`		`- "+" <e:Factor> =>e,`
	`751`	`+ "+" <e:Factor> =>ast::Expression::Unop { a: Box::new(e), op: ast::UnaryOperator::Pos },`
`752`	`752`	`"-" <e:Factor> => ast::Expression::Unop { a: Box::new(e), op: ast::UnaryOperator::Neg },`
	`753`	`+ "~" <e:Factor> => ast::Expression::Unop { a: Box::new(e), op: ast::UnaryOperator::Inv },`
`753`	`754`	`<e:Power> => e,`
`754`	`755`	`};`
`755`	`756`
`@@ -1013,6 +1014,7 @@ extern {`
`1013`	`1014`	`StartExpression => lexer::Tok::StartExpression,`
`1014`	`1015`	`"+" => lexer::Tok::Plus,`
`1015`	`1016`	`"-" => lexer::Tok::Minus,`
	`1017`	`+ "~" => lexer::Tok::Tilde,`
`1016`	`1018`	`":" => lexer::Tok::Colon,`
`1017`	`1019`	`"." => lexer::Tok::Dot,`
`1018`	`1020`	`"," => lexer::Tok::Comma,`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -847,8 +847,10 @@ impl Compiler {`
`847`	`847`
`848`	`848`	`// Perform operation:`
`849`	`849`	`let i =match op{`
	`850`	`+ ast::UnaryOperator::Pos => bytecode::UnaryOperator::Plus,`
`850`	`851`	`ast::UnaryOperator::Neg => bytecode::UnaryOperator::Minus,`
`851`	`852`	`ast::UnaryOperator::Not => bytecode::UnaryOperator::Not,`
	`853`	`+ ast::UnaryOperator::Inv => bytecode::UnaryOperator::Invert,`
`852`	`854`	`};`
`853`	`855`	`let i =Instruction::UnaryOperation{op: i};`
`854`	`856`	`self.emit(i);`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-/*`
`2`		`- * Ast standard module`
`3`		`- *`
`4`		`- * This module makes use of the parser logic, and translates all ast nodes`
`5`		`- * into python ast.AST objects.`
`6`		`- */`
	`1`	+//! `ast` standard module for abstract syntax trees.
	`2`	`+//!`
	`3`	`+//! This module makes use of the parser logic, and translates all ast nodes`
	`4`	`+//! into python ast.AST objects.`
`7`	`5`
`8`	`6`	`externcrate rustpython_parser;`
`9`	`7`
`@@ -302,7 +300,9 @@ fn expression_to_ast(ctx: &PyContext, expression: &ast::Expression) -> PyObjectR`
`302`	`300`
`303`	`301`	`let str_op =match op{`
`304`	`302`	`ast::UnaryOperator::Not =>"Not",`
	`303`	`+ ast::UnaryOperator::Inv =>"Invert",`
`305`	`304`	`ast::UnaryOperator::Neg =>"USub",`
	`305`	`+ ast::UnaryOperator::Pos =>"UAdd",`
`306`	`306`	`};`
`307`	`307`	`let py_op = ctx.new_str(str_op.to_string());`
`308`	`308`	`node.set_attr("op", py_op);`

Comments

(0)