Merge pull request #1087 from Thirumalai-Shaktivel/ternary_if

Author: Thirumalai-Shaktivel

src/lpython/parser/parser.yy

@@ -272,6 +272,7 @@ void yyerror(YYLTYPE *yyloc, LFortran::Parser &p, const std::string &msg)
 
 %precedence ":="
 %precedence LAMBDA
+%left KW_IF KW_ELSE
 %left "or"
 %left "and"
 %precedence "not"
@@ -401,7 +402,6 @@ yield_expr
 expression_statment
     : tuple_list { $$ = EXPR_01($1, @$); }
     | yield_expr { $$ = EXPR_01($1, @$); }
-    | ternary_if_statement { $$ = EXPR_01($1, @$); }
     ;
 
 pass_statement
@@ -435,7 +435,6 @@ target_list
 assignment_statement
     : target_list tuple_list { $$ = ASSIGNMENT($1, $2, @$); }
     | target_list yield_expr { $$ = ASSIGNMENT($1, $2, @$); }
-    | target_list ternary_if_statement { $$ = ASSIGNMENT($1, $2, @$); }
     | target_list tuple_list TK_TYPE_COMMENT {
         $$ = ASSIGNMENT2($1, $2, $3, @$); }
     ;
@@ -1070,6 +1069,7 @@ expr
     | "not" expr { $$ = UNARY($2, Not, @$); }
 
     | comprehension { $$ = $1; }
+    | ternary_if_statement { $$ = $1; }
     | lambda_expression { $$ = $1; }
     ;
 

tests/parser/conditional_expr1.py

@@ -0,0 +1,62 @@
+# Ternary operator (Conditional expressions)
+b = 6 if a == 2 else 8
+
+'true' if True else 'false'
+
+result = x if not (a > b) else y
+
+print(a,"is greater") if (a > b) else print(b,"is Greater")
+
+x('True' if True else 'False')
+
+test = (x(123) if a else b.c)
+
+res = test.x(
+    '' if z is None else var)
+
+size = sum(2 if ord(c) > 0xFFFF else 1 for c in init) + 1
+
+(x, y, 'a' if a else 'b')
+
+x += -1 if true else 1
+
+(self.assertTrue if tktype in whentrue else self.assertFalse)\
+                    (func())
+
+x = {
+    f.parts[0] if len(f.parts) > 1 else f.with_suffix('').name
+    for f in always_iterable(dist.files)
+    if f.suffix == ".py"
+}
+
+return_value = {
+    key: value if not isinstance(value, str) else eval(value, globals, locals)
+    for key, value in ann.items()
+}
+
+kwonly_sig = (msg % ("s" if given != 1 else "", kwonly_given,
+                        "s" if kwonly_given != 1 else ""))
+
+struct.pack_into(
+    "".join(_formats),
+    self.shm.buf,
+    self._offset_data_start,
+    *(v.encode(_enc) if isinstance(v, str) else v for v in sequence)
+)
+
+for name in dirs if entries is None else zip(dirs, entries): ...
+
+if (root or drv) if n == 0 else cf(abs_parts[:n]) != cf(to_abs_parts): ...
+
+x, y = thing, name if isinstance(name, str) else None
+
+print('%*d%s ' % (offset_width, start, ':' if start in labels else '.'),
+                  end='  '*(level-1))
+
+Signals = {
+  C: tuple(C.getcontext().flags.keys()) if C else None,
+  P: tuple(P.getcontext().flags.keys())
+}
+
+# FIXME: Generated AST is not similar to CPython Parser
+chunks = [b'z' if cond1 else b'y' if cond2 else x for word in words]

tests/parser/if2.py

@@ -30,12 +30,3 @@
 if x.shape == () or y.shape == () or x.shape[1] != y.shape[0]:
     assert arr[()] is ArrayLike
     pass
-
-# Ternary operator (Conditional expressions)
-b = 6 if a == 2 else 8
-
-'true' if True else 'false'
-
-result = x if not (a > b) else y
-
-print(a,"is greater") if (a > b) else print(b,"is Greater")

tests/reference/ast_new-conditional_expr1-07ccb9e.json

@@ -0,0 +1,13 @@
+{
+    "basename": "ast_new-conditional_expr1-07ccb9e",
+    "cmd": "lpython --show-ast --new-parser --no-color {infile} -o {outfile}",
+    "infile": "tests/parser/conditional_expr1.py",
+    "infile_hash": "5846a6c58bf238c4276f733b5fc9876a948ed63558444210d9f79c55",
+    "outfile": null,
+    "outfile_hash": null,
+    "stdout": "ast_new-conditional_expr1-07ccb9e.stdout",
+    "stdout_hash": "251284c9d204fc5bea30416beb5eae7c591f6fdc2fa050307a249157",
+    "stderr": null,
+    "stderr_hash": null,
+    "returncode": 0
+}

tests/reference/ast_new-conditional_expr1-07ccb9e.stdout

@@ -0,0 +1 @@
+(Module [(Assign [(Name b Store)] (IfExp (Compare (Name a Load) Eq [(ConstantInt 2 ())]) (ConstantInt 6 ()) (ConstantInt 8 ())) ()) (Expr (IfExp (ConstantBool .true. ()) (ConstantStr "true" ()) (ConstantStr "false" ()))) (Assign [(Name result Store)] (IfExp (UnaryOp Not (Compare (Name a Load) Gt [(Name b Load)])) (Name x Load) (Name y Load)) ()) (Expr (IfExp (Compare (Name a Load) Gt [(Name b Load)]) (Call (Name print Load) [(Name a Load) (ConstantStr "is greater" ())] []) (Call (Name print Load) [(Name b Load) (ConstantStr "is Greater" ())] []))) (Expr (Call (Name x Load) [(IfExp (ConstantBool .true. ()) (ConstantStr "True" ()) (ConstantStr "False" ()))] [])) (Assign [(Name test Store)] (IfExp (Name a Load) (Call (Name x Load) [(ConstantInt 123 ())] []) (Attribute (Name b Load) c Load)) ()) (Assign [(Name res Store)] (Call (Attribute (Name test Load) x Load) [(IfExp (Compare (Name z Load) Is [(ConstantNone ())]) (ConstantStr "" ()) (Name var Load))] []) ()) (Assign [(Name size Store)] (BinOp (Call (Name sum Load) [(GeneratorExp (IfExp (Compare (Call (Name ord Load) [(Name c Load)] []) Gt [(ConstantInt 65535 ())]) (ConstantInt 2 ()) (ConstantInt 1 ())) [((Name c Store) (Name init Load) [] 0)])] []) Add (ConstantInt 1 ())) ()) (Expr (Tuple [(Name x Load) (Name y Load) (IfExp (Name a Load) (ConstantStr "a" ()) (ConstantStr "b" ()))] Load)) (AugAssign (Name x Store) Add (IfExp (Name true Load) (UnaryOp USub (ConstantInt 1 ())) (ConstantInt 1 ()))) (Expr (Call (IfExp (Compare (Name tktype Load) In [(Name whentrue Load)]) (Attribute (Name self Load) assertTrue Load) (Attribute (Name self Load) assertFalse Load)) [(Call (Name func Load) [] [])] [])) (Assign [(Name x Store)] (SetComp (IfExp (Compare (Call (Name len Load) [(Attribute (Name f Load) parts Load)] []) Gt [(ConstantInt 1 ())]) (Subscript (Attribute (Name f Load) parts Load) (ConstantInt 0 ()) Load) (Attribute (Call (Attribute (Name f Load) with_suffix Load) [(ConstantStr "" ())] []) name Load)) [((Name f Store) (Call (Name always_iterable Load) [(Attribute (Name dist Load) files Load)] []) [(Compare (Attribute (Name f Load) suffix Load) Eq [(ConstantStr ".py" ())])] 0)]) ()) (Assign [(Name return_value Store)] (DictComp (Name key Load) (IfExp (UnaryOp Not (Call (Name isinstance Load) [(Name value Load) (Name str Load)] [])) (Name value Load) (Call (Name eval Load) [(Name value Load) (Name globals Load) (Name locals Load)] [])) [((Tuple [(Name key Store) (Name value Store)] Store) (Call (Attribute (Name ann Load) items Load) [] []) [] 0)]) ()) (Assign [(Name kwonly_sig Store)] (BinOp (Name msg Load) Mod (Tuple [(IfExp (Compare (Name given Load) NotEq [(ConstantInt 1 ())]) (ConstantStr "s" ()) (ConstantStr "" ())) (Name kwonly_given Load) (IfExp (Compare (Name kwonly_given Load) NotEq [(ConstantInt 1 ())]) (ConstantStr "s" ()) (ConstantStr "" ()))] Load)) ()) (Expr (Call (Attribute (Name struct Load) pack_into Load) [(Call (Attribute (ConstantStr "" ()) join Load) [(Name _formats Load)] []) (Attribute (Attribute (Name self Load) shm Load) buf Load) (Attribute (Name self Load) _offset_data_start Load) (Starred (GeneratorExp (IfExp (Call (Name isinstance Load) [(Name v Load) (Name str Load)] []) (Call (Attribute (Name v Load) encode Load) [(Name _enc Load)] []) (Name v Load)) [((Name v Store) (Name sequence Load) [] 0)]) Load)] [])) (For (Name name Store) (IfExp (Compare (Name entries Load) Is [(ConstantNone ())]) (Name dirs Load) (Call (Name zip Load) [(Name dirs Load) (Name entries Load)] [])) [(Expr (ConstantEllipsis ()))] [] ()) (If (IfExp (Compare (Name n Load) Eq [(ConstantInt 0 ())]) (BoolOp Or [(Name root Load) (Name drv Load)]) (Compare (Call (Name cf Load) [(Subscript (Name abs_parts Load) (Slice () (Name n Load) ()) Load)] []) NotEq [(Call (Name cf Load) [(Name to_abs_parts Load)] [])])) [(Expr (ConstantEllipsis ()))] []) (Assign [(Tuple [(Name x Store) (Name y Store)] Store)] (Tuple [(Name thing Load) (IfExp (Call (Name isinstance Load) [(Name name Load) (Name str Load)] []) (Name name Load) (ConstantNone ()))] Load) ()) (Expr (Call (Name print Load) [(BinOp (ConstantStr "%*d%s " ()) Mod (Tuple [(Name offset_width Load) (Name start Load) (IfExp (Compare (Name start Load) In [(Name labels Load)]) (ConstantStr ":" ()) (ConstantStr "." ()))] Load))] [(end (BinOp (ConstantStr "  " ()) Mult (BinOp (Name level Load) Sub (ConstantInt 1 ()))))])) (Assign [(Name Signals Store)] (Dict [(Name C Load) (Name P Load)] [(IfExp (Name C Load) (Call (Name tuple Load) [(Call (Attribute (Attribute (Call (Attribute (Name C Load) getcontext Load) [] []) flags Load) keys Load) [] [])] []) (ConstantNone ())) (Call (Name tuple Load) [(Call (Attribute (Attribute (Call (Attribute (Name P Load) getcontext Load) [] []) flags Load) keys Load) [] [])] [])]) ()) (Assign [(Name chunks Store)] (ListComp (IfExp (Name cond2 Load) (IfExp (Name cond1 Load) (ConstantBytes "b'z'" ()) (ConstantBytes "b'y'" ())) (Name x Load)) [((Name word Store) (Name words Load) [] 0)]) ())] [])

tests/reference/ast_new-if2-c3b6022.json

@@ -2,11 +2,11 @@
     "basename": "ast_new-if2-c3b6022",
     "cmd": "lpython --show-ast --new-parser --no-color {infile} -o {outfile}",
     "infile": "tests/parser/if2.py",
-    "infile_hash": "519806e6b51d47084255a725210dcae7d7451b8aa5e9b7e684941831",
+    "infile_hash": "09292d52335f9d0c6e9011355eb63afc6c32e6130ce7e03ff913cec9",
     "outfile": null,
     "outfile_hash": null,
     "stdout": "ast_new-if2-c3b6022.stdout",
-    "stdout_hash": "acb8fee9254dc2a1fff51fd70b7350768c8696f9740a5abf5631cf78",
+    "stdout_hash": "78ba145bd97727929e0eb9bc9a23e9a47f9fcfa53195f39a91b78097",
     "stderr": null,
     "stderr_hash": null,
     "returncode": 0

tests/reference/ast_new-if2-c3b6022.stdout

@@ -1 +1 @@
-(Module [(If (Compare (Call (Name type Load) [(Name x Load)] []) Is [(Name int Load)]) [(Pass)] []) (If (Compare (Compare (BinOp (BinOp (BinOp (ConstantInt 2 ()) Add (ConstantInt 3 ())) Div (ConstantInt 2 ())) Sub (ConstantInt 1 ())) Is [(ConstantInt 5 ())]) Is [(ConstantBool .true. ())]) [(Pass)] []) (If (Compare (Name x Load) IsNot [(Call (Name type Load) [(Name float Load)] [])]) [(Pass)] []) (If (Compare (Name x Load) IsNot [(Call (Name type Load) [(Name int Load)] [])]) [(Pass)] []) (Assign [(Name a Store)] (List [(ConstantInt 1 ()) (ConstantInt 2 ()) (ConstantInt 3 ())] Load) ()) (If (Compare (Name a Load) NotIn [(List [(ConstantInt 1 ()) (ConstantInt 2 ())] Load)]) [(Pass)] []) (If (Compare (Compare (Name a Load) NotIn [(List [(ConstantInt 1 ()) (ConstantInt 2 ())] Load)]) NotIn [(List [(ConstantBool .true. ()) (ConstantBool .false. ())] Load)]) [(Pass)] []) (If (Compare (Name field Load) In [(List [(ConstantStr "vararg" ()) (ConstantStr "kwarg" ())] Load)]) [(If (Compare (Name value Load) Is [(ConstantNone ())]) [(Pass)] [])] []) (If (Compare (Name a Load) In [(Name list1 Load)]) [(Pass)] []) (If (BoolOp Or [(BoolOp Or [(Compare (Attribute (Name x Load) shape Load) Eq [(Tuple [] Load)]) (Compare (Attribute (Name y Load) shape Load) Eq [(Tuple [] Load)])]) (Compare (Subscript (Attribute (Name x Load) shape Load) (ConstantInt 1 ()) Load) NotEq [(Subscript (Attribute (Name y Load) shape Load) (ConstantInt 0 ()) Load)])]) [(Assert (Compare (Subscript (Name arr Load) (Tuple [] Load) Load) Is [(Name ArrayLike Load)]) ()) (Pass)] []) (Assign [(Name b Store)] (IfExp (Compare (Name a Load) Eq [(ConstantInt 2 ())]) (ConstantInt 6 ()) (ConstantInt 8 ())) ()) (Expr (IfExp (ConstantBool .true. ()) (ConstantStr "true" ()) (ConstantStr "false" ()))) (Assign [(Name result Store)] (IfExp (UnaryOp Not (Compare (Name a Load) Gt [(Name b Load)])) (Name x Load) (Name y Load)) ()) (Expr (IfExp (Compare (Name a Load) Gt [(Name b Load)]) (Call (Name print Load) [(Name a Load) (ConstantStr "is greater" ())] []) (Call (Name print Load) [(Name b Load) (ConstantStr "is Greater" ())] [])))] [])
+(Module [(If (Compare (Call (Name type Load) [(Name x Load)] []) Is [(Name int Load)]) [(Pass)] []) (If (Compare (Compare (BinOp (BinOp (BinOp (ConstantInt 2 ()) Add (ConstantInt 3 ())) Div (ConstantInt 2 ())) Sub (ConstantInt 1 ())) Is [(ConstantInt 5 ())]) Is [(ConstantBool .true. ())]) [(Pass)] []) (If (Compare (Name x Load) IsNot [(Call (Name type Load) [(Name float Load)] [])]) [(Pass)] []) (If (Compare (Name x Load) IsNot [(Call (Name type Load) [(Name int Load)] [])]) [(Pass)] []) (Assign [(Name a Store)] (List [(ConstantInt 1 ()) (ConstantInt 2 ()) (ConstantInt 3 ())] Load) ()) (If (Compare (Name a Load) NotIn [(List [(ConstantInt 1 ()) (ConstantInt 2 ())] Load)]) [(Pass)] []) (If (Compare (Compare (Name a Load) NotIn [(List [(ConstantInt 1 ()) (ConstantInt 2 ())] Load)]) NotIn [(List [(ConstantBool .true. ()) (ConstantBool .false. ())] Load)]) [(Pass)] []) (If (Compare (Name field Load) In [(List [(ConstantStr "vararg" ()) (ConstantStr "kwarg" ())] Load)]) [(If (Compare (Name value Load) Is [(ConstantNone ())]) [(Pass)] [])] []) (If (Compare (Name a Load) In [(Name list1 Load)]) [(Pass)] []) (If (BoolOp Or [(BoolOp Or [(Compare (Attribute (Name x Load) shape Load) Eq [(Tuple [] Load)]) (Compare (Attribute (Name y Load) shape Load) Eq [(Tuple [] Load)])]) (Compare (Subscript (Attribute (Name x Load) shape Load) (ConstantInt 1 ()) Load) NotEq [(Subscript (Attribute (Name y Load) shape Load) (ConstantInt 0 ()) Load)])]) [(Assert (Compare (Subscript (Name arr Load) (Tuple [] Load) Load) Is [(Name ArrayLike Load)]) ()) (Pass)] [])] [])

tests/tests.toml

@@ -464,6 +464,10 @@ ast_new = true
 filename = "parser/comprehension1.py"
 ast_new = true
 
+[[test]]
+filename = "parser/conditional_expr1.py"
+ast_new = true
+
 [[test]]
 filename = "parser/try1.py"
 ast_new = true